Merge branch 'dev' into DIGG-465-new-filter-groups

diggsweden · Nov 21, 2024 · 822326b · 822326b
2 parents 47e0a31 + e7c437c
commit 822326b
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 143 deletions.
diff --git a/components/content/Entryscape/DataSetPage/index.tsx b/components/content/Entryscape/DataSetPage/index.tsx
@@ -58,7 +58,7 @@ export const DataSetPage: React.FC = () => {
   const { env, setBreadcrumb, iconSize } = useContext(SettingsContext);
   const entry = useContext(EntrystoreContext);
   const { lang, t } = useTranslation();
-  const { dataSet, name } = query || {};
+  const { dataSet } = query || {};
   const ids = (typeof dataSet === "string" && dataSet.split("_")) || [];
   const cid = ids[0];
   const eid = ids[1];
@@ -138,7 +138,7 @@ export const DataSetPage: React.FC = () => {
           {
             return '/${lang}/${t(
               "routes|datasets$path",
-            )}/${cid}_'+entryid+'/${name}/apiexplore/'+apientryid;
+            )}/${cid}_'+entryid+'/apiexplore/'+apientryid;
           }          
           
           window.__entryscape_config = [{

diff --git a/components/content/Search/SearchResults/index.tsx b/components/content/Search/SearchResults/index.tsx
@@ -339,7 +339,8 @@ export const SearchResults: FC<SearchResultsProps> = ({
                         )}
                       {hit.metadata && hit.metadata["organisation_literal"] && (
                         <span className="organisation break-words">
-                          {" | " + hit.metadata["organisation_literal"]}
+                          {hit.metadata["theme_literal"].length > 0 && " | "}
+                          {hit.metadata["organisation_literal"]}
                         </span>
                       )}
                     </div>

diff --git a/pages/dataservice/[dataSet]/[name].tsx b/pages/dataservice/[dataSet]/[name].tsx
@@ -1,34 +1,23 @@
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import { EntrystoreProvider } from "@/providers/EntrystoreProvider";
-import { SettingsContext } from "@/providers/SettingsProvider";
-import { DataServicePage } from "@/components/content/Entryscape/DataServicePage";
-import { useScript } from "@/hooks/useScript";
+import { GetServerSideProps } from "next";
 
 export default function ExploreApiPage() {
-  const { env } = useContext(SettingsContext);
-
-  const { query } = useRouter() || {};
-  const { dataSet, name } = query || {};
-  const ids = (typeof dataSet === "string" && dataSet.split("_")) || [];
-  const cid = ids[0];
-  const eid = ids[1];
-  const postscribeStatus = useScript(
-    "/postscribe.min.js",
-    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
-    "anonymous",
-  );
-  return postscribeStatus === "ready" ? (
-    <EntrystoreProvider
-      env={env}
-      cid={cid}
-      eid={eid}
-      entrystoreUrl={env.ENTRYSCAPE_DATASETS_PATH}
-      fetchMore={true}
-    >
-      <DataServicePage dataSet={dataSet} name={name} />
-    </EntrystoreProvider>
-  ) : (
-    <></>
-  );
+  return null;
 }
+
+export const getServerSideProps: GetServerSideProps = async ({ params }) => {
+  const dataSet = params?.dataSet;
+
+  if (!dataSet) {
+    return {
+      notFound: true,
+    };
+  }
+
+  // Reconstruct the original URI and redirect to the new format
+  return {
+    redirect: {
+      destination: `/dataservice/${dataSet}`,
+      permanent: true,
+    },
+  };
+};
diff --git a/pages/datasets/[dataSet]/[name]/apiexplore/[apieid].tsx b/pages/datasets/[dataSet]/[name]/apiexplore/[apieid].tsx
@@ -1,38 +1,24 @@
-import { DataSetExploreApiPage } from "@/components/content/Entryscape/DatasetExploreApiPage";
-// export default DataSetExploreApiPage;
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import { useScript } from "@/hooks/useScript";
-import { ApiIndexProvider } from "@/providers/ApiIndexContext";
-import EntrystoreProvider from "@/providers/EntrystoreProvider";
-import { SettingsContext } from "@/providers/SettingsProvider";
+import { GetServerSideProps } from "next";
 
 export default function ExploreApiPage() {
-  const { env } = useContext(SettingsContext);
-
-  const { query } = useRouter() || {};
-  const { dataSet, apieid } = query || {};
-  const ids = (typeof dataSet === "string" && dataSet.split("_")) || [];
-  const cid = ids[0];
-  const eid = ids[1];
-  const postscribeStatus = useScript(
-    "/postscribe.min.js",
-    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
-    "anonymous",
-  );
-  return postscribeStatus === "ready" ? (
-    <ApiIndexProvider apiIndexFileUrl={env.API_DETECTION_PATH}>
-      <EntrystoreProvider
-        env={env}
-        cid={cid}
-        eid={eid}
-        entrystoreUrl={env.ENTRYSCAPE_DATASETS_PATH}
-        fetchMore={true}
-      >
-        <DataSetExploreApiPage dataSet={dataSet} apieid={apieid} />
-      </EntrystoreProvider>
-    </ApiIndexProvider>
-  ) : (
-    <></>
-  );
+  return null;
 }
+
+export const getServerSideProps: GetServerSideProps = async ({ params }) => {
+  const dataSet = params?.dataSet;
+  const apieid = params?.apieid;
+
+  if (!dataSet || !apieid) {
+    return {
+      notFound: true,
+    };
+  }
+
+  // Reconstruct the original URI and redirect to the new format
+  return {
+    redirect: {
+      destination: `/datasets/${dataSet}/apiexplore/${apieid}`,
+      permanent: true,
+    },
+  };
+};
diff --git a/pages/datasets/[dataSet]/[name]/apiexplore/index.tsx b/pages/datasets/[dataSet]/[name]/apiexplore/index.tsx
@@ -1,37 +1,23 @@
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import { ApiIndexProvider } from "@/providers/ApiIndexContext";
-import { DataSetPage } from "@/components/content/Entryscape/DataSetPage";
-import { useScript } from "@/hooks/useScript";
-import { SettingsContext } from "@/providers/SettingsProvider";
-import EntrystoreProvider from "@/providers/EntrystoreProvider";
+import { GetServerSideProps } from "next";
 
 export default function DataSet() {
-  const { env } = useContext(SettingsContext);
-
-  const { query } = useRouter() || {};
-  const { dataSet } = query || {};
-  const ids = (typeof dataSet === "string" && dataSet.split("_")) || [];
-  const cid = ids[0];
-  const eid = ids[1];
-  const postscribeStatus = useScript(
-    "/postscribe.min.js",
-    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
-    "anonymous",
-  );
-  return postscribeStatus === "ready" ? (
-    <ApiIndexProvider apiIndexFileUrl={env.API_DETECTION_PATH}>
-      <EntrystoreProvider
-        env={env}
-        cid={cid}
-        eid={eid}
-        entrystoreUrl={env.ENTRYSCAPE_DATASETS_PATH}
-        fetchMore={false}
-      >
-        <DataSetPage />
-      </EntrystoreProvider>
-    </ApiIndexProvider>
-  ) : (
-    <></>
-  );
+  return null;
 }
+
+export const getServerSideProps: GetServerSideProps = async ({ params }) => {
+  const dataSet = params?.dataSet;
+
+  if (!dataSet) {
+    return {
+      notFound: true,
+    };
+  }
+
+  // Reconstruct the original URI and redirect to the new format
+  return {
+    redirect: {
+      destination: `/datasets/${dataSet}`,
+      permanent: true,
+    },
+  };
+};
diff --git a/pages/datasets/[dataSet]/[name]/index.tsx b/pages/datasets/[dataSet]/[name]/index.tsx
@@ -1,41 +1,23 @@
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import { ApiIndexProvider } from "@/providers/ApiIndexContext";
-import EntrystoreProvider from "@/providers/EntrystoreProvider";
-import { SettingsContext } from "@/providers/SettingsProvider";
-
-import { DataSetPage } from "@/components/content/Entryscape/DataSetPage";
-import { useScript } from "@/hooks/useScript";
+import { GetServerSideProps } from "next";
 
 export default function DataSet() {
-  const { env } = useContext(SettingsContext);
-
-  const router = useRouter() || {};
-  // const { dataSet } = router?.query;
-  const ids =
-    (typeof router?.query?.dataSet === "string" &&
-      router?.query?.dataSet.split("_")) ||
-    [];
-  const cid = ids[0];
-  const eid = ids[1];
-  const postscribeStatus = useScript(
-    "/postscribe.min.js",
-    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
-    "anonymous",
-  );
-  return postscribeStatus === "ready" ? (
-    <ApiIndexProvider apiIndexFileUrl={env.API_DETECTION_PATH}>
-      <EntrystoreProvider
-        env={env}
-        cid={cid}
-        eid={eid}
-        entrystoreUrl={env.ENTRYSCAPE_DATASETS_PATH}
-        fetchMore={false}
-      >
-        <DataSetPage />
-      </EntrystoreProvider>
-    </ApiIndexProvider>
-  ) : (
-    <></>
-  );
+  return null;
 }
+
+export const getServerSideProps: GetServerSideProps = async ({ params }) => {
+  const dataSet = params?.dataSet;
+
+  if (!dataSet) {
+    return {
+      notFound: true,
+    };
+  }
+
+  // Reconstruct the original URI and redirect to the new format
+  return {
+    redirect: {
+      destination: `/datasets/${dataSet}`,
+      permanent: true,
+    },
+  };
+};
diff --git a/pages/datasets/[dataSet]/apiexplore/[apieid].tsx b/pages/datasets/[dataSet]/apiexplore/[apieid].tsx
@@ -0,0 +1,38 @@
+import { DataSetExploreApiPage } from "@/components/content/Entryscape/DatasetExploreApiPage";
+// export default DataSetExploreApiPage;
+import { useRouter } from "next/router";
+import { useContext } from "react";
+import { useScript } from "@/hooks/useScript";
+import { ApiIndexProvider } from "@/providers/ApiIndexContext";
+import EntrystoreProvider from "@/providers/EntrystoreProvider";
+import { SettingsContext } from "@/providers/SettingsProvider";
+
+export default function ExploreApiPage() {
+  const { env } = useContext(SettingsContext);
+
+  const { query } = useRouter() || {};
+  const { dataSet, apieid } = query || {};
+  const ids = (typeof dataSet === "string" && dataSet.split("_")) || [];
+  const cid = ids[0];
+  const eid = ids[1];
+  const postscribeStatus = useScript(
+    "/postscribe.min.js",
+    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
+    "anonymous",
+  );
+  return postscribeStatus === "ready" ? (
+    <ApiIndexProvider apiIndexFileUrl={env.API_DETECTION_PATH}>
+      <EntrystoreProvider
+        env={env}
+        cid={cid}
+        eid={eid}
+        entrystoreUrl={env.ENTRYSCAPE_DATASETS_PATH}
+        fetchMore={true}
+      >
+        <DataSetExploreApiPage dataSet={dataSet} apieid={apieid} />
+      </EntrystoreProvider>
+    </ApiIndexProvider>
+  ) : (
+    <></>
+  );
+}
diff --git a/utilities/entryScape.ts b/utilities/entryScape.ts
@@ -4,7 +4,6 @@ import {
   getEntryLang,
   resourcesSearch,
   listChoices,
-  slugify,
   getLocalizedMetadataValue,
   getTemplateChoices,
   getLocalizedChoiceLabel,
@@ -546,7 +545,7 @@ export class EntryScape {
           ? hitSpecification.pathResolver(child)
           : `${hitSpecification.path || "datamangd"}${context.getId()}_${
               hit.entryId
-            }/${slugify(hit.title)}`;
+            }`;
 
         hits.push(hit);
       }