Merge pull request #3184 from microsoft-search/develop

v4.9.2 Bugfix for preselect filter regression
microsoft-search · Aug 8, 2023 · 284e2bd · 284e2bd
2 parents 7d4ab34 + 3746645
commit 284e2bd
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/search-extensibility/package-lock.json b/search-extensibility/package-lock.json
diff --git a/search-parts/config/package-solution.json b/search-parts/config/package-solution.json
@@ -3,7 +3,7 @@
     "solution": {
         "name": "PnP Modern Search - Search Web Parts - v4",
         "id": "59903278-dd5d-4e9e-bef6-562aae716b8b",
-        "version": "4.9.1.0",
+        "version": "4.9.2.0",
         "includeClientSideAssets": true,
         "skipFeatureDeployment": true,
         "isDomainIsolated": false,

diff --git a/search-parts/package-lock.json b/search-parts/package-lock.json
diff --git a/search-parts/package.json b/search-parts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pnp/modern-search-web-parts",
-    "version": "4.9.1",
+    "version": "4.9.2",
     "private": true,
     "main": "lib/index.js",
     "engines": {

diff --git a/search-parts/src/helpers/DateHelper.ts b/search-parts/src/helpers/DateHelper.ts
@@ -40,8 +40,8 @@ export class DateHelper {
             ];
 
             // Moment is by default 'en-us'
-            if (!culture.startsWith('en-us') && culture !== "en") {
-                // check if culture must be used with two letter name in momentjs  
+            if (!culture.startsWith('en-us') && momentTwoLetterLanguageName.some((c) => c == culture)) {
+                // check if culture must be used with two letter name in momentjs
                 for (let i = 0; i < momentTwoLetterLanguageName.length; i++)
                     if (culture.startsWith(momentTwoLetterLanguageName[i])) {
                         culture = culture.split('-')[0];

diff --git a/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx b/search-parts/src/webparts/searchFilters/components/SearchFiltersContainer.tsx
@@ -133,7 +133,7 @@ export default class SearchFiltersContainer extends React.Component<ISearchFilte
 
     // When new filters are received from the data source
     if (!isEqual(prevProps.availableFilters, this.props.availableFilters)
-       || !isEqual(prevState.currentUiFilters, this.state.currentUiFilters)) {
+       || (!isEqual(prevState.currentUiFilters, this.state.currentUiFilters)) && prevState.currentUiFilters.length > 0) {
 
       this.getFiltersDeepLink();
       this.getFiltersToDisplay(this.props.availableFilters, this.state.currentUiFilters, this.props.filtersConfiguration);