release v2.1.2 (#639)

mainsail-crew · Feb 14, 2022 · ebf7486 · ebf7486
1 parent ed0a697
commit ebf7486
Show file tree

Hide file tree

Showing 9 changed files with 1,910 additions and 1,882 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mainsail",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "decription": "a klipper web interface",
   "author": {

diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue
@@ -188,11 +188,13 @@ export default class TheTopCornerMenu extends Mixins(BaseMixin) {
             const actionUppercase = action.trim().charAt(0).toUpperCase() + action.trim().slice(1)
             let titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.Service' + actionUppercase
             let descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Service' + actionUppercase
-            const buttonKey = 'App.TopCornerMenu.' + actionUppercase
+            let buttonKey = 'App.TopCornerMenu.' + actionUppercase
 
             if (serviceName === 'klipper' && ['stop', 'restart', 'firmwareRestart'].includes(action)){
                 titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.' + (action !== 'stop' ? 'Klipper' : 'Service') + actionUppercase
                 descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Klipper' + actionUppercase
+
+                if (action === 'firmwareRestart') buttonKey = 'App.TopCornerMenu.KlipperFirmwareRestart'
             } else if (serviceName === 'host') {
                 titleKey = 'App.TopCornerMenu.ConfirmationDialog.Title.Host' + actionUppercase
                 descriptionKey = 'App.TopCornerMenu.ConfirmationDialog.Description.Host' + actionUppercase

diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
@@ -287,7 +287,19 @@ export default class TempChart extends Mixins(BaseMixin) {
     tooltipFormater(datasets: any) {
         let output = ''
 
-        const mainDatasets = datasets.filter((dataset: any) => !dataset.seriesName.includes('-') && dataset.seriesName !== 'date')
+        const mainDatasets = datasets.filter((dataset: any) => {
+            if (dataset.seriesName === 'date') return false
+            if (dataset.seriesName.includes('-')) {
+                if (dataset.seriesName.lastIndexOf('-') > -1) {
+                    const suffix = dataset.seriesName.slice(dataset.seriesName.lastIndexOf('-') + 1)
+                    return !['target', 'power'].includes(suffix)
+                }
+
+                return true
+            }
+
+            return true
+        })
         if (datasets.length) {
             let outputTime = datasets[0]['axisValueLabel']
             outputTime = outputTime.substr(outputTime.indexOf(' '))

diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
@@ -16,10 +16,9 @@
 }
 
 .dragzone {
-    display: table;
     position: absolute;
-    top: 0; left: 0;
-    width: 100%; height: 100%;
+    top: 0; left: 0; right: 0; bottom: 0;
+    height: 100%;
     z-index: 9999999999;
     background-color: rgba(0, 0, 0, 0.5);
     transition: visibility 175ms, opacity 175ms;
@@ -36,9 +35,7 @@
 }
 
 .dragzone .textnode {
-    display: table-cell;
     text-align: center;
-    vertical-align: middle;
     transition: font-size 175ms;
 }
 </style>
@@ -222,7 +219,7 @@
                     </tr>
                 </template>
             </v-data-table>
-            <div class="dragzone" :style="'visibility: '+dropzone.visibility+'; opacity: '+dropzone.hidden">
+            <div class="dragzone d-flex justify-center flex-column" :style="'visibility: '+dropzone.visibility+'; opacity: '+dropzone.hidden">
                 <div class="textnode">{{ $t('Files.DropFilesToAddGcode')}}</div>
             </div>
         </panel>