feat: Provide option in phone input widget to turn off auto formatting (

appsmithorg#10832)
ganganimaulik · Feb 11, 2022 · 85cc3f3 · 85cc3f3
1 parent c992bd5
commit 85cc3f3
Show file tree

Hide file tree

Showing 7 changed files with 1,131 additions and 29 deletions.
diff --git a/...lient/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Phone_input_spec.js b/...lient/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/Phone_input_spec.js
@@ -23,7 +23,7 @@ describe("Phone input widget - ", () => {
 
   it("should check for the format and dialCode", () => {
     cy.get(`.t--widget-${widgetName} input`).clear();
-    cy.wait(300);
+    cy.wait(500);
     cy.get(`.t--widget-${widgetName} input`).type("9999999999");
     cy.get(".t--widget-textwidget").should("contain", "(999) 999-9999:US:+1");
 
@@ -33,9 +33,9 @@ describe("Phone input widget - ", () => {
       "Afghanistan (+93)",
     );
     cy.get(`.t--widget-${widgetName} input`).clear();
-    cy.wait(300);
-    cy.get(`.t--widget-${widgetName} input`).type("1111111111");
-    cy.get(".t--widget-textwidget").should("contain", "1111111111:AF:+93");
+    cy.wait(500);
+    cy.get(`.t--widget-${widgetName} input`).type("1234567890");
+    cy.get(".t--widget-textwidget").should("contain", "1234567890:AF:+93");
     cy.get(".t--input-country-code-change").should("contain", "🇦🇫+93");
 
     cy.get(".t--property-control-allowcountrycodechange label")
@@ -50,10 +50,34 @@ describe("Phone input widget - ", () => {
       .last()
       .click();
     cy.get(`.t--widget-${widgetName} input`).clear();
-    cy.wait(300);
+    cy.wait(500);
     cy.get(`.t--widget-${widgetName} input`).type("9999999999");
     cy.get(".t--widget-textwidget").should("contain", "99999 99999:IN:+91");
     cy.get(".t--input-country-code-change").should("contain", "🇮🇳+91");
+
+    cy.get(".t--property-control-enableformatting label")
+      .last()
+      .click({ force: true });
+
+    cy.selectDropdownValue(
+      ".t--property-control-defaultcountrycode",
+      "United States / Canada (+1)",
+    );
+    cy.get(`.t--widget-${widgetName} input`).clear();
+    cy.wait(500);
+    cy.get(`.t--widget-${widgetName} input`).type("9999999999");
+    cy.get(".t--widget-textwidget").should("contain", "9999999999:US:+1");
+
+    cy.openPropertyPane(widgetName);
+    cy.selectDropdownValue(
+      ".t--property-control-defaultcountrycode",
+      "India (+91)",
+    );
+    cy.get(`.t--widget-${widgetName} input`).clear();
+    cy.wait(500);
+    cy.get(`.t--widget-${widgetName} input`).type("1234567890");
+    cy.get(".t--widget-textwidget").should("contain", "1234567890:IN:+91");
+    cy.get(".t--input-country-code-change").should("contain", "🇮🇳+91");
   });
 
   it("should check that widget input resets on submit", () => {

diff --git a/app/client/src/constants/WidgetConstants.tsx b/app/client/src/constants/WidgetConstants.tsx
@@ -69,7 +69,7 @@ export const layoutConfigurations: LayoutConfigurations = {
   FLUID: { minWidth: -1, maxWidth: -1 },
 };
 
-export const LATEST_PAGE_VERSION = 51;
+export const LATEST_PAGE_VERSION = 52;
 
 export const GridDefaults = {
   DEFAULT_CELL_SIZE: 1,

diff --git a/app/client/src/utils/DSLMigrations.ts b/app/client/src/utils/DSLMigrations.ts
@@ -45,6 +45,7 @@ import { migrateMapWidgetIsClickedMarkerCentered } from "./migrations/MapWidget"
 import { DSLWidget } from "widgets/constants";
 import { migrateRecaptchaType } from "./migrations/ButtonWidgetMigrations";
 import { PrivateWidgets } from "entities/DataTree/dataTreeFactory";
+import { migratePhoneInputWidgetAllowFormatting } from "./migrations/PhoneInputWidgetMigrations";
 
 /**
  * adds logBlackList key for all list widget children
@@ -1042,6 +1043,11 @@ export const transformDSL = (
      * We're skipping this to fix a bad table migration - migrateTableWidgetNumericColumnName
      * it overwrites the computedValue of the table columns
      */
+    currentDSL.version = 51;
+  }
+
+  if (currentDSL.version === 51) {
+    currentDSL = migratePhoneInputWidgetAllowFormatting(currentDSL);
     currentDSL.version = LATEST_PAGE_VERSION;
   }