@fluid-topics/ft-search-context 1.1.107 → 1.1.111

package/build/ft-search-context.properties.d.ts

@@ -1,8 +1,8 @@
-import { FtSearchFilter, FtSearchSortCriterion } from "@fluid-topics/public-api";
+import { FtMetadataFilter, FtSearchSortCriterion } from "@fluid-topics/public-api";
 export interface FtSearchContextProperties {
     query?: string;
     contentLocale?: string;
-    filters?: FtSearchFilter[];
+    filters?: FtMetadataFilter[];
     sort?: FtSearchSortCriterion[];
     pageSize?: number;
 }

package/build/store/FtSearchStateManager.d.ts

@@ -1,9 +1,8 @@
 import { FtSearchPageState } from "./model";
 import { FtReduxStore } from "@fluid-topics/ft-wc-utils";
 import { FtSearchPageStateReducers } from "./redux";
-import { FtPublicClusterSortCriterion, FtSearchFilter, FtSearchRequest, FtSearchScope, FtSearchSortCriterion, FtVirtualField } from "@fluid-topics/public-api";
+import { FtDateFilterTypeKeys, FtMetadataFilter, FtPublicClusterSortCriterion, FtSearchRequest, FtSearchScope, FtSearchSortCriterion, FtVirtualField } from "@fluid-topics/public-api";
 import { FtSearchService } from "./utils/FtSearchService";
-import { FtPeriodFilter } from "@fluid-topics/public-api/dist/mjs/types/ft-common/public";
 export declare const searchInDocumentTitlesOnlySelector: (s: FtSearchPageState) => boolean;
 export declare class ClearAllFiltersEvent extends Event {
     static eventName: string;
@@ -23,24 +22,27 @@ export declare class FtSearchStateManager {
     setPageSize(pageSize: number): void;
     setPageNumber(pageNumber: number): void;
     setSort(sort: FtSearchSortCriterion[]): void;
-    setFilters(filters: FtSearchFilter[]): void;
+    setFilters(filters: FtMetadataFilter[]): void;
     setClusterSortCriterion(criterions: FtPublicClusterSortCriterion[]): void;
     setSearchInDocumentTitlesOnly(searchInDocumentTitleOnly: boolean): void;
     setVirtualField(virtualField: FtVirtualField): void;
     get searchInDocumentTitlesOnly(): boolean;
-    get periodFilter(): FtPeriodFilter | undefined;
     clearAllFilters(): void;
     addFacet(id: string): void;
     replaceFacet(oldId: string, newId?: string): void;
     private get facetIds();
     private set facetIds(value);
     setFilter(key: string, values: string[]): void;
+    setValueFilter(key: string, values: string[]): void;
+    setDateFilter(key: string, dateType: FtDateFilterTypeKeys): void;
+    removeDateFilter(key: string): void;
+    setRangeFilter(key: string, from: string, to: string): void;
+    removeRangeFilter(key: string): void;
     setLiveQuery(query: string): void;
     setRequest(request: FtSearchRequest): void;
     setScope(scope: FtSearchScope): void;
     setIgnoreEmptyQuery(ignoreEmptyQuery: boolean): void;
     setOpenExternalDocumentInNewTab(openExternalDocumentInNewTab: boolean): void;
-    setPeriodFilter(periodFilter?: FtPeriodFilter): void;
     private localesDebouncer;
     updateLocales(): Promise<boolean>;
     private searchDebouncer;

package/build/store/FtSearchStateManager.js

@@ -65,7 +65,7 @@ export class FtSearchStateManager {
         this.launchSearch();
     }
     setFilters(filters) {
-        const cleanFilters = filters.filter(filter => filter.values.length > 0);
+        const cleanFilters = filters.filter(f => !f.valueFilter || f.valueFilter.values.length > 0);
         this.store.actions.setRequestFilters(cleanFilters);
         this.store.actions.setPageNumber(1);
         cleanFilters.forEach(f => {
@@ -97,9 +97,6 @@ export class FtSearchStateManager {
     get searchInDocumentTitlesOnly() {
         return searchInDocumentTitlesOnlySelector(this.store.getState());
     }
-    get periodFilter() {
-        return this.store.getState().request.periodFilter;
-    }
     // Used in GWT
     clearAllFilters() {
         this.setFilters([]);
@@ -125,10 +122,71 @@ export class FtSearchStateManager {
         let facetsConf = uniqIds.map(id => ({ id: id }));
         this.store.actions.setRequestFacets(facetsConf);
     }
+    /* @deprecated */
     setFilter(key, values) {
-        let existingFilters = this.store.getState().request.filters;
-        let newFilter = { key: key, values: values, negative: false };
-        let filters = [...existingFilters.filter(filter => filter.key !== key), newFilter];
+        this.setValueFilter(key, values);
+    }
+    setValueFilter(key, values) {
+        let existingFilters = this.store.getState().request.metadataFilters;
+        let newFilter = {
+            key: key,
+            valueFilter: {
+                values: values,
+                negative: false,
+            },
+        };
+        let filters = [
+            ...existingFilters.filter(f => !f.valueFilter),
+            ...existingFilters.filter(f => f.valueFilter && f.key !== newFilter.key),
+            newFilter
+        ];
+        this.setFilters(filters);
+    }
+    setDateFilter(key, dateType) {
+        let existingFilters = this.store.getState().request.metadataFilters;
+        let newFilter = {
+            key: key,
+            dateFilter: {
+                type: dateType
+            },
+        };
+        let filters = [
+            ...existingFilters.filter(f => !f.dateFilter),
+            ...existingFilters.filter(f => f.dateFilter && f.key !== newFilter.key),
+            newFilter
+        ];
+        this.setFilters(filters);
+    }
+    removeDateFilter(key) {
+        let existingFilters = this.store.getState().request.metadataFilters;
+        const filters = [
+            ...existingFilters.filter(f => !f.dateFilter),
+            ...existingFilters.filter(f => f.dateFilter && f.key !== key),
+        ];
+        this.setFilters(filters);
+    }
+    setRangeFilter(key, from, to) {
+        let existingFilters = this.store.getState().request.metadataFilters;
+        let newFilter = {
+            key: key,
+            rangeFilter: {
+                from: from,
+                to: to
+            },
+        };
+        let filters = [
+            ...existingFilters.filter(f => !f.rangeFilter),
+            ...existingFilters.filter(f => f.rangeFilter && f.key !== newFilter.key),
+            newFilter
+        ];
+        this.setFilters(filters);
+    }
+    removeRangeFilter(key) {
+        let existingFilters = this.store.getState().request.metadataFilters;
+        const filters = [
+            ...existingFilters.filter(f => !f.rangeFilter),
+            ...existingFilters.filter(f => f.rangeFilter && f.key !== key),
+        ];
         this.setFilters(filters);
     }
     setLiveQuery(query) {
@@ -152,11 +210,6 @@ export class FtSearchStateManager {
     setOpenExternalDocumentInNewTab(openExternalDocumentInNewTab) {
         this.openExternalDocumentInNewTab = openExternalDocumentInNewTab;
     }
-    setPeriodFilter(periodFilter) {
-        this.store.actions.setRequestPeriodFilter(periodFilter);
-        this.store.actions.setPageNumber(1);
-        this.launchSearch();
-    }
     updateLocales() {
         return this.localesDebouncer.run(async () => this.store.actions.setLocales((await this.service.getAvailableSearchLocales()).contentLocales));
     }
@@ -205,7 +258,7 @@ export class FtSearchStateManager {
             const searchRequest = searchState.request;
             const request = {
                 input: searchState.liveQuery,
-                filters: searchRequest.filters,
+                metadataFilters: searchRequest.metadataFilters,
                 sort: searchRequest.sort,
                 contentLocale: searchRequest.contentLocale,
                 scope: searchRequest.scope,

package/build/store/redux.d.ts

@@ -8,7 +8,7 @@ declare const searchPageStateReducers: {
     setPageSize: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["paging"]["perPage"]>) => void;
     setPageNumber: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["paging"]["page"]>) => void;
     setRequestSort: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["sort"]>) => void;
-    setRequestFilters: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["filters"]>) => void;
+    setRequestFilters: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["metadataFilters"]>) => void;
     setRequestFacets: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["facets"]>) => void;
     setRequestVirtualField: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["virtualField"]>) => void;
     setRequestScope: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["scope"]>) => void;
@@ -20,7 +20,6 @@ declare const searchPageStateReducers: {
     setPaging: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["paging"]>) => void;
     setLiveQuery: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["liveQuery"]>) => void;
     setSuggestResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["suggestResults"]>) => void;
-    setRequestPeriodFilter: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["periodFilter"]>) => void;
 };
 export type FtSearchPageStateReducers = typeof searchPageStateReducers;
 export declare const createSearchPageStore: (id: string) => FtReduxStore<FtSearchPageState, {
@@ -30,7 +29,7 @@ export declare const createSearchPageStore: (id: string) => FtReduxStore<FtSearc
     setPageSize: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["paging"]["perPage"]>) => void;
     setPageNumber: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["paging"]["page"]>) => void;
     setRequestSort: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["sort"]>) => void;
-    setRequestFilters: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["filters"]>) => void;
+    setRequestFilters: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["metadataFilters"]>) => void;
     setRequestFacets: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["facets"]>) => void;
     setRequestVirtualField: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["virtualField"]>) => void;
     setRequestScope: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["scope"]>) => void;
@@ -42,6 +41,5 @@ export declare const createSearchPageStore: (id: string) => FtReduxStore<FtSearc
     setPaging: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["paging"]>) => void;
     setLiveQuery: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["liveQuery"]>) => void;
     setSuggestResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["suggestResults"]>) => void;
-    setRequestPeriodFilter: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["periodFilter"]>) => void;
 }, import("redux").AnyAction>;
 export {};

package/build/store/redux.js

@@ -19,7 +19,7 @@ const searchPageStateReducers = {
         state.request.sort = action.payload;
     },
     setRequestFilters: (state, action) => {
-        state.request.filters = action.payload;
+        state.request.metadataFilters = action.payload;
     },
     setRequestFacets: (state, action) => {
         state.request.facets = action.payload;
@@ -55,9 +55,6 @@ const searchPageStateReducers = {
     setSuggestResults: (state, action) => {
         state.suggestResults = action.payload;
     },
-    setRequestPeriodFilter: (state, action) => {
-        state.request.periodFilter = action.payload;
-    },
 };
 export const createSearchPageStore = (id) => FtReduxStore.get({
     name: "ft-search-" + id,
@@ -65,7 +62,7 @@ export const createSearchPageStore = (id) => FtReduxStore.get({
         request: {
             query: "",
             clusterSortCriterions: [],
-            filters: [],
+            metadataFilters: [],
             facets: [],
             sort: [],
             paging: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-search-context",
-  "version": "1.1.107",
+  "version": "1.1.111",
   "description": "Context block for integrated search components",
   "keywords": [
     "Lit"
@@ -19,12 +19,12 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.1.107",
-    "@fluid-topics/ft-wc-utils": "1.1.107",
+    "@fluid-topics/ft-app-context": "1.1.111",
+    "@fluid-topics/ft-wc-utils": "1.1.111",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.75"
+    "@fluid-topics/public-api": "1.0.77"
   },
-  "gitHead": "8dd7bc8f7eb8c278b8d3ac319694daa86f9ac9af"
+  "gitHead": "23129f0e44db11e1d2c0431cedc4dde05c3241ee"
 }