[FIX] helpers: setXcToFixedReferenceType support all xc

Backport of task 4743563 from saas-18.4. Ensures both parts of an xc
reference are treated as static in the standalone composer.

Before this commit:
- The static reference only considered the part before ':'.

After this commit:
- Both the part before and after ':' are now correctly treated as static.

closes #7326

Task: 5165969
Signed-off-by: Rémi Rahir (rar) <[email protected]>

Author: rmbh-odoo

src/components/side_panel/data_validation/dv_criterion_form/dv_input/dv_input.ts

@@ -97,6 +97,7 @@ export class DataValidationInput extends Component<Props, SpreadsheetChildEnv> {
       placeholder: this.placeholder,
       class: "o-sidePanel-composer",
       defaultRangeSheetId: this.env.model.getters.getActiveSheetId(),
+      defaultStatic: true,
     };
   }
 

src/helpers/reference_type.ts

@@ -48,29 +48,39 @@ function getTokenNextReferenceType(xc: string): string {
 }
 
 /**
- * Returns the given XC with the given reference type. The XC string should not contain a sheet name.
+ * Returns the given XC with the given reference type.
  */
 export function setXcToFixedReferenceType(xc: string, referenceType: FixedReferenceType): string {
-  if (xc.includes("!")) {
-    throw new Error("The given XC should not contain a sheet name");
-  }
+  let sheetName;
+  ({ sheetName, xc } = splitReference(xc));
+  sheetName = sheetName ? sheetName + "!" : "";
 
   xc = xc.replace(/\$/g, "");
-  let indexOfNumber: number;
+  const splitIndex = xc.indexOf(":");
+  if (splitIndex >= 0) {
+    return `${sheetName}${_setXcToFixedReferenceType(
+      xc.slice(0, splitIndex),
+      referenceType
+    )}:${_setXcToFixedReferenceType(xc.slice(splitIndex + 1), referenceType)}`;
+  } else {
+    return sheetName + _setXcToFixedReferenceType(xc, referenceType);
+  }
+}
+
+function _setXcToFixedReferenceType(xc: string, referenceType: FixedReferenceType): string {
+  const indexOfNumber = xc.search(/[0-9]/);
+  const hasCol = indexOfNumber !== 0;
+  const hasRow = indexOfNumber >= 0;
   switch (referenceType) {
     case "col":
+      if (!hasCol) return xc;
       return "$" + xc;
     case "row":
-      indexOfNumber = xc.search(/[0-9]/);
+      if (!hasRow) return xc;
       return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
     case "colrow":
-      indexOfNumber = xc.search(/[0-9]/);
-      if (indexOfNumber === -1 || indexOfNumber === 0) {
-        // no row number (eg. A) or no column (eg. 1)
-        return "$" + xc;
-      }
-      xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
-      return "$" + xc;
+      if (!hasRow || !hasCol) return "$" + xc;
+      return "$" + xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
     case "none":
       return xc;
   }

tests/helpers/reference_types_helpers.test.ts

@@ -1,5 +1,8 @@
 import { Token } from "../../src/formulas";
-import { loopThroughReferenceType } from "../../src/helpers/reference_type";
+import {
+  loopThroughReferenceType,
+  setXcToFixedReferenceType,
+} from "../../src/helpers/reference_type";
 
 function refToken(referenceString: string): Token {
   return { type: "REFERENCE", value: referenceString };
@@ -68,4 +71,31 @@ describe("loopThroughReferenceType", () => {
     );
     expect(loopThroughReferenceType(refToken("Sheet2!$A1:$B1"))).toEqual(refToken("Sheet2!A1:B1"));
   });
+
+  describe("setXcToFixedReferenceType", () => {
+    test.each(["A1", "$A1", "A$1", "$A$1"])("simple ref", (ref) => {
+      expect(setXcToFixedReferenceType(ref, "none")).toBe("A1");
+      expect(setXcToFixedReferenceType(ref, "col")).toBe("$A1");
+      expect(setXcToFixedReferenceType(ref, "row")).toBe("A$1");
+      expect(setXcToFixedReferenceType(ref, "colrow")).toBe("$A$1");
+    });
+
+    test.each(["Sheet!A1", "Sheet!$A1", "Sheet!A$1", "Sheet!$A$1"])("with sheetName", (ref) => {
+      expect(setXcToFixedReferenceType(ref, "none")).toBe("Sheet!A1");
+      expect(setXcToFixedReferenceType(ref, "col")).toBe("Sheet!$A1");
+      expect(setXcToFixedReferenceType(ref, "row")).toBe("Sheet!A$1");
+      expect(setXcToFixedReferenceType(ref, "colrow")).toBe("Sheet!$A$1");
+    });
+
+    // ranges = [A1:C3, $A1:C3 ... A1:$C3 ... $A$1:$C$3]
+    const ranges = ["A1", "$A1", "A$1", "$A$1"].flatMap((topLeft) =>
+      ["C3", "$C3", "C$3", "$C$3"].map((bottomRight) => `${topLeft}:${bottomRight}`)
+    );
+    test.each(ranges)("ranges", (ref) => {
+      expect(setXcToFixedReferenceType(ref, "none")).toBe("A1:C3");
+      expect(setXcToFixedReferenceType(ref, "col")).toBe("$A1:$C3");
+      expect(setXcToFixedReferenceType(ref, "row")).toBe("A$1:C$3");
+      expect(setXcToFixedReferenceType(ref, "colrow")).toBe("$A$1:$C$3");
+    });
+  });
 });