Merge pull request #505 from diggsweden/DIGG-463

Digg 463
diggsweden · Nov 15, 2024 · 60c96db · 60c96db
2 parents 900219e + e659bfe
commit 60c96db
Show file tree

Hide file tree

Showing 12 changed files with 1,612 additions and 1,339 deletions.
diff --git a/components/content/Search/SearchFilters/index.tsx b/components/content/Search/SearchFilters/index.tsx
@@ -292,7 +292,7 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                                   aria-selected={selected(key, facetValue)}
                                 >
                                   <button
-                                    className={`focus--in group relative flex w-full items-center break-all py-md pl-md pr-[3rem] text-left hover:bg-brown-100 ${
+                                    className={`focus--in group relative flex w-full items-center break-words py-md pl-md pr-[3rem] text-left hover:bg-brown-100 ${
                                       selected(key, facetValue) && "font-strong"
                                     }`}
                                     onClick={() => {
@@ -361,9 +361,11 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                         name="API"
                         type="checkbox"
                         className="peer/hvd-only sr-only"
-                        checked={search.request.facetValues?.some(
-                          (t) => t.title == ESRdfType.hvd,
-                        )}
+                        checked={
+                          search.request.facetValues?.some(
+                            (t) => t.title == ESRdfType.hvd,
+                          ) || false
+                        }
                         onChange={() => doSearch(key, facetValues[0])}
                       />
                       <label
@@ -396,9 +398,11 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                         name="National"
                         type="checkbox"
                         className="peer/national-only sr-only"
-                        checked={search.request.facetValues?.some(
-                          (t) => t.facet == ESRdfType.national_data,
-                        )}
+                        checked={
+                          search.request.facetValues?.some(
+                            (t) => t.facet == ESRdfType.national_data,
+                          ) || false
+                        }
                         onChange={() => doSearch(key, facetValues[0])}
                       />
                       <label

diff --git a/components/content/Search/SearchPage/SearchPageEntryScape/index.tsx b/components/content/Search/SearchPage/SearchPageEntryScape/index.tsx
@@ -8,7 +8,6 @@ import SearchProvider, {
 import { decode } from "qss";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { useScript } from "@/hooks/useScript";
 import Head from "next/head";
 import { Container } from "@/components/layout/Container";
 import { ESRdfType, ESType } from "@/utilities/entryScape";
@@ -33,11 +32,6 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
   const [query, setQuery] = useState("");
   const [showFilter, setShowFilter] = useState(false);
   const [showTip, setShowTip] = useState(false);
-  const postscribeStatus = useScript(
-    "/postscribe.min.js",
-    "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
-    "anonymous",
-  );
 
   const clearCurrentScrollPos = () => {
     if (typeof localStorage != "undefined") {
@@ -140,12 +134,16 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
           },
           {
             resource: "http://purl.org/dc/terms/type",
+            dcatProperty: "dcterms:type",
+            dcatId: "adms:publishertype",
             type: ESType.uri,
             related: true,
+            dcatType: "choice",
             indexOrder: 1,
           },
           {
             resource: "http://purl.org/dc/terms/publisher",
+            dcatProperty: "dcterms:publisher",
             type: ESType.uri,
             indexOrder: 2,
           },
@@ -159,6 +157,7 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
           },
           {
             resource: "http://purl.org/dc/terms/accrualPeriodicity",
+            dcatId: "dcat:dcterms:accrualPeriodicity_da",
             type: ESType.uri,
             dcatProperty: "dcterms:accrualPeriodicity",
             dcatType: "choice",
@@ -232,6 +231,7 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
           },
           {
             resource: "http://purl.org/dc/terms/publisher",
+            dcatProperty: "dcterms:publisher",
             type: ESType.uri,
             indexOrder: 1,
           },
@@ -260,6 +260,7 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
           {
             resource: "http://www.w3.org/2004/02/skos/core#inScheme",
             type: ESType.uri,
+            dcatProperty: "dcterms:type",
             indexOrder: 0,
           },
         ],
@@ -286,83 +287,81 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
         />
       </Head>
 
-      {postscribeStatus === "ready" && (
-        <SearchProvider
-          entryscapeUrl={
-            searchProviderSettings[
-              searchType as keyof typeof searchProviderSettings
-            ].entryscapeUrl
-          }
-          hitSpecifications={
-            searchProviderSettings[
-              searchType as keyof typeof searchProviderSettings
-            ].hitSpecifications
-          }
-          facetSpecification={
-            searchProviderSettings[
-              searchType as keyof typeof searchProviderSettings
-            ].facetSpecification
-          }
-          initRequest={
-            searchProviderSettings[
-              searchType as keyof typeof searchProviderSettings
-            ].initRequest
-          }
-        >
-          <SearchContext.Consumer>
-            {(search) => (
-              <Container>
-                <div className="flex max-w-md items-end justify-between">
-                  <Heading level={1} size="lg" className="mb-none">
-                    {pageTitle}
-                  </Heading>
+      <SearchProvider
+        entryscapeUrl={
+          searchProviderSettings[
+            searchType as keyof typeof searchProviderSettings
+          ].entryscapeUrl
+        }
+        hitSpecifications={
+          searchProviderSettings[
+            searchType as keyof typeof searchProviderSettings
+          ].hitSpecifications
+        }
+        facetSpecification={
+          searchProviderSettings[
+            searchType as keyof typeof searchProviderSettings
+          ].facetSpecification
+        }
+        initRequest={
+          searchProviderSettings[
+            searchType as keyof typeof searchProviderSettings
+          ].initRequest
+        }
+      >
+        <SearchContext.Consumer>
+          {(search) => (
+            <Container>
+              <div className="flex max-w-md items-end justify-between">
+                <Heading level={1} size="lg" className="mb-none">
+                  {pageTitle}
+                </Heading>
 
-                  {searchType === "datasets" && (
-                    <Button
-                      aria-expanded={showTip}
-                      variant="plain"
-                      size="sm"
-                      icon={ChevronDownIcon}
-                      iconPosition="right"
-                      className={showTip ? "active" : " "}
-                      onClick={() => {
-                        clearCurrentScrollPos();
-                        setShowTip(!showTip);
-                      }}
-                      label={t("pages|search$search-tips")}
-                    />
-                  )}
-                </div>
+                {searchType === "datasets" && (
+                  <Button
+                    aria-expanded={showTip}
+                    variant="plain"
+                    size="sm"
+                    icon={ChevronDownIcon}
+                    iconPosition="right"
+                    className={showTip ? "active" : " "}
+                    onClick={() => {
+                      clearCurrentScrollPos();
+                      setShowTip(!showTip);
+                    }}
+                    label={t("pages|search$search-tips")}
+                  />
+                )}
+              </div>
 
-                {searchType === "datasets" && <SearchTips showTip={showTip} />}
+              {searchType === "datasets" && <SearchTips showTip={showTip} />}
 
-                <SearchForm
-                  search={search}
-                  searchMode={searchType}
-                  query={query}
-                  setQuery={setQuery}
-                />
+              <SearchForm
+                search={search}
+                searchMode={searchType}
+                query={query}
+                setQuery={setQuery}
+              />
 
-                <SearchPageSelector query={query} />
+              <SearchPageSelector query={query} />
 
-                <SearchFilters
-                  showFilter={showFilter}
-                  searchMode={searchType}
-                  search={search}
-                  query={query}
-                  setShowFilter={setShowFilter}
-                />
-                <noscript>{t("common|no-js-text")}</noscript>
-                <SearchResults
-                  showSorting={showFilter}
-                  search={search}
-                  searchMode="datasets"
-                />
-              </Container>
-            )}
-          </SearchContext.Consumer>
-        </SearchProvider>
-      )}
+              <SearchFilters
+                showFilter={showFilter}
+                searchMode={searchType}
+                search={search}
+                query={query}
+                setShowFilter={setShowFilter}
+              />
+              <noscript>{t("common|no-js-text")}</noscript>
+              <SearchResults
+                showSorting={showFilter}
+                search={search}
+                searchMode="datasets"
+              />
+            </Container>
+          )}
+        </SearchContext.Consumer>
+      </SearchProvider>
     </div>
   );
 };
diff --git a/components/content/Search/SearchResults/index.tsx b/components/content/Search/SearchResults/index.tsx
@@ -292,21 +292,14 @@ export const SearchResults: FC<SearchResultsProps> = ({
                   {hit.metadata &&
                     search.allFacets &&
                     !search.loadingFacets &&
-                    hit.metadata["inScheme_resource"] &&
-                    search.getFacetValueTitle(
-                      "http://www.w3.org/2004/02/skos/core#inScheme",
-                      hit.metadata["inScheme_resource"][0],
-                    ) && (
-                      <span>
-                        {search.getFacetValueTitle(
-                          "http://www.w3.org/2004/02/skos/core#inScheme",
-                          hit.metadata["inScheme_resource"][0],
-                        )}
-                      </span>
+                    hit.metadata["inScheme_resource"] && (
+                      <span>{hit.metadata["inScheme_resource"]}</span>
                     )}
 
                   {isCompact && hit.descriptionLang && (
-                    <p className="mb-xs break-words">{hit.description}</p>
+                    <p className="mb-xs line-clamp-4 break-words md:line-clamp-2">
+                      {hit.description}
+                    </p>
                   )}
 
                   <div
@@ -321,13 +314,11 @@ export const SearchResults: FC<SearchResultsProps> = ({
                             {hit.metadata["theme_literal"].join(",  ")}
                           </span>
                         )}
-                      {hit.metadata &&
-                        hit.metadata["organisation_literal"] &&
-                        hit.metadata["organisation_literal"].length > 0 && (
-                          <span className="organisation break-words">
-                            {" | " + hit.metadata["organisation_literal"][0]}
-                          </span>
-                        )}
+                      {hit.metadata && hit.metadata["organisation_literal"] && (
+                        <span className="organisation break-words">
+                          {" | " + hit.metadata["organisation_literal"]}
+                        </span>
+                      )}
                     </div>
                     <div className="formats space-x-md">
                       {hit.metadata &&

diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "@alfalab/winston3-logstash-transport": "^1.3.0",
     "@apollo/client": "^3.6.9",
     "@beam-australia/react-env": "^3.1.1",
+    "@entryscape/entrystore-js": "^4.14.3",
     "@types/node-fetch": "^2.6.2",
     "@types/swagger-ui-react": "^4.11.0",
     "class-variance-authority": "^0.7.0",