Issue #SB-24995 fix: Fixed filter in desktop (#6679)

* Issue #SB-22410 feat: Guest profile feedback implementation

* Issue #SB-22410 feat: Updated Languages strings

* Issue #SB-22410 feat: Guest profile feedback implementation

* Issue #SB-22410 feat: Guest profile feedback implementation

* Issue #SB-0000 feat: Updated api endpoints as per portal changes

* Issue #SB-23372 fix: Updated translation for bengali language

* Issue #SB-21427 fix: Disabled download button for content which dont have download url

* Issue #SB-21427 feat: Added tooltip for disabled download button

* Issue #SB-0000 fix: Fixed about us iframe popup ui

* Issue #SB-24477 fix: Fixed BMG filters

* Issue #SB-24488 fix: Fixed filter for myDownloads

* Issue #SB-24488 fix: Fixed filter for myDownloads

* Issue #SB-24488 fix: Fixed filter for myDownloads

* Issue #SB-24488 fix: Fixed filter for myDownloads

* Issue #SB-0000 fix: Kept exact version for electron-builder dependency

* Issue #SB-0000 fix: Kept exact version for electron-builder dependency

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-0000 fix: Added pdata for telemetry events

* Issue #SB-24669 fix: Close opened popup on page leave

* Issue #SB-24673 fix: Added avatar for guest user profile

* Issue #SB-24678 fix: Updated userSDK

* Issue #SB-24727 fix: Hide error toast in offline mode

* Issue #SB-24673 fix: Update name as soon as created offline profile

* Issue #SB-24758 fix: Added new route for create managed user

* Issue #SB-24805 fix: Added null check

* Issue #SB-24805 fix: Added null check

* Issue #SB-24826 fix: Pulled phrase app strings

* Issue #SB-24826 fix: Updated json files

* Issue #SB-24995 fix: Fixed filter in desktop

src/app/client/src/app/modules/public/module/offline/components/library/library.component.ts

@@ -251,17 +251,6 @@ export class LibraryComponent implements OnInit, OnDestroy {
             }
         }
 
-        if (_.get(this.facets, 'length')) {
-            this.facets.forEach((item) => {
-                if (_.has(filterData, item.name) && _.get(item, 'values.length')) {
-                    item.values.forEach((element: any) => {
-                        if (!filterData[item.name].includes(element.name)) {
-                            filterData[item.name]  = filterData[item.name].filter(value => value === element.name);
-                        }
-                    });
-                }
-            });
-        }
         this.selectedFilters = filterData;
         const defaultFilters = _.reduce(filters, (collector: any, element) => {
             if (element.code === 'board') {

src/desktop/modules/controllers/content/content.ts

@@ -567,7 +567,8 @@ export default class Content {
                 });
                 resolve(facetData);
             } else {
-                    _.forEach(facets, (facet) => {
+                    const extendedFacets = [...facets, ...["board", "medium", "gradeLevel", "subject"]];
+                    _.forEach(extendedFacets, (facet) => {
                         let eachFacetData = _.map(contents, (content) => _.get(content, facet));
                         const arrayData = [];
                         _.forEach(eachFacetData, (data) => {
@@ -583,7 +584,27 @@ export default class Content {
                                 return ({ name: data[0], count: data.length});
                             }
                         });
-                        facetData.push({ name: facet, values: _.compact(result) || [] });
+
+                        if (facet === 'board' || facet === 'se_boards') {
+                            facet = 'se_boards'
+                        } else if (facet === 'gradeLevel' || facet === 'se_gradeLevels') {
+                            facet = 'se_gradeLevels';
+                        } else if (facet === 'medium' || facet === 'se_mediums') {
+                            facet = 'se_mediums';
+                        } else if (facet === 'subject' || facet === 'se_subjects') {
+                            facet = 'se_subjects';
+                        }
+
+                        const facetList = facetData.map(item => item.name);
+                        if (facetList.length && facetList.includes(facet)) {
+                            _.each(facetData, (facetItem) => {
+                                if(facetItem.name === facet) {
+                                    facetItem.values = _.merge(facetItem.values, _.compact(result));
+                                }
+                            })
+                        } else {
+                            facetData.push({ name: facet, values: _.compact(result) || [] });
+                        }
                     });
                     resolve(facetData);
                 }
@@ -853,8 +874,8 @@ export default class Content {
 
     private getFilters(filters) {
         // Update BMG filter names
-        const bmgFilters =  _.intersection(Object.keys(filters), ["se_boards", "se_gradeLevels", "se_mediums"]);
-        let keyMap = new Map([["se_boards", 'board'], ["se_gradeLevels", "gradeLevel"], ["se_mediums", "medium"]]);
+        const bmgFilters =  _.intersection(Object.keys(filters), ["se_boards", "se_gradeLevels", "se_mediums", "se_subjects"]);
+        let keyMap = new Map([["se_boards", 'board'], ["se_gradeLevels", "gradeLevel"], ["se_mediums", "medium"], ["se_subjects", "subject"]]);
         bmgFilters.forEach(newKey => {
             const oldKey = keyMap.get(newKey);
             delete Object.assign(filters, { [oldKey]: filters[newKey] })[newKey];