Merge branch 'release' into fix/user-login-source-overwrite

app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js

@@ -22,8 +22,7 @@ describe(
       PageLeftPane.switchSegment(PagePaneSegment.UI);
       PageLeftPane.assertPresence("Table1");
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      cy.RenameEntity(apiName);
-      cy.validateMessage(apiName);
+      cy.CreationOfUniqueAPIcheck(apiName);
     });
   },
 );

app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts

@@ -102,7 +102,7 @@ describe(
           //Create and run query.
 
           _.dataSources.EnterQuery(
-            "SELECT * FROM users ORDER BY id LIMIT 10;",
+            "SELECT * FROM users ORDER BY username LIMIT 10;",
             1000,
           );
           _.dataSources.RunQuery();

app/client/cypress/support/ApiCommands.js

@@ -4,6 +4,7 @@
 require("cy-verify-downloads").addCustomCommand();
 require("cypress-file-upload");
 import ApiEditor from "../locators/ApiEditor";
+
 const apiwidget = require("../locators/apiWidgetslocator.json");
 const explorer = require("../locators/explorerlocators.json");
 import { ObjectsRegistry } from "./Objects/Registry";
@@ -114,12 +115,10 @@ Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => {
   cy.wait("@createNewApi");
   // cy.wait("@getUser");
   cy.get(apiwidget.resourceUrl).should("be.visible");
-  agHelper.RenameQuery(apiname);
-  cy.get(".ads-v2-tooltip .ads-v2-text").should(($x) => {
-    expect($x).contain(
-      apiname.concat(" is already being used or is a restricted keyword."),
-    );
-  });
+  agHelper.RenameQuery(
+    apiname,
+    apiname.concat(" is already being used or is a restricted keyword."),
+  );
 });
 
 Cypress.Commands.add("RenameEntity", (value, selectFirst) => {
@@ -138,12 +137,10 @@ Cypress.Commands.add("CreateApiAndValidateUniqueEntityName", (apiname) => {
   agHelper.GetNClick(apiwidget.createapi);
   cy.wait("@createNewApi");
   cy.get(apiwidget.resourceUrl).should("be.visible");
-  agHelper.RenameQuery(apiname);
-  cy.get(".ads-v2-tooltip .ads-v2-text").should(($x) => {
-    expect($x).contain(
-      apiname.concat(" is already being used or is a restricted keyword."),
-    );
-  });
+  agHelper.RenameQuery(
+    apiname,
+    apiname.concat(" is already being used or is a restricted keyword."),
+  );
 });
 
 Cypress.Commands.add("validateMessage", (value) => {

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

@@ -16,12 +16,14 @@ interface DeleteParams {
   entityType?: EntityItemsType;
   toastToValidate?: string;
 }
+
 interface SubActionParams {
   subAction: string;
   index?: number;
   force?: boolean;
   toastToValidate?: string;
 }
+
 interface SelectAndValidateParams {
   clickOptions?: Partial<ClickOptions>;
   widgetName: string;
@@ -33,6 +35,7 @@ interface SelectAndValidateParams {
 }
 
 let LOCAL_STORAGE_MEMORY: any = {};
+
 export interface IEnterValue {
   propFieldName: string;
   directInput: boolean;
@@ -53,12 +56,15 @@ export class AggregateHelper {
   public get isMac() {
     return Cypress.platform === "darwin";
   }
+
   private selectLine = `${
     this.isMac ? "{cmd}{shift}{leftArrow}" : "{shift}{home}"
   }`;
+
   public get removeLine() {
     return "{backspace}";
   }
+
   public _modifierKey = `${this.isMac ? "meta" : "ctrl"}`;
   private selectAll = `${this.isMac ? "{cmd}{a}" : "{ctrl}{a}"}`;
   private lazyCodeEditorFallback = ".t--lazyCodeEditor-fallback";
@@ -226,6 +232,7 @@ export class AggregateHelper {
     textInputLocator: string;
     renameVal: string;
     dblClick?: boolean;
+    willFailError?: string;
   }) {
     const { dblClick = false, nameLocator, renameVal, textInputLocator } = args;
 
@@ -240,11 +247,15 @@ export class AggregateHelper {
     cy.get(textInputLocator)
       .clear({ force: true })
       .type(renameVal, { force: true, delay: 0 })
-      .should("have.value", renameVal)
-      .blur();
-
-    this.PressEnter();
+      .should("have.value", renameVal);
 
+    if (args.willFailError) {
+      this.AssertContains(args.willFailError, "exist", ".ads-v2-tooltip");
+      cy.get(textInputLocator).blur();
+    } else {
+      cy.get(textInputLocator).blur();
+      this.PressEnter();
+    }
     this.Sleep();
   }
 
@@ -257,12 +268,13 @@ export class AggregateHelper {
     this.AssertElementVisibility(this.locator._editIcon);
   }
 
-  public RenameQuery(renameVal: string) {
+  public RenameQuery(renameVal: string, willFailError?: string) {
     this.rename({
       nameLocator: this.locator._queryName,
       textInputLocator: this.locator._queryNameTxt,
       renameVal,
       dblClick: true,
+      willFailError,
     });
   }
 
@@ -937,6 +949,7 @@ export class AggregateHelper {
       this.TypeText(selector, totype, index);
     }
   }
+
   public ClickNClear(selector: string, force = false, index = 0) {
     this.GetNClick(selector, index, force);
     this.ClearTextField(selector, force, index);

app/client/src/workers/Evaluation/__tests__/evaluation.test.ts

@@ -18,6 +18,7 @@ import WidgetFactory from "WidgetProvider/factory";
 import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
 import { sortObjectWithArray } from "../../../utils/treeUtils";
 import klona from "klona";
+
 import { APP_MODE } from "entities/App";
 
 const klonaFullSpy = jest.fn();
@@ -31,6 +32,17 @@ jest.mock("klona/full", () => ({
     return klona.klona(arg);
   },
 }));
+const klonaJsonSpy = jest.fn();
+
+jest.mock("klona/json", () => ({
+  // TODO: Fix this the next time the file is edited
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  klona: (arg: any) => {
+    klonaJsonSpy(arg);
+
+    return klona.klona(arg);
+  },
+}));
 
 export const WIDGET_CONFIG_MAP: WidgetTypeConfigMap = {
   CONTAINER_WIDGET: {
@@ -581,7 +593,8 @@ describe("DataTreeEvaluator", () => {
     );
     evaluator.evalAndValidateFirstTree();
     // Hard check to not regress on the number of clone operations. Try to improve this number.
-    expect(klonaFullSpy).toBeCalledTimes(41);
+    expect(klonaFullSpy).toBeCalledTimes(40);
+    expect(klonaJsonSpy).toBeCalledTimes(3);
   });
 
   it("Evaluates a binding in first run", () => {
@@ -1102,6 +1115,7 @@ describe("DataTreeEvaluator", () => {
       unEvalUpdates,
     );
     // Hard check to not regress on the number of clone operations. Try to improve this number.
-    expect(klonaFullSpy).toBeCalledTimes(7);
+    expect(klonaFullSpy).toBeCalledTimes(6);
+    expect(klonaJsonSpy).toBeCalledTimes(2);
   });
 });

app/client/src/workers/common/DataTreeEvaluator/index.ts

@@ -1059,7 +1059,7 @@ export default class DataTreeEvaluator {
     staleMetaIds: string[];
     contextTree: DataTree;
   } {
-    const safeTree = klona(unEvalTree);
+    const safeTree = klonaJSON(unEvalTree);
     const dataStore = DataStore.getDataStore();
     const dataStoreClone = klonaJSON(dataStore);