From 8b5b88e18b7c2f7bf8a88309c4baacdc1ab71d7d Mon Sep 17 00:00:00 2001 From: Ryan Cooley Date: Fri, 23 Feb 2024 08:48:40 -0800 Subject: [PATCH] =?UTF-8?q?Revert=20"FOUR-13480=20|=20Implement=20Template?= =?UTF-8?q?=20Listing=20UI=20Under=20=E2=80=98My=20Templates=E2=80=99=20Ta?= =?UTF-8?q?b"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Process/ScreenController.php | 16 +- .../js/components/shared/EllipsisMenu.vue | 21 +- .../components/shared/ellipsisMenuActions.js | 25 -- .../components/MyTemplatesListing.vue | 230 ------------------ .../js/processes/screen-templates/index.js | 26 -- .../components/categorized_resource.blade.php | 77 +----- .../views/processes/screens/index.blade.php | 16 +- .../processes/screens/myTemplates.blade.php | 30 --- .../screens/publicTemplates.blade.php | 0 webpack.mix.js | 1 - 10 files changed, 8 insertions(+), 434 deletions(-) delete mode 100644 resources/js/processes/screen-templates/components/MyTemplatesListing.vue delete mode 100644 resources/js/processes/screen-templates/index.js delete mode 100644 resources/views/processes/screens/myTemplates.blade.php delete mode 100644 resources/views/processes/screens/publicTemplates.blade.php diff --git a/ProcessMaker/Http/Controllers/Process/ScreenController.php b/ProcessMaker/Http/Controllers/Process/ScreenController.php index 1ae64dc53b..109a4f523c 100644 --- a/ProcessMaker/Http/Controllers/Process/ScreenController.php +++ b/ProcessMaker/Http/Controllers/Process/ScreenController.php @@ -56,21 +56,7 @@ public function index(Request $request) 'countCategories' => ScreenCategory::where(['status' => 'ACTIVE', 'is_system' => false])->count(), ]; - $myScreenTemplates = (object) [ - - ]; - - $publicScreenTemplates = (object) [ - - ]; - - return view('processes.screens.index', - compact( - 'listConfig', - 'catConfig', - 'myScreenTemplates', - 'publicScreenTemplates', - )); + return view('processes.screens.index', compact('listConfig', 'catConfig')); } /** diff --git a/resources/js/components/shared/EllipsisMenu.vue b/resources/js/components/shared/EllipsisMenu.vue index ccbc57998b..d100f218ff 100644 --- a/resources/js/components/shared/EllipsisMenu.vue +++ b/resources/js/components/shared/EllipsisMenu.vue @@ -25,10 +25,6 @@ - @@ -114,22 +110,7 @@ export default { components: { PmqlInput }, filters: { }, mixins: [], - props: [ - "actions", - "permission", - "data", - "isDocumenterInstalled", - "divider", - "lauchpad", - "screenTemplate", - "customButton", - "showProgress", - "isPackageInstalled", - "searchBar", - "variant", - "redirectTo", - "redirectId", - ], + props: ["actions", "permission", "data", "isDocumenterInstalled", "divider", "lauchpad", "customButton", "showProgress", "isPackageInstalled", "searchBar", "variant", "redirectTo", "redirectId"], data() { return { active: false, diff --git a/resources/js/components/shared/ellipsisMenuActions.js b/resources/js/components/shared/ellipsisMenuActions.js index 05dd07a158..554373c513 100644 --- a/resources/js/components/shared/ellipsisMenuActions.js +++ b/resources/js/components/shared/ellipsisMenuActions.js @@ -253,31 +253,6 @@ export default { permission: ["delete-decision_tables", "view-additional-asset-actions"] }, ], - myTemplateActions: [ - //TODO: Update My Template Ellipsis Menu Actions - { - value: "edit-template", - content: "Edit Template", - link: true, - href: "/designer/screen-builder/{{id}}/edit", - permission: ["edit-screens", "view-additional-asset-actions"], - icon: "fas fa-pen-square", - }, - { - value: "make-public", - content: "Make Public", - link: true, - href: "/designer/screens/{{id}}/edit", - permission: ["edit-screens", "view-additional-asset-actions"], - icon: "fas fa-file-export", - }, - { - value: "delete-template", - content: "Delete Template", - permission: ["delete-screens", "view-additional-asset-actions"], - icon: "fas fa-trash-alt", - }, - ], }; }, }; diff --git a/resources/js/processes/screen-templates/components/MyTemplatesListing.vue b/resources/js/processes/screen-templates/components/MyTemplatesListing.vue deleted file mode 100644 index 91c4dfe4af..0000000000 --- a/resources/js/processes/screen-templates/components/MyTemplatesListing.vue +++ /dev/null @@ -1,230 +0,0 @@ - - - - - diff --git a/resources/js/processes/screen-templates/index.js b/resources/js/processes/screen-templates/index.js deleted file mode 100644 index 2a0e9fcc79..0000000000 --- a/resources/js/processes/screen-templates/index.js +++ /dev/null @@ -1,26 +0,0 @@ -import Vue from "vue"; -import MyTemplatesListing from "../screen-templates/components/MyTemplatesListing"; - -new Vue({ - el: "#myTemplatesIndex", - components: { - MyTemplatesListing, - }, - data: { - filter: "", - pmql: "", - urlPmql: "", - }, - methods: { - onNLQConversion(query) { - this.onChange(query); - this.reload(); - }, - onChange(query) { - this.pmql = query; - }, - reload() { - this.$refs.myTemplatesListing.fetch(); - }, - }, -}); diff --git a/resources/views/components/categorized_resource.blade.php b/resources/views/components/categorized_resource.blade.php index 54dcb355be..d5b1aa75f6 100644 --- a/resources/views/components/categorized_resource.blade.php +++ b/resources/views/components/categorized_resource.blade.php @@ -46,27 +46,6 @@ @endisset - @elseif (isset($myScreenTemplates)) - @if ($catConfig->permissions['view']) - - @endif - - @else @if ($catConfig->permissions['view'] && $catConfig->routes->itemsIndexWeb !== "data-sources.index")