fix: Fix some route redirection issues

Author: ssongliu

frontend/src/layout/components/Sidebar/components/Collapse.vue

@@ -402,6 +402,7 @@ onMounted(() => {
         padding: 3px 0;
     }
     .msg-tag {
+        margin-top: 3px;
         float: right;
         background-color: transparent;
         color: var(--panel-main-bg-color-1);

frontend/src/routers/index.ts

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

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: '/',
+    path: '/dashboard',
     name: 'Home-Menu',
     component: Layout,
-    redirect: '/',
+    redirect: '/dashboard',
     meta: {
         keepAlive: true,
         title: 'menu.home',
         icon: 'p-home',
     },
     children: [
         {
-            path: '/',
+            path: '/dashboard',
             name: 'home',
             component: () => import('@/views/home/index.vue'),
             meta: {

frontend/src/views/log/operation/index.vue

@@ -41,7 +41,7 @@
                     <el-option :label="$t('commons.status.success')" value="Success" />
                     <el-option :label="$t('commons.status.failed')" value="Failed" />
                 </el-select>
-                <el-select v-model="searchNode" @change="search()" clearable class="p-w-200">
+                <el-select v-if="globalStore.isAdmin" v-model="searchNode" @change="search()" clearable class="p-w-200">
                     <template #prefix>{{ $t('xpack.node.node') }}</template>
                     <el-option :label="$t('commons.table.all')" value="" />
                     <el-option v-for="(node, index) in nodes" :key="index" :label="node.name" :value="node.name" />
@@ -207,9 +207,10 @@ const onSubmitClean = async () => {
 };
 
 onMounted(() => {
-    if (globalStore.isMasterProductPro) {
+    if (globalStore.isAdmin && globalStore.isMasterProductPro) {
         loadNodes();
     }
+    searchNode.value = globalStore.isAdmin ? '' : globalStore.currentNode;
     search();
 });
 </script>

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

@@ -427,7 +427,7 @@ const login = (formEl: FormInstance | undefined) => {
             menuStore.setMenuList([]);
             tabsStore.removeAllTabs();
             globalStore.isAdmin = res.data.role === 'ADMIN';
-            changeToLocal();
+            await changeToLocal();
             MsgSuccess(i18n.t('commons.msg.loginSuccess'));
             localStorage.removeItem('dashboardCache');
             localStorage.removeItem('upgradeChecked');
@@ -473,7 +473,7 @@ const mfaLogin = async (auto: boolean) => {
             tabsStore.removeAllTabs();
             MsgSuccess(i18n.t('commons.msg.loginSuccess'));
             globalStore.isAdmin = res.data.role === 'ADMIN';
-            changeToLocal();
+            await changeToLocal();
             localStorage.removeItem('dashboardCache');
             localStorage.removeItem('upgradeChecked');
             routerToName('home');
@@ -522,7 +522,7 @@ const passkeyLogin = async () => {
         globalStore.setAgreeLicense(true);
         menuStore.setMenuList([]);
         tabsStore.removeAllTabs();
-        changeToLocal();
+        await changeToLocal();
         MsgSuccess(i18n.t('commons.msg.loginSuccess'));
         localStorage.removeItem('dashboardCache');
         localStorage.removeItem('upgradeChecked');
@@ -531,7 +531,6 @@ const passkeyLogin = async () => {
     } catch (res: any) {
         if (res?.message) {
             MsgError(i18n.t('commons.login.passkeyFailed'));
-            console.log(res.message);
         }
     } finally {
         isLoggingIn = false;

frontend/src/views/setting/panel/index.vue

@@ -7,7 +7,7 @@
                         <el-col :span="1"><br /></el-col>
                         <el-col :xs="24" :sm="20" :md="15" :lg="12" :xl="12">
                             <el-form-item :label="$t('setting.user')" prop="userName">
-                                <el-input disabled v-model="form.userName">
+                                <el-input type="password" disabled v-model="form.userName">
                                     <template #append>
                                         <el-button @click="onChangeUserName()" icon="Setting">
                                             {{ $t('commons.button.set') }}
@@ -335,7 +335,7 @@ const search = async () => {
     form.systemIP = agentRes.data.systemIP;
 
     const res = await getSettingInfo();
-    form.userName = res.data.userName;
+    form.userName = '******';
     form.password = '******';
     form.theme = res.data.theme;
     form.menuTabs = res.data.menuTabs;
@@ -388,7 +388,7 @@ const onChangePassword = () => {
     passwordRef.value.acceptParams({ complexityVerification: form.complexityVerification });
 };
 const onChangeUserName = () => {
-    userNameRef.value.acceptParams({ userName: form.userName });
+    userNameRef.value.acceptParams();
 };
 const onChangeTitle = () => {
     panelNameRef.value.acceptParams({ panelName: form.panelName });

frontend/src/views/setting/panel/username/index.vue

@@ -25,9 +25,6 @@ import router from '@/routers';
 import { GlobalStore } from '@/store';
 const globalStore = GlobalStore();
 
-interface DialogProps {
-    userName: string;
-}
 const drawerVisible = ref();
 const loading = ref();
 
@@ -39,8 +36,7 @@ const rules = reactive({
 });
 const formRef = ref<FormInstance>();
 
-const acceptParams = (params: DialogProps): void => {
-    form.userName = params.userName;
+const acceptParams = (): void => {
     drawerVisible.value = true;
 };
 

frontend/src/views/setting/safe/index.vue

@@ -446,7 +446,6 @@ const registerPasskey = async () => {
         await loadPasskeys();
     } catch (res: any) {
         if (res?.message) {
-            console.log(res.message);
             MsgError(i18n.global.t('setting.passkeyFailed'));
         }
     } finally {