From 27f55edf3cd994ea032e27e11685860b4ec24741 Mon Sep 17 00:00:00 2001 From: Jordan Blasenhauer Date: Tue, 30 Jul 2024 15:09:50 +0200 Subject: [PATCH] refactor utils and update modal component * add utils to check widget type * remove useless utils and move others to modal component --- .../dashboard/components/Builder/Bans.vue | 17 +- .../components/Builder/GlobalConfig.vue | 10 +- .../dashboard/components/Builder/Home.vue | 6 +- .../components/Builder/Instances.vue | 3 +- .../dashboard/components/Builder/Jobs.vue | 11 +- .../dashboard/components/Builder/Plugins.vue | 15 +- .../dashboard/components/Builder/Reports.vue | 17 +- .../dashboard/components/Builder/Services.vue | 11 +- .../dashboard/components/Builder/Setup.vue | 1 + .../dashboard/components/Widget/Button.vue | 56 ++- .../dashboard/components/Widget/Cell.vue | 14 +- .../dashboard/components/Widget/Modal.vue | 166 ++++--- src/ui/client/dashboard/pages/bans/Bans.vue | 9 +- .../pages/global-config/globalConfig.vue | 5 - src/ui/client/dashboard/pages/home/Home.vue | 5 - .../dashboard/pages/instances/Instances.vue | 7 - src/ui/client/dashboard/pages/jobs/Jobs.vue | 2 - .../dashboard/pages/plugins/Plugins.vue | 3 - .../dashboard/pages/reports/reports.vue | 7 - .../dashboard/pages/services/index.html | 2 +- .../dashboard/pages/services/services.vue | 7 - src/ui/client/dashboard/utils/form.js | 22 +- src/ui/client/dashboard/utils/global.js | 177 +------- src/ui/client/setup/Setup.vue | 5 - src/ui/client/tests/services.json | 404 +++++++++++++++++- src/ui/client/tests/services.py | 47 +- src/ui/client/tests/services.txt | 2 +- 27 files changed, 659 insertions(+), 372 deletions(-) diff --git a/src/ui/client/dashboard/components/Builder/Bans.vue b/src/ui/client/dashboard/components/Builder/Bans.vue index ab6b2db54..0d5cc1512 100644 --- a/src/ui/client/dashboard/components/Builder/Bans.vue +++ b/src/ui/client/dashboard/components/Builder/Bans.vue @@ -7,6 +7,7 @@ import Subtitle from "@components/Widget/Subtitle.vue"; import Table from "@components/Widget/Table.vue"; import ListPairs from "@components/List/Pairs.vue"; import MessageUnmatch from "@components/Message/Unmatch.vue"; +import { useEqualStr } from "@utils/global.js"; /** @name Builder/Bans.vue @@ -47,23 +48,17 @@ const props = defineProps({