Fixed bugs with confirm dialog, added history saving

Author: megastary

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lazy-admin",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "GUI for PowerShell scripts to simplify day to day IT tasks.",
   "productName": "Lazy Admin",
   "cordovaId": "eu.houby-studio.lazy-admin",
@@ -17,6 +17,7 @@
     "axios": "^0.19.2",
     "electron-log": "^4.1.1",
     "electron-updater": "^4.3.1",
+    "lodash": "^4.17.19",
     "node-powershell": "^4.0.0",
     "quasar": "^1.12.13",
     "regedit": "^3.0.3",

src/pages/ScriptsPage.vue

@@ -80,7 +80,7 @@
               :rules="param.required ? [ val => val && val.length > 0 || $t('requiredField') ] : [] "
               :hint="`${param.required ? $t('requiredParam') : $t('optionalParam') } | ${param.type} | ${param.hint ? param.hint[language] || param.hint['default'] : ''}`"
               :type="paramType[param.type][1]"
-              @keyup.enter="$event.target.nextElementSibling.focus()"
+              @keydown.enter.prevent
               filled
               clearable
               lazy-rules
@@ -297,7 +297,10 @@
       no-backdrop-dismiss
     >
       <q-card class="full-width">
-        <q-form autofocus>
+        <q-form
+          autofocus
+          @submit="executeCommand"
+        >
           <q-card-section>
             <div class="text-h6">
               <q-icon
@@ -330,7 +333,6 @@
             <q-btn
               v-close-popup
               :label="$t('launch')"
-              @click="executeCommand"
               flat
               type="submit"
             />
@@ -432,6 +434,7 @@ import { exportFile } from 'quasar'
 import { mapGetters } from 'vuex'
 import { QMarkdown } from '@quasar/quasar-ui-qmarkdown'
 import Prism from 'vue-prismjs'
+import _ from 'lodash'
 import 'src/assets/prism_tomorrowlight.css'
 const childProcess = require('child_process')
 
@@ -471,7 +474,7 @@ export default {
       returnParamsPaginate: 1, // In multiple selection workflows allows parameters for each selection
       resultCommand: '', // Command ready to be executed, that is variables replaced for user set parameters
       results: {}, // Command result object displayed in Results Dialog
-      resultsSelected: { '0': [] }, // Array of selected objects from Results Dialog
+      resultsSelected: [[]], // Array of selected objects from Results Dialog
       resultsFilter: '', // Filter for results table
       externalHelpFile: '', // Holds Help text loaded from external source
       displayCommandDiag: false, // Visibility state for command dialog
@@ -502,7 +505,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('lazystore', ['getLanguage', 'getSearch', 'getScriptsArray', 'getDefinitions', 'getCommandMaximized', 'getAlwaysConfirm']),
+    ...mapGetters('lazystore', ['getLanguage', 'getSearch', 'getScriptsArray', 'getDefinitions', 'getCommandMaximized', 'getAlwaysConfirm', 'getHistoryLength', 'getHistory']),
     language: function () {
       return this.getLanguage
     },
@@ -526,6 +529,18 @@ export default {
     alwaysConfirm: function () {
       return this.getAlwaysConfirm
     },
+    historyLength: function () {
+      return this.getHistoryLength
+    },
+    history: {
+      get () {
+        return this.getHistory
+      },
+      set (val) {
+        let history = _.cloneDeep(val)
+        this.$store.dispatch('lazystore/setHistory', history)
+      }
+    },
     resultsColumns: {
       get () {
         let columns = [
@@ -662,7 +677,7 @@ export default {
       this.returnParams = {} // User defined parameters from Command Dialog
       this.returnParamsPaginate = 1 // In multiple selection workflows allows parameters for each selection
       this.results = {} // Command result object displayed in Results Dialog
-      this.resultsSelected = { '0': [] } // Array of selected objects from Results Dialog
+      this.resultsSelected = [[]] // Array of selected objects from Results Dialog
       this.resultsFilter = '' // Filter for results table
     },
     // If user needs to stop PowerShell execution for whatever reason, he can smash Esc to kill process and launch new one.
@@ -807,21 +822,14 @@ export default {
       }
     },
     executeCommand () {
-      // this.resultsSelected = [] // Clear variable as we do not need it anymore
-      // TODO: Above move to preexecute command, so user can see it and edit it before running
       this.toggleLoading(true)
-      // TODO: Save command to history
       this.$pwsh.shell.clear().then(() => {
         if (this.currentCommand.insidePsSession) {
-          // if (this.resultCommand.match(/(\r\n|\n|\r)/gm)) {
-          //   console.log('multiline!')
-          // }
           this.$pwsh.shell.addCommand(`Invoke-Command -Session $Global:LazyAdminPSSession -ScriptBlock {${this.resultCommand}}`)
         } else {
           this.$pwsh.shell.addCommand(this.resultCommand)
         }
         this.$pwsh.shell.invoke().then(output => {
-          // console.log('Command results: ', output)
           //  Code block to handle PowerShell return data
           let data
           let params
@@ -858,6 +866,16 @@ export default {
               output: output.trim()
             }
           }
+          // Save to history
+          this.history = {
+            currentCommand: this.currentCommand,
+            currentCommandMaster: this.currentCommandMaster,
+            currentWorkflowIndex: this.currentWorkflowIndex,
+            resultCommand: this.resultCommand,
+            returnParams: this.returnParams,
+            returnParamsPaginate: this.returnParamsPaginate,
+            results: this.results
+          }
           this.displayResultsDiag = true
           this.toggleLoading()
         }).catch(error => {

src/pages/SettingsPage.vue

@@ -1,7 +1,11 @@
 <template>
   <q-page class="row justify-center items-center">
     <div class="column">
-      <q-card class="full-width">
+      <q-card
+        class="full-width"
+        square
+        bordered
+      >
         <q-card-section>
           <q-toolbar-title class="text-h2 text-center">
             {{ $t('settings') }}

src/store/lazystore/actions.js

@@ -72,3 +72,23 @@ export async function setUpdateProgress ({ commit }, updateProgress) {
 export async function setAlwaysConfirm ({ commit }, alwaysConfirm) {
   commit('SET_ALWAYSCONFIRM', alwaysConfirm)
 }
+
+// Commit mutation to set history length - Accessed in SettingsPage.vue
+export async function setHistoryLength ({ commit }, historyLength) {
+  commit('SET_HISTORYLENGTH', historyLength)
+}
+
+// Commit mutation to set history dialog visibility - Accessed in FullLayout.vue
+export async function setHistoryVisible ({ commit }, historyVisible) {
+  commit('SET_HISTORYVISIBLE', historyVisible)
+}
+
+// Commit mutation to set history - Accessed in ScriptsPage.vue
+export async function setHistory ({ commit, state }, history) {
+  // const newHistory = state.history
+  // newHistory.unshift(history)
+  // if (newHistory.length > this.historyLength) {
+  //   newHistory.length = this.historyLength
+  // }
+  commit('SET_HISTORY', history)
+}

src/store/lazystore/getters.js

@@ -46,6 +46,18 @@ export function getAlwaysConfirm (state) {
   return state.always_confirm
 }
 
+export function getHistoryLength (state) {
+  return state.history_length
+}
+
+export function getHistoryVisible (state) {
+  return state.history_visible
+}
+
+export function getHistory (state) {
+  return state.history
+}
+
 // Dynamically build array of scripts to display in ScriptsPage.vue page
 export function getScriptsArray (state) {
   try {

src/store/lazystore/mutations.js

@@ -54,3 +54,15 @@ export const SET_UPDATEPROGRESS = (state, value) => {
 export const SET_ALWAYSCONFIRM = (state, value) => {
   state.always_confirm = value
 }
+
+export const SET_HISTORYLENGTH = (state, value) => {
+  state.history_length = value
+}
+
+export const SET_HISTORYVISIBLE = (state, value) => {
+  state.history_visible = value
+}
+
+export const SET_HISTORY = (state, value) => {
+  state.history.unshift(value)
+}

src/store/lazystore/state.js

@@ -13,6 +13,9 @@ export default function () {
     definitions_update_in_progress: false, // Are definitions update in progress?
     restart_required: false, // Is application restart required? (To install updates)
     update_progress: '', // Update Progress message
-    always_confirm: false // Should confirmation dialog be always displayed regardless script definition
+    always_confirm: false, // Should confirmation dialog be always displayed regardless script definition
+    history_length: 100, // How many commands should be saved
+    history_visible: false, // Is history dialog window visible?
+    history: [] // Array holding previous commands
   }
 }