feat: added install by version

crawlab-team · Nov 22, 2023 · 0afa224 · 0afa224
1 parent c0fa9a7
commit 0afa224
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 33 deletions.
diff --git a/src/i18n/lang/en/views/env.ts b/src/i18n/lang/en/views/env.ts
@@ -28,6 +28,7 @@ const env: LViewsEnv = {
         selectedNodes: 'Selected nodes',
         upgrade: 'Upgrade',
         mode: 'Mode',
+        version: 'Version',
       },
     },
     task: {

diff --git a/src/i18n/lang/zh/views/env.ts b/src/i18n/lang/zh/views/env.ts
@@ -28,6 +28,7 @@ const env: LViewsEnv = {
         selectedNodes: '已选节点',
         upgrade: '是否升级',
         mode: '模式',
+        version: '版本',
       },
     },
     task: {

diff --git a/src/interfaces/i18n/views/env.d.ts b/src/interfaces/i18n/views/env.d.ts
@@ -8,7 +8,6 @@ interface LViewsEnv {
         enabled: string;
         cmd: string;
         proxy: string;
-        version: string;
       };
       lang: {
         python: {
@@ -29,6 +28,7 @@ interface LViewsEnv {
         selectedNodes: string;
         upgrade: string;
         mode: string;
+        version: string;
       };
     };
     task: {

diff --git a/src/views/deps/components/form/InstallForm.vue b/src/views/deps/components/form/InstallForm.vue
@@ -24,35 +24,48 @@
           <el-option value="selected-nodes" :label="t('views.env.deps.dependency.form.selectedNodes')"/>
         </el-select>
       </cl-form-item>
-      <cl-form-item :span="4" :label="t('views.env.deps.dependency.form.version')">
-        <el-select v-model="version">
-        </el-select>
-      </cl-form-item>
-      <cl-form-item :label="t('views.env.deps.dependency.form.upgrade')">
-        <cl-switch v-model="upgrade"/>
-      </cl-form-item>
       <cl-form-item v-if="mode === 'selected-nodes'" :span="4"
                     :label="t('views.env.deps.dependency.form.selectedNodes')">
         <el-select v-model="nodeIds" multiple :placeholder="t('views.env.deps.dependency.form.selectedNodes')">
           <el-option v-for="n in nodes" :key="n.key" :value="n._id" :label="n.name"/>
         </el-select>
       </cl-form-item>
+      <cl-form-item :span="4" :label="t('views.env.deps.dependency.form.version')">
+        <el-select v-model="version" :disabled="versionsLoading" :placeholder="t('common.status.loading')">
+          <el-option
+            v-for="(v, $index) in versions"
+            :key="$index"
+            :label="v"
+            :value="v"
+          />
+        </el-select>
+      </cl-form-item>
     </cl-form>
   </cl-dialog>
 </template>
 
 <script lang="ts">
-import {defineComponent, onBeforeMount, ref} from 'vue';
+import {defineComponent, onBeforeMount, ref, watch} from 'vue';
 import {translate} from '@/utils';
+import useRequest from "@/services/request";
 
 const t = translate;
 
+const endpointL = '/deps/lang';
+
+const {
+  get,
+} = useRequest();
+
 export default defineComponent({
   name: 'InstallForm',
   props: {
     visible: {
       type: Boolean,
     },
+    lang: {
+      type: String,
+    },
     names: {
       type: Array,
       default: () => {
@@ -73,9 +86,8 @@ export default defineComponent({
     'confirm',
     'close',
   ],
-  setup(_, {emit}) {
+  setup(props, {emit}) {
     const mode = ref('all');
-    const upgrade = ref(true);
     const nodeIds = ref([]);
     const version = ref('');
 
@@ -88,8 +100,8 @@ export default defineComponent({
     const onConfirm = () => {
       emit('confirm', {
         mode: mode.value,
-        upgrade: upgrade.value,
         nodeIds: nodeIds.value,
+        version: version.value,
       });
       reset();
     };
@@ -99,14 +111,30 @@ export default defineComponent({
       reset();
     };
 
-    onBeforeMount(async () => {
-    });
+    const versions = ref([]);
+    const versionsLoading = ref(false);
+    const getVersions = async () => {
+      if (!props.visible) return;
+      versionsLoading.value = true;
+      try {
+        const res = await get(`${endpointL}/${props.lang}/${props.names[0]}/versions`)
+        versions.value = res.data;
+        if (versions.value.length > 0) {
+          version.value = versions.value[0];
+        }
+      } finally {
+        versionsLoading.value = false;
+      }
+    };
+    watch(() => props.visible, getVersions);
+    onBeforeMount(getVersions);
 
     return {
       mode,
-      upgrade,
       nodeIds,
       version,
+      versions,
+      versionsLoading,
       onConfirm,
       onClose,
       t,

diff --git a/src/views/deps/components/lang/DependencyLang.vue b/src/views/deps/components/lang/DependencyLang.vue
@@ -82,6 +82,7 @@
     <template #extra>
       <cl-install-form
         :visible="dialogVisible.install"
+        :lang="lang"
         :nodes="allNodes"
         :names="installForm.names"
         @confirm="onInstall"
@@ -242,19 +243,6 @@ export default defineComponent({
       names: [],
     });
 
-    const isInstallable = (dep: EnvDepsDependency) => {
-      if (dep.upgradable) return true;
-      let node_ids = [];
-      if (installed.value) {
-        node_ids = dep.node_ids || [];
-      } else if (dep.result) {
-        node_ids = dep.result.node_ids || [];
-      } else {
-        return false;
-      }
-      return node_ids.length < allNodes.value.length;
-    };
-
     const isUninstallable = (dep: EnvDepsDependency) => {
       let node_ids = [];
       if (installed.value) {
@@ -353,8 +341,7 @@ export default defineComponent({
             {
               type: 'primary',
               icon: ['fa', 'download'],
-              tooltip: row.upgradable ? t('views.env.deps.common.actions.installAndUpgrade') : t('common.actions.install'),
-              disabled: (row) => !isInstallable(row),
+              tooltip: t('common.actions.install'),
               onClick: async (row) => {
                 installForm.value.names = [row.name];
                 dialogVisible.value.install = true;
@@ -514,10 +501,9 @@ export default defineComponent({
       uninstallForm.value.names = rows.map(d => d.name || '');
     };
 
-    const onInstall = async ({mode, upgrade, nodeIds, version}: { mode: string; upgrade: boolean; nodeIds: string[]; version: string; }) => {
+    const onInstall = async ({mode, nodeIds, version}: { mode: string; nodeIds: string[]; version: string; }) => {
       const data = {
         mode,
-        upgrade,
         names: installForm.value.names,
         node_id: [] as string[],
         version,
@@ -541,7 +527,7 @@ export default defineComponent({
         data['node_id'] = nodeIds;
       }
       await post(`${endpoint.value}/uninstall`, data);
-      await ElMessage.success(t('common.message.success.uninstall'));
+      ElMessage.success(t('common.message.success.uninstall'));
       await getRunningTaskList();
       onDialogClose('uninstall');
     };