From 392fee66a2f9f6da07480e493a6c683d7a761e48 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 13 Nov 2023 11:25:13 +0530 Subject: [PATCH 1/5] ci: Auto format vue files with prettier --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7443bde6a8..5561068486 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: rev: v2.7.1 hooks: - id: prettier - types_or: [javascript] + types_or: [javascript, vue] # Ignore any files that might contain jinja / bundles exclude: | (?x)^( From b4bc871aab74f2c49ab894a2b4b4062dd5f8c040 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 13 Nov 2023 11:26:00 +0530 Subject: [PATCH 2/5] style: Auto format vue file with prettier - Ran pre-commit run --all-files --- .../js/form_builder/components/SearchBox.vue | 2 +- .../js/form_builder/components/Tabs.vue | 8 +- .../components/controls/ButtonControl.vue | 6 +- .../components/controls/CheckControl.vue | 5 +- .../components/controls/DataControl.vue | 7 +- .../components/controls/SelectControl.vue | 25 +- .../components/controls/TextControl.vue | 2 +- .../js/frappe/build_events/BuildError.vue | 13 +- .../js/frappe/build_events/BuildSuccess.vue | 12 +- .../js/frappe/file_uploader/FileBrowser.vue | 67 ++- .../js/frappe/file_uploader/FilePreview.vue | 54 ++- .../js/frappe/file_uploader/FileUploader.vue | 448 +++++++++++------- .../js/frappe/file_uploader/ImageCropper.vue | 33 +- .../js/frappe/file_uploader/ProgressRing.vue | 9 +- .../js/frappe/file_uploader/WebLink.vue | 8 +- .../print_format_builder/ConfigureColumns.vue | 12 +- .../public/js/print_format_builder/Field.vue | 45 +- .../js/print_format_builder/HTMLEditor.vue | 9 +- .../print_format_builder/LetterHeadEditor.vue | 168 +++---- .../js/print_format_builder/Preview.vue | 16 +- .../js/print_format_builder/PrintFormat.vue | 10 +- .../PrintFormatBuilder.vue | 6 +- .../PrintFormatControls.vue | 68 +-- .../PrintFormatSection.vue | 54 +-- .../components/ActionNode.vue | 20 +- .../components/ConnectionLine.vue | 6 +- 26 files changed, 574 insertions(+), 539 deletions(-) diff --git a/frappe/public/js/form_builder/components/SearchBox.vue b/frappe/public/js/form_builder/components/SearchBox.vue index bae326058d..050037a6b0 100644 --- a/frappe/public/js/form_builder/components/SearchBox.vue +++ b/frappe/public/js/form_builder/components/SearchBox.vue @@ -6,7 +6,7 @@ class="search-input form-control" type="text" :placeholder="__('Search properties...')" - @input="event => $emit('update:modelValue', event.target.value)" + @input="(event) => $emit('update:modelValue', event.target.value)" />
diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue index 6f2ace4d13..ef8674f4c4 100644 --- a/frappe/public/js/form_builder/components/Tabs.vue +++ b/frappe/public/js/form_builder/components/Tabs.vue @@ -13,7 +13,7 @@ const store = useStore(); const { Backspace } = useMagicKeys(); whenever(Backspace, (value) => { if (value && selected.value && store.not_using_input) { - remove_tab(store.current_tab, '', true); + remove_tab(store.current_tab, "", true); } }); @@ -45,12 +45,10 @@ function add_new_section() { function is_tab_empty(tab) { // check if sections have columns and it contains fields - return !tab.sections.some((section) => - section.columns.some((column) => column.fields.length) - ); + return !tab.sections.some((section) => section.columns.some((column) => column.fields.length)); } -function remove_tab(tab, event, force=false) { +function remove_tab(tab, event, force = false) { // is remove_tab_btn is not visible then return if (!event?.currentTarget?.offsetParent && !force) return; diff --git a/frappe/public/js/form_builder/components/controls/ButtonControl.vue b/frappe/public/js/form_builder/components/controls/ButtonControl.vue index 46fc97052c..6642d5dc49 100644 --- a/frappe/public/js/form_builder/components/controls/ButtonControl.vue +++ b/frappe/public/js/form_builder/components/controls/ButtonControl.vue @@ -4,10 +4,7 @@ const props = defineProps(["df", "value"]);