fix quotes during import and moved the upload template button to drop…

…down
amidaware · Oct 2, 2023 · 00b4896 · 00b4896
1 parent 817a37c
commit 00b4896
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 58 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,13 +9,12 @@
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
   "typescript.tsdk": "node_modules/typescript/lib",
   "files.watcherExclude": {
-    "files.watcherExclude": {
       "**/.git/objects/**": true,
       "**/.git/subtree-cache/**": true,
       "**/node_modules/": true,
       "/node_modules/**": true,
       "**/env/": true,
       "/env/**": true
-    }
-  }
+  },
+  "prettier.prettierPath": "./node_modules/prettier"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/ee/reporting/components/ReportTemplateForm.vue b/src/ee/reporting/components/ReportTemplateForm.vue
@@ -342,7 +342,7 @@ watch(
   () => {
     edited.value = true;
   },
-  { deep: true }
+  { deep: true },
 );
 
 function openClosePrompt() {
@@ -385,15 +385,15 @@ watch(
       const removed = oldArray.filter((item) => newArray.indexOf(item) == -1);
       removed.forEach((item) => delete dependencies.value[item]);
     }
-  }
+  },
 );
 
 // initial set of depends on options
 const dependsOnOptions = ["client", "site", "agent"];
 
 // will add any custom added depend_on options to the list
 state.depends_on?.forEach((item) =>
-  !dependsOnOptions.includes(item) ? dependsOnOptions.push(item) : null
+  !dependsOnOptions.includes(item) ? dependsOnOptions.push(item) : null,
 );
 
 // the filtered list that the select uses
@@ -402,7 +402,7 @@ const dependsOnFilterOptions = ref(dependsOnOptions);
 function createValue(
   val: string,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  done: (val: any, mode: "add-unique" | "add" | "toggle" | undefined) => void
+  done: (val: any, mode: "add-unique" | "add" | "toggle" | undefined) => void,
 ) {
   if (val.length > 0) {
     if (!dependsOnOptions.includes(val)) {
@@ -419,7 +419,7 @@ function filterFn(val: string, update: (callback: () => void) => void) {
     } else {
       const needle = val.toLowerCase();
       dependsOnFilterOptions.value = dependsOnOptions.filter(
-        (v) => v.toLowerCase().indexOf(needle) > -1
+        (v) => v.toLowerCase().indexOf(needle) > -1,
       );
     }
   });
@@ -457,7 +457,7 @@ const HTMLTemplateOptions = computed<QSelectOption<number>[]>(() =>
   reportHTMLTemplates.value.map((template) => ({
     label: template.name,
     value: template.id,
-  }))
+  })),
 );
 
 const debug = ref(false);
@@ -559,7 +559,7 @@ function initializeEditor() {
   templateModel = monaco.editor.createModel(
     state.template_md,
     props.templateType,
-    templateUri
+    templateUri,
   );
   cssModel = monaco.editor.createModel(state.template_css, "css", cssUri);
 
@@ -590,7 +590,7 @@ function initializeEditor() {
   variablesModel = monaco.editor.createModel(
     state.template_variables,
     "yaml",
-    variablesUri
+    variablesUri,
   );
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   variablesEditor.value = monaco.editor.create(variablesDiv.value!, {
@@ -612,8 +612,8 @@ function initializeEditor() {
 
 // make sure to put quotes around any variable values that have { or }
 function wrapDoubleQuotes() {
-  const matchJsonCharacters = /(\b.*: *?[^\n\r])([^"].*[{}]+.*[^"])\r?$/gm;
-  const putDoubleQuotes = '$1"$2"';
+  const matchJsonCharacters = /(\b.*: *?[^\n\r])([^'].*[{}]+.*[^'])\r?$/gm;
+  const putDoubleQuotes = "$1'$2'";
 
   if (matchJsonCharacters.test(state.template_variables)) {
     const newText = variablesEditor.value

diff --git a/src/ee/reporting/components/ReportTemplateImport.vue b/src/ee/reporting/components/ReportTemplateImport.vue
@@ -20,7 +20,9 @@ For details, see: https://license.tacticalrmm.com/ee
           dense
           filled
           label="Import File"
-          style="width: 250px"
+          style="width: 400px"
+          accept=".json"
+          hint="Only accepts exported report template json files"
         />
       </q-card-section>
 

diff --git a/src/ee/reporting/components/ReportsManager.vue b/src/ee/reporting/components/ReportsManager.vue
@@ -68,6 +68,12 @@ For details, see: https://license.tacticalrmm.com/ee
                   <q-item-label>Html Template</q-item-label>
                 </q-item-section>
               </q-item>
+
+              <q-item clickable v-close-popup @click="importReportTemplate">
+                <q-item-section>
+                  <q-item-label>Import Report Template</q-item-label>
+                </q-item-section>
+              </q-item>
             </q-list>
           </q-btn-dropdown>
           <q-btn
@@ -108,18 +114,6 @@ For details, see: https://license.tacticalrmm.com/ee
               <q-icon name="search" color="primary" />
             </template>
           </q-input>
-
-          <q-btn icon="menu" dropdown-icon="none" dense>
-            <q-menu>
-              <q-list dense>
-                <q-item clickable v-close-popup @click="importReportTemplate">
-                  <q-item-section>
-                    <q-item-label>Import Report Template</q-item-label>
-                  </q-item-section>
-                </q-item>
-              </q-list>
-            </q-menu>
-          </q-btn>
         </template>
 
         <template #body="props">