Merge pull request #3 from mainsail-crew/develop

.
LynxCrew · Jun 25, 2023 · 65fbc85 · 65fbc85
2 parents 1fc973a + 98a7509
commit 65fbc85
Show file tree

Hide file tree

Showing 11 changed files with 2,453 additions and 1,656 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
         "overlayscrollbars-vue": "^0.2.2",
         "regenerator-runtime": "^0.13.9",
         "resize-observer-polyfill": "^1.5.1",
-        "semver": "^7.3.5",
+        "semver": "^7.5.2",
         "typed_janus_js": "^1.0.14",
         "uuid": "^9.0.0",
         "vue": "^2.7.10",
@@ -94,13 +94,13 @@
         "vite": "^3.2.7",
         "vite-plugin-checker": "^0.5.0",
         "vite-plugin-package-version": "^1.0.2",
-        "vite-plugin-pwa": "^0.13.0",
+        "vite-plugin-pwa": "^0.16.4",
         "vite-plugin-vue2": "^2.0.1",
         "vue-debounce-decorator": "^1.0.1",
         "vue-i18n-extract": "^2.0.7",
         "vue-router": "^3.5.2",
         "vue-template-compiler": "^2.6.14",
-        "workbox-core": "^6.4.2"
+        "workbox-core": "^7.0.0"
     },
     "postcss": {
         "plugins": {

diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
@@ -1,9 +1,6 @@
 <template>
     <div>
-        <panel
-            :title="$t('Files.GCodeFiles').toString()"
-            :icon="mdiFileDocumentMultipleOutline"
-            card-class="gcode-files-panel">
+        <panel :title="$t('Files.GCodeFiles')" :icon="mdiFileDocumentMultipleOutline" card-class="gcode-files-panel">
             <v-card-text>
                 <v-row>
                     <v-col class="col-12 d-flex align-center">
@@ -372,7 +369,7 @@
                     <v-icon class="mr-1">{{ mdiContentCopy }}</v-icon>
                     {{ $t('Files.Duplicate') }}
                 </v-list-item>
-                <v-list-item v-if="!contextMenu.item.isDirectory" class="red--text" @click="removeFile">
+                <v-list-item v-if="!contextMenu.item.isDirectory" class="red--text" @click="deleteDialog = true">
                     <v-icon class="mr-1" color="error">{{ mdiDelete }}</v-icon>
                     {{ $t('Files.Delete') }}
                 </v-list-item>
@@ -387,7 +384,7 @@
         </v-menu>
         <v-dialog v-model="dialogCreateDirectory.show" :max-width="400">
             <panel
-                :title="$t('Files.NewDirectory').toString()"
+                :title="$t('Files.NewDirectory')"
                 card-class="gcode-files-new-directory-dialog"
                 :margin-bottom="false">
                 <template #buttons>
@@ -415,10 +412,7 @@
             </panel>
         </v-dialog>
         <v-dialog v-model="dialogRenameFile.show" :max-width="400">
-            <panel
-                :title="$t('Files.RenameFile').toString()"
-                card-class="gcode-files-rename-file-dialog"
-                :margin-bottom="false">
+            <panel :title="$t('Files.RenameFile')" card-class="gcode-files-rename-file-dialog" :margin-bottom="false">
                 <template #buttons>
                     <v-btn icon tile @click="dialogRenameFile.show = false">
                         <v-icon>{{ mdiCloseThick }}</v-icon>
@@ -428,7 +422,7 @@
                     <v-text-field
                         ref="inputFieldRenameFile"
                         v-model="dialogRenameFile.newName"
-                        :label="$t('Files.Name').toString()"
+                        :label="$t('Files.Name')"
                         required
                         :rules="nameInputRules"
                         @update:error="(bool) => (isInvalidName = bool)"
@@ -445,7 +439,7 @@
         </v-dialog>
         <v-dialog v-model="dialogDuplicateFile.show" :max-width="400">
             <panel
-                :title="$t('Files.DuplicateFile').toString()"
+                :title="$t('Files.DuplicateFile')"
                 card-class="gcode-files-duplicate-file-dialog"
                 :margin-bottom="false">
                 <template #buttons>
@@ -457,7 +451,7 @@
                     <v-text-field
                         ref="inputFieldDuplicateFile"
                         v-model="dialogDuplicateFile.newName"
-                        :label="$t('Files.Name').toString()"
+                        :label="$t('Files.Name')"
                         required
                         :rules="nameInputRules"
                         @update:error="(bool) => (isInvalidName = bool)"
@@ -474,7 +468,7 @@
         </v-dialog>
         <v-dialog v-model="dialogRenameDirectory.show" max-width="400">
             <panel
-                :title="$t('Files.RenameDirectory').toString()"
+                :title="$t('Files.RenameDirectory')"
                 card-class="gcode-files-rename-directory-dialog"
                 :margin-bottom="false">
                 <template #buttons>
@@ -503,7 +497,7 @@
         </v-dialog>
         <v-dialog v-model="dialogDeleteDirectory.show" max-width="400">
             <panel
-                :title="$t('Files.DeleteDirectory').toString()"
+                :title="$t('Files.DeleteDirectory')"
                 card-class="gcode-files-delete-directory-dialog"
                 :margin-bottom="false">
                 <template #buttons>
@@ -523,18 +517,45 @@
                 </v-card-actions>
             </panel>
         </v-dialog>
+
+        <!-- CONFIRM DELETE SINGLE FILE DIALOG -->
+        <v-dialog v-model="deleteDialog" max-width="400">
+            <panel :title="$t('Files.Delete')" card-class="gcode-files-delete-dialog" :margin-bottom="false">
+                <template #buttons>
+                    <v-btn icon tile @click="deleteDialog = false">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-text>
+                    <p class="mb-0">
+                        {{ $t('Files.DeleteSingleFileQuestion', { name: contextMenu.item.filename }) }}
+                    </p>
+                </v-card-text>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn color="" text @click="deleteDialog = false">
+                        {{ $t('Files.Cancel') }}
+                    </v-btn>
+                    <v-btn color="error" text @click="removeFile">
+                        {{ $t('Files.Delete') }}
+                    </v-btn>
+                </v-card-actions>
+            </panel>
+        </v-dialog>
+
+        <!-- CONFIRM DELETE MULTIPLE FILES DIALOG -->
         <v-dialog v-model="deleteSelectedDialog" max-width="400">
-            <panel
-                :title="$t('Files.Delete').toString()"
-                card-class="gcode-files-delete-selected-dialog"
-                :margin-bottom="false">
+            <panel :title="$t('Files.Delete')" card-class="gcode-files-delete-selected-dialog" :margin-bottom="false">
                 <template #buttons>
                     <v-btn icon tile @click="deleteSelectedDialog = false">
                         <v-icon>{{ mdiCloseThick }}</v-icon>
                     </v-btn>
                 </template>
                 <v-card-text>
-                    <p class="mb-0">{{ $t('Files.DeleteSelectedQuestion', { count: selectedFiles.length }) }}</p>
+                    <p v-if="selectedFiles.length === 1" class="mb-0">
+                        {{ $t('Files.DeleteSingleFileQuestion', { name: selectedFiles[0].filename }) }}
+                    </p>
+                    <p v-else class="mb-0">{{ $t('Files.DeleteSelectedQuestion', { count: selectedFiles.length }) }}</p>
                 </v-card-text>
                 <v-card-actions>
                     <v-spacer></v-spacer>
@@ -545,7 +566,7 @@
         </v-dialog>
         <v-dialog v-model="dialogAddBatchToQueue.show" max-width="400">
             <panel
-                :title="$t('Files.AddToQueue').toString()"
+                :title="$t('Files.AddToQueue')"
                 card-class="gcode-files-add-to-queue-dialog"
                 :icon="mdiPlaylistPlus"
                 :margin-bottom="false">
@@ -783,6 +804,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         item: { ...this.contextMenu.item },
     }
 
+    private deleteDialog = false
     private deleteSelectedDialog = false
 
     private isInvalidName = true
@@ -1379,6 +1401,8 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
             { path: 'gcodes' + this.currentPath + '/' + this.contextMenu.item.filename },
             { action: 'files/getDeleteFile' }
         )
+
+        this.deleteDialog = false
     }
 
     deleteDirectory(item: FileStateGcodefile) {

diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
@@ -1,18 +1,8 @@
-<style>
-.history-jobs-table th {
-    white-space: nowrap;
-}
-
-.history-jobs-table th.text-start {
-    padding-right: 0 !important;
-}
-</style>
-
 <template>
     <div>
         <panel
             :icon="mdiFileDocumentMultipleOutline"
-            :title="$t('History.PrintHistory').toString()"
+            :title="$t('History.PrintHistory')"
             card-class="history-list-panel">
             <v-card-text>
                 <v-row>
@@ -234,7 +224,7 @@
                     <v-icon class="mr-1">{{ mdiPrinter }}</v-icon>
                     {{ $t('History.Reprint') }}
                 </v-list-item>
-                <v-list-item class="red--text" @click="deleteJob(contextMenu.item)">
+                <v-list-item class="red--text" @click="deleteDialog = true">
                     <v-icon class="mr-1" color="error">{{ mdiDelete }}</v-icon>
                     {{ $t('History.Delete') }}
                 </v-list-item>
@@ -246,7 +236,7 @@
             persistent
             @keydown.esc="detailsDialog.boolShow = false">
             <panel
-                :title="$t('History.JobDetails').toString()"
+                :title="$t('History.JobDetails')"
                 :icon="mdiUpdate"
                 card-class="history-detail-dialog"
                 :margin-bottom="false">
@@ -430,18 +420,47 @@
                 </v-card-text>
             </panel>
         </v-dialog>
+
+        <!-- CONFIRM DELETE SINGLE FILE DIALOG -->
+        <v-dialog v-model="deleteDialog" max-width="400">
+            <panel :title="$t('History.Delete')" card-class="history-delete-dialog" :margin-bottom="false">
+                <template #buttons>
+                    <v-btn icon tile @click="deleteDialog = false">
+                        <v-icon>{{ mdiCloseThick }}</v-icon>
+                    </v-btn>
+                </template>
+                <v-card-text>
+                    <p class="mb-0">
+                        {{ $t('History.DeleteSingleJobQuestion') }}
+                    </p>
+                </v-card-text>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn color="" text @click="deleteDialog = false">
+                        {{ $t('History.Cancel') }}
+                    </v-btn>
+                    <v-btn color="error" text @click="deleteJob">
+                        {{ $t('History.Delete') }}
+                    </v-btn>
+                </v-card-actions>
+            </panel>
+        </v-dialog>
+
+        <!-- CONFIRM DELETE MULTIPLE FILES DIALOG -->
         <v-dialog v-model="deleteSelectedDialog" max-width="400">
-            <panel
-                :title="$t('History.Delete').toString()"
-                card-class="history-delete-selected-dialog"
-                :margin-bottom="false">
+            <panel :title="$t('History.Delete')" card-class="history-delete-selected-dialog" :margin-bottom="false">
                 <template #buttons>
                     <v-btn icon tile @click="deleteSelectedDialog = false">
                         <v-icon>{{ mdiCloseThick }}</v-icon>
                     </v-btn>
                 </template>
                 <v-card-text>
-                    <p class="mb-0">{{ $t('History.DeleteSelectedQuestion', { count: selectedJobs.length }) }}</p>
+                    <p v-if="selectedJobs.length === 1" class="mb-0">
+                        {{ $t('History.DeleteSingleJobQuestion') }}
+                    </p>
+                    <p v-else class="mb-0">
+                        {{ $t('History.DeleteSelectedQuestion', { count: selectedJobs.length }) }}
+                    </p>
                 </v-card-text>
                 <v-card-actions>
                     <v-spacer></v-spacer>
@@ -555,6 +574,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         type: 'create',
     }
 
+    private deleteDialog = false
     private deleteSelectedDialog = false
 
     get jobs() {
@@ -918,12 +938,14 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
             this.$socket.emit('printer.print.start', { filename: item.filename }, { action: 'switchToDashboard' })
     }
 
-    deleteJob(item: ServerHistoryStateJob) {
+    deleteJob() {
         this.$socket.emit(
             'server.history.delete_job',
-            { uid: item.job_id },
+            { uid: this.contextMenu.item.job_id },
             { action: 'server/history/getDeletedJobs' }
         )
+
+        this.deleteDialog = false
     }
 
     deleteSelectedJobs() {
@@ -1082,3 +1104,13 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+::v-deep .history-jobs-table th {
+    white-space: nowrap;
+}
+
+::v-deep .history-jobs-table th.text-start {
+    padding-right: 0 !important;
+}
+</style>