fix missing product category filtering query param, omit envId from URL

kontent-ai · Nov 6, 2023 · f746907 · f746907
1 parent 0681430
commit f746907
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/components/shared/ui/appPage.tsx b/components/shared/ui/appPage.tsx
@@ -4,7 +4,7 @@ import { FC, ReactNode } from "react";
 import { perCollectionSEOTitle } from "../../../lib/constants/labels";
 import { ValidCollectionCodename } from "../../../lib/types/perCollection";
 import { useSmartLink } from "../../../lib/useSmartLink";
-import { Stringified, parseFlatted } from "../../../lib/utils/circularityUtils";
+import { parseFlatted,Stringified } from "../../../lib/utils/circularityUtils";
 import { siteCodename } from "../../../lib/utils/env";
 import { createItemSmartLink } from "../../../lib/utils/smartLinkUtils";
 import { Article, contentTypes, Metadata, Nav_NavigationItem, Product, Solution, WSL_Page, WSL_WebSpotlightRoot } from "../../../models";

diff --git a/lib/utils/changeUrlQueryString.ts b/lib/utils/changeUrlQueryString.ts
@@ -2,5 +2,10 @@ import { NextRouter } from "next/router";
 import { ParsedUrlQueryInput } from "querystring";
 
 export const changeUrlQueryString = (query: ParsedUrlQueryInput, router: NextRouter) => {
-  router.replace({ query: query }, undefined, { scroll: false, shallow: true });
+  const asPath = {
+    pathname: router.asPath.split('?')[0], // getting rid of envId
+    query
+  };
+
+  router.replace({ query: query }, asPath, { scroll: false, shallow: true });
 }
diff --git a/lib/utils/circularityUtils.ts b/lib/utils/circularityUtils.ts
@@ -1,4 +1,4 @@
-import { stringify, parse } from "flatted";
+import { parse,stringify } from "flatted";
 
 /**
  * Helper methods for managing circular references.

diff --git a/pages/[envId]/[slug].tsx b/pages/[envId]/[slug].tsx
@@ -6,7 +6,7 @@ import { Content } from "../../components/shared/Content";
 import { AppPage } from "../../components/shared/ui/appPage";
 import { getDefaultMetadata, getItemBySlug, getPagesSlugs, getSiteMenu } from "../../lib/kontentClient";
 import { reservedListingSlugs } from "../../lib/routing";
-import { Stringified, parseFlatted, stringifyAsType } from "../../lib/utils/circularityUtils";
+import { parseFlatted, Stringified, stringifyAsType } from "../../lib/utils/circularityUtils";
 import { defaultEnvId } from "../../lib/utils/env";
 import { getEnvIdFromRouteParams, getPreviewApiKeyFromPreviewData } from "../../lib/utils/pageUtils";
 import { createElementSmartLink, createFixedAddSmartLink } from "../../lib/utils/smartLinkUtils";
@@ -83,7 +83,10 @@ const TopLevelPage: FC<Props> = (props) => {
         {...createFixedAddSmartLink("end")}
       >
         {page.elements.content.linkedItems.map((piece) => (
-          <Content key={piece.system.id} item={piece} />
+          <Content
+            key={piece.system.id}
+            item={piece}
+          />
         ))}
       </div>
     </AppPage>

diff --git a/pages/[envId]/articles/category/[category]/page/[page].tsx b/pages/[envId]/articles/category/[category]/page/[page].tsx
@@ -12,7 +12,7 @@ import { ArticlePageSize } from "../../../../../../lib/constants/paging";
 import { getArticlesCountByCategory, getArticlesForListing, getDefaultMetadata, getItemBySlug, getItemsTotalCount, getSiteMenu } from "../../../../../../lib/kontentClient";
 import { ResolutionContext, resolveUrlPath } from "../../../../../../lib/routing";
 import { ArticleListingUrlQuery, ArticleTypeWithAll, categoryFilterSource, isArticleType } from "../../../../../../lib/utils/articlesListing";
-import { Stringified, parseFlatted, stringifyAsType } from "../../../../../../lib/utils/circularityUtils";
+import { parseFlatted, Stringified, stringifyAsType } from "../../../../../../lib/utils/circularityUtils";
 import { defaultEnvId, siteCodename } from "../../../../../../lib/utils/env";
 import { getEnvIdFromRouteParams, getPreviewApiKeyFromPreviewData } from "../../../../../../lib/utils/pageUtils";
 import { Article, contentTypes, Metadata, Nav_NavigationItem, taxonomies, WSL_Page } from "../../../../../../models";

diff --git a/pages/[envId]/index.tsx b/pages/[envId]/index.tsx
@@ -7,7 +7,7 @@ import { Content } from '../../components/shared/Content';
 import { AppPage } from '../../components/shared/ui/appPage';
 import { getHomepage, getSiteMenu } from '../../lib/kontentClient';
 import { useSmartLink } from '../../lib/useSmartLink';
-import { Stringified, parseFlatted, stringifyAsType } from '../../lib/utils/circularityUtils';
+import { parseFlatted, Stringified, stringifyAsType } from '../../lib/utils/circularityUtils';
 import { defaultEnvId } from '../../lib/utils/env';
 import { getEnvIdFromRouteParams, getPreviewApiKeyFromPreviewData } from '../../lib/utils/pageUtils';
 import { Metadata, Nav_NavigationItem, WSL_WebSpotlightRoot } from '../../models';

diff --git a/pages/[envId]/products/index.tsx b/pages/[envId]/products/index.tsx
@@ -11,7 +11,7 @@ import { ProductsPageSize } from "../../../lib/constants/paging";
 import { getDefaultMetadata, getItemBySlug, getProductsForListing, getSiteMenu } from "../../../lib/kontentClient";
 import { createQueryString, reservedListingSlugs, resolveUrlPath } from "../../../lib/routing";
 import { changeUrlQueryString } from "../../../lib/utils/changeUrlQueryString";
-import { Stringified, parseFlatted, stringifyAsType } from "../../../lib/utils/circularityUtils";
+import { parseFlatted, Stringified, stringifyAsType } from "../../../lib/utils/circularityUtils";
 import { defaultEnvId, siteCodename } from "../../../lib/utils/env";
 import { getEnvIdFromRouteParams, getPreviewApiKeyFromPreviewData } from "../../../lib/utils/pageUtils";
 import { contentTypes, Metadata, Nav_NavigationItem, Product, WSL_Page } from "../../../models";
@@ -123,7 +123,7 @@ export const Products: FC<Props> = props => {
         ? [...categories, term.codename, ...term.terms.map((t) => t.codename)]
         : categories.filter((c) => c !== term.codename && !term.terms.map((t) => t.codename).includes(c));
 
-      changeUrlQueryString({ category: newCategories }, router);
+      changeUrlQueryString({ ...router.query, category: newCategories }, router);
     };
 
     return (