From 3e6b9a999536858fa3cd8423a94e25fbd1b1f0eb Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Thu, 14 Nov 2024 15:41:18 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 29 +++++++++++++++++------------ src/views/MainLayout.vue | 4 ++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app.config.ts b/src/app.config.ts index f59817cf..e989d051 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -56,20 +56,25 @@ const path = import.meta.env.VITE_MANUAL_URL ?? "https://bma-ehr-manual.frappet.synology.me"; -const generatePopupPath = (routeName: any) => { - if (routeName.includes("viewLogs")) { - return `${path}/manual/chapter-2-superadmin-maintenance`; - } - if (routeName.includes("manageUsers")) { - return `${path}/manual/chapter-2-superadmin-maintenance`; - } - if (routeName.includes("manageRoles")) { - return `${path}/manual/chapter-2-superadmin-maintenance`; - } - if (routeName.includes("managePermission")) { +const generatePopupPath = (check: any) => { + // if (routeName.includes("viewLogs")) { + // return `${path}/manual/chapter-2-superadmin-maintenance`; + // } + // if (routeName.includes("manageUsers")) { + // return `${path}/manual/chapter-2-superadmin-maintenance`; + // } + // if (routeName.includes("manageRoles")) { + // return `${path}/manual/chapter-2-superadmin-maintenance`; + // } + // if (routeName.includes("managePermission")) { + // return `${path}/manual/chapter-2-superadmin-maintenance`; + // } + if (!check) { + return `${path}/manual/chapter-1-superadmin-maintenance`; + } else if (check) { return `${path}/manual/chapter-2-superadmin-maintenance`; } else { - return manualConfig[routeName as keyof typeof manualConfig]; + return manualConfig[check as keyof typeof manualConfig]; } }; diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 8f887f18..f99f734a 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -303,9 +303,9 @@ function handleButtonClick() { const currentPath = route.name; const queryParams = { role: "admin" }; // Replace with your query parameters const queryString = new URLSearchParams(queryParams).toString(); - + const findRole = role.value.includes('SUPER_ADMIN') // Assuming config.generatePopupPath() returns a base URL - const popupBasePath = config.generatePopupPath(currentPath); + const popupBasePath = config.generatePopupPath(findRole); if (popupBasePath) { const popupPath = `${popupBasePath}?${queryString}`;