Merge pull request #633 from arabcoders/dev

QoL improvements

Author: arabcoders

composer.lock

@@ -269,34 +269,30 @@
               </p>
             </div>
           </div>
-          <div class="field" v-if="backends.length > 0">
+          <div class="field">
             <hr>
-            <label class="label has-text-danger" for="force_export">
-              Export current local database state to this backend?
+            <label class="label has-text-danger" for="backup_data">
+              Create backup for this backend data?
             </label>
             <div class="control">
-              <input id="force_export" type="checkbox" class="switch is-success"
-                     v-model="forceExport">
-              <label for="force_export">Yes</label>
+              <input id="backup_data" type="checkbox" class="switch is-success" v-model="backup_data">
+              <label for="backup_data">Yes</label>
               <p class="help">
-                <span class="icon has-text-danger"><i class="fas fa-exclamation-triangle"></i></span>
-                If this is a new backend, you need to get it in sync with your current database,
-                enabling this option will initiate a one time force export the current local database state to the
-                backend. This will override the backend state to be inline with the local database state.
+                This will run a one time backup for the backend data.
               </p>
             </div>
           </div>
-          <div class="field" v-else>
+          <div class="field" v-if="backends.length > 0">
             <hr>
-            <label class="label has-text-danger" for="run_import">
-              Export current local database state to this backend?
+            <label class="label has-text-danger" for="force_export">
+              Force Export local data to this backend?
             </label>
             <div class="control">
-              <input id="run_import" type="checkbox" class="switch is-success" v-model="runImport">
-              <label for="run_import">Yes</label>
-              <p class="help">
-                <span class="icon has-text-danger"><i class="fas fa-info-circle"></i></span>
-                Do you want to run a one time import for this backend after adding this backend?
+              <input id="force_export" type="checkbox" class="switch is-success" v-model="force_export">
+              <label for="force_export">Yes</label>
+              <p class="help has-text-danger">
+                <span class="icon"><i class="fas fa-info-circle"></i></span>
+                THIS OPTION WILL OVERRIDE THE BACKEND DATA with locally stored data.
               </p>
             </div>
           </div>
@@ -335,7 +331,7 @@ import request from '~/utils/request'
 import {awaitElement, explode, notification, ucFirst} from '~/utils/index'
 import {useStorage} from "@vueuse/core";
 
-const emit = defineEmits(['addBackend', 'forceExport', 'runImport'])
+const emit = defineEmits(['addBackend', 'backupData', 'forceExport'])
 
 const props = defineProps({
   backends: {
@@ -377,8 +373,8 @@ const uuidLoading = ref(false)
 const serversLoading = ref(false)
 const exposeToken = ref(false)
 const error = ref()
-const forceExport = ref(false)
-const runImport = ref(false)
+const backup_data = ref(true)
+const force_export = ref(false)
 
 const isLimited = ref(false)
 const accessTokenResponse = ref({})
@@ -674,16 +670,15 @@ const addBackend = async () => {
 
   notification('success', 'Information', `Backend ${backend.value.name} added successfully.`)
 
-  let event
-  if (true === Boolean(forceExport?.value ?? false)) {
-    event = 'forceExport'
-  } else if (true === Boolean(runImport?.value ?? false)) {
-    event = 'runImport'
-  } else {
-    event = 'addBackend'
+  if (true === Boolean(backup_data?.value ?? false)) {
+    emit('backupData', backend)
+  }
+
+  if (true === Boolean(force_export?.value ?? false)) {
+    emit('forceExport', backend)
   }
 
-  emit(event, backend)
+  emit('addBackend')
 
   return true
 }

frontend/components/BackendAdd.vue

@@ -50,7 +50,12 @@ onMounted(async () => {
     }
     const json = await response.json();
     if ('users' in json) {
-      users.value = json?.users;
+      json.users.forEach(user => {
+        const username = user.user
+        if (!users.value.includes(username)) {
+          users.value.push(username);
+        }
+      });
     }
   } catch (e) {
     notification('error', `Failed to fetch users. ${e}`);

frontend/components/UserSelection.vue

@@ -15,13 +15,13 @@
         "@vueuse/nuxt": "^13.0.0",
         "@xterm/addon-fit": "^0.10.0",
         "@xterm/xterm": "^5.5.0",
-        "cronstrue": "^2.49.0",
+        "cronstrue": "^2.57.0",
         "floating-vue": "^5.2.2",
-        "hls.js": "^1.4.14",
+        "hls.js": "^1.6.0",
         "marked": "^15.0.7",
         "marked-base-url": "^1.1.3",
         "moment": "^2.30.1",
-        "nuxt": "^3.16",
+        "nuxt": "^3.16.2",
         "plyr": "^3.7.8",
         "vue": "^3.4.21",
         "vue-router": "^4.3.0",

frontend/package.json

@@ -35,8 +35,9 @@
       </div>
 
       <div class="column is-12" v-if="toggleForm">
-        <BackendAdd @forceExport="e => handleEvents('forceExport', e)" :backends="backends"
-                    @runImport="e => handleEvents('runImport', e)" @addBackend="e => handleEvents('addBackend', e)"/>
+        <BackendAdd @backupData="e => handleEvents('backupData', e)" :backends="backends"
+                    @forceExport="e => handleEvents('forceExport', e)"
+                    @addBackend="e => handleEvents('addBackend', e)"/>
       </div>
       <template v-else>
         <div class="column is-12" v-if="backends.length<1">
@@ -188,7 +189,7 @@ import 'assets/css/bulma-switch.css'
 import moment from 'moment'
 import request from '~/utils/request'
 import BackendAdd from '~/components/BackendAdd'
-import {ag, copyText, makeConsoleCommand, notification, r, TOOLTIP_DATE_FORMAT} from '~/utils/index'
+import {ag, copyText, makeConsoleCommand, notification, queue_event, r, TOOLTIP_DATE_FORMAT} from '~/utils/index'
 import {useStorage} from '@vueuse/core'
 import Message from '~/components/Message'
 
@@ -206,31 +207,31 @@ const usefulCommands = {
   export_now: {
     id: 1,
     title: "Run normal export.",
-    command: 'state:export -v -s {name}',
+    command: 'state:export -v -u {user} -s {name}',
     state_key: 'export.enabled',
   },
   import_now: {
     id: 2,
     title: "Run normal import.",
-    command: 'state:import -v -s {name}',
+    command: 'state:import -v -u {user} -s {name}',
     state_key: 'import.enabled'
   },
   force_export: {
     id: 3,
     title: "Force export local play state to this backend.",
-    command: 'state:export -fi -v -s {name}',
+    command: 'state:export -fi -v -u {user} -s {name}',
     state_key: 'export.enabled',
   },
   backup_now: {
     id: 4,
     title: "Backup this backend play state.",
-    command: "state:backup -v -s {name} --file '{date}.manual_{name}.json'",
+    command: "state:backup -v -u {user} -s {name} --file '{date}.manual_{name}.json'",
     state_key: 'import.enabled',
   },
   metadata_only: {
     id: 5,
     title: "Import this backend metadata.",
-    command: "state:import -v --metadata-only -s {name}",
+    command: "state:import -v --metadata-only -u {user} -s {name}",
     state_key: 'import.enabled',
   },
 }
@@ -247,7 +248,7 @@ const forwardCommand = async backend => {
     date: moment().format('YYYYMMDD'),
   }
 
-  await navigateTo(makeConsoleCommand(r(usefulCommands[index].command, {...backend, ...util})));
+  await navigateTo(makeConsoleCommand(r(usefulCommands[index].command, {...backend, ...util, user: api_user.value})));
 }
 
 const loadContent = async () => {
@@ -285,18 +286,54 @@ const updateValue = async (backend, key, newValue) => {
 
 const handleEvents = async (event, backend) => {
   switch (event) {
-    case 'forceExport':
-      notification('warning', 'Warning', `We are going to sync '${backend.value.name}' play state to match the current local database.`, 10000)
-      await navigateTo(makeConsoleCommand(`state:export -fi -v -s ${backend.value.name}`, true))
+    case 'backupData':
+      try {
+        const backup_status = await queue_event('run_console', {
+          command: 'state:backup',
+          args: [
+            '-v',
+            '--user',
+            api_user.value,
+            '--select-backend',
+            backend.value.name,
+            '--file',
+            '{user}.{backend}.{date}.initial_backup.json',
+          ]
+        })
+        console.log(backup_status);
+
+        notification('info', 'Info', `We are going to initiate a backup for '${backend.value.name}' in little bit.`, 5000)
+      } catch (e) {
+        notification('error', 'Error', `Failed to queue backup request. ${e.message}`)
+      }
       break
-    case 'runImport':
-      notification('info', 'Info', `We are going to import '${backend.value.name}' play state to the local database.`, 10000)
-      await navigateTo(makeConsoleCommand(`state:import -v -s ${backend.value.name}`, true))
+    case 'forceExport':
+      try {
+        const export_status = await queue_event('run_console', {
+          command: 'state:export',
+          args: [
+            '-fi',
+            '-v',
+            '--user',
+            api_user.value,
+            '--dry-run',
+            '--select-backend',
+            backend.value.name,
+          ]
+        }, 180)
+
+        console.log(export_status);
+
+        notification('info', 'Info', `Soon we are going to force export the local data to '${backend.value.name}'.`, 5000)
+      } catch (e) {
+        notification('error', 'Error', `Failed to queue force export request. ${e.message}`)
+      }
       break
     case 'addBackend':
       toggleForm.value = false
       await loadContent()
       break
   }
 }
+
 </script>