Skip to content

[FIX] range: invalid sheet name with special character #7433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 19.0
Choose a base branch
from
+20 −3
Open

[FIX] range: invalid sheet name with special character #7433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/helpers/range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export function getRangeString(
let sheetName: string = "";
if (prefixSheet) {
if (range.invalidSheetName) {
sheetName = range.invalidSheetName;
sheetName = getCanonicalSymbolName(range.invalidSheetName);
} else {
sheetName = getCanonicalSymbolName(getSheetName(range.sheetId));
}
Expand Down
12 changes: 12 additions & 0 deletions tests/model/model_import_export.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,13 @@ describe("Migrations", () => {

const cfs = data.sheets[1].conditionalFormats;
const rule1 = cfs[0].rule as ColorScaleRule;
<<<<<<< 108241aef1e4dfe05d441cdacf4a459b08cd5e1a
expect(cfs[0].ranges).toEqual(["sheetName_!A1:A2"]);
||||||| 49f1e4223a0d7252d8bd63d4bb4b213821897bde
expect(cfs[0].ranges).toEqual(["=sheetName_!A1:A2"]);
=======
expect(cfs[0].ranges).toEqual(["'=sheetName_'!A1:A2"]);
>>>>>>> ab933007c2faa6928837d4a5aa5e81bd3d4694f7
expect(rule1.minimum.value).toEqual("=sheetName_!B1");
expect(rule1.midpoint?.value).toEqual("=sheetName_!B1");
expect(rule1.maximum.value).toEqual("=sheetName_!B1");
Expand All @@ -314,7 +320,13 @@ describe("Migrations", () => {
expect(rule2.upperInflectionPoint.value).toEqual("=sheetName_!B1");

const rule3 = cfs[2].rule as ColorScaleRule;
<<<<<<< 108241aef1e4dfe05d441cdacf4a459b08cd5e1a
expect(cfs[2].ranges).toEqual(["sheetName_!A1:A2"]);
||||||| 49f1e4223a0d7252d8bd63d4bb4b213821897bde
expect(cfs[2].ranges).toEqual(["=sheetName_!A1:A2"]);
=======
expect(cfs[2].ranges).toEqual(["'=sheetName_'!A1:A2"]);
>>>>>>> ab933007c2faa6928837d4a5aa5e81bd3d4694f7
expect(rule3.minimum.value).toEqual("33");
expect(rule3.midpoint?.value).toEqual("13");
expect(rule3.maximum.value).toBeUndefined();
Expand Down
9 changes: 7 additions & 2 deletions tests/range_plugin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,16 @@ describe("range plugin", () => {
}
);

test("invalid sheet name with special character", () => {
const range = m.getters.getRangeFromSheetXC("s1", "'Invalid Sheet Name'!A1");
expect(m.getters.getRangeString(range, "s1")).toBe("'Invalid Sheet Name'!A1");
});

test.each([
["s1!!!A1:A9", "'s1!!'!A1:A9"],
["'s1!!'!A1:A9", "'s1!!'!A1:A9"],
["s1!!!A1:s1!!!A9", "s1!!!A1:s1!!!A9"],
["s1!!!A1:s1!!!A9", "s1!!!A1:s1!!!A9"],
["s1!!!A1:s1!!!A9", "'s1!!!A1:s1!!'!A9"],
["s1!!!A1:s1!!!A9", "'s1!!!A1:s1!!'!A9"],
])(
"xc with more than one exclamation mark does not throw error",
(rangeString, expectedString) => {
Expand Down