chore: Removing the feature flag for using Entity Item component from ADS templates

app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js

@@ -92,7 +92,7 @@ describe(
       cy.get(appPage.closeButton).closest("div").click({ force: true });
       PageLeftPane.switchSegment(PagePaneSegment.UI);
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      cy.xpath(appPage.postApi).click({ force: true });
+      cy.get(appPage.postApi).click({ force: true });
       cy.ResponseCheck("Test");
       // cy.ResponseCheck("Task completed");
       cy.ResponseCheck("[email protected]");

app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts

@@ -31,7 +31,7 @@ describe(
         entityNameinLeftSidebar: "Tab2",
         action: "Rename",
       });
-      agHelper.TypeText(locators._entityNameEditing("Tab2"), tabname);
+      agHelper.TypeText(locators._entityNameEditing, tabname, { clear: true });
       agHelper.Sleep(2000);
       entityExplorer.ValidateDuplicateMessageToolTip(tabname);
       cy.get(explorer.editEntity)

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js

@@ -119,7 +119,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page1",
         pageName,
-        false,
+        true,
         EntityItems.Page,
       );
       PageList.ClonePage(pageName);

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js

@@ -83,7 +83,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page2",
         "ParentPage1",
-        false,
+        true,
         EntityItems.Page,
       );
       dataSources.NavigateToDSCreateNew();
@@ -101,7 +101,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page2",
         "ChildPage1",
-        false,
+        true,
         EntityItems.Page,
       );
       dataSources.NavigateToDSCreateNew();
@@ -132,7 +132,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "ParentPage1",
         "ParentPageRenamed",
-        false,
+        true,
         EntityItems.Page,
       );
       agHelper.RemoveUIElement(

app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js

@@ -25,6 +25,6 @@ describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
 
     cy.get(".t--widget-imagewidget").eq(0).click();
     //check if the entities are expanded
-    cy.get(`[data-guided-tour-id="explorer-entity-Image1"]`).should("exist");
+    cy.get(`[data-testid="t--entity-item-Image1"]`).should("exist");
   });
 });

app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts

@@ -35,12 +35,20 @@ describe("Fork application with Jsobjects", {}, function () {
     for (let i = 1; i <= 11; i++) {
       agHelper.GetNClick(locators._entityTestId(`JS${i}`));
       agHelper.FailIfErrorToast("");
-      agHelper.AssertClassExists(locators._entityTestId(`JS${i}`), "active");
+      agHelper.AssertAttribute(
+        locators._entityTestId(`JS${i}`),
+        "data-selected",
+        "true",
+      );
     }
     for (let i = 12; i <= 17; i++) {
       agHelper.GetNClick(locators._entityTestId(`J${i}`));
       agHelper.FailIfErrorToast("");
-      agHelper.AssertClassExists(locators._entityTestId(`J${i}`), "active");
+      agHelper.AssertAttribute(
+        locators._entityTestId(`J${i}`),
+        "data-selected",
+        "true",
+      );
     }
 
     jsEditor.CreateJSObject('"MiddleName": "Test",\n', {
@@ -51,9 +59,17 @@ describe("Fork application with Jsobjects", {}, function () {
       lineNumber: 5,
     });
     agHelper.GetNClick(locators._entityTestId("J16"));
-    agHelper.AssertClassExists(locators._entityTestId("J16"), "active");
+    agHelper.AssertAttribute(
+      locators._entityTestId("J16"),
+      "data-selected",
+      "true",
+    );
     agHelper.GetNClick(locators._entityTestId("J17"));
-    agHelper.AssertClassExists(locators._entityTestId("J17"), "active");
+    agHelper.AssertAttribute(
+      locators._entityTestId("J17"),
+      "data-selected",
+      "true",
+    );
     agHelper.GetNAssertContains(".CodeMirror-line ", '"MiddleName": "Test"');
   });
 });

app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js

@@ -45,7 +45,7 @@ describe("Slug URLs", { tags: ["@tag.AppUrl"] }, () => {
     entityExplorer.RenameEntityFromExplorer(
       "Page1",
       "Renamed",
-      false,
+      true,
       EntityItems.Page,
     );
     assertHelper.AssertNetworkStatus("updatePage");

app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts

@@ -31,8 +31,8 @@ describe("Check Page Actions Menu", {}, function () {
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("NewPage Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("NewPage Copy");
     PageList.assertAbsence("NewPage Copy");
@@ -92,8 +92,8 @@ describe("Check Page Actions Menu", {}, function () {
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("Page2 Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("Page2 Copy");
     PageList.assertAbsence("Page2 Copy");
@@ -113,8 +113,8 @@ describe("Check Page Actions Menu", {}, function () {
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("HomePage Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("HomePage Copy");
     PageList.assertAbsence("HomePage Copy");

app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts

@@ -25,7 +25,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page1",
         "Home",
-        false,
+        true,
         entityItems.Page,
       );
     });

app/client/cypress/locators/CMSApplocators.js

@@ -12,7 +12,7 @@ export default {
   confirmButton: "span:contains('Confirm')",
   closeButton: "span:contains('Close')",
   datasourcesbutton: "//div[text()='Datasources']",
-  postApi: "//div[text()='send_mail']",
+  postApi: "[data-testid='t--ide-tab-send_mail']",
   deleteButton: "//span[text()='Delete Proposal']",
   deleteTaskText: "//span[text()='Delete this task']",
 };

app/client/cypress/locators/apiWidgetslocator.json

@@ -4,7 +4,7 @@
   "searchApi": ".t--sidebar input[type=text]",
   "createapi": ".t--createBlankApiCard",
   "createAuthApiDatasource": ".t--createAuthApiDatasource",
-  "popover": "//button[contains(@class, 'entity-context-menu')]",
+  "popover": "button[data-testid='t--more-action-trigger']",
   "moveTo": ".single-select >div:contains('Move to')",
   "copyTo": ".single-select >div:contains('Copy to page')",
   "home": ".single-select >div:contains('Page1')",

app/client/cypress/locators/commonlocators.json

@@ -183,7 +183,6 @@
   "filepickerv2": ".t--draggable-filepickerwidgetv2",
   "dashboardItemName": ".uppy-Dashboard-Item-name",
   "mapChartShowLabels": ".t--property-control-showlabels input",
-  "widgetSection": ".t--entity.widgets > .t--entity-item > span.t--entity-collapse-toggle",
   "changeThemeBtn": ".t--change-theme-btn",
   "editThemeBtn": ".t--edit-theme-btn",
   "themeCard": ".t--theme-card",
@@ -248,4 +247,4 @@
   "downloadFileType": "button[class*='t--open-dropdown-Select-file-type'] > span:first-of-type",
   "listToggle": "[data-testid='t--list-toggle']",
   "showBindingsMenu": "//*[@id='entity-properties-container']"
-}
+}

app/client/cypress/support/ApiCommands.js

@@ -150,7 +150,7 @@ Cypress.Commands.add("validateMessage", (value) => {
 });
 
 Cypress.Commands.add("DeleteWidgetFromSideBar", () => {
-  cy.xpath(apiwidget.popover).last().click({ force: true });
+  cy.get(apiwidget.popover).last().click({ force: true });
   cy.get(apiwidget.delete).click({ force: true });
   cy.wait("@updateLayout").should(
     "have.nested.property",

app/client/cypress/support/Objects/CommonLocators.ts

@@ -98,10 +98,7 @@ export class CommonLocators {
     "//div[text()='" +
     entityNameinLeftSidebar +
     "']/ancestor::div[contains(@class, 't--entity-item')]/following-sibling::div//div[contains(@class, 't--entity-property')]//code";
-  _entityNameEditing = (entityNameinLeftSidebar: string) =>
-    "//span[text()='" +
-    entityNameinLeftSidebar +
-    "']/parent::div[contains(@class, 't--entity-name editing')]/input";
+  _entityNameEditing = ".t--entity-name.editing input";
   _jsToggle = (controlToToggle: string) =>
     `.t--property-control-${controlToToggle} .t--js-toggle, [data-guided-tour-iid='${controlToToggle}']`;
   _buttonByText = (btnVisibleText: string) =>
@@ -334,9 +331,14 @@ export class CommonLocators {
   _exitFullScreen = ".application-demo-new-dashboard-control-exit-fullscreen";
   _menuItem = ".bp3-menu-item";
   _slashCommandHintText = ".slash-command-hint-text";
-  _selectionItem = ".rc-select-selection-item";
   errorPageTitle = ".t--error-page-title";
   errorPageDescription = ".t--error-page-description";
+  _moduleInstanceEntity = (module: string) =>
+    `[data-testid=t--entity-item-${module}1]`;
+  _codeEditor = "[data-testid=code-editor-target]";
+  _selectionItem = ".rc-select-selection-item";
+  _moduleInputEntity = (inputName: string) =>
+    `[data-testid=t--module-instance-input-field-wrapper-${inputName}]`;
   _selectClearButton_testId = "selectbutton.btn.cancel";
   _selectClearButton_dataTestId = `[data-testid="${this._selectClearButton_testId}"]`;
   _saveDatasource = `[data-testid='t--store-as-datasource']`;
@@ -347,6 +349,7 @@ export class CommonLocators {
   _showBoundary = ".show-boundary";
   _entityItem = "[data-testid='t--entity-item-Api1']";
   _rowData = "[data-colindex='0'][data-rowindex='0']";
+  _visualNonIdeaState = ".bp3-non-ideal-state";
   _editorTab = ".editor-tab";
   _entityTestId = (entity: string) =>
     `[data-testid="t--entity-item-${entity}"]`;

app/client/cypress/support/Pages/AggregateHelper.ts

@@ -986,12 +986,14 @@ export class AggregateHelper {
           parseSpecialCharSeq: boolean;
           shouldFocus: boolean;
           delay: number;
+          clear: boolean;
         }> = 0,
   ) {
     let index: number;
     let shouldFocus = true;
     let parseSpecialCharSeq = false;
     let delay = 10;
+    let clear = false;
 
     if (typeof indexOrOptions === "number") {
       index = indexOrOptions;
@@ -1003,6 +1005,7 @@ export class AggregateHelper {
         indexOrOptions.shouldFocus !== undefined
           ? indexOrOptions.shouldFocus
           : true;
+      clear = indexOrOptions.clear || false;
     }
 
     const element = this.GetElement(selector).eq(index);
@@ -1013,6 +1016,14 @@ export class AggregateHelper {
 
     if (value === "") return element;
 
+    if (clear) {
+      return element.wait(100).clear().type(value, {
+        parseSpecialCharSequences: parseSpecialCharSeq,
+        delay: delay,
+        force: true,
+      });
+    }
+
     return element.wait(100).type(value, {
       parseSpecialCharSequences: parseSpecialCharSeq,
       delay: delay,

app/client/cypress/support/Pages/EditorNavigation.ts

@@ -29,12 +29,12 @@ export enum EditorViewMode {
 }
 
 const pagePaneListItemSelector = (name: string) =>
-  "//div[contains(@class, 't--entity-name')][text()='" + name + "']";
+  `//span[contains(@class, 't--entity-name')][text()='${name}']`;
 
 export const PageLeftPane = new LeftPane(
   pagePaneListItemSelector,
   ".ide-editor-left-pane",
-  ".ide-editor-left-pane__content .active.t--entity-item",
+  ".ide-editor-left-pane__content .t--entity-item[data-selected='true']",
   Object.values(PagePaneSegment),
 );
 

app/client/cypress/support/Pages/EntityExplorer.ts

@@ -52,13 +52,9 @@ export class EntityExplorer {
   private assertHelper = ObjectsRegistry.AssertHelper;
 
   public _contextMenu = (entityNameinLeftSidebar: string) =>
-    "//div[text()='" +
+    "//span[text()='" +
     entityNameinLeftSidebar +
-    "']/ancestor::div[1]/following-sibling::div//button[contains(@class, 'entity-context-menu')]";
-  _entityNameInExplorer = (entityNameinLeftSidebar: string) =>
-    "//div[contains(@class, 't--entity-explorer')]//div[contains(@class, 't--entity-name')][text()='" +
-    entityNameinLeftSidebar +
-    "']";
+    "']/parent::div/following-sibling::div//button";
 
   private _visibleTextSpan = (spanText: string) =>
     "//span[text()='" + spanText + "']";
@@ -72,6 +68,7 @@ export class EntityExplorer {
   _widgetTagSuggestedWidgets = ".widget-tag-collapsible-suggested";
   _widgetTagBuildingBlocks = ".widget-tag-collapsible-building-blocks";
   _widgetSeeMoreButton = "[data-testid='t--explorer-ui-entity-tag-see-more']";
+  _entityAddButton = ".t--entity-add-btn";
   _entityName = ".t--entity-name";
 
   public ActionContextMenuByEntityName({
@@ -103,7 +100,7 @@ export class EntityExplorer {
         toastToValidate: toastToValidate,
       });
     }
-    if (entityType === EntityItems.Page) {
+    if (entityType === EntityItems.Page && action !== "Rename") {
       PageList.HideList();
     }
   }
@@ -121,16 +118,18 @@ export class EntityExplorer {
   }
 
   public ValidateDuplicateMessageToolTip(tooltipText: string) {
-    this.agHelper.AssertTooltip(tooltipText.concat(" is already being used."));
+    this.agHelper.AssertTooltip(
+      tooltipText.concat(" is already being used or is a restricted keyword."),
+    );
   }
 
   public DeleteAllQueriesForDB(dsName: string) {
     AppSidebar.navigate(AppSidebarButton.Editor);
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
     this.agHelper
       .GetElement(this._visibleTextSpan(dsName))
-      .parent()
       .siblings()
+      .children()
       .each(($el: any) => {
         cy.wrap($el)
           .find(".t--entity-name")
@@ -275,8 +274,9 @@ export class EntityExplorer {
         action: "Rename",
         entityType,
       });
-    else cy.xpath(PageLeftPane.listItemSelector(entityName)).dblclick();
-    cy.xpath(this.locator._entityNameEditing(entityName))
+    else cy.get(this.locator._entityTestId(entityName)).dblclick();
+    cy.get(this.locator._entityNameEditing)
+      .clear()
       .type(renameVal)
       .wait(500)
       .type("{enter}")

app/client/cypress/support/Pages/IDE/LeftPane.ts

@@ -1,7 +1,5 @@
 import { ObjectsRegistry } from "../../Objects/Registry";
-import { PagePaneSegment } from "../EditorNavigation";
 import AddView from "./AddView";
-import FileTabs from "./FileTabs";
 import ListView from "./ListView";
 
 export class LeftPane {
@@ -11,11 +9,10 @@ export class LeftPane {
   locators = {
     segment: (name: string) => "//span[text()='" + name + "']/ancestor::div",
     expandCollapseArrow: (name: string) =>
-      "//div[text()='" +
-      name +
-      "']/ancestor::div/span[contains(@class, 't--entity-collapse-toggle')]",
+      `//span[contains(@class, 't--entity-name')][text()="${name}"]/ancestor::div//*[@data-testid="t--entity-collapse-toggle"]`,
     activeItemSelector: "",
     selector: "",
+    entityItem: (name: string) => `div[data-testid='t--entity-item-${name}']`,
   };
   public listView: ListView;
 
@@ -41,7 +38,7 @@ export class LeftPane {
 
   public assertPresence(name: string) {
     ObjectsRegistry.AggregateHelper.AssertElementLength(
-      this.listItemSelector(name),
+      this.locators.entityItem(name),
       1,
     );
   }
@@ -83,13 +80,15 @@ export class LeftPane {
       .then((state) => {
         const closed = state === "arrow-right-s-line";
         const opened = state === "arrow-down-s-line";
+
         if ((expand && closed) || (!expand && opened)) {
           ObjectsRegistry.AggregateHelper.GetNClick(
             this.locators.expandCollapseArrow(itemName),
           );
         }
       });
   }
+
   public selectedItem(
     exists?: "exist" | "not.exist" | "noVerify",
   ): Cypress.Chainable {