feat: delete uncompleted file if the task failed in the middle of pro…

…gress Signed-off-by: seven <[email protected]>
geek-fun · Nov 17, 2024 · b245aa6 · b245aa6
1 parent 2ca9fc0
commit b245aa6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/src/store/backupRestoreStore.ts b/src/store/backupRestoreStore.ts
@@ -51,8 +51,6 @@ export const useBackupRestoreStore = defineStore('backupRestoreStore', {
             }),
           );
 
-          console.log('es response', response);
-
           const hits = response.hits.hits;
           if (hits.length === 0) {
             hasMore = false;
@@ -67,6 +65,7 @@ export const useBackupRestoreStore = defineStore('backupRestoreStore', {
         }
         return filePath;
       } catch (error) {
+        sourceFileApi.deleteFileOrFolder(filePath).catch();
         throw new CustomError(
           get(error, 'status', 500),
           get(error, 'details', get(error, 'message', '')),

diff --git a/src/store/connectionStore.ts b/src/store/connectionStore.ts
@@ -72,6 +72,9 @@ export const useConnectionStore = defineStore('connectionStore', {
     establishedIndexOptions(state) {
       return state.established?.indices.map(({ index }) => ({ label: index, value: index })) ?? [];
     },
+    connectionOptions(state) {
+      return state.connections.map(({ name }) => ({ label: name, value: name }));
+    },
   },
   actions: {
     async fetchConnections() {
@@ -96,8 +99,15 @@ export const useConnectionStore = defineStore('connectionStore', {
       await storeApi.set('connections', pureObject(this.connections));
     },
     async establishConnection(connection: Connection) {
-      await this.testConnection(connection);
+      try {
+        await this.testConnection(connection);
+      } catch (err) {
+        this.established = null;
+        throw err;
+      }
+
       const client = loadHttpClient(connection);
+
       try {
         const data = (await client.get('/_cat/indices', 'format=json')) as Array<{
           [key: string]: string;

diff --git a/src/views/backup-restore/components/backup.vue b/src/views/backup-restore/components/backup.vue
@@ -27,7 +27,7 @@
           <n-grid-item span="8">
             <n-form-item :label="$t('backup.backupForm.index')" path="index">
               <n-select
-                :options="establishedIndexOptions"
+                :options="indexOptions"
                 :placeholder="$t('connection.selectIndex')"
                 v-model:value="backupFormData.index"
                 remote
@@ -114,13 +114,7 @@ const message = useMessage();
 const lang = useLang();
 const fileFormRef = ref();
 const connectionStore = useConnectionStore();
-const {
-  fetchConnections,
-  fetchIndices,
-  establishConnection,
-  selectIndex,
-  establishedIndexOptions,
-} = connectionStore;
+const { fetchConnections, fetchIndices, establishConnection, selectIndex } = connectionStore;
 const { established, connections } = storeToRefs(connectionStore);
 
 const backupRestoreStore = useBackupRestoreStore();
@@ -180,15 +174,27 @@ const backupFormRules = reactive<FormRules>({
   //   },
   // ],
 });
-const loadingRefs = ref<{ connection: boolean; index: boolean }>({
-  connection: false,
-  index: false,
-});
 
 const connectionOptions = computed(() =>
   connections.value.map(({ name }) => ({ label: name, value: name })),
 );
 
+const indexOptions = ref<Array<{ label: string; value: string }>>([]);
+watch(established, () => {
+  if (!established.value) {
+    indexOptions.value = [];
+    backupFormData.value.index = '';
+    return;
+  }
+  indexOptions.value =
+    established.value?.indices.map(({ index }) => ({ label: index, value: index })) ?? [];
+});
+
+const loadingRefs = ref<{ connection: boolean; index: boolean }>({
+  connection: false,
+  index: false,
+});
+
 const handleOpen = async (isOpen: boolean, target: string) => {
   if (!isOpen) return;
   if (target === 'connection') {