Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update reqs and fix custom field values

This commit is contained in:
sadnub 2021-05-28 22:31:58 -04:00
parent bd8d523e10
commit 71a1f9d74a
4 changed files with 84 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
web/package-lock.json generated
View File

@ -13,13 +13,13 @@
"dotenv": "^8.6.0",
"prismjs": "^1.23.0",
"qrcode.vue": "^3.2.0",
"quasar": "^2.0.0-beta.17",
"quasar": "^2.0.0-beta.19",
"vue-prism-editor": "^2.0.0-alpha.2",
"vue3-apexcharts": "^1.4.0"
},
"devDependencies": {
"@quasar/app": "^3.0.0-beta.24",
"@quasar/cli": "^1.1.3"
"@quasar/app": "^3.0.0-beta.27",
"@quasar/cli": "^1.2.0"
}
},
"node_modules/@babel/code-frame": {
@ -2065,9 +2065,9 @@
"dev": true
},
"node_modules/@types/node": {
"version": "15.3.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
"integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
"version": "15.6.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
"integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
"dev": true
},
"node_modules/@types/parse-json": {
@ -2514,6 +2514,18 @@
"node": ">= 0.6"
}
},
"node_modules/acorn": {
"version": "8.2.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
"integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
},
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/acorn-walk": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
@ -5243,9 +5255,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
"version": "1.3.728",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
"integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
"version": "1.3.738",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
"integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
"dev": true
},
"node_modules/elementtree": {
@ -6928,6 +6940,15 @@
}
]
},
"node_modules/ignore": {
"version": "5.1.8",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
"dev": true,
"engines": {
"node": ">= 4"
}
},
"node_modules/import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@ -9934,15 +9955,6 @@
"integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
"dev": true
},
"node_modules/postcss/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/prepend-http": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
@ -10077,9 +10089,9 @@
}
},
"node_modules/quasar": {
"version": "2.0.0-beta.17",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.0-beta.17.tgz",
"integrity": "sha512-TvpytNLpZZiguZHRvolQzRPMuPZPbUn84cyrmOeXlAfWccJx3tEdR2YQGMQWcyJU+hK9N/nUSurSCxwcxVctHw==",
"version": "2.0.0-beta.19",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.0-beta.19.tgz",
"integrity": "sha512-0h+HMytYpWkmsRldFzJlPlfSoUjxKoCZB8dpK4UTsFdOfN3OLOEhHxxqfViC1MRqU4NnnO4/6PcP9khJiy9esQ==",
"engines": {
"node": ">= 10.18.1",
"npm": ">= 6.13.4",
@ -11682,9 +11694,9 @@
}
},
"node_modules/table/node_modules/ajv": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.4.0.tgz",
"integrity": "sha512-7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q==",
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
"integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
"dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
@ -14776,9 +14788,9 @@
"dev": true
},
"@types/node": {
"version": "15.3.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
"integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
"version": "15.6.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
"integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
"dev": true
},
"@types/parse-json": {
@ -15211,6 +15223,12 @@
"negotiator": "0.6.2"
}
},
"acorn": {
"version": "8.2.4",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
"integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
"dev": true
},
"acorn-walk": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",
@ -17363,9 +17381,9 @@
}
},
"electron-to-chromium": {
"version": "1.3.728",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
"integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
"version": "1.3.738",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
"integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
"dev": true
},
"elementtree": {
@ -18694,6 +18712,12 @@
"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
"dev": true
},
"ignore": {
"version": "5.1.8",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
"dev": true
},
"import-fresh": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@ -21045,9 +21069,9 @@
"dev": true
},
"quasar": {
"version": "2.0.0-beta.17",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.0-beta.17.tgz",
"integrity": "sha512-TvpytNLpZZiguZHRvolQzRPMuPZPbUn84cyrmOeXlAfWccJx3tEdR2YQGMQWcyJU+hK9N/nUSurSCxwcxVctHw=="
"version": "2.0.0-beta.19",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.0-beta.19.tgz",
"integrity": "sha512-0h+HMytYpWkmsRldFzJlPlfSoUjxKoCZB8dpK4UTsFdOfN3OLOEhHxxqfViC1MRqU4NnnO4/6PcP9khJiy9esQ=="
},
"query-string": {
"version": "5.1.1",
@ -22287,9 +22311,9 @@
},
"dependencies": {
"ajv": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.4.0.tgz",
"integrity": "sha512-7QD2l6+KBSLwf+7MuYocbWvRPdOu63/trReTLu2KFwkgctnub1auoF+Y1WYcm09CTM7quuscrzqmASaLHC/K4Q==",
"version": "8.5.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
"integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",

12
web/package.json
View File

@ -11,18 +11,18 @@
},
"dependencies": {
"@quasar/extras": "^1.10.6",
"apexcharts": "^3.23.1",
"apexcharts": "^3.26.3",
"axios": "^0.21.1",
"dotenv": "^8.2.0",
"prismjs": "^1.22.0",
"dotenv": "^8.6.0",
"prismjs": "^1.23.0",
"qrcode.vue": "^3.2.0",
"quasar": "^2.0.0-beta.17",
"quasar": "^2.0.0-beta.19",
"vue-prism-editor": "^2.0.0-alpha.2",
"vue3-apexcharts": "^1.4.0"
},
"devDependencies": {
"@quasar/app": "^3.0.0-beta.24",
"@quasar/cli": "^1.1.3"
"@quasar/app": "^3.0.0-beta.27",
"@quasar/cli": "^1.2.0"
},
"browserslist": [
"last 3 Chrome versions",

24
web/src/components/CustomField.vue
View File

@ -8,8 +8,8 @@
:label="field.name"
:type="field.type === 'text' ? 'text' : 'number'"
:hint="hintText(field)"
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
:rules="[...validationRules]"
reactive-rules
autogrow
@ -20,8 +20,8 @@
ref="input"
:label="field.name"
:hint="hintText(field)"
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
/>
<q-input
@ -31,8 +31,8 @@
:hint="hintText(field)"
outlined
dense
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
:rules="[...validationRules]"
reactive-rules
>
@ -40,8 +40,8 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-date
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
mask="YYYY-MM-DD HH:mm"
>
<div class="row items-center justify-end">
@ -53,8 +53,8 @@
<q-icon name="access_time" class="cursor-pointer">
<q-popup-proxy transition-show="scale" transition-hide="scale">
<q-time
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
mask="YYYY-MM-DD HH:mm"
>
<div class="row items-center justify-end">
@ -69,8 +69,8 @@
<q-select
v-else-if="field.type === 'single' || field.type === 'multiple'"
ref="input"
:modelValue="modelValue"
@update:modelValue="value => $emit('update:modelValue', value)"
:model-value="modelValue"
@update:model-value="value => $emit('update:modelValue', value)"
outlined
dense
:hint="hintText(field)"

10
web/src/components/modals/coresettings/CustomFieldsForm.vue
View File

@ -70,7 +70,7 @@
dense
label="Default Value"
v-model="localField.default_value_string"
:rules="[...defaultValueRules]"
:rules="defaultValueRules"
reactive-rules
>
<template v-slot:append>
@ -111,7 +111,7 @@
outlined
dense
v-model="localField.default_value_string"
:rules="[...defaultValueRules]"
:rules="defaultValueRules"
reactive-rules
/>
@ -124,7 +124,7 @@
dense
multiple
v-model="localField.default_values_multiple"
:rules="[...defaultValueRules]"
:rules="defaultValueRules"
reactive-rules
/>
@ -136,7 +136,7 @@
outlined
dense
v-model="localField.default_value_string"
:rules="[...defaultValueRules]"
:rules="defaultValueRules"
reactive-rules
autogrow
/>
@ -205,6 +205,8 @@ export default {
defaultValueRules() {
if (this.localField.required) {
return [val => !!val || `Default Value needs to be set for required fields`];
} else {
return [];
}
},
},