diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts index 652d15d55d..ea820319ab 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/InputTruncateCheck_Spec.ts @@ -93,7 +93,7 @@ Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig], index) => { if (index === 0) { configureApi(); } - entityExplorer.PinUnpinEntityExplorer(false); + // entityExplorer.PinUnpinEntityExplorer(false); entityExplorer.DragDropWidgetNVerify(widgetSelector, 300, 200); entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON, 400, 400); //entityExplorer.SelectEntityByName(draggableWidgets.BUTTONNAME("1")); @@ -110,7 +110,7 @@ Object.entries(widgetsToTest).forEach(([widgetSelector, testConfig], index) => { PROPERTY_SELECTOR.TextFieldName, `{{appsmith.store.textPayloadOnSubmit}}`, ); - entityExplorer.PinUnpinEntityExplorer(true); + // entityExplorer.PinUnpinEntityExplorer(true); }); it("2. StoreValue should have complete input value", () => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js index 654f64911c..4bca57f843 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js @@ -1,7 +1,7 @@ import homePage from "../../../../locators/HomePage"; import * as _ from "../../../../support/Objects/ObjectsCore"; -describe("Visual regression tests", () => { +describe.skip("Visual regression tests", () => { // for any changes in UI, update the screenshot in snapshot folder, to do so: // 1. Delete the required screenshot which you want to update. // 2. Run test in headless mode with any browser diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js index af4b55b064..d8f1aa6006 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js @@ -1,6 +1,6 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; -describe("Visual tests for datasources", () => { +describe.skip("Visual tests for datasources", () => { // for any changes in UI, update the screenshot in snapshot folder, to do so: // 1. Delete the required screenshot which you want to update. // 2. Run test in headless mode with any browser diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorComment_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorComment_spec.js index 292e091c92..9a450fafa1 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorComment_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorComment_spec.js @@ -3,7 +3,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry"; let jsEditor = ObjectsRegistry.JSEditor, agHelper = ObjectsRegistry.AggregateHelper; -describe("JSEditor Comment - Visual tests", () => { +describe.skip("JSEditor Comment - Visual tests", () => { it("1. comments code on the editor", () => { jsEditor.CreateJSObject( `export default { diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js index c8218c9c31..cdd0a70191 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js @@ -8,7 +8,7 @@ import { dataSources, } from "../../../../support/Objects/ObjectsCore"; -describe("JSEditor Indendation - Visual tests", () => { +describe.skip("JSEditor Indendation - Visual tests", () => { it("6. TC 1933 - jSEditor prettify verification on cloned application", () => { const appname = localStorage.getItem("AppName"); jsEditor.CreateJSObject( diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js index 335d92f05d..9cd38dd21a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/JSEditorSaveAndAutoIndent_spec.js @@ -1,6 +1,6 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; -describe("JS Editor Save and Auto-indent: Visual tests", () => { +describe.skip("JS Editor Save and Auto-indent: Visual tests", () => { it("1. Auto indents and saves the code when Ctrl/Cmd+s is pressed", () => { _.jsEditor.CreateJSObject( `export default { diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js index 19a9ebafde..b9d25e41f4 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/WidgetsLayout_spec.js @@ -1,4 +1,4 @@ -describe("Visual regression tests", () => { +describe.skip("Visual regression tests", () => { // for any changes in UI, update the screenshot in snapshot folder, to do so: // 1. Delete the required screenshot which you want to update // 2. Run test in headless mode with chrome (to maintain same resolution in CI) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts index 3fb6399d29..ba35f91370 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts @@ -75,13 +75,13 @@ describe("Camera widget - Image test", () => { agHelper.AssertExistingToggleState("Mirrored", "true"); propPane.EnterJSContext("Mirrored", "{{(55>45)?false:true}}", true, true); deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.CAMERA)); - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) .matchImageSnapshot("cameraImageMirroredScreen", { failureThreshold: 0.15, failureThresholdType: "percent", customDiffConfig: { threshold: 0.15 }, - }); + }); */ deployMode.NavigateBacktoEditor(); entityExplorer.SelectEntityByName("Camera1"); propPane.EnterJSContext("Mirrored", "", false); @@ -114,9 +114,9 @@ describe("Camera widget - Image test", () => { //Validate camera screen & icons agHelper.AssertElementVisibility(widgetLocators.cameraImageVideoOnOffBtn); agHelper.AssertElementVisibility(widgetLocators.cameraImageVideoDropdown); - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraImageScreen"); + .matchImageSnapshot("cameraImageScreen"); */ //Capture image agHelper.GetNClick(widgetLocators.cameraCaptureBtn); @@ -124,18 +124,18 @@ describe("Camera widget - Image test", () => { agHelper.AssertElementVisibility(widgetLocators.cameraImageDiscardBtn); //Validate image in preview screen - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraImagePreviewScreen"); + .matchImageSnapshot("cameraImagePreviewScreen"); */ //Save image agHelper.GetNClick(widgetLocators.cameraSaveBtn); agHelper.AssertElementVisibility(widgetLocators.cameraRefreshBtn); //Validate image in refresh screen - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraImageSavedScreen"); + .matchImageSnapshot("cameraImageSavedScreen"); */ //Refresh image agHelper.GetNClick(widgetLocators.cameraRefreshBtn); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts index 977ff16262..55c59502c9 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Video_Spec.ts @@ -58,9 +58,9 @@ describe("Camera widget - Video test", () => { agHelper.AssertExistingToggleState("Mirrored", "true"); propPane.EnterJSContext("Mirrored", "{{(55>45)?false:true}}", true, true); deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.CAMERA)); - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraVideoMirroredScreen"); + .matchImageSnapshot("cameraVideoMirroredScreen"); */ deployMode.NavigateBacktoEditor(); entityExplorer.SelectEntityByName("Camera1"); propPane.EnterJSContext("Mirrored", "", false); @@ -95,9 +95,9 @@ describe("Camera widget - Video test", () => { agHelper.AssertElementVisibility(widgetLocators.cameraMicrophoneDropdown); agHelper.AssertElementVisibility(widgetLocators.cameraVideoOnOffBtn); agHelper.AssertElementVisibility(widgetLocators.cameraVideoDropdown); - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraVideoScreen"); + .matchImageSnapshot("cameraVideoScreen"); */ //Start video recording agHelper.GetNClick(widgetLocators.cameraCaptureBtn); @@ -110,18 +110,18 @@ describe("Camera widget - Video test", () => { agHelper.AssertElementVisibility(widgetLocators.cameraVideoPlayBtn); //Validate video in preview screen - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraVideoPreviewScreen"); + .matchImageSnapshot("cameraVideoPreviewScreen"); */ //Save video agHelper.GetNClick(widgetLocators.cameraSaveBtn); //Validate video in refresh screen agHelper.AssertElementVisibility(widgetLocators.cameraRefreshBtn); - agHelper + /* agHelper .GetElement(locators._widgetInDeployed(draggableWidgets.CAMERA)) - .matchImageSnapshot("cameraVideoSavedScreen"); + .matchImageSnapshot("cameraVideoSavedScreen"); */ //Refresh video agHelper.GetNClick(widgetLocators.cameraRefreshBtn); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts similarity index 96% rename from app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.js rename to app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts index 9ce99a7ab9..9847c98612 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/CodeScanner/CodeScanner1_spec.ts @@ -1,8 +1,9 @@ -const explorer = require("../../../../../locators/explorerlocators.json"); -const widgetsPage = require("../../../../../locators/Widgets.json"); -const commonlocators = require("../../../../../locators/commonlocators.json"); -const publish = require("../../../../../locators/publishWidgetspage.json"); +import explorer from "../../../../../locators/explorerlocators.json"; +import publish from "../../../../../locators/publishWidgetspage.json"; +import commonlocators from "../../../../../locators/commonlocators.json"; +import widgetsPage from "../../../../../locators/Widgets.json"; import * as _ from "../../../../../support/Objects/ObjectsCore"; + const widgetName = "codescannerwidget"; const codeScannerVideoOnPublishPage = `${publish.codescannerwidget} ${commonlocators.codeScannerVideo}`; const codeScannerDisabledSVGIconOnPublishPage = `${publish.codescannerwidget} ${commonlocators.codeScannerDisabledSVGIcon}`; diff --git a/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.js b/app/client/cypress/e2e/Sanity/Datasources/RestApiOAuth2Validation_spec.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java index eabb8952a4..21d39a3da8 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java @@ -664,7 +664,7 @@ public class NewActionServiceCEImpl extends BaseService findAllById(Iterable id) { - return repository.findAllById(id).flatMap(this::sanitizeAction); + return repository.findAllByIdIn(id).flatMap(this::sanitizeAction); } @Override @@ -1908,7 +1908,7 @@ public class NewActionServiceCEImpl extends BaseService { // Update collectionId and defaultCollectionIds in actionDTOs ActionDTO unpublishedAction = newAction.getUnpublishedAction(); @@ -1960,6 +1960,7 @@ public class NewActionServiceCEImpl extends BaseService