[ACS-5742] Fix Search e2e's (#8902)

* [ACS-5742] added People filter to demo-shell * [ACS-5742] fixed search e2e's * [ACS-5742] linter * [ACS-5742] build fix * [ACS-5742] fixed build * [ACS-5742] removed duplicated unit test
Alfresco · Sep 12, 2023 · 0d5e70e · 0d5e70e
1 parent 3aa5599
commit 0d5e70e
Show file tree

Hide file tree

Showing 17 changed files with 490 additions and 304 deletions.
diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
@@ -13,13 +13,5 @@
   "C280063": "https://alfresco.atlassian.net/browse/ACS-4595",
   "C280064": "https://alfresco.atlassian.net/browse/ACS-4595",
   "C280407": "https://alfresco.atlassian.net/browse/ACS-4595",
-  "C277288": "https://alfresco.atlassian.net/browse/AAE-15475",
-  "C280054": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C280058": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C286298": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C277146": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C286556": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C291802": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C277280": "https://alfresco.atlassian.net/browse/ACS-5742",
-  "C277281": "https://alfresco.atlassian.net/browse/ACS-5742"
+  "C277288": "https://alfresco.atlassian.net/browse/AAE-15475"
 }
diff --git a/e2e/search/components/search-sorting-picker.e2e.ts b/e2e/search/components/search-sorting-picker.e2e.ts
@@ -171,15 +171,15 @@ describe('Search Sorting Picker', () => {
 
     it('[C277280] Should be able to sort the search results by "Name" ASC', async () => {
         await searchFilters.checkSearchFiltersIsDisplayed();
-        await searchFilters.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`);
+        await searchFilters.creatorCheckListFiltersPage().enterFilterInputValue(`${acsUser.firstName} ${acsUser.lastName}`);
         await searchResults.sortByName('ASC');
 
         await expect(await searchResults.checkListIsOrderedByNameAsc()).toBe(true);
     });
 
     it('[C277281] Should be able to sort the search results by "Name" DESC', async () => {
         await searchFilters.checkSearchFiltersIsDisplayed();
-        await searchFilters.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`);
+        await searchFilters.creatorCheckListFiltersPage().enterFilterInputValue(`${acsUser.firstName} ${acsUser.lastName}`);
         await searchResults.sortByName('DESC');
         await expect(await searchResults.checkListIsOrderedByNameDesc()).toBe(true);
     });

diff --git a/e2e/search/pages/search-filters.page.ts b/e2e/search/pages/search-filters.page.ts
@@ -24,7 +24,7 @@ export class SearchFiltersPage {
 
     searchFilters = $('adf-search-filter');
     fileTypeFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-SEARCH.FACET_FIELDS.TYPE"]');
-    creatorFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-SEARCH.FACET_FIELDS.CREATOR"]');
+    creatorFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-SEARCH.FILTER.PEOPLE"]');
     fileSizeFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-SEARCH.FACET_FIELDS.SIZE"]');
     nameFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-Name"]');
     checkListFilter = $('mat-expansion-panel[data-automation-id="expansion-panel-Check List"]');

diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts
@@ -163,7 +163,7 @@ describe('Search Filters', () => {
         await searchFiltersPage.checkSearchFiltersIsDisplayed();
 
         const userOption = `${acsUser.firstName} ${acsUser.lastName}`;
-        const searchCheckListPage = await searchFiltersPage.creatorCheckListFiltersPage().filterBy(userOption);
+        const searchCheckListPage = await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(userOption);
         await searchCheckListPage.checkChipIsDisplayed(userOption);
         await searchCheckListPage.removeFilterOption(userOption);
         await searchCheckListPage.checkChipIsNotDisplayed(userOption);
@@ -172,7 +172,7 @@ describe('Search Filters', () => {
     it('[C277146] Should Show more/less buttons be hidden when inactive', async () => {
         await BrowserActions.getUrl(`${browser.baseUrl}/search;q=*`);
 
-        const searchCheckListPage = searchFiltersPage.creatorCheckListFiltersPage();
+        const searchCheckListPage = searchFiltersPage.fileTypeCheckListFiltersPage();
 
         await searchCheckListPage.checkShowLessButtonIsNotDisplayed();
         await searchCheckListPage.checkShowMoreButtonIsDisplayed();
@@ -189,7 +189,7 @@ describe('Search Filters', () => {
         await searchFiltersPage.clickFileSizeFilterHeader();
         await searchFiltersPage.checkFileSizeFilterIsCollapsed();
 
-        await searchFiltersPage.creatorCheckListFiltersPage().clickCheckListOption('Administrator');
+        await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue('Administrator');
 
         await searchFiltersPage.checkFileTypeFilterIsCollapsed();
         await searchFiltersPage.checkFileSizeFilterIsCollapsed();
@@ -269,7 +269,7 @@ describe('Search Filters', () => {
             await searchResults.dataTable.waitTillContentLoaded();
 
             await searchFiltersPage.creatorCheckListFiltersPage().searchInFilter('dminis');
-            await searchFiltersPage.creatorCheckListFiltersPage().checkCheckListOptionIsDisplayed('Administrator');
+            await searchFiltersPage.creatorCheckListFiltersPage().checkCheckListAutocompleteOptionIsDisplayed('Administrator');
         });
 
         it('[C291981] Should group search facets under the default label, by default', async () => {

diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts
@@ -86,7 +86,7 @@ describe('Search Component - Multi-Select Facet', () => {
             userOption = `${acsUser.firstName} ${acsUser.lastName}`;
 
             await searchFiltersPage.checkSearchFiltersIsDisplayed();
-            await searchFiltersPage.creatorCheckListFiltersPage().filterBy(userOption);
+            await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(userOption);
         });
 
         afterAll(async () => {
@@ -112,7 +112,7 @@ describe('Search Component - Multi-Select Facet', () => {
             userOption = `${acsUser.firstName} ${acsUser.lastName}`;
 
             await searchFiltersPage.checkSearchFiltersIsDisplayed();
-            await searchFiltersPage.creatorCheckListFiltersPage().filterBy(userOption);
+            await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(userOption);
             await searchFiltersPage.fileTypeCheckListFiltersPage().filterBy('Plain Text');
             await searchResultsPage.dataTable.waitTillContentLoaded();
 
@@ -177,8 +177,8 @@ describe('Search Component - Multi-Select Facet', () => {
             await searchResultsPage.dataTable.waitTillContentLoaded();
 
             await searchFiltersPage.checkSearchFiltersIsDisplayed();
-            await searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${userUploadingTxt.firstName} ${userUploadingTxt.lastName}`);
-            await searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${userUploadingImg.firstName} ${userUploadingImg.lastName}`);
+            await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(`${userUploadingTxt.firstName} ${userUploadingTxt.lastName}`);
+            await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(`${userUploadingImg.firstName} ${userUploadingImg.lastName}`);
             await searchResultsPage.dataTable.waitTillContentLoaded();
 
             await searchResultsPage.checkContentIsDisplayed(txtFile.entry.name);
@@ -229,7 +229,7 @@ describe('Search Component - Multi-Select Facet', () => {
 
             await searchFiltersPage.checkSearchFiltersIsDisplayed();
             await searchFiltersPage.fileTypeCheckListFiltersPage().filterBy('Plain Text');
-            await searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`);
+            await searchFiltersPage.creatorCheckListFiltersPage().enterFilterInputValue(`${acsUser.firstName} ${acsUser.lastName}`);
             await searchResultsPage.dataTable.waitTillContentLoaded();
 
             await expect(await searchResultsPage.numberOfResultsDisplayed()).toBe(1);

diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json
diff --git a/...h/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html b/...h/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
@@ -35,6 +35,7 @@
                 [disabled]="option | adfIsIncluded: selectedOptions : compareOption"
                 *ngFor="let option of filteredOptions" [value]="option" [matTooltipShowDelay]="tooltipShowDelay"
                 [matTooltipDisabled]="!option.fullPath" matTooltipPosition="right"
+                [attr.data-automation-id]="'option-' + (option.value)"
                 [matTooltip]="'SEARCH.RESULTS.WILL_CONTAIN' | translate:{searchTerm: option.fullPath || option.value}"
                 [ngClass]="(option | adfIsIncluded: selectedOptions : compareOption) && 'adf-autocomplete-added-option'">
                 {{ option.fullPath || option.value }}

diff --git a/...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html b/...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html
@@ -1,19 +1,19 @@
 <mat-chip [attr.data-automation-id]="'search-filter-chip-tabbed-' + tabbedFacet.label"
           disableRipple
           class="adf-search-filter-chip-tabbed"
-          [class.adf-search-toggle-chip]="(displayValue$ | async) || menuTrigger.menuOpen"
+          [class.adf-search-toggle-chip]="displayValue || menuTrigger.menuOpen"
           [disabled]="!isPopulated"
           tabIndex="0"
           [matMenuTriggerFor]="menu"
           (onMenuOpen)="onMenuOpen()"
           (keydown.enter)="onEnterKeydown()"
           (keydown.escape)="onEscKeydown()"
-          [attr.title]="displayValue$ | async"
+          [attr.title]="displayValue"
           #menuTrigger="matMenuTrigger">
 
     <span class="adf-search-filter-placeholder">{{ tabbedFacet.label | translate }}:</span>
 
-    <span class="adf-search-filter-ellipsis adf-filter-value" *ngIf="displayValue$ | async as displayValue; else showAny">
+    <span class="adf-search-filter-ellipsis adf-filter-value" *ngIf="displayValue; else showAny">
         &nbsp; {{ displayValue | translate }}
     </span>
     <ng-template #showAny><span class="adf-search-filter-ellipsis adf-filter-value">&nbsp;{{ 'SEARCH.FILTER.ANY' | translate }}</span></ng-template>
@@ -33,18 +33,9 @@
                 {{ tabbedFacet.label | translate }}
             </ng-container>
             <ng-container ngProjectAs="filter-content">
-                <adf-search-filter-tabbed>
-                    <ng-container *ngFor="let field of tabbedFacet.fields">
-                        <adf-search-chip-autocomplete-input
-                            *adf-search-filter-tab="tabbedFacet.facets[field]?.label"
-                            [autocompleteOptions]="autocompleteOptions[field]"
-                            [onReset$]="reset$"
-                            [allowOnlyPredefinedValues]="true"
-                            [compareOption]="optionComparator"
-                            (optionsChanged)="onOptionsChange($event, field)">
-                        </adf-search-chip-autocomplete-input>
-                    </ng-container>
-                </adf-search-filter-tabbed>
+                <adf-search-facet-tabbed-content [tabbedFacet]="tabbedFacet" (isPopulated)="isPopulated = $event"
+                                                 [onReset$]="reset$" [onApply$]="apply$" (displayValue$)="displayValue = $event">
+                </adf-search-facet-tabbed-content>
             </ng-container>
             <ng-container ngProjectAs="filter-actions">
                 <button mat-button class="adf-search-action-button" (click)="onRemove()" id="cancel-filter-button">