From 1ad6bba0aba0ab96f69b9a3e21b77f7bb4cfe64b Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Sat, 7 Jan 2023 23:21:21 +0000
Subject: [PATCH] set useQueryParam to false for app categories (#6330)

* set useQueryParam to false for app categories

* New param 'useQueryParam' for AppCategoryNavigation/AdminAppsList

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
---
 apps/web/pages/auth/setup/index.tsx                   |  2 +-
 .../app-store/_components/AppCategoryNavigation.tsx   |  4 +++-
 packages/app-store/_utils/getAppCategories.ts         |  2 +-
 packages/features/apps/AdminAppsList.tsx              | 11 ++++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/web/pages/auth/setup/index.tsx b/apps/web/pages/auth/setup/index.tsx
index dfc472042d..32f39baa76 100644
--- a/apps/web/pages/auth/setup/index.tsx
+++ b/apps/web/pages/auth/setup/index.tsx
@@ -27,7 +27,7 @@ export default function Setup(props: inferSSRProps<typeof getServerSideProps>) {
     {
       title: t("enable_apps"),
       description: t("enable_apps_description"),
-      content: <AdminAppsList baseURL="/auth/setup?step=2" />,
+      content: <AdminAppsList baseURL="/auth/setup?step=2" useQueryParam={true} />,
       isLoading: false,
     },
   ];
diff --git a/packages/app-store/_components/AppCategoryNavigation.tsx b/packages/app-store/_components/AppCategoryNavigation.tsx
index ff3be3a4b9..73879bff65 100644
--- a/packages/app-store/_components/AppCategoryNavigation.tsx
+++ b/packages/app-store/_components/AppCategoryNavigation.tsx
@@ -12,15 +12,17 @@ const AppCategoryNavigation = ({
   containerClassname,
   className,
   fromAdmin,
+  useQueryParam = false,
 }: {
   baseURL: string;
   children: React.ReactNode;
   containerClassname: string;
   className?: string;
   fromAdmin?: boolean;
+  useQueryParam?: boolean;
 }) => {
   const [animationRef] = useAutoAnimate<HTMLDivElement>();
-  const appCategories = useMemo(() => getAppCategories(baseURL), [baseURL]);
+  const appCategories = useMemo(() => getAppCategories(baseURL, useQueryParam), [baseURL, useQueryParam]);
 
   return (
     <div className={classNames("flex flex-col p-2 md:p-0 xl:flex-row", className)}>
diff --git a/packages/app-store/_utils/getAppCategories.ts b/packages/app-store/_utils/getAppCategories.ts
index ccc4ba0657..3d6cf8d45b 100644
--- a/packages/app-store/_utils/getAppCategories.ts
+++ b/packages/app-store/_utils/getAppCategories.ts
@@ -7,7 +7,7 @@ function getHref(baseURL: string, category: string, useQueryParam: boolean) {
   return useQueryParam ? `${baseUrlParsed.toString()}` : `${baseURL}/${category}`;
 }
 
-const getAppCategories = (baseURL: string, useQueryParam = true) => {
+const getAppCategories = (baseURL: string, useQueryParam: boolean) => {
   return [
     {
       name: "calendar",
diff --git a/packages/features/apps/AdminAppsList.tsx b/packages/features/apps/AdminAppsList.tsx
index ada566739b..41bd721b2a 100644
--- a/packages/features/apps/AdminAppsList.tsx
+++ b/packages/features/apps/AdminAppsList.tsx
@@ -174,7 +174,15 @@ const querySchema = z.object({
     .default(AppCategories.calendar),
 });
 
-const AdminAppsList = ({ baseURL, className }: { baseURL: string; className?: string }) => {
+const AdminAppsList = ({
+  baseURL,
+  className,
+  useQueryParam = false,
+}: {
+  baseURL: string;
+  className?: string;
+  useQueryParam?: boolean;
+}) => {
   const router = useRouter();
   return (
     <form
@@ -187,6 +195,7 @@ const AdminAppsList = ({ baseURL, className }: { baseURL: string; className?: st
       <AppCategoryNavigation
         baseURL={baseURL}
         fromAdmin
+        useQueryParam={useQueryParam}
         containerClassname="w-full xl:mx-5 xl:w-2/3 xl:pr-5"
         className={className}>
         <AdminAppsListContainer />