From 2295f24622359872192dca382954781806c17f05 Mon Sep 17 00:00:00 2001
From: Johannes Kettmann <jkettmann@gmx.net>
Date: Tue, 13 Dec 2022 15:11:45 +0100
Subject: [PATCH 1/5] Use URL params as single source of truth

---
 .../issues/components/filters/filters.tsx     | 44 ++----------------
 features/issues/context/filters-context.tsx   | 46 -------------------
 features/issues/context/index.ts              |  1 -
 features/issues/hooks/use-filters.ts          | 21 +++++++--
 features/issues/index.ts                      |  1 -
 features/ui/page-container/page-container.tsx | 33 ++++++-------
 pages/dashboard/issues.tsx                    | 15 +++---
 7 files changed, 43 insertions(+), 118 deletions(-)
 delete mode 100644 features/issues/context/filters-context.tsx
 delete mode 100644 features/issues/context/index.ts

diff --git a/features/issues/components/filters/filters.tsx b/features/issues/components/filters/filters.tsx
index 5b92d0d..4410de5 100644
--- a/features/issues/components/filters/filters.tsx
+++ b/features/issues/components/filters/filters.tsx
@@ -1,11 +1,4 @@
-import React, {
-  useState,
-  useEffect,
-  useCallback,
-  useRef,
-  useContext,
-} from "react";
-import { useRouter } from "next/router";
+import React, { useState, useCallback, useContext } from "react";
 import { useWindowSize } from "react-use";
 import { Select, Option, Input, NavigationContext } from "@features/ui";
 import { useFilters } from "../../hooks/use-filters";
@@ -16,15 +9,14 @@ import * as S from "./filters.styled";
 export function Filters() {
   const { handleFilters, filters } = useFilters();
   const { data: projects } = useProjects();
-  const router = useRouter();
-  const routerQueryProjectName =
-    (router.query.projectName as string)?.toLowerCase() || undefined;
+
   const [inputValue, setInputValue] = useState<string>("");
   const projectNames = projects?.map((project) => project.name.toLowerCase());
-  const isFirst = useRef(true);
+
   const { width } = useWindowSize();
   const isMobileScreen = width <= 1023;
   const { isMobileMenuOpen } = useContext(NavigationContext);
+
   const handleChange = (input: string) => {
     setInputValue(input);
 
@@ -65,34 +57,6 @@ export function Filters() {
     [handleFilters]
   );
 
-  useEffect(() => {
-    const newObj: { [key: string]: string } = {
-      ...filters,
-    };
-
-    Object.keys(newObj).forEach((key) => {
-      if (newObj[key] === undefined) {
-        delete newObj[key];
-      }
-    });
-
-    const url = {
-      pathname: router.pathname,
-      query: {
-        page: router.query.page || 1,
-        ...newObj,
-      },
-    };
-
-    if (routerQueryProjectName && isFirst) {
-      handleProjectName(routerQueryProjectName);
-      setInputValue(routerQueryProjectName || "");
-      isFirst.current = false;
-    }
-
-    router.push(url, undefined, { shallow: false });
-  }, [filters.level, filters.status, filters.project, router.query.page]);
-
   return (
     <S.Container>
       <Select
diff --git a/features/issues/context/filters-context.tsx b/features/issues/context/filters-context.tsx
deleted file mode 100644
index a7472ee..0000000
--- a/features/issues/context/filters-context.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React, {
-  useState,
-  useMemo,
-  useCallback,
-  createContext,
-  ReactNode,
-} from "react";
-import { IssueFilters } from "@api/issues.types";
-
-export const FiltersContext = createContext<{
-  filters: IssueFilters;
-  handleFilters: (filter: IssueFilters) => unknown;
-}>({
-  filters: { status: undefined, level: undefined, project: undefined },
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
-  handleFilters: (_filter: IssueFilters) => {},
-});
-
-type FiltersProviderProps = {
-  children: ReactNode | ReactNode[];
-};
-
-export function FiltersProvider({ children }: FiltersProviderProps) {
-  const [filters, setFilters] = useState<IssueFilters>({
-    status: undefined,
-    level: undefined,
-    project: undefined,
-  });
-
-  const handleFilters = useCallback(
-    (filter: any) =>
-      setFilters((prevFilters) => ({ ...prevFilters, ...filter })),
-    []
-  );
-
-  const memoizedValue = useMemo(
-    () => ({ filters, handleFilters }),
-    [filters, handleFilters]
-  );
-
-  return (
-    <FiltersContext.Provider value={memoizedValue}>
-      {children}
-    </FiltersContext.Provider>
-  );
-}
diff --git a/features/issues/context/index.ts b/features/issues/context/index.ts
deleted file mode 100644
index cfeccc8..0000000
--- a/features/issues/context/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./filters-context";
diff --git a/features/issues/hooks/use-filters.ts b/features/issues/hooks/use-filters.ts
index 8ebce02..2256aca 100644
--- a/features/issues/hooks/use-filters.ts
+++ b/features/issues/hooks/use-filters.ts
@@ -1,4 +1,19 @@
-import { useContext } from "react";
-import { FiltersContext } from "../context/filters-context";
+import { useRouter } from "next/router";
+import { IssueFilters } from "@api/issues.types";
 
-export const useFilters = () => useContext(FiltersContext);
+export const useFilters = () => {
+  const router = useRouter();
+
+  const filters = {
+    status: router.query.status,
+    level: router.query.level,
+    project: router.query.project,
+  } as IssueFilters;
+
+  const handleFilters = (newFilters: IssueFilters) => {
+    const query = { ...router.query, ...newFilters };
+    router.push({ query });
+  };
+
+  return { filters, handleFilters };
+};
diff --git a/features/issues/index.ts b/features/issues/index.ts
index 4818906..8e6318f 100644
--- a/features/issues/index.ts
+++ b/features/issues/index.ts
@@ -1,3 +1,2 @@
 export * from "./api";
 export * from "./components/issue-list";
-export * from "./context";
diff --git a/features/ui/page-container/page-container.tsx b/features/ui/page-container/page-container.tsx
index d5e132d..4f97f80 100644
--- a/features/ui/page-container/page-container.tsx
+++ b/features/ui/page-container/page-container.tsx
@@ -3,7 +3,6 @@ import Head from "next/head";
 import styled from "styled-components";
 import { SidebarNavigation } from "../sidebar-navigation";
 import { color, displayFont, textFont, space, breakpoint } from "@styles/theme";
-import { FiltersProvider } from "@features/issues";
 
 type PageContainerProps = {
   children: React.ReactNode;
@@ -58,23 +57,21 @@ export function PageContainer({ children, title, info }: PageContainerProps) {
   // "Warning: A title element received an array with more than 1 element as children."
   const documentTitle = `ProLog - ${title}`;
   return (
-    <FiltersProvider>
-      <Container>
-        <Head>
-          <title>{documentTitle}</title>
-          <meta name="description" content="Error monitoring" />
-          <link rel="icon" href="/favicon.ico" />
-        </Head>
+    <Container>
+      <Head>
+        <title>{documentTitle}</title>
+        <meta name="description" content="Error monitoring" />
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
 
-        <SidebarNavigation />
-        <Main>
-          <ContentContainer>
-            <Title>{title}</Title>
-            <Info>{info}</Info>
-            {children}
-          </ContentContainer>
-        </Main>
-      </Container>
-    </FiltersProvider>
+      <SidebarNavigation />
+      <Main>
+        <ContentContainer>
+          <Title>{title}</Title>
+          <Info>{info}</Info>
+          {children}
+        </ContentContainer>
+      </Main>
+    </Container>
   );
 }
diff --git a/pages/dashboard/issues.tsx b/pages/dashboard/issues.tsx
index 933f1cd..73a91ce 100644
--- a/pages/dashboard/issues.tsx
+++ b/pages/dashboard/issues.tsx
@@ -1,18 +1,15 @@
 import { PageContainer } from "@features/ui";
 import { IssueList } from "@features/issues";
-import { FiltersProvider } from "@features/issues";
 import type { NextPage } from "next";
 
 const IssuesPage: NextPage = () => {
   return (
-    <FiltersProvider>
-      <PageContainer
-        title="Issues"
-        info="Overview of errors, warnings, and events logged from your projects."
-      >
-        <IssueList />
-      </PageContainer>
-    </FiltersProvider>
+    <PageContainer
+      title="Issues"
+      info="Overview of errors, warnings, and events logged from your projects."
+    >
+      <IssueList />
+    </PageContainer>
   );
 };
 

From f15404bf19bd5e40bc6c9f4d4fa6ced970619023 Mon Sep 17 00:00:00 2001
From: Johannes Kettmann <jkettmann@gmx.net>
Date: Tue, 13 Dec 2022 15:48:56 +0100
Subject: [PATCH 2/5] Initialize input default values

---
 .../issues/components/filters/filters.tsx     | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/features/issues/components/filters/filters.tsx b/features/issues/components/filters/filters.tsx
index 4410de5..3db0749 100644
--- a/features/issues/components/filters/filters.tsx
+++ b/features/issues/components/filters/filters.tsx
@@ -2,15 +2,33 @@ import React, { useState, useCallback, useContext } from "react";
 import { useWindowSize } from "react-use";
 import { Select, Option, Input, NavigationContext } from "@features/ui";
 import { useFilters } from "../../hooks/use-filters";
-import { IssueLevel, IssueStatus } from "@api/issues.types";
+import { IssueFilters, IssueLevel, IssueStatus } from "@api/issues.types";
 import { useProjects } from "@features/projects";
 import * as S from "./filters.styled";
+import { capitalize } from "lodash";
+
+function getStatusDefaultValue(filters: IssueFilters) {
+  if (!filters.status) {
+    return "Status";
+  }
+  if (filters.status === IssueStatus.open) {
+    return "Unresolved";
+  }
+  return "Resolved";
+}
+
+function getLevelDefaultValue(filters: IssueFilters) {
+  if (!filters.level) {
+    return "Level";
+  }
+  return capitalize(filters.level);
+}
 
 export function Filters() {
   const { handleFilters, filters } = useFilters();
   const { data: projects } = useProjects();
 
-  const [inputValue, setInputValue] = useState<string>("");
+  const [inputValue, setInputValue] = useState(filters.project || "");
   const projectNames = projects?.map((project) => project.name.toLowerCase());
 
   const { width } = useWindowSize();
@@ -61,7 +79,7 @@ export function Filters() {
     <S.Container>
       <Select
         placeholder="Status"
-        defaultValue="Status"
+        defaultValue={getStatusDefaultValue(filters)}
         width={isMobileScreen ? "97%" : "8rem"}
         style={{
           ...(isMobileMenuOpen && {
@@ -82,7 +100,7 @@ export function Filters() {
 
       <Select
         placeholder="Level"
-        defaultValue="Level"
+        defaultValue={getLevelDefaultValue(filters)}
         width={isMobileScreen ? "97%" : "8rem"}
         style={{
           ...(isMobileMenuOpen && {

From 38f6b406efc69a1af9a716f36a1390447b4ccf5e Mon Sep 17 00:00:00 2001
From: Johannes Kettmann <jkettmann@gmx.net>
Date: Tue, 13 Dec 2022 16:01:45 +0100
Subject: [PATCH 3/5] Replace project input autocomplete with debounce

---
 .../issues/components/filters/filters.tsx     | 35 +++++--------------
 package-lock.json                             | 20 ++++++++++-
 package.json                                  |  3 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/features/issues/components/filters/filters.tsx b/features/issues/components/filters/filters.tsx
index 3db0749..c5d03ed 100644
--- a/features/issues/components/filters/filters.tsx
+++ b/features/issues/components/filters/filters.tsx
@@ -1,11 +1,11 @@
-import React, { useState, useCallback, useContext } from "react";
+import React, { useState, useContext } from "react";
 import { useWindowSize } from "react-use";
+import { useDebouncedCallback } from "use-debounce";
+import { capitalize } from "lodash";
 import { Select, Option, Input, NavigationContext } from "@features/ui";
-import { useFilters } from "../../hooks/use-filters";
 import { IssueFilters, IssueLevel, IssueStatus } from "@api/issues.types";
-import { useProjects } from "@features/projects";
+import { useFilters } from "../../hooks/use-filters";
 import * as S from "./filters.styled";
-import { capitalize } from "lodash";
 
 function getStatusDefaultValue(filters: IssueFilters) {
   if (!filters.status) {
@@ -26,30 +26,17 @@ function getLevelDefaultValue(filters: IssueFilters) {
 
 export function Filters() {
   const { handleFilters, filters } = useFilters();
-  const { data: projects } = useProjects();
 
+  const debouncedHandleFilters = useDebouncedCallback(handleFilters, 300);
   const [inputValue, setInputValue] = useState(filters.project || "");
-  const projectNames = projects?.map((project) => project.name.toLowerCase());
 
   const { width } = useWindowSize();
   const isMobileScreen = width <= 1023;
   const { isMobileMenuOpen } = useContext(NavigationContext);
 
-  const handleChange = (input: string) => {
-    setInputValue(input);
-
-    if (inputValue?.length < 2) {
-      handleProjectName(undefined);
-      return;
-    }
-
-    const name = projectNames?.find((name) =>
-      name?.toLowerCase().includes(inputValue.toLowerCase())
-    );
-
-    if (name) {
-      handleProjectName(name);
-    }
+  const handleChange = (project: string) => {
+    setInputValue(project);
+    debouncedHandleFilters({ project: project.toLowerCase() });
   };
 
   const handleLevel = (level?: string) => {
@@ -69,12 +56,6 @@ export function Filters() {
     handleFilters({ status: status as IssueStatus });
   };
 
-  const handleProjectName = useCallback(
-    (projectName?: string) =>
-      handleFilters({ project: projectName?.toLowerCase() }),
-    [handleFilters]
-  );
-
   return (
     <S.Container>
       <Select
diff --git a/package-lock.json b/package-lock.json
index 5cbf726..04f398a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,8 @@
         "react-dom": "^18.2.0",
         "react-use": "^17.4.0",
         "styled-components": "^5.3.6",
-        "styled-normalize": "^8.0.7"
+        "styled-normalize": "^8.0.7",
+        "use-debounce": "^9.0.2"
       },
       "devDependencies": {
         "@babel/core": "^7.17.5",
@@ -30809,6 +30810,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/use-debounce": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-9.0.2.tgz",
+      "integrity": "sha512-QLyB0sxt9F5AisGDrUybCRJSLE60bTQR0yXc+IebNGUu1GCXwii1zsZl82mPGdWqDVQy7+1FKMLHQUixxf5Nbw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/use-sync-external-store": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
@@ -55544,6 +55556,12 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "use-debounce": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-9.0.2.tgz",
+      "integrity": "sha512-QLyB0sxt9F5AisGDrUybCRJSLE60bTQR0yXc+IebNGUu1GCXwii1zsZl82mPGdWqDVQy7+1FKMLHQUixxf5Nbw==",
+      "requires": {}
+    },
     "use-sync-external-store": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
diff --git a/package.json b/package.json
index 1fd4b26..0aae8a2 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,8 @@
     "react-dom": "^18.2.0",
     "react-use": "^17.4.0",
     "styled-components": "^5.3.6",
-    "styled-normalize": "^8.0.7"
+    "styled-normalize": "^8.0.7",
+    "use-debounce": "^9.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.17.5",

From 1f7467d0c237094f6f4b0bc97c21eb0d81cedc16 Mon Sep 17 00:00:00 2001
From: Johannes Kettmann <jkettmann@gmx.net>
Date: Tue, 13 Dec 2022 16:08:04 +0100
Subject: [PATCH 4/5] Fix select options overlaying navigation on mobile

---
 .../issues/components/filters/filters.tsx     | 21 ++-----------------
 .../sidebar-navigation/sidebar-navigation.tsx |  1 +
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/features/issues/components/filters/filters.tsx b/features/issues/components/filters/filters.tsx
index c5d03ed..7d23dcf 100644
--- a/features/issues/components/filters/filters.tsx
+++ b/features/issues/components/filters/filters.tsx
@@ -1,8 +1,8 @@
-import React, { useState, useContext } from "react";
+import React, { useState } from "react";
 import { useWindowSize } from "react-use";
 import { useDebouncedCallback } from "use-debounce";
 import { capitalize } from "lodash";
-import { Select, Option, Input, NavigationContext } from "@features/ui";
+import { Select, Option, Input } from "@features/ui";
 import { IssueFilters, IssueLevel, IssueStatus } from "@api/issues.types";
 import { useFilters } from "../../hooks/use-filters";
 import * as S from "./filters.styled";
@@ -32,7 +32,6 @@ export function Filters() {
 
   const { width } = useWindowSize();
   const isMobileScreen = width <= 1023;
-  const { isMobileMenuOpen } = useContext(NavigationContext);
 
   const handleChange = (project: string) => {
     setInputValue(project);
@@ -62,11 +61,6 @@ export function Filters() {
         placeholder="Status"
         defaultValue={getStatusDefaultValue(filters)}
         width={isMobileScreen ? "97%" : "8rem"}
-        style={{
-          ...(isMobileMenuOpen && {
-            opacity: 0,
-          }),
-        }}
       >
         <Option value={undefined} handleCallback={handleStatus}>
           --None--
@@ -83,11 +77,6 @@ export function Filters() {
         placeholder="Level"
         defaultValue={getLevelDefaultValue(filters)}
         width={isMobileScreen ? "97%" : "8rem"}
-        style={{
-          ...(isMobileMenuOpen && {
-            opacity: 0,
-          }),
-        }}
       >
         <Option value={undefined} handleCallback={handleLevel}>
           --None--
@@ -109,12 +98,6 @@ export function Filters() {
         label="project name"
         placeholder="Project Name"
         iconSrc="/icons/search-icon.svg"
-        style={{
-          ...(isMobileScreen && { width: "94%", marginRight: "3rem" }),
-          ...(isMobileMenuOpen && {
-            opacity: 0,
-          }),
-        }}
       />
     </S.Container>
   );
diff --git a/features/ui/sidebar-navigation/sidebar-navigation.tsx b/features/ui/sidebar-navigation/sidebar-navigation.tsx
index 54c3047..5569c4b 100644
--- a/features/ui/sidebar-navigation/sidebar-navigation.tsx
+++ b/features/ui/sidebar-navigation/sidebar-navigation.tsx
@@ -49,6 +49,7 @@ const Container = styled.div<{ isCollapsed: boolean }>`
 const FixedContainer = styled.div`
   ${containerStyles}
   position: fixed;
+  z-index: 1;
 `;
 
 const Header = styled.header`

From 185d3aa91a1256e9536fd7dc8499ac9162f29c8f Mon Sep 17 00:00:00 2001
From: Johannes Kettmann <jkettmann@gmx.net>
Date: Wed, 14 Dec 2022 11:57:47 +0100
Subject: [PATCH 5/5] Replace programmatic mobile styles with CSS

---
 .../components/filters/filters.styled.ts       | 16 +++++++++++++++-
 features/issues/components/filters/filters.tsx | 18 ++++++------------
 features/ui/input/input.styled.ts              |  1 +
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/features/issues/components/filters/filters.styled.ts b/features/issues/components/filters/filters.styled.ts
index 7d9c604..55190dd 100644
--- a/features/issues/components/filters/filters.styled.ts
+++ b/features/issues/components/filters/filters.styled.ts
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import { breakpoint } from "@styles/theme";
+import { Select as UnstyledSelect, Input as UnstyledInput } from "@features/ui";
 
 export const Container = styled.div`
   display: flex;
@@ -12,7 +13,20 @@ export const Container = styled.div`
     flex-direction: row;
     justify-content: flex-end;
     order: initial;
-    gap: 3rem;
     flex-wrap: wrap;
   }
 `;
+
+export const Select = styled(UnstyledSelect)`
+  width: 100%;
+  @media (min-width: ${breakpoint("desktop")}) {
+    width: 10rem;
+  }
+`;
+
+export const Input = styled(UnstyledInput)`
+  width: 100%;
+  @media (min-width: ${breakpoint("desktop")}) {
+    width: 17.5rem;
+  }
+`;
diff --git a/features/issues/components/filters/filters.tsx b/features/issues/components/filters/filters.tsx
index 7d23dcf..9155675 100644
--- a/features/issues/components/filters/filters.tsx
+++ b/features/issues/components/filters/filters.tsx
@@ -1,8 +1,7 @@
 import React, { useState } from "react";
-import { useWindowSize } from "react-use";
 import { useDebouncedCallback } from "use-debounce";
 import { capitalize } from "lodash";
-import { Select, Option, Input } from "@features/ui";
+import { Option } from "@features/ui";
 import { IssueFilters, IssueLevel, IssueStatus } from "@api/issues.types";
 import { useFilters } from "../../hooks/use-filters";
 import * as S from "./filters.styled";
@@ -30,9 +29,6 @@ export function Filters() {
   const debouncedHandleFilters = useDebouncedCallback(handleFilters, 300);
   const [inputValue, setInputValue] = useState(filters.project || "");
 
-  const { width } = useWindowSize();
-  const isMobileScreen = width <= 1023;
-
   const handleChange = (project: string) => {
     setInputValue(project);
     debouncedHandleFilters({ project: project.toLowerCase() });
@@ -57,10 +53,9 @@ export function Filters() {
 
   return (
     <S.Container>
-      <Select
+      <S.Select
         placeholder="Status"
         defaultValue={getStatusDefaultValue(filters)}
-        width={isMobileScreen ? "97%" : "8rem"}
       >
         <Option value={undefined} handleCallback={handleStatus}>
           --None--
@@ -71,12 +66,11 @@ export function Filters() {
         <Option value="Resolved" handleCallback={handleStatus}>
           Resolved
         </Option>
-      </Select>
+      </S.Select>
 
-      <Select
+      <S.Select
         placeholder="Level"
         defaultValue={getLevelDefaultValue(filters)}
-        width={isMobileScreen ? "97%" : "8rem"}
       >
         <Option value={undefined} handleCallback={handleLevel}>
           --None--
@@ -90,9 +84,9 @@ export function Filters() {
         <Option value="Info" handleCallback={handleLevel}>
           Info
         </Option>
-      </Select>
+      </S.Select>
 
-      <Input
+      <S.Input
         handleChange={handleChange}
         value={inputValue}
         label="project name"
diff --git a/features/ui/input/input.styled.ts b/features/ui/input/input.styled.ts
index c5ce947..a410060 100644
--- a/features/ui/input/input.styled.ts
+++ b/features/ui/input/input.styled.ts
@@ -17,6 +17,7 @@ export const InputContainer = styled.input<{
   border-radius: 7px;
   width: calc(${space(20)} * 4 - ${space(6)});
   padding: ${space(2, 3)};
+  box-sizing: border-box;
   letter-spacing: 0.05rem;
   color: ${color("gray", 900)};
   ${textFont("md", "regular")};