Removed the advanced search icon in the top area, and changed the advanced search rows so the last one to be removed ends advanced search mode.

client/src/modules/peoplesearch/peoplesearch-base.component.ts

@@ -97,7 +97,13 @@ abstract class PeopleSearchBaseComponent {
 
     removeSearchTag(tagIndex: number): void {
         this.queries.splice(tagIndex, 1);
+
+        if (this.queries.length === 0) {
+            this.clearSearch();
+            this.advancedSearch = false;
+        }
     }
+
     addSearchTag(): void {
         this.queries.push({key: null, value: ''});
     }
@@ -261,9 +267,9 @@ abstract class PeopleSearchBaseComponent {
         this.localStorageService.setItem(this.searchTextLocalStorageKey, this.query || '');
     }
 
-    toggleAdvancedSearch(): void {
+    enableAdvancedSearch(): void {
         this.clearSearch();
-        this.advancedSearch = !this.advancedSearch;
+        this.advancedSearch = true;
     }
 
     protected toggleView(state: string): void {

client/src/modules/peoplesearch/peoplesearch-cards.component.html

@@ -29,15 +29,11 @@
                     placeholder="{{'Placeholder_Search' | translate}}" auto-focus>
     </ias-search-box>
 
-    <ias-button id="advanced-search-icon" class="ias-icon-button" ng-click="$ctrl.toggleAdvancedSearch()"
+    <ias-button id="advanced-search-icon" class="ias-icon-button" ng-click="$ctrl.enableAdvancedSearch()"
                 ng-if="!$ctrl.advancedSearch && $ctrl.advancedSearchEnabled"
                 ng-attr-title="{{ 'Title_AdvancedSearch' | translate }}">
         <ias-icon class="ias-selected" icon="search_advanced"></ias-icon>
     </ias-button>
-    <ias-button id="close-advanced-search-icon" class="ias-icon-button" ng-click="$ctrl.toggleAdvancedSearch()"
-                ng-if="$ctrl.advancedSearch" ng-attr-title="{{ 'Button_Close' | translate }}">
-        <ias-icon class="ias-selected" icon="close_thin"></ias-icon>
-    </ias-button>
 
     <span class="ias-fill"></span>
 
@@ -63,7 +59,7 @@
             <option ng-repeat="tag in $ctrl.advancedSearchTags" ng-attr-value="{{tag.attribute}}">{{tag.label}}</option>
         </select>
         <input ng-model="query.value" autocomplete="off">
-        <ias-button class="ias-icon-button" ng-click="$ctrl.removeSearchTag($index)" ng-if="$index > 0"
+        <ias-button class="ias-icon-button" ng-click="$ctrl.removeSearchTag($index)"
                     ng-attr-title="{{ 'Button_Remove' | translate }}">
             <ias-icon icon="close_thin"></ias-icon>
         </ias-button>