Issue #SB-4214 chore: Merge pull request #769 from ArchanaKumari01/page-section

Issue #SB-4214 fix:Anonymous desktop consumption: When no boards/mediums etc. are selected, show 'Select Board', 'Select Medium' etc.

src/app/client/src/app/modules/core/components/data-driven-filter/data-driven-filter.component.html

@@ -11,10 +11,10 @@
           <div content>
             <div *ngIf="formFieldProperties && formInputData && showSearchedParam" class="twelve wide column content margin-bottom-15">
               <span *ngFor="let field of formFieldProperties">
-                <span class="padded chip margin-top--5 margin-right-10" *ngIf='formInputData[field.code] && formInputData[field.code].length > 0 && showFilter'>
+                <span class="padded chip margin-top--5 margin-right-10" *ngIf='formInputData[field.code] && formInputData[field.code].length > 0'>
                   {{field.name}}:
                   <span *ngFor="let item of formInputData[field.code]">
-                    <a class="ui label margin-top--5" *ngIf='!isObject(item) '>
+                    <a class="ui label margin-top--5" *ngIf='!isObject(item)'>
                       {{item}}
                       <i class="delete icon" (click)="removeFilterSelection(field.code,item)"></i>
                     </a>
@@ -31,7 +31,7 @@
                 <div *ngIf="formFieldProperties" class="ui stackable grid">
                   <div *ngFor="let field of formFieldProperties" class="{{field.renderingHints.semanticColumnWidth || 'twelve'}} wide column">
                     <div *ngIf="field.inputType==='select'" class="field">
-                      <sui-multi-select id={{field.code}} name={{field.code}} placeholder={{field.name}} class="selection filterFieldSearch" [(ngModel)]="formInputData[field.code]"
+                      <sui-multi-select id={{field.code}} name={{field.code}} defaultSelectionText={{field.name}} zeroSelectionText="Select" class="selection filterFieldSearch" [(ngModel)]="formInputData[field.code]"
                         [options]="options" [hasLabels]="false" #multiSelect>
                         <sui-select-option *ngFor="let option of field.range" [value]="option.name"></sui-select-option>
                       </sui-multi-select>

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

@@ -32,20 +32,20 @@
               </div>
               <div class="two wide column ">
                 <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Curriculum" [options]="options" [hasLabels]=false
-                  placeholder="Curriculum" #multiSelect>
+                defaultSelectionText="Board" zeroSelectionText="Select" #multiSelect>
                   <sui-select-option *ngFor="let board of searchBoards" [value]="board"> </sui-select-option>
                 </sui-multi-select>
               </div>
               <div class="two wide column">
                 <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Medium" [options]="options" [hasLabels]=false
-                  placeholder="Medium" #multiSelect>
+                defaultSelectionText="Medium" zeroSelectionText="Select"  #multiSelect>
                   <sui-select-option *ngFor="let language of searchLanguages" [value]="language"> </sui-select-option>
                   <i class="dropdown icon"></i>
                 </sui-multi-select>
               </div>
               <div class="two wide column">
                 <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Subjects" [options]="options" [hasLabels]=false
-                  placeholder="Subjects" #multiSelect>
+                defaultSelectionText="Subjects" zeroSelectionText="Select" #multiSelect>
                   <sui-select-option *ngFor="let subject of searchSubjects" [value]="subject"> </sui-select-option>
                 </sui-multi-select>
               </div>

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

@@ -26,7 +26,7 @@
               </div>
               <div class="two wide column">
                 <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.OrgType" labelField="orgType.name"
-                  [options]="options" [hasLabels]=false placeholder="Org Type" #multiSelect>
+                  [options]="options" [hasLabels]=false  defaultSelectionText="Org Type" zeroSelectionText="Select" #multiSelect>
                   <sui-select-option *ngFor="let orgType of searchOrgType" [value]="orgType"> </sui-select-option>
                 </sui-multi-select>
               </div>

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

@@ -27,33 +27,34 @@
                 </div>
                 <div class="two wide column ">
                   <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Grades" [options]="options" [hasLabels]=false
-                  placeholder="Class"  #multiSelect>
+                    defaultSelectionText="Class" zeroSelectionText="Select" #multiSelect>
                     <sui-select-option *ngFor="let grades of searchGrades" [value]="grades"> </sui-select-option>
                   </sui-multi-select>
 
                 </div>
                 <div class="two wide column">
                   <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Medium" [options]="options" [hasLabels]=false
-                  placeholder="Medium" #multiSelect>
+                    defaultSelectionText="Medium" zeroSelectionText="Select" #multiSelect>
                     <sui-select-option *ngFor="let medium of searchMediums" [value]="medium"> </sui-select-option>
                     <i class="dropdown icon"></i>
                   </sui-multi-select>
                 </div>
                 <div class="two wide column">
                   <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Subjects" [options]="options" [hasLabels]=false
-                  placeholder="Subjects" #multiSelect>
+                   defaultSelectionText="Subjects" zeroSelectionText="Select" #multiSelect>
                     <sui-select-option *ngFor="let subject of searchSubjects" [value]="subject"> </sui-select-option>
                   </sui-multi-select>
                 </div>
                 <div class="two wide column">
                   <sui-multi-select class="selection ui filtersearch" [(ngModel)]="queryParams.Roles" labelField="roles.name" valueField="roles.id"
-                    [options]="options" [hasLabels]=false placeholder="Roles" #multiSelect>
+                    [options]="options" [hasLabels]=false   defaultSelectionText="Roles" zeroSelectionText="Select" #multiSelect>
                     <sui-select-option *ngFor="let roles of searchRoles" [value]="roles"> </sui-select-option>
                   </sui-multi-select>
                 </div>
                 <div class="two wide column">
                   <div class="ui input profileLocationFilter">
-                    <input type="text" class="filterLocationInput" placeholder="{{resourceService.frmelmnts?.prmpt?.userlocation}}" [(ngModel)]="queryParams.Location"
+                    <input type="text" class="filterLocationInput" placeholder="{{resourceService.frmelmnts?.prmpt?.userlocation}}" 
+                     [(ngModel)]="queryParams.Location"
                     />
                   </div>
                 </div>