Merge pull request #491 from diggsweden/DIGG-440

Digg 440

Author: MikaMunterud

components/content/Entryscape/DataServicePage/index.tsx

@@ -99,7 +99,7 @@ export const DataServicePage: React.FC<{
             },
 
             blocks: [
-              ${customIndicators},
+              ${customIndicators(t)},
               ${exploreApiLink},
               ${keyword(t)},
               ${theme(t)},            

components/content/Entryscape/DataSetPage/index.tsx

@@ -189,7 +189,7 @@ export const DataSetPage: React.FC = () => {
             ],
 
             blocks: [
-              ${customIndicators},
+              ${customIndicators(t)},
               ${exploreApiLink(cid, eid, t)},
               ${keyword(t)},
               ${theme(t)},

components/content/Entryscape/DatasetExploreApiPage/index.tsx

@@ -153,7 +153,7 @@ export const DataSetExploreApiPage: React.FC<{
             ],
 
             blocks: [
-              ${customIndicators},   
+              ${customIndicators(t)},   
           ]
           }]
           </script>              

components/content/Search/SearchFilters/index.tsx

@@ -163,6 +163,10 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
   const containHVD = !search.request.facetValues?.find(
     (d) => d.facet === hvd && search.request.facetValues?.length === 1,
   );
+  const national = "http://purl.org/dc/terms/subject";
+  const containNational = !search.request.facetValues?.find(
+    (d) => d.facet === national && search.request.facetValues?.length === 1,
+  );
 
   const clearCurrentScrollPos = () => {
     if (typeof localStorage != "undefined" && typeof location != "undefined") {
@@ -243,7 +247,7 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                     )
                   : value?.facetValues.slice(0, show);
 
-                if (key !== hvd) {
+                if (key !== hvd && key !== national) {
                   return (
                     <li key={"box" + value.title + idx} role="listitem">
                       <SearchFilter
@@ -349,7 +353,7 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                       </SearchFilter>
                     </li>
                   );
-                } else {
+                } else if (key === hvd) {
                   return (
                     <div key={value.title} className="relative max-w-fit">
                       <input
@@ -384,29 +388,52 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                       />
                     </div>
                   );
+                } else if (key === national) {
+                  return (
+                    <div key={value.title} className="relative max-w-fit">
+                      <input
+                        id="national_only"
+                        name="National"
+                        type="checkbox"
+                        className="peer/national-only sr-only"
+                        checked={search.request.facetValues?.some(
+                          (t) => t.facet == ESRdfType.national_data,
+                        )}
+                        onChange={() => doSearch(key, facetValues[0])}
+                      />
+                      <label
+                        className="button button--small button--secondary z-2 focus--outline focus--primary relative cursor-pointer pr-xl 
+                      peer-checked:after:translate-x-full peer-focus-visible/national-only:bg-whiteOpaque5 peer-focus-visible/national-only:outline-dashed peer-focus-visible/national-only:outline-[3px] 
+                      peer-focus-visible/national-only:outline-offset-2 peer-focus-visible/national-only:outline-primary md:pr-xl"
+                        htmlFor="national_only"
+                      >
+                        {t(`resources|${key}`)}
+                      </label>
+                      <CheckboxIcon
+                        height={iconSize * 1.5}
+                        width={iconSize * 1.5}
+                        viewBox="0 0 24 24"
+                        className="pointer-events-none absolute right-sm top-1/4 peer-checked/national-only:hidden"
+                      />
+                      <CheckboxCheckedIcon
+                        height={iconSize * 1.5}
+                        width={iconSize * 1.5}
+                        viewBox="0 0 24 24"
+                        className="pointer-events-none absolute right-sm top-1/4 hidden peer-checked/national-only:block"
+                      />
+                    </div>
+                  );
                 }
               })}
           {searchMode == "datasets" && (
-            <div className="relative max-w-fit">
-              <input
-                id="api_only"
-                name="API"
-                type="checkbox"
-                className="peer/api-only sr-only"
-                checked={
-                  search.request.esRdfTypes?.some(
-                    (t) => t == ESRdfType.esterms_ServedByDataService,
-                  ) &&
-                  search.request.esRdfTypes?.some(
-                    (t) => t == ESRdfType.esterms_IndependentDataService,
-                  ) &&
-                  !search.request.esRdfTypes?.some(
-                    (t) => t == ESRdfType.dataset,
-                  )
-                }
-                onChange={() => {
-                  clearCurrentScrollPos();
-                  if (
+            <>
+              <div className="relative max-w-fit">
+                <input
+                  id="api_only"
+                  name="API"
+                  type="checkbox"
+                  className="peer/api-only sr-only"
+                  checked={
                     search.request.esRdfTypes?.some(
                       (t) => t == ESRdfType.esterms_ServedByDataService,
                     ) &&
@@ -416,67 +443,83 @@ export const SearchFilters: React.FC<SearchFilterProps> = ({
                     !search.request.esRdfTypes?.some(
                       (t) => t == ESRdfType.dataset,
                     )
-                  ) {
-                    search
-                      .set({
-                        esRdfTypes: [
-                          ESRdfType.dataset,
-                          ESRdfType.esterms_IndependentDataService,
-                          ESRdfType.esterms_ServedByDataService,
-                        ],
-                        query: query,
-                      })
-                      .then(() => search.doSearch());
-                  } else {
-                    search
-                      .set({
-                        esRdfTypes: [
-                          ESRdfType.esterms_IndependentDataService,
-                          ESRdfType.esterms_ServedByDataService,
-                        ],
-                        query: query,
-                      })
-                      .then(() => search.doSearch());
                   }
-                }}
-              />
-              <label
-                className="button button--small button--secondary z-2 focus--outline focus--primary relative cursor-pointer pr-xl 
+                  onChange={() => {
+                    clearCurrentScrollPos();
+                    if (
+                      search.request.esRdfTypes?.some(
+                        (t) => t == ESRdfType.esterms_ServedByDataService,
+                      ) &&
+                      search.request.esRdfTypes?.some(
+                        (t) => t == ESRdfType.esterms_IndependentDataService,
+                      ) &&
+                      !search.request.esRdfTypes?.some(
+                        (t) => t == ESRdfType.dataset,
+                      )
+                    ) {
+                      search
+                        .set({
+                          esRdfTypes: [
+                            ESRdfType.dataset,
+                            ESRdfType.esterms_IndependentDataService,
+                            ESRdfType.esterms_ServedByDataService,
+                          ],
+                          query: query,
+                        })
+                        .then(() => search.doSearch());
+                    } else {
+                      search
+                        .set({
+                          esRdfTypes: [
+                            ESRdfType.esterms_IndependentDataService,
+                            ESRdfType.esterms_ServedByDataService,
+                          ],
+                          query: query,
+                        })
+                        .then(() => search.doSearch());
+                    }
+                  }}
+                />
+                <label
+                  className="button button--small button--secondary z-2 focus--outline focus--primary relative cursor-pointer pr-xl 
                 peer-checked:after:translate-x-full peer-focus-visible/api-only:bg-whiteOpaque5 peer-focus-visible/api-only:outline-dashed 
                 peer-focus-visible/api-only:outline-[3px] peer-focus-visible/api-only:outline-offset-2 peer-focus-visible/api-only:outline-primary md:pr-xl"
-                htmlFor="api_only"
-              >
-                API
-              </label>
-              <CheckboxIcon
-                height={iconSize * 1.5}
-                width={iconSize * 1.5}
-                viewBox="0 0 24 24"
-                className="pointer-events-none absolute right-sm top-1/4 peer-checked/api-only:hidden"
-              />
-              <CheckboxCheckedIcon
-                height={iconSize * 1.5}
-                width={iconSize * 1.5}
-                viewBox="0 0 24 24"
-                className="pointer-events-none absolute right-sm top-1/4 hidden peer-checked/api-only:block"
-              />
-            </div>
+                  htmlFor="api_only"
+                >
+                  API
+                </label>
+                <CheckboxIcon
+                  height={iconSize * 1.5}
+                  width={iconSize * 1.5}
+                  viewBox="0 0 24 24"
+                  className="pointer-events-none absolute right-sm top-1/4 peer-checked/api-only:hidden"
+                />
+                <CheckboxCheckedIcon
+                  height={iconSize * 1.5}
+                  width={iconSize * 1.5}
+                  viewBox="0 0 24 24"
+                  className="pointer-events-none absolute right-sm top-1/4 hidden peer-checked/api-only:block"
+                />
+              </div>
+            </>
           )}
         </ul>
       </div>
       {search.request.facetValues && search.request.facetValues.length > 0 && (
         <div className="mt-lg flex flex-col justify-between gap-md md:flex-row md:items-baseline">
           <div className="flex flex-col flex-wrap gap-sm md:flex-row md:gap-md">
-            {containHVD && (
+            {(containHVD || containNational) && (
               <span className="text-textSecondary">
                 {t("common|active-filters")}
               </span>
             )}
+
             {search.request &&
               search.request.facetValues &&
               (search.request.facetValues as SearchFacetValue[]).map(
                 (facetValue: SearchFacetValue, index: number) =>
-                  facetValue.facet !== hvd && (
+                  facetValue.facet !== hvd &&
+                  facetValue.facet !== national && (
                     <Button
                       variant="filter"
                       size="xs"

components/content/Search/SearchPage/SearchPageEntryScape/index.tsx

@@ -181,6 +181,14 @@ export const SearchPageEntryScape: FC<SearchProps> = ({ searchType }) => {
             dcatFilterEnabled: false,
             indexOrder: 6,
           },
+          {
+            resource: "http://purl.org/dc/terms/subject",
+            type: ESType.uri,
+            dcatProperty: "dcterms:subject",
+            dcatType: "choice",
+            dcatFilterEnabled: false,
+            indexOrder: 7,
+          },
         ],
       },
       initRequest: {

components/content/Search/SearchResults/index.tsx

@@ -183,6 +183,7 @@ export const SearchResults: FC<SearchResultsProps> = ({
   const [lastUpdate, setLastUpdate] = useState<string>("");
   const { t } = useTranslation();
   const hvd = "http://data.europa.eu/r5r/applicableLegislation";
+  const national = "http://purl.org/dc/terms/subject";
   const searchKey = typeof location != "undefined" ? location.search : "server";
   const posY =
     typeof localStorage != "undefined"
@@ -232,6 +233,13 @@ export const SearchResults: FC<SearchResultsProps> = ({
     return isHvd.includes(true);
   }
 
+  function isNational(dataset: object) {
+    const isNational = Object.values(dataset).map((ds) =>
+      ds.hasOwnProperty(national),
+    );
+    return isNational.includes(true);
+  }
+
   return (
     <div id="search-result" className="my-lg md:my-xl">
       <div className="mb-lg flex flex-col-reverse justify-between md:flex-row">
@@ -339,6 +347,13 @@ export const SearchResults: FC<SearchResultsProps> = ({
                           {t("common|high-value-dataset")}
                         </span>
                       )}
+                      {isNational(hit.esEntry._metadata._graph) && (
+                        <span
+                          className={`bg-green-200 px-sm py-xs text-sm uppercase`}
+                        >
+                          {t("common|national-dataset")}
+                        </span>
+                      )}
                     </div>
                   </div>
                 </li>

locales/en/common.json

@@ -54,6 +54,7 @@
   "menu-anchor": "On-page navigation",
   "menu-form": "Form steps",
   "menu-form-bottom": "Form actions",
+  "national-dataset": "National basic data",
   "no-js-text": "JavaScript must be enabled for the search page to work.",
   "of": "of",
   "to": "to",

locales/en/resources.json

@@ -6,6 +6,7 @@
   "http://purl.org/dc/terms/accessRights": "Access",
   "http://purl.org/dc/terms/license": "License",
   "http://data.europa.eu/r5r/applicableLegislation": "High-value dataset",
+  "http://purl.org/dc/terms/subject": "National basic data",
 
   "https://dataportal.se/concepts/licensecategories/otherlicense": "Other licenses",
   "https://dataportal.se/concepts/licensecategories/nolicense": "License missing",

locales/sv/common.json

@@ -54,6 +54,7 @@
   "menu-anchor": "Sidinnehållsnavigation",
   "menu-form": "Formulärsteg",
   "menu-form-bottom": "Formuläråtgärder",
+  "national-dataset": "Nationella grunddata",
   "no-js-text": "JavaScript måste vara aktiverat för att söksidan ska fungera.",
   "seo-title": "Sveriges Dataportal",
   "search": "Sök",

locales/sv/resources.json

@@ -6,6 +6,7 @@
   "http://purl.org/dc/terms/accessRights": "Åtkomsträttigheter",
   "http://purl.org/dc/terms/license": "Licens",
   "http://data.europa.eu/r5r/applicableLegislation": "Värdefulla datamängder",
+  "http://purl.org/dc/terms/subject": "Nationella grunddata",
 
   "https://dataportal.se/concepts/licensecategories/otherlicense": "Övriga licenser",
   "https://dataportal.se/concepts/licensecategories/nolicense": "Saknar licens",

utilities/entryScape.ts

@@ -36,6 +36,7 @@ export enum ESRdfType {
   esterms_ServedByDataService = "esterms:ServedByDataService",
   hvd = "http://data.europa.eu/eli/reg_impl/2023/138/oj",
   agent = "http://xmlns.com/foaf/0.1/Agent",
+  national_data = "http://purl.org/dc/terms/subject",
 }
 
 /* eslint-enable no-unused-vars */

utilities/entryscape_blocks.ts

@@ -1,6 +1,6 @@
 import { Translate } from "next-translate";
 
-export const customIndicators = `
+export const customIndicators = (t: Translate) => `
     {
     block: 'customIndicators',
     extends: 'template',
@@ -58,6 +58,14 @@ export const customIndicators = `
       '<span>{{label}}</span>' +
     '</span>{{/eachprop}}' +
 
+    '{{#ifprop "dcterms:subject"}}' +
+    '<span class="indicator" title="Nationell datamängd">' +
+      '<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">' +
+        '<path d="M12 21C9.48333 21 7.35417 20.6125 5.6125 19.8375C3.87083 19.0625 3 18.1167 3 17V7C3 5.9 3.87917 4.95833 5.6375 4.175C7.39583 3.39167 9.51667 3 12 3C14.4833 3 16.6042 3.39167 18.3625 4.175C20.1208 4.95833 21 5.9 21 7V17C21 18.1167 20.1292 19.0625 18.3875 19.8375C16.6458 20.6125 14.5167 21 12 21ZM12 9.025C13.4833 9.025 14.975 8.8125 16.475 8.3875C17.975 7.9625 18.8167 7.50833 19 7.025C18.8167 6.54167 17.9792 6.08333 16.4875 5.65C14.9958 5.21667 13.5 5 12 5C10.4833 5 8.99583 5.2125 7.5375 5.6375C6.07917 6.0625 5.23333 6.525 5 7.025C5.23333 7.525 6.07917 7.98333 7.5375 8.4C8.99583 8.81667 10.4833 9.025 12 9.025ZM12 14C12.7 14 13.375 13.9667 14.025 13.9C14.675 13.8333 15.2958 13.7375 15.8875 13.6125C16.4792 13.4875 17.0375 13.3333 17.5625 13.15C18.0875 12.9667 18.5667 12.7583 19 12.525V9.525C18.5667 9.75833 18.0875 9.96667 17.5625 10.15C17.0375 10.3333 16.4792 10.4875 15.8875 10.6125C15.2958 10.7375 14.675 10.8333 14.025 10.9C13.375 10.9667 12.7 11 12 11C11.3 11 10.6167 10.9667 9.95 10.9C9.28333 10.8333 8.65417 10.7375 8.0625 10.6125C7.47083 10.4875 6.91667 10.3333 6.4 10.15C5.88333 9.96667 5.41667 9.75833 5 9.525V12.525C5.41667 12.7583 5.88333 12.9667 6.4 13.15C6.91667 13.3333 7.47083 13.4875 8.0625 13.6125C8.65417 13.7375 9.28333 13.8333 9.95 13.9C10.6167 13.9667 11.3 14 12 14ZM12 19C12.7667 19 13.5458 18.9417 14.3375 18.825C15.1292 18.7083 15.8583 18.5542 16.525 18.3625C17.1917 18.1708 17.75 17.9542 18.2 17.7125C18.65 17.4708 18.9167 17.225 19 16.975V14.525C18.5667 14.7583 18.0875 14.9667 17.5625 15.15C17.0375 15.3333 16.4792 15.4875 15.8875 15.6125C15.2958 15.7375 14.675 15.8333 14.025 15.9C13.375 15.9667 12.7 16 12 16C11.3 16 10.6167 15.9667 9.95 15.9C9.28333 15.8333 8.65417 15.7375 8.0625 15.6125C7.47083 15.4875 6.91667 15.3333 6.4 15.15C5.88333 14.9667 5.41667 14.7583 5 14.525V17C5.08333 17.25 5.34583 17.4917 5.7875 17.725C6.22917 17.9583 6.78333 18.1708 7.45 18.3625C8.11667 18.5542 8.85 18.7083 9.65 18.825C10.45 18.9417 11.2333 19 12 19Z" fill="#6E615A"/>' +
+      '</svg>' +
+      '<span>${t("common|national-dataset")}</span>' +
+    '</span>{{/ifprop}}' + 
+
     '{{#ifprop "schema:offers"}}' +
     '<span class="indicator" title="Avgift">' +
     '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">' +

utilities/generateCsp.ts

@@ -87,7 +87,7 @@ const generateCSP = ({ nonce }: generateCSPProps = {}) => {
     "connect-src",
     `'self' https://* http://127.0.0.1:1300/ https://admin.dataportal.se https://editera.dataportal.se https://webbanalys.digg.se ${
       reactEnv("APOLLO_URL") || ""
-    } https://* webbanalys.digg.se statsapi.screen9.com`,
+    } https://* webbanalys.digg.se statsapi.screen9.com geo-inspire.trafikverket.se`,
   );
 
   // Return the object in a formatted value