feat: Add Enterprise Edition redirection logic

Author: ssongliu

frontend/src/api/interface/auth.ts

@@ -40,6 +40,7 @@ export namespace Login {
         panelName: string;
         theme: string;
         isOffLine: boolean;
+        isXpackEE: boolean;
         needCaptcha: boolean;
         passkeySetting: boolean;
     }

frontend/src/api/modules/setting.ts

@@ -43,22 +43,24 @@ export const loadLicenseOptions = () => {
 export const listNodeOptions = (type: string) => {
     return http.post<Array<Setting.NodeItem>>(`/core/nodes/list`, { type: type });
 };
-export const loadNodeByUser = () => {
-    return http.get<Array<Setting.NodeItem>>(`/core/xpackee/users/nodes`);
-};
-
 export const listAllSimpleNodes = () => {
     return http.get<Array<Setting.SimpleNodeItem>>(`/core/nodes/simple/all`);
 };
-
 export const getLicenseSmsInfo = () => {
     return http.get<Setting.SmsInfo>(`/core/licenses/sms/info`);
 };
-
 export const listAppNodes = () => {
     return http.get<Array<Setting.NodeAppItem>>(`/core/xpack/nodes/apps/update`, {}, { timeout: TimeoutEnum.T_60S });
 };
 
+// xpackee
+export const loadNodeByUser = () => {
+    return http.get<Array<Setting.NodeItem>>(`/core/xpackee/users/nodes`);
+};
+export const getXpackEELicenseStatus = () => {
+    return http.get<Setting.LicenseStatus>(`/core/xpackee/licenses/status`);
+};
+
 // agent
 export const loadBaseDir = () => {
     return http.get<string>(`/settings/basedir`);

frontend/src/components/router-button/index.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script lang="ts" setup>
-import { routerToName, routerToPath } from '@/utils/router';
+import { routerToNameWithQuery, routerToPathWithQuery } from '@/utils/router';
 import { computed, onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -46,8 +46,8 @@ const activeName = ref('');
 const handleChange = (label: string) => {
     const btn = buttonArray.value.find((btn) => btn.label === label);
     if (!btn) return;
-    if (btn.path) routerToPath(btn.path);
-    else if (btn.name) routerToName(btn.name);
+    if (btn.path) routerToPathWithQuery(btn.path, { uncached: 'true' });
+    else if (btn.name) routerToNameWithQuery(btn.name, { uncached: 'true' });
     activeName.value = btn.label;
 };
 

frontend/src/routers/index.ts

@@ -11,7 +11,7 @@ router.beforeEach((to, from, next) => {
     NProgress.start();
     axiosCanceler.removeAllPending();
     const globalStore = GlobalStore();
-    if (!globalStore.isAdmin && to.name === 'Panel') {
+    if (globalStore.isXpackEE && !globalStore.isAdmin && to.name === 'Panel') {
         next({
             name: 'Alert',
         });

frontend/src/routers/router.ts

@@ -7,18 +7,18 @@ const xpackEEModules: Record<string, RouteRecordRaw> = import.meta.glob('../xpac
 modules = { ...modules, ...xpackModules, ...xpackEEModules };
 
 const homeRouter: RouteRecordRaw = {
-    path: '/dashboard',
+    path: '/',
     name: 'Home-Menu',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/',
     meta: {
         keepAlive: true,
         title: 'menu.home',
         icon: 'p-home',
     },
     children: [
         {
-            path: '/dashboard',
+            path: '/',
             name: 'home',
             component: () => import('@/views/home/index.vue'),
             meta: {

frontend/src/store/interface/index.ts

@@ -27,37 +27,43 @@ export interface Watermark {
 }
 
 export interface GlobalState {
-    isLoading: boolean;
-    loadingText: string;
-    isLogin: boolean;
-    entrance: string;
     language: string; // zh | en | tw
+    device: DeviceType;
     themeConfig: ThemeConfigProp;
+    // ui
     isFullScreen: boolean;
     openMenuTabs: boolean;
     watermark: Watermark;
     watermarkShow: boolean;
-    isOnRestart: boolean;
+    isLoading: boolean;
+    loadingText: string;
+    // auth
+    ignoreCaptcha: boolean;
     agreeLicense: boolean;
+    isLogin: boolean;
+    entrance: string;
+    // context
     hasNewVersion: boolean;
-    ignoreCaptcha: boolean;
-    device: DeviceType;
     lastFilePath: string;
     currentDB: string;
     currentPgDB: string;
     currentRedisDB: string;
     showEntranceWarn: boolean;
     defaultNetwork: string;
     defaultIO: string;
-    isFxplay: boolean;
-
+    isOnRestart: boolean;
+    // tags
     isAdmin: boolean;
-    isProductPro: boolean;
+    isXpackEE: boolean;
     isIntl: boolean;
+    isFxplay: boolean;
+    isOffLine: boolean;
+    // license
+    isProductPro: boolean;
     productProExpires: number;
     isMasterProductPro: boolean;
-    isOffLine: boolean;
-
+    isXpackEELicensed: boolean;
+    // multi-node
     masterAlias: string;
     currentNode: string;
     currentNodeAddr: string;

frontend/src/store/modules/global.ts

@@ -7,11 +7,8 @@ import i18n, { setActiveLocale } from '@/lang';
 const GlobalStore = defineStore({
     id: 'GlobalState',
     state: (): GlobalState => ({
-        isLoading: false,
-        loadingText: '',
-        isLogin: false,
-        entrance: '',
         language: '',
+        device: DeviceType.Desktop,
         themeConfig: {
             panelName: '',
             primary: '#005eeb',
@@ -27,31 +24,40 @@ const GlobalStore = defineStore({
             loginBgType: '',
             loginBtnLinkColor: '',
         },
+        // ui
+        isFullScreen: false,
+        openMenuTabs: false,
         watermark: null,
         watermarkShow: false,
-        openMenuTabs: false,
-        isFullScreen: false,
-        isOnRestart: false,
+        isLoading: false,
+        loadingText: '',
+        // auth
+        ignoreCaptcha: true,
         agreeLicense: false,
+        isLogin: false,
+        entrance: '',
+        // context
         hasNewVersion: false,
-        ignoreCaptcha: true,
-        device: DeviceType.Desktop,
         lastFilePath: '',
         currentDB: '',
         currentPgDB: '',
         currentRedisDB: '',
         showEntranceWarn: true,
         defaultNetwork: 'all',
         defaultIO: 'all',
-        isFxplay: false,
-
+        isOnRestart: false,
+        // tags
         isAdmin: false,
-        isProductPro: false,
+        isXpackEE: false,
         isIntl: false,
+        isFxplay: false,
+        isOffLine: false,
+        // license
+        isProductPro: false,
         productProExpires: 0,
         isMasterProductPro: false,
-        isOffLine: false,
-
+        isXpackEELicensed: false,
+        // multi-node
         masterAlias: '',
         currentNode: 'local',
         currentNodeAddr: '',

frontend/src/views/login/components/login-form.vue

@@ -586,6 +586,7 @@ const getSetting = async () => {
         isFxplay.value = res.data.isFxplay;
         globalStore.isFxplay = isFxplay.value;
         globalStore.isOffLine = res.data.isOffLine;
+        globalStore.isXpackEE = res.data.isXpackEE;
         globalStore.ignoreCaptcha = !res.data.needCaptcha;
         passkeySetting.value = res.data.passkeySetting;
         if (!globalStore.ignoreCaptcha) {

frontend/src/views/setting/index.vue

@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import i18n from '@/lang';
 import { useGlobalStore } from '@/composables/useGlobalStore';
-const { isOffLine, isFxplay, isAdmin } = useGlobalStore();
+const { isOffLine, isFxplay, isAdmin, isXpackEE } = useGlobalStore();
 
 const buttons = [
     {
@@ -35,7 +35,7 @@ const buttons = [
     },
     {
         label: i18n.global.t('setting.license'),
-        path: '/settings/license',
+        path: isXpackEE.value ? '/xpack-ee/license' : '/settings/license',
     },
     {
         label: i18n.global.t('setting.about'),
@@ -50,7 +50,7 @@ onMounted(() => {
     if (isFxplay.value) {
         buttons.splice(6, 1);
     }
-    if (!isAdmin.value) {
+    if (isXpackEE.value && !isAdmin.value) {
         buttons.splice(0, 1);
         buttons.splice(0, 1);
         buttons.splice(3, 1);