Merge pull request #2166 from RedisInsight/e2e/feature/RI-4106_rework-search

E2e/feature/ri 4106 rework search

Author: mariasergeenko

tests/e2e/pageObjects/browser-page.ts

@@ -72,7 +72,6 @@ export class BrowserPage extends InstancePage {
     treeViewButton = Selector('[data-testid=view-type-list-btn]');
     browserViewButton = Selector('[data-testid=view-type-browser-btn]');
     treeViewSeparator = Selector('[data-testid=tree-view-delimiter-btn]');
-    deleteFilterButton = Selector('[data-testid*=delete-btn]');
     searchButton = Selector('[data-testid=search-btn]');
     clearFilterButton = Selector('[data-testid=reset-filter-btn]');
     clearSelectionButton = Selector('[data-testid=clear-selection-btn]');
@@ -118,7 +117,7 @@ export class BrowserPage extends InstancePage {
     //LINKS
     internalLinkToWorkbench = Selector('[data-testid=internal-workbench-link]');
     userSurveyLink = Selector('[data-testid=user-survey-link]');
-    redisearchFreeLink = Selector('[data-testid=redisearch-free-db]');
+    redisearchFreeLink = Selector('[data-testid=get-started-link]');
     //OPTION ELEMENTS
     stringOption = Selector('#string');
     jsonOption = Selector('#ReJSON-RL');
@@ -130,7 +129,8 @@ export class BrowserPage extends InstancePage {
     removeFromHeadSelection = Selector('#HEAD');
     selectedFilterTypeString = Selector('[data-testid=filter-option-type-selected-string]');
     filterOptionType = Selector('[data-test-subj^=filter-option-type-]');
-    filterByKeyTypeDropDown = Selector('[data-testid=filter-option-type-default]', { timeout: 500 });
+    filterByKeyTypeDropDown = Selector('[data-testid=select-filter-key-type]', { timeout: 500 });
+    filterAllKeyType = Selector('[id=all]');
     filterOptionTypeSelected = Selector('[data-testid^=filter-option-type-selected]');
     consumerOption = Selector('[data-testid=consumer-option]');
     claimTimeOptionSelect = Selector('[data-testid=time-option-select]');
@@ -209,7 +209,6 @@ export class BrowserPage extends InstancePage {
     jsonKeyValue = Selector('[data-testid=json-data]');
     jsonError = Selector('[data-testid=edit-json-error]');
     tooltip = Selector('[role=tooltip]');
-    popover = Selector('[role=dialog]');
     noResultsFound = Selector('[data-test-subj=no-result-found]');
     searchAdvices = Selector('[data-test-subj=search-advices]');
     keysNumberOfResults = Selector('[data-testid=keys-number-of-results]');
@@ -274,6 +273,8 @@ export class BrowserPage extends InstancePage {
     changeValueWarning = Selector('[data-testid=approve-popover]');
     // TABLE
     keyListItem = Selector('[role=rowgroup] [role=row]');
+    // Dialog
+    noReadySearchDialogTitle = Selector('[data-testid=welcome-page-title]');
 
     /**
      * Common part for Add any new key
@@ -487,14 +488,20 @@ export class BrowserPage extends InstancePage {
      * @param groupName The group name
      */
     async selectFilterGroupType(groupName: string): Promise<void> {
-        if (await this.deleteFilterButton.exists) {
-            await t.click(this.deleteFilterButton);
-        }
         await t
             .click(this.filterByKeyTypeDropDown)
             .click((this.filterOptionType).withExactText(groupName));
     }
 
+    /**
+     * Select all key type filter group type
+     */
+    async setAllKeyType(): Promise<void> {
+        await t
+            .click(this.filterByKeyTypeDropDown)
+            .click(this.filterAllKeyType);
+    }
+
     /**
      * Searching by Key name in the list
      * @param keyName The name of the key

tests/e2e/tests/critical-path/browser/filtering-history.e2e.ts

@@ -52,6 +52,7 @@ test('Recent filters history', async t => {
     await t.expect(browserPage.filterHistoryItemText.withText(keysForSearch[0]).exists).ok('Filter history requests not saved after reloading page');
 
     // Open Tree view to check also there
+    await t.click(browserPage.showFilterHistoryBtn);
     await t.click(browserPage.treeViewButton);
     // Search by 2nd key name
     await browserPage.searchByKeyName(`${keysForSearch[1]}*`);
@@ -60,7 +61,6 @@ test('Recent filters history', async t => {
     await t.hover(browserPage.filterHistoryItemText.withText(keysForSearch[1]));
     await t.click(browserPage.filterHistoryOption.withText(keysForSearch[1]).find(browserPage.cssRemoveSuggestionItem));
     await t.expect(browserPage.filterHistoryItemText.withText(keysForSearch[1]).exists).notOk('Filter history request not deleted');
-
     // Verify that user can clear the history of requests
     await t.click(browserPage.clearFilterHistoryBtn);
     await t.expect(browserPage.showFilterHistoryBtn.exists).notOk('Filter history button displayed for key type search');

tests/e2e/tests/critical-path/browser/filtering.e2e.ts

@@ -81,7 +81,7 @@ test
         for (const { textType } of keyTypes) {
             await browserPage.selectFilterGroupType(textType);
             // Check key type label
-            await t.expect((await browserPage.filteringLabel.textContent).toUpperCase).eql(textType.toUpperCase, `The label of type ${textType} is displayed`);
+            await t.expect((await browserPage.filterByKeyTypeDropDown.innerText).toUpperCase).eql(textType.toUpperCase, `The label of type ${textType} is displayed`);
             if (['Stream', 'Graph', 'TS'].includes(textType)) {
                 await t.expect(browserPage.keysNumberOfResults.textContent).eql('0', 'Number of found keys');
             }
@@ -90,8 +90,4 @@ test
                 await t.expect(browserPage.keysNumberOfResults.textContent).match(regExp, 'Number of found keys');
             }
         }
-        // Check removing of the label
-        await t.click(browserPage.deleteFilterButton);
-        await t.expect(browserPage.multiSearchArea.find(browserPage.cssFilteringLabel).exists).notOk('The label of filtering type is removed');
-        await t.expect(browserPage.keysSummary.textContent).contains('Total', 'The filter is removed');
     });

tests/e2e/tests/critical-path/browser/search-capabilities.e2e.ts

@@ -148,12 +148,12 @@ test
     .after(async() => {
         await deleteStandaloneDatabaseApi(ossStandaloneV5Config);
     })('No RediSearch module message', async t => {
-        const noRedisearchMessage = 'RediSearch module is not loaded. Create a free Redis database(opens in a new tab or window) with module support on Redis Cloud.';
+        const noRedisearchMessage = 'Looks like RediSearch is not available for this database';
         const externalPageLink = 'https://redis.com/try-free/?utm_source=redis&utm_medium=app&utm_campaign=redisinsight_browser_search';
 
         await t.click(browserPage.redisearchModeBtn);
-        // Verify that user can see message in popover when he not have RediSearch module
-        await t.expect(browserPage.popover.textContent).contains(noRedisearchMessage, 'Invalid text in no redisearch popover');
+        // Verify that user can see message in the dialog when he doesn't have RediSearch module
+        await t.expect(browserPage.noReadySearchDialogTitle.textContent).contains(noRedisearchMessage, 'Invalid text in no redisearch popover');
         // Verify that user can navigate by link to create a Redis db
         await t.click(browserPage.redisearchFreeLink);
         await Common.checkURL(externalPageLink);

tests/e2e/tests/critical-path/tree-view/tree-view-improvements.e2e.ts

@@ -56,7 +56,7 @@ test
         // The folder without any namespaces is selected (if exists) when folder does not exist after search/filter
         await verifyKeysDisplayedInTheList([keyNameSingle]);
 
-        await t.click(browserPage.setDeleteButton);
+        await browserPage.setAllKeyType();
         // The folder without any patterns selected and the list of keys is displayed when there is a folder without any patterns
         await verifyKeysDisplayedInTheList([keyNameSingle]);
         await verifyKeysNotDisplayedInTheList([`${keyNames[0]}:1`, `${keyNames[2]}:2`]);
@@ -104,7 +104,7 @@ test
         // Filtered Tree view preselected folder
         await t.expect(browserPage.keyListTable.textContent).contains('No results found.', 'Key is not found message not displayed');
 
-        await t.click(browserPage.streamDeleteButton); // clear stream from filter
+        await browserPage.setAllKeyType(); // clear stream from filter
         // Filtered Tree view preselected folder
         await t.expect(browserPage.keyListTable.textContent).notContains('No results found.', 'Key is not found message still displayed');
         await t.expect(
@@ -180,7 +180,7 @@ test
         // The first folder with namespaces is expanded and selected when folder and folder without any namespaces does not exist after search/filter
         await verifyKeysDisplayedInTheList([keyNames[0], keyNames[1]]);
 
-        await t.click(browserPage.hashDeleteButton);
+        await browserPage.setAllKeyType();
         await browserPage.Cli.sendCommandsInCli([`DEL ${keyNames[0]}`]);
         await t.click(browserPage.refreshKeysButton); // refresh keys
         // The previously selected folder is preselected when key does not exist after keys refresh

tests/e2e/tests/regression/browser/filtering.e2e.ts

@@ -121,15 +121,6 @@ test
         await t.expect(browserPage.multiSearchArea.find(browserPage.cssFilteringLabel).visible).notOk('The filter per key type is not removed');
         await t.expect(browserPage.filterByPatterSearchInput.getAttribute('value')).eql('', 'All characters from filter input are not removed');
         await t.expect(browserPage.clearFilterButton.visible).notOk('The clear control is not disappeared');
-
-        // Set filter by key type and type characters
-        await t.typeText(browserPage.filterByPatterSearchInput, keyName);
-        await browserPage.selectFilterGroupType(COMMAND_GROUP_SET);
-        // Verify that when user clicks "Clear selection button" in Dropdown with key data types selected data type is reseted
-        await t.click(browserPage.filterOptionTypeSelected.nth(1));
-        await t.click(browserPage.clearSelectionButton);
-        await t.expect(browserPage.multiSearchArea.find(browserPage.cssFilteringLabel).visible).notOk('The filter per key type is not removed');
-        await t.expect(browserPage.filterByPatterSearchInput.getAttribute('value')).eql(keyName, 'All characters from filter input are not removed');
     });
 test
     .before(async() => {