From 7f06a4c707f10ae8038463deb9c6df33fb2c003e Mon Sep 17 00:00:00 2001
From: stacksmash76 <98354295+stacksmash76@users.noreply.github.com>
Date: Sun, 15 May 2022 14:07:28 +0200
Subject: [PATCH] feat(web): improve filters nav mobile  (#272)

fix(components/Debug): added overflow handling for smaller screens (or for long lines)
feat(settings/SidebarNav): shortened vertical padding from 24px to 8px
fix(filters/FilterDetails): fixed FilterDetails component to behave properly with mobile devices and made it consistent with the desktop UI
chore: cleaned up unnecessary code

Co-authored-by: anonymous <anonymous>
---
 web/src/components/debug.tsx        |  6 +++--
 web/src/screens/Settings.tsx        |  2 +-
 web/src/screens/filters/details.tsx | 42 ++++++-----------------------
 web/src/utils/index.ts              | 18 -------------
 4 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/web/src/components/debug.tsx b/web/src/components/debug.tsx
index 95e649d..7b9767c 100644
--- a/web/src/components/debug.tsx
+++ b/web/src/components/debug.tsx
@@ -10,8 +10,10 @@ const DEBUG: FC<DebugProps> = ({ values }) => {
     }
 
     return (
-        <div className="w-full p-2 flex flex-col mt-12 mb-12 bg-gray-100 dark:bg-gray-900">
-            <pre className="dark:text-gray-400">{JSON.stringify(values, 0 as any, 2)}</pre>
+        <div className="w-full p-2 flex flex-col mt-6 bg-gray-100 dark:bg-gray-900">
+            <pre className="overflow-x-auto dark:text-gray-400">
+              {JSON.stringify(values, undefined, 2)}
+            </pre>
         </div>
     );
 };
diff --git a/web/src/screens/Settings.tsx b/web/src/screens/Settings.tsx
index ea3349e..313edf5 100644
--- a/web/src/screens/Settings.tsx
+++ b/web/src/screens/Settings.tsx
@@ -53,7 +53,7 @@ function SubNavLink({item, url}: any) {
 
 function SidebarNav({subNavigation, url}: any) {
     return (
-        <aside className="py-6 lg:col-span-3">
+        <aside className="py-2 lg:col-span-3">
             <nav className="space-y-1">
                 {subNavigation.map((item: any) => (
                     <SubNavLink item={item} url={url} key={item.href}/>
diff --git a/web/src/screens/filters/details.tsx b/web/src/screens/filters/details.tsx
index 8fe08dc..f318d00 100644
--- a/web/src/screens/filters/details.tsx
+++ b/web/src/screens/filters/details.tsx
@@ -31,7 +31,7 @@ import {
 import { queryClient } from "../../App";
 import { APIClient } from "../../api/APIClient";
 import { useToggle } from "../../hooks/hooks";
-import { buildPath, classNames } from "../../utils";
+import { classNames } from "../../utils";
 
 import {
     NumberField,
@@ -61,17 +61,14 @@ const tabs = [
 
 function TabNavLink({ item, url }: any) {
     const location = useLocation();
-
-    const { pathname } = location;
-    const splitLocation = pathname.split("/");
+    const splitLocation = location.pathname.split("/");
 
     // we need to clean the / if it's a base root path
-    const too = item.href ? `${url}/${item.href}` : url
     return (
         <NavLink
             key={item.name}
-            to={too}
-            exact={true}
+            to={item.href ? `${url}/${item.href}` : url}
+            exact
             activeClassName="border-purple-600 dark:border-blue-500 text-purple-600 dark:text-white"
             className={classNames(
                 'border-transparent text-gray-500 hover:text-purple-600 dark:hover:text-white hover:border-purple-600 dark:hover:border-blue-500 whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm'
@@ -196,18 +193,12 @@ export default function FilterDetails() {
         deleteMutation.mutate(filter.id)
     }
 
-    const handleMobileNav = (e: any, href: string) => {
-        const s = history.location.pathname.split(/((?:\/.*?)?\/filters\/\d)/gi);
-        const p = buildPath(s[1], href);
-        history.push(p);
-    }
-
     return (
         <main>
             <header className="py-10">
                 <div className="max-w-screen-xl mx-auto px-4 sm:px-6 lg:px-8 flex items-center">
                     <h1 className="text-3xl font-bold text-black dark:text-white">
-                        <NavLink to="/filters" exact={true}>
+                        <NavLink to="/filters" exact>
                             Filters
                         </NavLink>
                     </h1>
@@ -219,27 +210,10 @@ export default function FilterDetails() {
                 <div className="bg-white dark:bg-gray-800 rounded-lg shadow">
                     <div className="relative mx-auto md:px-6 xl:px-4">
                         <div className="px-4 sm:px-6 md:px-0">
-                            <div className="pt-2 pb-6">
-
-                                <div className="sm:hidden">
-                                    <label htmlFor="selected-tab" className="sr-only">
-                                        Select a tab
-                                    </label>
-                                    <select
-                                        id="selected-tab"
-                                        name="selected-tab"
-                                        className="mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-700 focus:outline-none focus:ring-purple-500 focus:border-purple-500 sm:text-sm rounded-md"
-                                    >
-                                        {tabs.map((tab) => (
-                                            <option key={tab.name} onClick={(e) => handleMobileNav(e, tab.href)}>
-                                                {tab.name}
-                                            </option>
-                                        ))}
-                                    </select>
-                                </div>
-                                <div className="hidden sm:block">
+                            <div className="pt-1 pb-6">
+                                <div className="block overflow-auto">
                                     <div className="border-b border-gray-200 dark:border-gray-700">
-                                        <nav className="-mb-px flex space-x-8">
+                                        <nav className="-mb-px flex space-x-6 sm:space-x-8">
                                             {tabs.map((tab) => (
                                                 <TabNavLink item={tab} url={url} key={tab.href} />
                                             ))}
diff --git a/web/src/utils/index.ts b/web/src/utils/index.ts
index 8ce1e7c..36c790f 100644
--- a/web/src/utils/index.ts
+++ b/web/src/utils/index.ts
@@ -31,24 +31,6 @@ export function sseBaseUrl() {
     return `${window.location.origin}${baseUrl()}`;
 }
 
-export function buildPath(...args: string[]): string {
-    const [first] = args;
-    const firstTrimmed = first.trim();
-    const result = args
-        .map((part) => part.trim())
-        .map((part, i) => {
-            if (i === 0) {
-                return part.replace(/[/]*$/g, '');
-            } else {
-                return part.replace(/(^[/]*|[/]*$)/g, '');
-            }
-        })
-        .filter((x) => x.length)
-        .join('/');
-
-    return firstTrimmed === '/' ? `/${result}` : result;
-}
-
 export function classNames(...classes: string[]) {
     return classes.filter(Boolean).join(' ')
 }