Merge pull request #5025 from rajeevsathish/release-3.2.2_New

Issue #SB-20354 Filter issue

src/app/client/src/app/modules/content-search/components/prominent-filter/prominent-filter.component.html

@@ -31,10 +31,10 @@
                     </a>
                   </ng-container>
 
-                  <ng-container *ngFor="let item of channelInputLabel">
-                    <a class="ui label mt-8 mr-8" *ngIf='item?.name && field.code === "channel"'>
-                      {{item.name}}
-                      <i class="delete icon" (click)="removeFilterSelection(field.code,item.identifier)"></i>
+                  <ng-container *ngFor="let item of formInputData[field.code]">
+                    <a class="ui label mt-8 mr-8" *ngIf='item && field.code === "channel"'>
+                      {{channelData(item)}}
+                      <i class="delete icon" (click)="removeFilterSelection(field.code,item)"></i>
                     </a>
                   </ng-container>
 
@@ -63,7 +63,7 @@
                   </sui-multi-select>
                 </div>
                 <div *ngIf="field.code === 'channel'">
-                  <sui-multi-select (ngModelChange)="modelChange($event);setFilterInteractData()" id={{field.code}}
+                  <sui-multi-select (ngModelChange)="setFilterInteractData()" id={{field.code}}
                     name={{field.code}} defaultSelectionText={{field.name}}
                     zeroSelectionText={{resourceService.frmelmnts.lbl.Select}} class="ui selection dropdown multiple"
                     [(ngModel)]="formInputData[field.code]" [options]="options" [hasLabels]="false" labelField="name"
@@ -147,10 +147,10 @@
                       </a>
                     </ng-container>
 
-                    <ng-container *ngFor="let item of channelInputLabel">
-                      <a class="ui label mt-8 mr-8" *ngIf='item?.name && field.code === "channel"'>
-                        {{item.name}}
-                        <i class="delete icon" (click)="removeFilterSelection(field.code,item.identifier)"></i>
+                    <ng-container *ngFor="let item of formInputData[field.code]">
+                      <a class="ui label mt-8 mr-8" *ngIf='item && field.code === "channel"'>
+                        {{channelData(item)}}
+                        <i class="delete icon" (click)="removeFilterSelection(field.code,item)"></i>
                       </a>
                     </ng-container>
 
@@ -181,7 +181,7 @@
                     </sui-multi-select>
                   </div>
                   <div *ngIf="field.code === 'channel'">
-                    <sui-multi-select (ngModelChange)="modelChange($event);setFilterInteractData()" id={{field.code}}
+                    <sui-multi-select (ngModelChange)="setFilterInteractData()" id={{field.code}}
                       name={{field.code}} defaultSelectionText={{field.name}}
                       zeroSelectionText={{resourceService.frmelmnts.lbl.Select}}
                       class="selection sbt-dropdown sbt-dropdown-bold sbt-dropdown--sm sbt-purple--lbg w-100 mb-16"

src/app/client/src/app/modules/content-search/components/prominent-filter/prominent-filter.component.ts

@@ -247,7 +247,7 @@ export class ProminentFilterComponent implements OnInit, OnDestroy {
         _.forEach(this.formInputData.channel, (value, key) => {
           const orgDetails = _.find(this.formFieldProperties, { code: 'channel' });
           const range = _.find(orgDetails['range'], { 'identifier': value });
-          channel.push(range['name']);
+          channel.push(range['identifier']);
         });
         this.formInputData['channel'] = channel;
       }
@@ -267,6 +267,7 @@ export class ProminentFilterComponent implements OnInit, OnDestroy {
 
   resetFilters() {
     if (!_.isEmpty(this.ignoreQuery)) {
+      this.ignoreQuery.push('selectedTab');
       this.formInputData = _.pick(this.formInputData, this.ignoreQuery);
     } else {
       this.formInputData = {};
@@ -313,7 +314,7 @@ export class ProminentFilterComponent implements OnInit, OnDestroy {
     const channel = [];
     _.forEach(data, (value, key) => {
       const orgDetails = _.find(this.formFieldProperties, { code: 'channel' });
-      const range = _.find(orgDetails['range'], { name: value });
+      const range = _.find(orgDetails['range'], { identifier : value });
       channel.push(range['identifier']);
     });
     return channel;
@@ -357,4 +358,9 @@ export class ProminentFilterComponent implements OnInit, OnDestroy {
       this.resourceDataSubscription.unsubscribe();
     }
   }
+  channelData(item) {
+    const orgDetails = _.find(this.formFieldProperties, { code: 'channel' });
+    const range = _.find(orgDetails['range'], { identifier: item });
+    return range['name'];
+  }
 }