add ns to router path

charts/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: datatunerx-ui
-          image: release.daocloud.io/datatunerx/datatunerx-ui:v0.0.1-dev-abf7e99
+          image: release.daocloud.io/datatunerx/datatunerx-ui:v0.0.1-dev-fbada94
           env:
           - name: 'API_URL'
             value: "https://10.33.1.10:6443"

samples/rayservice.yaml

@@ -1,7 +1,7 @@
 apiVersion: ray.io/v1
 kind: RayService
 metadata:
-  name: finetune-sample5
+  name: finetune-sampleasdf
   namespace: datatunerx-dev
   labels:
     createdByFrontend: "true"

src/App.vue

@@ -1,5 +1,8 @@
 <template>
-  <div>
-    <router-view />
-  </div>
+  <router-view />
+  <dialog-wrapper />
 </template>
+
+<script lang="ts" setup>
+import { DialogWrapper } from '@dao-style/extend';
+</script>

src/api/ray-service.ts

@@ -176,3 +176,8 @@ const apiVersion = 'ray.io/v1';
 const kind = 'RayService';
 
 export const rayServiceClient = new K8sClient<RayService>(apiVersion, kind);
+
+export interface InferenceApplication {
+  name: string,
+  llmCheckpoint: string,
+}

src/components/AnakinHeader.vue

@@ -1,33 +1,21 @@
 <script setup lang="ts">
-
-// import { noop } from '@vueuse/core';
 import { i18n } from '@/plugins';
 import AnakinHeaderButton from '@/components/AnakinHeaderButton.vue';
 import Avatar from '@/assets/avatar.webp';
 import { useNamespaceStore } from '@/stores/namespace';
 import { useUserStore } from '@/stores/user';
 
-const userStore = useUserStore();
+const route = useRoute();
 const router = useRouter();
 
+const userStore = useUserStore();
+
 const logout = async () => {
   await userStore.logout();
   router.push('/');
 };
 
 const userOperation = computed(() => [
-  // {
-  //   label: i18n.t('components.AnakinHeader.user.personal-center'),
-  //   icon: 'icon-user',
-  //   href: './profile',
-  //   operate: noop,
-  // },
-  // {
-  //   label: i18n.t('components.AnakinHeader.user.setting'),
-  //   icon: 'icon-setting',
-  //   href: './settings',
-  //   operate: noop,
-  // },
   {
     label: i18n.t('components.AnakinHeader.user.logout'),
     icon: 'icon-logout',
@@ -45,6 +33,29 @@ const namespace = computed({
     namespaceStore.setNamespace(val);
   },
 });
+
+watch(namespace, (ns) => {
+  if (route.name === 'ConsoleContainer' && ns) {
+    router.push({
+      name: 'FinetuneExperimentList',
+      params: { ns },
+    });
+  } else {
+    router.push({
+      name: route.name as string,
+      params: { ns },
+    });
+  }
+}, {
+  immediate: true,
+});
+
+watch(() => route.params.ns, (ns) => {
+  if (ns) {
+    namespace.value = ns as string;
+  }
+});
+
 </script>
 
 <template>
@@ -58,7 +69,6 @@ const namespace = computed({
       >
     </div>
 
-    <!-- <span class="datatunerx-header__namespace"> {{ i18n.t('components.AnakinHeader.namespace') }} </span> -->
     <dao-select
       v-model="namespace"
       search
@@ -107,13 +117,6 @@ const namespace = computed({
                 >
                   {{ operate.label }}
                 </dao-button>
-                <!-- <dao-history-link
-                  :href="operate.href"
-                  :icon="operate.icon"
-                  class="datatunerx-user-drop--item"
-                >
-                  {{ operate.label }}
-                </dao-history-link> -->
               </dao-dropdown-item>
             </dao-dropdown-menu>
           </template>
@@ -138,16 +141,6 @@ $datatunerx-header-color: var(--dao-navigation-090);
   color: $datatunerx-header-color;
   background-color: $datatunerx-header-background;
 
-  &__product {
-    width: 210px;
-    /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
-    font-family: PingFang SC-Bold, PingFang SC;
-    font-size: 26px;
-    font-weight: bold;
-    color: #fff;
-    text-align: center;
-  }
-
   &__namespace {
     margin-left: 30px;
     font-size: 16px;

src/components/AnakinNav.vue

@@ -1,32 +1,50 @@
 <script lang="ts" setup>
 import { i18n } from '@/plugins';
+import { useNamespaceStore } from '@/stores/namespace';
 import { NavRoute } from '@/types/common';
 import { getActiveRouteFold } from '@/utils/util';
 
+const { namespace } = storeToRefs(useNamespaceStore());
+
 const routes = computed<NavRoute[]>(() => {
   const items = [
     {
-      to: { name: 'FinetuneExperimentList' },
+      to: {
+        name: 'FinetuneExperimentList',
+        params: { ns: namespace.value },
+      },
       display: i18n.t('components.AnakinHeader.menu.fineTuningExperiment'),
       icon: 'icon-engine',
     },
     {
-      to: { name: 'ModelRegistryList' },
+      to: {
+        name: 'ModelRegistryList',
+        params: { ns: namespace.value },
+      },
       display: i18n.t('components.AnakinHeader.menu.modeRegistry'),
       icon: 'icon-registry',
     },
     {
-      to: { name: 'DatasetList' },
+      to: {
+        name: 'DatasetList',
+        params: { ns: namespace.value },
+      },
       display: i18n.t('components.AnakinHeader.menu.dataset'),
       icon: 'icon-mspider',
     },
     {
-      to: { name: 'HyperparameterList' },
+      to: {
+        name: 'HyperparameterList',
+        params: { ns: namespace.value },
+      },
       display: i18n.t('components.AnakinHeader.menu.hyperparameterGroup'),
       icon: 'icon-cluster',
     },
     {
-      to: { name: 'InferenceApplicationList' },
+      to: {
+        name: 'InferenceApplicationList',
+        params: { ns: namespace.value },
+      },
       display: i18n.t('components.AnakinHeader.menu.inference'),
       icon: 'icon-book',
     },