DIGG-494: National dropdown filter

diggsweden · Dec 13, 2024 · 7430747 · 7430747
1 parent 8dbf961
commit 7430747
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts b/features/search/search-page/search-page-entryscape/search-page-provider-settings.ts
@@ -147,9 +147,10 @@ export function createSearchProviderSettings(env: EnvSettings, lang: string) {
             dcatProperty: "dcterms:subject",
             indexOrder: 7,
             group: "type",
-            customFilter:
-              "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/*",
             showInSearchResult: true,
+            customProperties: [
+              "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/",
+            ],
           },
           {
             resource: "http://purl.org/dc/terms/conformsTo",

diff --git a/types/search.d.ts b/types/search.d.ts
@@ -44,6 +44,7 @@ export interface FacetSpecificationItem {
   dcatFilterEnabled?: boolean;
   customFilter?: string;
   customSearch?: ESRdfType[];
+  customProperties?: string[];
   showInSearchResult?: boolean;
 }
 
@@ -92,6 +93,7 @@ export interface SearchFacetValue {
   facetValueString: string;
   related: boolean;
   customFilter?: string;
+  customProperties?: string[];
   customSearch?: ESRdfType[];
 }
 

diff --git a/utilities/entrystore/entrystore.service.ts b/utilities/entrystore/entrystore.service.ts
@@ -449,9 +449,26 @@ export class EntrystoreService {
           customSearch: facetSpec.customSearch,
           facetValues: f.values
             .filter((value: ESFacetFieldValue) => {
+              if (
+                facetSpec.customProperties &&
+                facetSpec.customProperties.length > 0
+              ) {
+                return facetSpec.customProperties.some((property) =>
+                  value.name.startsWith(property),
+                );
+              }
               if (!value.name || value.name.trim() === "") return false;
               if (!facetSpec?.dcatFilterEnabled) return true;
 
+              if (
+                facetSpec.resource === "http://purl.org/dc/terms/subject" &&
+                value.name.startsWith(
+                  "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/",
+                )
+              ) {
+                return true;
+              }
+
               const choices: Choice[] = getTemplateChoices(
                 dcat,
                 facetSpec.dcatProperty,
@@ -680,7 +697,7 @@ export class EntrystoreService {
                 .startsWith(
                   facet?.customFilter?.endsWith("*")
                     ? facet?.customFilter?.slice(0, -1)
-                    : facet?.customFilter,
+                    : facet?.customFilter || facet?.customProperties?.[0],
                 ),
             );