From 395670207a9dfbcee237c08aa47c453f1dcaf2f0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 16 Apr 2024 08:25:13 +0530 Subject: [PATCH 1/6] fix: Auto fetch webpage list --- frontend/src/data/webPage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/data/webPage.ts b/frontend/src/data/webPage.ts index 12392b83..88eb3c52 100644 --- a/frontend/src/data/webPage.ts +++ b/frontend/src/data/webPage.ts @@ -15,6 +15,7 @@ const webPages = createListResource({ "modified", "owner", ], + auto: true, cache: "pages", orderBy: "modified desc", pageLength: 50, From 27b0d72c9fb64c9b0080e8a032dab1a42ba20a78 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 16 Apr 2024 08:37:05 +0530 Subject: [PATCH 2/6] fix: Cypress config --- frontend/{cypress.config.js => cypress.config.mjs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frontend/{cypress.config.js => cypress.config.mjs} (100%) diff --git a/frontend/cypress.config.js b/frontend/cypress.config.mjs similarity index 100% rename from frontend/cypress.config.js rename to frontend/cypress.config.mjs From c3e6fb2529a462f4c3e9872f4b3ab162d27977d6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 16 Apr 2024 09:03:46 +0530 Subject: [PATCH 3/6] build: Fix vite-plugin version --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 3c62284c..f54b68a3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,7 +18,7 @@ "@tiptap/pm": "^2.0.4", "@tiptap/starter-kit": "^2.0.4", "@tiptap/vue-3": "^2.0.4", - "@vitejs/plugin-vue": "3", + "@vitejs/plugin-vue": "5", "@vueuse/components": "^10.2.1", "@vueuse/core": "^10.2.1", "ace-builds": "^1.22.0", From 86799791c379b6613a916bf50a17a24dfbfa3589 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 17 Apr 2024 12:03:48 +0530 Subject: [PATCH 4/6] fix: Add fallback text if value is empty closes: https://github.com/frappe/builder/issues/131 --- builder/builder/doctype/builder_page/builder_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/builder/doctype/builder_page/builder_page.py b/builder/builder/doctype/builder_page/builder_page.py index a0908aeb..3c1d04d3 100644 --- a/builder/builder/doctype/builder_page/builder_page.py +++ b/builder/builder/doctype/builder_page/builder_page.py @@ -509,7 +509,7 @@ def get_style_file_path(): def escape_single_quotes(text): - return text.replace("'", "\\'") + return (text or "").replace("'", "\\'") # def generate_tailwind_css_file_from_html(html): From b7fcf417921cd6bcaf1b933ad2aada19bcee9751 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 17 Apr 2024 12:03:58 +0530 Subject: [PATCH 5/6] fix: Do not show gray box on tab switch --- frontend/src/components/BuilderCanvas.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/BuilderCanvas.vue b/frontend/src/components/BuilderCanvas.vue index ee4082de..485c71d1 100644 --- a/frontend/src/components/BuilderCanvas.vue +++ b/frontend/src/components/BuilderCanvas.vue @@ -4,7 +4,7 @@
From c87b997b8f7e7fe94b54bb45c35c8e9e6417f489 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 17 Apr 2024 12:11:59 +0530 Subject: [PATCH 6/6] fix: Set parent position as relative if a child is a positioned element closes: https://github.com/frappe/builder/issues/128 --- frontend/src/utils/block.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/utils/block.ts b/frontend/src/utils/block.ts index 4df86e7a..33805db9 100644 --- a/frontend/src/utils/block.ts +++ b/frontend/src/utils/block.ts @@ -366,6 +366,13 @@ class Block implements BlockOptions { if (childBlock.isText()) { childBlock.makeBlockEditable(); } + + if (childBlock.getStyle("position")) { + if (!this.getStyle("position")) { + this.setStyle("position", "relative"); + } + } + return childBlock; } removeChild(child: Block) {