From d0499f4ac2626d68d4390020bdaa007c3fda872e Mon Sep 17 00:00:00 2001 From: Teisha McRae Date: Thu, 12 Sep 2024 00:49:12 -0400 Subject: [PATCH 1/3] Reconfigure template panel events to listen from screenbuilder Add data-cy attribute to templates button for testing --- resources/js/processes/screen-builder/screen.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/js/processes/screen-builder/screen.vue b/resources/js/processes/screen-builder/screen.vue index ede1b2d734..f7f549969c 100644 --- a/resources/js/processes/screen-builder/screen.vue +++ b/resources/js/processes/screen-builder/screen.vue @@ -488,6 +488,7 @@ export default { variant: "link", icon: "fas fa-palette", action: "openTemplatesPanel()", + dataCy: "button-templates", }, { id: "button_calcs", @@ -733,6 +734,14 @@ export default { ProcessMaker.EventBus.$on("show-create-template-modal", () => { this.$refs["create-template-modal"].show(); }); + + ProcessMaker.EventBus.$on("open-templates-panel", () => { + this.openMyTemplates(); + }); + + ProcessMaker.EventBus.$on("close-templates-panel", () => { + this.closeTemplatesPanel(); + }); }, methods: { ...mapMutations("globalErrorsModule", { setStoreMode: "setMode" }), From 9acfbca507c086c43e47a7a82b0d7f0de541d746 Mon Sep 17 00:00:00 2001 From: Teisha McRae Date: Thu, 12 Sep 2024 23:48:45 -0400 Subject: [PATCH 2/3] Handle fetching templates data in screen-builder Remove fetching of data from core --- .../js/processes/screen-builder/screen.vue | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/resources/js/processes/screen-builder/screen.vue b/resources/js/processes/screen-builder/screen.vue index f7f549969c..92c5a33634 100644 --- a/resources/js/processes/screen-builder/screen.vue +++ b/resources/js/processes/screen-builder/screen.vue @@ -30,11 +30,7 @@ :render-controls="displayBuilder" :process-id="processId" :show-templates-panel="showTemplatesPanel" - :my-templates-data="myTemplatesData" - :shared-templates-data="sharedTemplatesData" @change="updateConfig" - @close-templates-panel="closeTemplatesPanel" - @show-shared-templates="fetchSharedTemplates" > @@ -735,10 +731,6 @@ export default { this.$refs["create-template-modal"].show(); }); - ProcessMaker.EventBus.$on("open-templates-panel", () => { - this.openMyTemplates(); - }); - ProcessMaker.EventBus.$on("close-templates-panel", () => { this.closeTemplatesPanel(); }); @@ -1044,38 +1036,11 @@ export default { this.$refs.builder.redo(); }, openTemplatesPanel() { - //Filter to retrieve my templates. When select shared templates, refetch. - this.fetchMyTemplates(); this.showTemplatesPanel = true; }, closeTemplatesPanel() { this.showTemplatesPanel = false; }, - fetchMyTemplates() { - ProcessMaker.apiClient - .get( - "templates/screen?is_public=0", - ) - .then((response) => { - this.myTemplatesData = response.data.data; - }) - .catch((error) => { - console.error(error); - }); - }, - fetchSharedTemplates() { - ProcessMaker.apiClient - .get( - "templates/screen?is_public=1", - ) - .then((response) => { - this.sharedTemplatesData = response.data.data; - this.$emit('shared-templates-loaded'); - }) - .catch((error) => { - console.error(error); - }); - }, openComputedProperties() { this.$refs.computedProperties.show(); }, From 819e9d6c91ac87e5b6322256113109583e88eda8 Mon Sep 17 00:00:00 2001 From: Teisha McRae Date: Fri, 13 Sep 2024 00:34:09 -0400 Subject: [PATCH 3/3] Remove showTemplatesPanel and closeTemplatesPanel functionality --- resources/js/processes/screen-builder/screen.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/resources/js/processes/screen-builder/screen.vue b/resources/js/processes/screen-builder/screen.vue index 92c5a33634..2345ec654b 100644 --- a/resources/js/processes/screen-builder/screen.vue +++ b/resources/js/processes/screen-builder/screen.vue @@ -29,7 +29,6 @@ :screen="screen" :render-controls="displayBuilder" :process-id="processId" - :show-templates-panel="showTemplatesPanel" @change="updateConfig" > @@ -605,7 +604,6 @@ export default { ], }, iframeHeight: "600px", - showTemplatesPanel: false, myTemplatesData: null, sharedTemplatesData: null, }; @@ -730,10 +728,6 @@ export default { ProcessMaker.EventBus.$on("show-create-template-modal", () => { this.$refs["create-template-modal"].show(); }); - - ProcessMaker.EventBus.$on("close-templates-panel", () => { - this.closeTemplatesPanel(); - }); }, methods: { ...mapMutations("globalErrorsModule", { setStoreMode: "setMode" }), @@ -1036,10 +1030,7 @@ export default { this.$refs.builder.redo(); }, openTemplatesPanel() { - this.showTemplatesPanel = true; - }, - closeTemplatesPanel() { - this.showTemplatesPanel = false; + this.$refs.builder.openTemplatesPanel(); }, openComputedProperties() { this.$refs.computedProperties.show();