yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Self-hosted grist embeds not matching

Browse Source 
closes #6451
This commit is contained in:
Tom Moor
2024-02-10 15:58:40 -05:00
parent 012d8c2ae7
commit 2d6a7ed244
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shared/editor/embeds/index.tsx
View File

@@ -93,7 +93,9 @@ export class EmbedDescriptor {
matcher(url: string): false | RegExpMatchArray { matcher(url: string): false | RegExpMatchArray {
const regexes = this.regexMatch ?? []; const regexes = this.regexMatch ?? [];
const settingsDomainRegex = urlRegex(this.settings?.url); const settingsDomainRegex = this.settings?.url
? urlRegex(this.settings?.url)
: undefined;
if (settingsDomainRegex) { if (settingsDomainRegex) {
regexes.unshift(settingsDomainRegex); regexes.unshift(settingsDomainRegex);
@@ -372,11 +374,13 @@ const embeds: EmbedDescriptor[] = [
keywords: "spreadsheet", keywords: "spreadsheet",
regexMatch: [new RegExp("^https?://([a-z.-]+\\.)?getgrist\\.com/(.+)$")], regexMatch: [new RegExp("^https?://([a-z.-]+\\.)?getgrist\\.com/(.+)$")],
transformMatch: (matches: RegExpMatchArray) => { transformMatch: (matches: RegExpMatchArray) => {
if (matches[0].includes("style=singlePage")) { const input = matches.input ?? matches[0];
return matches[0];
if (input.includes("style=singlePage")) {
return input;
} }
return matches[0].replace(/(\?embed=true)?$/, "?embed=true"); return input.replace(/(\?embed=true)?$/, "?embed=true");
}, },
icon: <Img src="/images/grist.png" alt="Grist" />, icon: <Img src="/images/grist.png" alt="Grist" />,
}), }),

7
shared/utils/urls.test.ts
View File

@@ -138,5 +138,12 @@ describe("#urlRegex", () => {
it("should return corresponding regex otherwise", () => { it("should return corresponding regex otherwise", () => {
const regex = urlRegex("https://docs.google.com"); const regex = urlRegex("https://docs.google.com");
expect(regex?.source).toBe(/https:\/\/docs\.google\.com/.source); expect(regex?.source).toBe(/https:\/\/docs\.google\.com/.source);
expect(regex?.test("https://docs.google.com")).toBe(true);
expect(regex?.test("https://docs.google.com/")).toBe(true);
expect(regex?.test("https://docs.google.com/d/123")).toBe(true);
expect(regex?.test("http://google.com")).toBe(false);
expect(regex?.test("http://docs.google.com")).toBe(false);
expect(regex?.test("http://docs.google.com/")).toBe(false);
expect(regex?.test("http://docs.google.com/d/123")).toBe(false);
}); });
}); });