Improve opening collections

Author: JanisV

frontend/src/App.vue

@@ -26,7 +26,6 @@ const hasError = globalStatus.hasError;
 const hasWarning = globalStatus.hasWarning;
 
 const isServerLess = import.meta.env.VITE_SERVERLESS;
-const selectedFile = ref(null)
 const serverFileList = ref([])
 const statusesList = ref([])
 const collectionSettings = ref({})
@@ -65,36 +64,39 @@ onMounted(async () => {
   }
 })
 
-const handleRemoteFileSelected = async (file) => {
+const openFile = async (file, connection_type) => {
   if (!file)
     return;
 
-  selectedFile.value = file;
   isOpened = true;
   await router.replace('/')
-  appTitle.pushTitle(file)
+  let ret = null
 
-  const ret = await service.openRemoteFile(file);
-  collectionSettings.value = ret.collectionSettings;
-  statusesList.value = ret.statusesList;
+  if (connection_type === 'remote') {
+    appTitle.pushTitle(file)
 
-  coinListViewRef.value.onOpenFile()
-}
+    ret = await service.openRemoteFile(file);
+  }
+  else if (connection_type === 'local') {
+    appTitle.pushTitle(file.name)
 
-const handleFileUpload = async (file) => {
-  if (!file)
-    return;
+    ret = await service.openLocalFile(file);
+  }
 
-  selectedFile.value = file;
-  isOpened = true;
-  await router.replace('/')
-  appTitle.pushTitle(file.name)
+  if (ret) {
+    collectionSettings.value = ret.collectionSettings;
+    statusesList.value = ret.statusesList;
 
-  const ret = await service.openLocalFile(file);
-  collectionSettings.value = ret.collectionSettings;
-  statusesList.value = ret.statusesList;
+    coinListViewRef.value.onOpenFile()
+  }
+}
 
-  coinListViewRef.value.onOpenFile()
+const handleRemoteFileSelected = async (file) => {
+  await openFile(file, 'remote')
+}
+
+const handleFileUpload = async (file) => {
+  await openFile(file, 'local')
 }
 </script>
 

frontend/src/composables/useService.js

@@ -164,24 +164,29 @@ export function useService(passwordDialogRef) {
     }
 
     const versionValid = await checkDbVersion(collectionSettings);
-    if (versionValid) {
+    if (!versionValid) {
+      return null;
+    }
+    else {
       const passwordValid = await checkDbPassword(collectionSettings)
-      if (passwordValid) {
-        await globalStatus.startLoading('Load collection');
-
-        try {
-          const responseFilters = await api.get('/api/filters', {params: {f: file}})
-          statusesList = responseFilters.data
-        }
-        catch (err) {
-          globalStatus.error.value = err
-        }
-        finally {
-          await globalStatus.finishLoading();
-        }
+      if (!passwordValid) {
+        return null;
       }
     }
 
+    await globalStatus.startLoading('Load collection');
+
+    try {
+      const responseFilters = await api.get('/api/filters', {params: {f: file}})
+      statusesList = responseFilters.data
+    }
+    catch (err) {
+      globalStatus.error.value = err
+    }
+    finally {
+      await globalStatus.finishLoading();
+    }
+
     return {collectionSettings, statusesList};
   }
 
@@ -215,6 +220,17 @@ export function useService(passwordDialogRef) {
         }
     })
 
+    const versionValid = await checkDbVersion(collectionSettings);
+    if (!versionValid) {
+      return null;
+    }
+    else {
+      const passwordValid = await checkDbPassword(collectionSettings)
+      if (!passwordValid) {
+        return null;
+      }
+    }
+
     const field_sql = `SELECT id, title FROM fields WHERE id IN (${Object.keys(fieldIds)})`
     const fieldsDb = await executeQuery(field_sql)
 
@@ -223,14 +239,8 @@ export function useService(passwordDialogRef) {
       collectionSettings.fields[field] = elem[1]
     })
 
-    const versionValid = await checkDbVersion(collectionSettings);
-    if (versionValid) {
-      const passwordValid = await checkDbPassword(collectionSettings)
-      if (passwordValid) {
-        const sql_statuses = 'SELECT DISTINCT status FROM coins';
-        statusesList = (await executeQuery(sql_statuses)).flat()
-      }
-    }
+    const sql_statuses = 'SELECT DISTINCT status FROM coins';
+    statusesList = (await executeQuery(sql_statuses)).flat()
 
     return {collectionSettings, statusesList};
   }