diff --git a/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js b/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js index c535eedbe285..15c00e8427fd 100644 --- a/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js +++ b/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("Curt50@gmail.com"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts index 6f149a7b49ee..495d8e4987b4 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts @@ -112,6 +112,8 @@ describe( "8. No autocomplete for Removed libraries", { tags: ["@tag.excludeForAirgap"] }, function () { + AppSidebar.navigate(AppSidebarButton.Editor); + EditorNavigation.SelectEntityByName("Text1Copy", EntityType.Widget); entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT"); AppSidebar.navigate(AppSidebarButton.Libraries); installer.uninstallLibrary("uuidjs"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js index 45d072a8b392..442c680e1391 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js @@ -30,7 +30,7 @@ describe( prettify: false, }); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false); + jsEditor.EnableDisableAsyncFuncSettings("myFun1", true); ee.DragDropWidgetNVerify(WIDGET.TEXT, 200, 600); EditorNavigation.SelectEntityByName("Text1", EntityType.Widget); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js index 11e9fd975b15..c830261e661a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js @@ -108,11 +108,6 @@ describe( action: "Rename", }); cy.EditApiNameFromExplorer("SecondAPI"); - cy.xpath(apiwidget.popover) - .last() - .should("be.hidden") - .invoke("show") - .click({ force: true }); ee.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "SecondAPI", action: "Move to page", diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts index c132f969099e..cd67484a5563 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts @@ -59,7 +59,7 @@ describe( toastToValidate: "moved to page", entityType: EntityItems.Page, }); - EditorNavigation.SelectEntityByName(newPageId, EntityType.Page); + PageList.VerifyIsCurrentPage(newPageId); PageLeftPane.switchSegment(PagePaneSegment.JS); PageLeftPane.assertPresence("RenamedJSObjectCopy"); jsEditor.ValidateDefaultJSObjProperties("RenamedJSObjectCopy"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js index 8df62d3156c0..39ac3ba7c28a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js @@ -32,7 +32,10 @@ describe( cy.get(".t--context-menu").click({ force: true }); }); cy.selectAction("Rename"); - cy.get(explorer.editEntity).last().type(firstApiName, { force: true }); + cy.get(explorer.editEntity) + .last() + .clear() + .type(firstApiName, { force: true }); cy.validateMessage(firstApiName); agHelper.PressEnter(); entityExplorer.ActionContextMenuByEntityName({ @@ -98,7 +101,10 @@ describe("Entity Naming conflict test", { tags: ["@tag.IDE"] }, function () { }); cy.selectAction("Rename"); - cy.get(explorer.editEntity).last().type(firstApiName, { force: true }); + cy.get(explorer.editEntity) + .last() + .clear() + .type(firstApiName, { force: true }); entityExplorer.ValidateDuplicateMessageToolTip(firstApiName); cy.get("body").click(0, 0); cy.wait(2000); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts index df52ca57622b..02466b00c31f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts +++ b/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) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js index 2b50b44e9d98..5eebeaba3f48 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js @@ -158,7 +158,7 @@ describe( gitSync.CreateGitBranch(tempBranch, true); cy.wait(2000); - EditorNavigation.SelectEntityByName("Page1", EntityType.Page); + PageList.VerifyIsCurrentPage("Page1"); PageLeftPane.switchSegment(PagePaneSegment.JS); // verify jsObject is not duplicated PageLeftPane.assertPresence(jsObject); @@ -232,8 +232,8 @@ describe( cy.xpath("//input[@class='bp3-input' and @value='Success']").should( "be.visible", ); - // switch to Page1 copy and verify jsObject data binding - EditorNavigation.SelectEntityByName("Page1", EntityType.Page); + // switch to Page1 and verify jsObject data binding + PageList.VerifyIsCurrentPage("Page1"); PageLeftPane.switchSegment(PagePaneSegment.JS); // verify jsObject is not duplicated PageLeftPane.assertPresence(jsObject); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index 8b08261e05b4..b407f88e9524 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/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); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js index e935bf114258..bf8caae3980f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js +++ b/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( diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js index 341a83185c6f..0ccca4a5700c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js +++ b/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"); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js index f2300cc4b0c0..6907a545452b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js @@ -155,9 +155,14 @@ describe( agHelper.Sleep(); // Assert context switching works when going back to canvas - EditorNavigation.SelectEntityByName("Page1", EntityType.Page); + cy.get(`div.t--entity-item[data-selected='true']`).should( + "have.length", + 1, + ); - cy.get(`div[data-testid='t--selected']`).should("have.length", 1); + EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [ + "Container1", + ]); cy.get(".t--property-pane-title").should("contain", "Text1"); // Go back to JS editor diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts index 16d7edefd6a3..8a4aea90d91f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts @@ -9,9 +9,10 @@ import { installer, draggableWidgets, } from "../../../../support/Objects/ObjectsCore"; -import { +import EditorNavigation, { AppSidebar, AppSidebarButton, + EntityType, PageLeftPane, PagePaneSegment, } from "../../../../support/Pages/EditorNavigation"; @@ -32,6 +33,7 @@ describe( AppSidebar.navigate(AppSidebarButton.Editor); entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 200, 200); PageLeftPane.switchSegment(PagePaneSegment.UI); + EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); entityExplorer.RenameEntityFromExplorer("Table1", "jsonwebtoken"); AppSidebar.navigate(AppSidebarButton.Libraries); installer.OpenInstaller(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts index ea2d5aa1d042..c806663383e2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts +++ b/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"'); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js index d93525a20f76..27ffbfadafa9 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js +++ b/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"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts index 1943783c3eb7..c7b0217dd76b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts @@ -13,26 +13,27 @@ import { propPane, } from "../../../../support/Objects/ObjectsCore"; import PageList from "../../../../support/Pages/PageList"; +import { EntityItems } from "../../../../support/Pages/AssertHelper"; describe("Check Page Actions Menu", {}, function () { it("1. Verify Page Actions when a page is selected", function () { homePage.RenameApplication("PageActions"); PageList.AddNewPage("New blank page"); entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 100); - PageList.ShowList(); - agHelper.GetNClick(entityExplorer._contextMenu("Page2"), 0, true); - agHelper.GetNClick(locators._contextMenuItem("Rename")); - agHelper.TypeText(propPane._placeholderName, `NewPage{enter}`, { - parseSpecialCharSeq: true, - }); + entityExplorer.RenameEntityFromExplorer( + "Page2", + "NewPage", + true, + EntityItems.Page, + ); PageList.ClonePage("NewPage"); PageList.HidePage("NewPage Copy"); PageList.ShowList(); agHelper.AssertAttribute( locators._entityTestId("NewPage Copy"), - "disabled", - "disabled", + "data-disabled", + "true", ); PageList.DeletePage("NewPage Copy"); PageList.assertAbsence("NewPage Copy"); @@ -79,12 +80,12 @@ describe("Check Page Actions Menu", {}, function () { it("2. Verify Page Actions when a page is not selected", function () { EditorNavigation.NavigateToPage("Page1", true); - PageList.ShowList(); - agHelper.GetNClick(entityExplorer._contextMenu("NewPage"), 0, true); - agHelper.GetNClick(locators._contextMenuItem("Rename")); - agHelper.TypeText(propPane._placeholderName, `Page2{enter}`, { - parseSpecialCharSeq: true, - }); + entityExplorer.RenameEntityFromExplorer( + "NewPage", + "Page2", + true, + EntityItems.Page, + ); PageList.ClonePage("Page2"); EditorNavigation.NavigateToPage("Page1", true); @@ -92,8 +93,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"); @@ -102,19 +103,20 @@ describe("Check Page Actions Menu", {}, function () { it("3. Verify Page Actions when a home page is selected", function () { entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 500, 100); PageList.ShowList(); - agHelper.GetNClick(entityExplorer._contextMenu("Page1"), 0, true); - agHelper.GetNClick(locators._contextMenuItem("Rename")); - agHelper.TypeText(propPane._placeholderName, `HomePage{enter}`, { - parseSpecialCharSeq: true, - }); + entityExplorer.RenameEntityFromExplorer( + "Page1", + "HomePage", + true, + EntityItems.Page, + ); PageList.ClonePage("HomePage"); PageList.HidePage("HomePage Copy"); PageList.ShowList(); agHelper.AssertAttribute( locators._entityTestId("HomePage Copy"), - "disabled", - "disabled", + "data-disabled", + "true", ); PageList.DeletePage("HomePage Copy"); PageList.assertAbsence("HomePage Copy"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts index 71edae318bd7..037ea3fdea8c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts @@ -25,7 +25,7 @@ describe( entityExplorer.RenameEntityFromExplorer( "Page1", "Home", - false, + true, entityItems.Page, ); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts index 993d7649a4f1..2561188885ba 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts @@ -82,15 +82,30 @@ describe( refactorInput.inputWidget.newName, ); PageLeftPane.switchSegment(PagePaneSegment.Queries); + + EditorNavigation.SelectEntityByName( + refactorInput.query.oldName, + EntityType.Query, + ); entityExplorer.RenameEntityFromExplorer( refactorInput.query.oldName, refactorInput.query.newName, ); + + EditorNavigation.SelectEntityByName( + refactorInput.api.oldName, + EntityType.Api, + ); entityExplorer.RenameEntityFromExplorer( refactorInput.api.oldName, refactorInput.api.newName, ); + PageLeftPane.switchSegment(PagePaneSegment.JS); + EditorNavigation.SelectEntityByName( + refactorInput.jsObject.oldName, + EntityType.JSObject, + ); entityExplorer.RenameEntityFromExplorer( refactorInput.jsObject.oldName, refactorInput.jsObject.newName, diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts index e2760744b5e1..c4e6051f9523 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts @@ -209,7 +209,7 @@ describe( it("3. Update 'setOptions' property - during onPage load", () => { EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false); //for on page load execution + jsEditor.EnableDisableAsyncFuncSettings("myFun1", true); //for on page load execution deployMode.DeployApp(); agHelper .GetText( @@ -268,7 +268,7 @@ describe( ])}, () => {showAlert('unable to run API')}); } }`); - jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true, false); //for on page load execution, since sync function is updated to async + jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true); //for on page load execution, since sync function is updated to async deployMode.DeployApp(); agHelper.WaitForCondition( agHelper @@ -313,7 +313,7 @@ describe( Select3.setOptions(Select1.options.concat(Select2.options)); } }`); - jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true, false); //for on page load execution, since sync function is updated to async + jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true); //for on page load execution, since sync function is updated to async EditorNavigation.SelectEntityByName("Input1", EntityType.Widget); propPane.UpdatePropertyFieldValue("Default value", "{{Select3.options}}"); deployMode.DeployApp(); @@ -355,7 +355,7 @@ describe( setTimeout(() => {Select1.setOptions(localValue)}, 1000); } }`); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", false, false); //for on page load execution + jsEditor.EnableDisableAsyncFuncSettings("myFun1", false); //for on page load execution deployMode.DeployApp(); agHelper .GetText( diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts index a89504d1794d..46697dee2b28 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/WidgetPropertySetters2_spec.ts @@ -14,6 +14,7 @@ import EditorNavigation, { PageLeftPane, PagePaneSegment, } from "../../../../support/Pages/EditorNavigation"; +import PageList from "../../../../support/Pages/PageList"; describe( "Widget Property Setters - Part II - Tc #2409", @@ -135,7 +136,7 @@ describe( false, ); jsEditor.RunJSObj(); - EditorNavigation.SelectEntityByName("Page1", EntityType.Page); + PageList.VerifyIsCurrentPage("Page1"); PageLeftPane.switchSegment(PagePaneSegment.UI); agHelper .GetText( @@ -176,7 +177,7 @@ describe( }`, false, ); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false); + jsEditor.EnableDisableAsyncFuncSettings("myFun1", true); deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON)); //Asserting before setTimeout JS function execution, button is visible agHelper.Sleep(2000); //waiting for settimeout to execute agHelper.AssertElementAbsence( @@ -235,7 +236,7 @@ describe( }`, false, ); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", false, false); + jsEditor.EnableDisableAsyncFuncSettings("myFun1", false); deployMode.DeployApp(); agHelper.AssertElementVisibility( locators._widgetInDeployed(draggableWidgets.INPUT_V2), //Asserting before setTimeout JS function execution, Input is visible diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js index f6c2128c334a..453c616a6998 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js @@ -94,7 +94,6 @@ describe( 'SELECT * FROM public."country" LIMIT 10;', ); // Going to HomePage where the button widget is located and opeing it's property pane. - EditorNavigation.SelectEntityByName("Page1", EntityType.Page); PageLeftPane.switchSegment(PagePaneSegment.UI); cy.openPropertyPane("selectwidget"); cy.reload(); diff --git a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts index 59fb56693b34..08c72ab99a3d 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/SetTimeout_spec.ts @@ -227,7 +227,7 @@ describe( prettify: true, }, ); - jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false); + jsEditor.EnableDisableAsyncFuncSettings("myFun1", true); deployMode.DeployApp(); agHelper.Sleep(1000); //DeployApp already waiting 2000ms hence reducing it here to equate to 3000 timeout agHelper.AssertContains("Success!"); diff --git a/app/client/cypress/fixtures/chartUpdatedDsl.json b/app/client/cypress/fixtures/chartUpdatedDsl.json index 1fb7e865c43f..d78064c37f3e 100644 --- a/app/client/cypress/fixtures/chartUpdatedDsl.json +++ b/app/client/cypress/fixtures/chartUpdatedDsl.json @@ -37,6 +37,7 @@ "parentColumnSpace": 75.25, "dynamicBindingPathList": [], "leftColumn": 0, + "parentId": "0", "children": [ { "backgroundColor": "transparent", @@ -57,6 +58,7 @@ "isLoading": false, "parentColumnSpace": 1, "leftColumn": 0, + "parentId": "mxbaasg65u", "dynamicBindingPathList": [], "children": [] } @@ -80,6 +82,7 @@ "parentColumnSpace": 75.25, "dynamicBindingPathList": [], "leftColumn": 0, + "parentId": "0", "children": [ { "backgroundColor": "transparent", @@ -101,6 +104,7 @@ "parentColumnSpace": 1, "leftColumn": 0, "dynamicBindingPathList": [], + "parentId": "i331vll2mg", "children": [ { "widgetName": "Test", @@ -152,6 +156,7 @@ "parentColumnSpace": 75.25, "dynamicBindingPathList": [], "leftColumn": 32, + "parentId": "0", "children": [ { "backgroundColor": "transparent", @@ -173,7 +178,8 @@ "parentColumnSpace": 1, "leftColumn": 0, "dynamicBindingPathList": [], - "children": [] + "children": [], + "parentId": "qznzsquf70" } ] } diff --git a/app/client/cypress/fixtures/newFormDsl.json b/app/client/cypress/fixtures/newFormDsl.json index a12ae1171e45..f3a1cf7043cc 100644 --- a/app/client/cypress/fixtures/newFormDsl.json +++ b/app/client/cypress/fixtures/newFormDsl.json @@ -35,6 +35,7 @@ "bottomRow": 20, "snapColumns": 16, "orientation": "VERTICAL", + "parentId": "0", "children": [ { "backgroundColor": "transparent", @@ -51,6 +52,7 @@ "bottomRow": 532, "snapColumns": 16, "orientation": "VERTICAL", + "parentId": "jaftzrmtin", "children": [ { "widgetName": "Text1", diff --git a/app/client/cypress/locators/CMSApplocators.js b/app/client/cypress/locators/CMSApplocators.js index f84c813e63ea..1ad3b7439ff9 100644 --- a/app/client/cypress/locators/CMSApplocators.js +++ b/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']", }; diff --git a/app/client/cypress/locators/apiWidgetslocator.json b/app/client/cypress/locators/apiWidgetslocator.json index e410f4a25293..2004e7f89a48 100644 --- a/app/client/cypress/locators/apiWidgetslocator.json +++ b/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--entity-context-menu-trigger']", "moveTo": ".single-select >div:contains('Move to')", "copyTo": ".single-select >div:contains('Copy to page')", "home": ".single-select >div:contains('Page1')", diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json index e6750c2d4e93..fbe4305f8aca 100644 --- a/app/client/cypress/locators/commonlocators.json +++ b/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']" -} \ No newline at end of file +} diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index 6136d917e789..94469328d70d 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -145,12 +145,14 @@ Cypress.Commands.add("CreateApiAndValidateUniqueEntityName", (apiname) => { Cypress.Commands.add("validateMessage", (value) => { cy.get(".rc-tooltip-inner").should(($x) => { - expect($x).contain(value.concat(" is already being used.")); + expect($x).contain( + value.concat(" is already being used or is a restricted keyword."), + ); }); }); 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", diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts index f10c896d3b45..ac2eadef9447 100644 --- a/app/client/cypress/support/Objects/CommonLocators.ts +++ b/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}"]`; diff --git a/app/client/cypress/support/Objects/FeatureFlags.ts b/app/client/cypress/support/Objects/FeatureFlags.ts index 31d8ebedac2e..8301ff7da0e1 100644 --- a/app/client/cypress/support/Objects/FeatureFlags.ts +++ b/app/client/cypress/support/Objects/FeatureFlags.ts @@ -4,6 +4,7 @@ import { ObjectsRegistry } from "./Registry"; const defaultFlags = { rollout_remove_feature_walkthrough_enabled: false, // remove this flag from here when it's removed from code release_git_modularisation_enabled: true, + release_ads_entity_item_enabled: true, }; export const featureFlagIntercept = ( diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index fa74ea5a239f..6ad77693d172 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/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, diff --git a/app/client/cypress/support/Pages/EditorNavigation.ts b/app/client/cypress/support/Pages/EditorNavigation.ts index 38fc48ad3ffe..2ffbd327515c 100644 --- a/app/client/cypress/support/Pages/EditorNavigation.ts +++ b/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), ); diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts index 5166d520622e..11fa60aacea1 100644 --- a/app/client/cypress/support/Pages/EntityExplorer.ts +++ b/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,28 +118,43 @@ 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."), + ); + } + + private deleteQueryUnderDatasource(dsName: string) { + return cy.get("body").then(($body) => { + if ($body.find(`span:contains('${dsName}')`).length === 0) return; + + return this.agHelper + .GetElement(this._visibleTextSpan(dsName)) + .siblings() + .children() + .then(($items) => { + if ($items.length > 0) { + cy.wrap($items[0]) + .find("button[data-testid='t--entity-context-menu-trigger']") + .click({ + force: true, + }); + cy.xpath(this.locator._contextMenuItem("Delete")).click({ + force: true, + }); + this.agHelper.GetNClick( + this.locator._contextMenuItem("Are you sure?"), + ); + cy.wait(500); + this.deleteQueryUnderDatasource(dsName); + } + }); + }); } public DeleteAllQueriesForDB(dsName: string) { AppSidebar.navigate(AppSidebarButton.Editor); PageLeftPane.switchSegment(PagePaneSegment.Queries); - this.agHelper - .GetElement(this._visibleTextSpan(dsName)) - .parent() - .siblings() - .each(($el: any) => { - cy.wrap($el) - .find(".t--entity-name") - .invoke("text") - .then(($query) => { - this.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: $query as string, - action: "Delete", - entityType: EntityItems.Query, - }); - }); - }); + this.deleteQueryUnderDatasource(dsName); } public SearchWidgetPane(widgetType: string) { @@ -266,17 +278,24 @@ export class EntityExplorer { entityType?: EntityItemsType, ) { AppSidebar.navigate(AppSidebarButton.Editor); - if (entityType === EntityItems.Page && !viaMenu) { - PageList.ShowList(); - } if (viaMenu) this.ActionContextMenuByEntityName({ entityNameinLeftSidebar: entityName, action: "Rename", entityType, }); - else cy.xpath(PageLeftPane.listItemSelector(entityName)).dblclick(); - cy.xpath(this.locator._entityNameEditing(entityName)) + else { + if (entityType === EntityItems.Page) { + PageList.ShowList(); + cy.get(this.locator._entityTestId(entityName)).click(); + PageList.ShowList(); + cy.get(this.locator._entityTestId(entityName)).dblclick(); + } else { + cy.get(this.locator._entityTestId(entityName)).dblclick(); + } + } + cy.get(this.locator._entityNameEditing) + .clear() .type(renameVal) .wait(500) .type("{enter}") diff --git a/app/client/cypress/support/Pages/IDE/LeftPane.ts b/app/client/cypress/support/Pages/IDE/LeftPane.ts index c2f5aec05ee4..1a0050ee923e 100644 --- a/app/client/cypress/support/Pages/IDE/LeftPane.ts +++ b/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, ); } @@ -79,10 +76,11 @@ export class LeftPane { this.locators.expandCollapseArrow(itemName), ); cy.xpath(this.locators.expandCollapseArrow(itemName)) - .invoke("attr", "id") + .invoke("attr", "data-icon") .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), @@ -90,6 +88,7 @@ export class LeftPane { } }); } + public selectedItem( exists?: "exist" | "not.exist" | "noVerify", ): Cypress.Chainable { diff --git a/app/client/cypress/support/Pages/IDE/ListView.ts b/app/client/cypress/support/Pages/IDE/ListView.ts index f9f4352af532..2a0bd1e989a2 100644 --- a/app/client/cypress/support/Pages/IDE/ListView.ts +++ b/app/client/cypress/support/Pages/IDE/ListView.ts @@ -3,7 +3,7 @@ import { ObjectsRegistry } from "../../Objects/Registry"; class ListView { public locators = { list: "[data-testid='t--ide-list']", - listItem: "[data-testid='t--ide-list-item']", + listItem: ".t--ide-list-item", addItem: "[data-testid='t--add-item']", }; diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts index 88d268b23360..85bc32fcd3b7 100644 --- a/app/client/cypress/support/Pages/JSEditor.ts +++ b/app/client/cypress/support/Pages/JSEditor.ts @@ -254,9 +254,9 @@ export class JSEditor { entityNameinLeftSidebar: entityName, action: "Rename", }); - cy.xpath(this.locator._entityNameEditing(entityName)).type( - renameVal + "{enter}", - ); + cy.get(this.locator._entityNameEditing) + .clear() + .type(renameVal + "{enter}"); PageLeftPane.assertPresence(renameVal); } diff --git a/app/client/cypress/support/Pages/PageList.ts b/app/client/cypress/support/Pages/PageList.ts index 5d48942cf12f..39c953de3961 100644 --- a/app/client/cypress/support/Pages/PageList.ts +++ b/app/client/cypress/support/Pages/PageList.ts @@ -9,7 +9,7 @@ import { PAGE_ENTITY_NAME } from "../../../src/ce/constants/messages"; class PageList { private locators = { pageListItem: (pageName: string) => - `.t--entity.page:contains('${pageName}')`, + `.t--entity-item.page:contains('${pageName}')`, newButton: ".pages .t--entity-add-btn", newPageOption: ".ads-v2-menu__menu-item-children", switcher: `.t--pages-switcher`, @@ -49,7 +49,7 @@ class PageList { public SelectedPageItem(): Cypress.Chainable { this.ShowList(); - return cy.get(".t--entity.page > .active"); + return cy.get(".t--entity-item.page > .active"); this.HideList(); } diff --git a/app/client/cypress/support/queryCommands.js b/app/client/cypress/support/queryCommands.js index 2faddda47a91..5419b61d50c9 100644 --- a/app/client/cypress/support/queryCommands.js +++ b/app/client/cypress/support/queryCommands.js @@ -57,14 +57,6 @@ Cypress.Commands.add("onlyQueryRun", () => { cy.get(".ads-v2-spinner").should("not.exist"); }); -Cypress.Commands.add("hoverAndClick", (entity) => { - cy.xpath( - "//div[text()='" + - entity + - "']/ancestor::div[1]/following-sibling::div//button[contains(@class, 'entity-context-menu')]", - ).click({ force: true }); -}); - Cypress.Commands.add("deleteQueryUsingContext", () => { cy.get(queryEditor.queryMoreAction).first().click(); cy.get(queryEditor.deleteUsingContext).click(); diff --git a/app/client/cypress/support/widgetCommands.js b/app/client/cypress/support/widgetCommands.js index 9e42a7b359af..c15c53767874 100644 --- a/app/client/cypress/support/widgetCommands.js +++ b/app/client/cypress/support/widgetCommands.js @@ -969,7 +969,7 @@ Cypress.Commands.add("Createpage", (pageName, navigateToCanvasPage = true) => { ee.RenameEntityFromExplorer( oldPageName, pageName, - false, + true, EntityItems.Page, ); } diff --git a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/loader.tsx b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/loader.tsx index 43e67b4980b0..0b615d3d6935 100644 --- a/app/client/src/pages/AppIDE/components/AppPluginActionEditor/loader.tsx +++ b/app/client/src/pages/AppIDE/components/AppPluginActionEditor/loader.tsx @@ -11,7 +11,7 @@ const LazyPluginActionEditor = lazy(async () => const AppPluginActionEditor = () => { return ( - + }> ); diff --git a/app/client/src/pages/AppIDE/components/JSAdd/loader.tsx b/app/client/src/pages/AppIDE/components/JSAdd/loader.tsx index 8c6769fe7271..e4449dba52a3 100644 --- a/app/client/src/pages/AppIDE/components/JSAdd/loader.tsx +++ b/app/client/src/pages/AppIDE/components/JSAdd/loader.tsx @@ -10,7 +10,7 @@ const LazyAddJS = lazy(async () => const AddJS = () => { return ( - + }> ); diff --git a/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx b/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx index a515c9779682..24a6599f25fd 100644 --- a/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx +++ b/app/client/src/pages/AppIDE/components/JSEntityItem/JSEntityItem.tsx @@ -44,7 +44,7 @@ export const JSEntityItem = ({ item }: { item: EntityItemProps }) => { } return ( - + ); diff --git a/app/client/src/pages/AppIDE/components/QueryAdd/loader.tsx b/app/client/src/pages/AppIDE/components/QueryAdd/loader.tsx index 2180702b13ac..abef6e53151c 100644 --- a/app/client/src/pages/AppIDE/components/QueryAdd/loader.tsx +++ b/app/client/src/pages/AppIDE/components/QueryAdd/loader.tsx @@ -10,7 +10,7 @@ const LazyAddQuery = lazy(async () => const QueryAdd = () => { return ( - + }> ); diff --git a/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx b/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx index 2757aba2763e..3574a814f255 100644 --- a/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx +++ b/app/client/src/pages/AppIDE/components/QueryEntityItem/QueryEntityItem.tsx @@ -50,7 +50,10 @@ export const QueryEntityItem = ({ item }: { item: EntityItemProps }) => { const dispatch = useDispatch(); const contextMenu = useMemo( () => ( - + ), diff --git a/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx b/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx index bd8bc121ab12..cbb09871231a 100644 --- a/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx +++ b/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx @@ -89,7 +89,7 @@ export const ListQuery = () => { items: items, className: "", renderList: (item: EntityItem) => { - return ; + return ; }, }; })} diff --git a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx index 9626aa31afdd..fccffe2824d0 100644 --- a/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx +++ b/app/client/src/pages/AppIDE/components/UIEntityListTree/WidgetContextMenu.tsx @@ -95,7 +95,7 @@ export const WidgetContextMenu = (props: {