diff options
| author | Derick Montague <derick.montague@ibm.com> | 2020-10-22 00:20:00 +0300 |
|---|---|---|
| committer | Derick Montague <derick.montague@ibm.com> | 2020-11-03 19:47:51 +0300 |
| commit | 602e98aa32f82fd3b0c3d250c7cc1f8da971db24 (patch) | |
| tree | 2894194868ff987718a8b19f112b8106d662aa83 | |
| parent | 47165201c79b3d2c4ccc62a49a9c75d038ee8fe6 (diff) | |
| download | webui-vue-602e98aa32f82fd3b0c3d250c7cc1f8da971db24.tar.xz | |
Update linting packages to use latest
- 99% of changes were small syntax changes that were changed by the
lint command. There were a couple of small manual changes to meet the
property order patterns established as part of the vue:recommended
guidelines.
There are rules that were set from errors to warnings and new stories
are being opened to address those issues.
Testing:
- Successfully ran npm run serve
- Successfully ran npm run lint
- Verified functionality works as expected, e.g. success and failure use cases
- Resolved any JavaScript errors thrown to the console
Signed-off-by: Derick Montague <derick.montague@ibm.com>
Change-Id: Ie082f31c73ccbe8a60afa8f88a9ef6dbf33d9fd2
121 files changed, 2531 insertions, 2330 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index 02167f42..c404a6d5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,36 +1,39 @@ module.exports = { root: true, env: { - node: true + node: true, }, - extends: ['plugin:vue/recommended', '@vue/prettier'], + extends: ['plugin:vue/recommended', 'eslint:recommended', '@vue/prettier'], rules: { + 'no-prototype-builtins': 'warn', 'no-console': 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'prettier/prettier': [ 'error', { - singleQuote: true - } + singleQuote: true, + }, ], - 'vue/component-name-in-template-casing': ['error', 'kebab-case'] + 'vue/component-name-in-template-casing': ['error', 'kebab-case'], + 'vue/custom-event-name-casing': ['warn'], + 'vue/no-unused-vars': ['warn'], }, parserOptions: { - parser: 'babel-eslint' + parser: 'babel-eslint', }, globals: { expect: true, - sinon: true + sinon: true, }, overrides: [ { files: [ '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)' + '**/tests/unit/**/*.spec.{j,t}s?(x)', ], env: { - jest: true - } - } - ] + jest: true, + }, + }, + ], }; diff --git a/babel.config.js b/babel.config.js index 03e1dd91..b8daaabc 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: [['@vue/cli-plugin-babel/preset', { useBuiltIns: 'entry' }]] + presets: [['@vue/cli-plugin-babel/preset', { useBuiltIns: 'entry' }]], }; diff --git a/jest.config.js b/jest.config.js index 6154fa39..86ffcd51 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,4 +1,4 @@ module.exports = { preset: '@vue/cli-plugin-unit-jest', - transformIgnorePatterns: ['/node_modules/(?!@carbon)'] + transformIgnorePatterns: ['/node_modules/(?!@carbon)'], }; diff --git a/package-lock.json b/package-lock.json index 81659fba..c0a5a1d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1107,6 +1107,90 @@ "minimist": "^1.2.0" } }, + "@eslint/eslintrc": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz", + "integrity": "sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + } + } + }, "@hapi/address": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", @@ -1214,6 +1298,12 @@ "strip-ansi": "^5.0.0" }, "dependencies": { + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -1380,40 +1470,12 @@ "glob-to-regexp": "^0.3.0" } }, - "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.3", - "run-parallel": "^1.1.9" - }, - "dependencies": { - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", - "dev": true - } - } - }, "@nodelib/fs.stat": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, - "@nodelib/fs.walk": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", - "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.3", - "fastq": "^1.6.0" - } - }, "@novnc/novnc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@novnc/novnc/-/novnc-1.2.0.tgz", @@ -1491,15 +1553,6 @@ } } }, - "@samverschueren/stream-to-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", - "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", - "dev": true, - "requires": { - "any-observable": "^0.3.0" - } - }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -1710,6 +1763,12 @@ "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", "dev": true }, + "@types/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", + "dev": true + }, "@types/q": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", @@ -1963,171 +2022,6 @@ "inquirer": "^7.1.0", "webpack": "^4.0.0", "yorkie": "^2.0.0" - }, - "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "dev": true, - "requires": { - "type-fest": "^0.11.0" - } - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "dev": true - } } }, "@vue/cli-plugin-router": { @@ -2540,6 +2434,13 @@ "yallist": "^2.1.2" } }, + "prettier": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "dev": true, + "optional": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -3222,9 +3123,9 @@ } }, "acorn-jsx": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", - "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, "acorn-walk": { @@ -3347,10 +3248,21 @@ "dev": true }, "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } + } }, "ansi-html": { "version": "0.0.7", @@ -3373,12 +3285,6 @@ "color-convert": "^1.9.0" } }, - "any-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", - "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==", - "dev": true - }, "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -5138,62 +5044,85 @@ "dev": true }, "cli-truncate": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", - "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, "requires": { - "slice-ansi": "0.0.4", - "string-width": "^1.0.1" + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "color-name": "~1.1.4" } }, - "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } } } }, "cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, "clipboard": { @@ -5295,12 +5224,6 @@ "q": "^1.1.2" } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -6985,12 +6908,6 @@ "integrity": "sha512-0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==", "dev": true }, - "elegant-spinner": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", - "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", - "dev": true - }, "elliptic": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", @@ -7064,6 +6981,23 @@ } } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + }, + "dependencies": { + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + } + } + }, "entities": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", @@ -7197,64 +7131,152 @@ } }, "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz", + "integrity": "sha512-G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", + "@eslint/eslintrc": "^0.1.3", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", + "enquirer": "^2.3.5", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.0", + "esquery": "^1.2.0", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", + "levn": "^0.4.1", + "lodash": "^4.17.19", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", + "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", "table": "^5.2.3", - "text-table": "^0.2.0" + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "eslint-visitor-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", + "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "dev": true + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -7265,33 +7287,120 @@ "resolve-from": "^4.0.0" } }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" } } } }, "eslint-config-prettier": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz", - "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.14.0.tgz", + "integrity": "sha512-DbVwh0qZhAC7CNDWcq8cBdK6FcVHiMTKmCypOPWeZkp9hJ8xYwTaWSa6bb6cjfi8KOeJy0e9a8Izxyx+O4+gCQ==", "dev": true, "requires": { "get-stdin": "^6.0.0" @@ -7320,12 +7429,23 @@ } }, "eslint-plugin-vue": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz", - "integrity": "sha512-mSv2Ebz3RaPP+XJO/mu7F+SdR9lrMyGISSExnarLFqqf3pF5wTmwWNrhHW1o9zKzKI811UVTIIkWJJvgO6SsUQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.1.0.tgz", + "integrity": "sha512-9dW7kj8/d2IkDdgNpvIhJdJ3XzU3x4PThXYMzWt49taktYnGyrTY6/bXCYZ/VtQKU9kXPntPrZ41+8Pw0Nxblg==", "dev": true, "requires": { - "vue-eslint-parser": "^4.0.2" + "eslint-utils": "^2.1.0", + "natural-compare": "^1.4.0", + "semver": "^7.3.2", + "vue-eslint-parser": "^7.1.1" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } } }, "eslint-scope": { @@ -7339,9 +7459,9 @@ } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" @@ -7360,14 +7480,22 @@ "dev": true }, "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", "dev": true, "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "acorn": "^7.4.0", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + } } }, "esprima": { @@ -7386,9 +7514,9 @@ }, "dependencies": { "estraverse": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz", - "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", "dev": true } } @@ -7776,15 +7904,6 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, - "fastq": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", - "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, "faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", @@ -7810,9 +7929,9 @@ "dev": true }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" @@ -8892,68 +9011,130 @@ "dev": true }, "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", "through": "^2.3.6" }, "dependencies": { - "ansi-regex": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - } + "has-flag": "^4.0.0" } } } @@ -9262,15 +9443,6 @@ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", - "dev": true, - "requires": { - "symbol-observable": "^1.1.0" - } - }, "is-path-cwd": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", @@ -9310,12 +9482,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true - }, "is-regex": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", @@ -10134,15 +10300,6 @@ "strip-ansi": "^5.0.0" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "dev": true, - "requires": { - "type-fest": "^0.11.0" - } - }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -10167,12 +10324,6 @@ "requires": { "ansi-regex": "^4.1.0" } - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "dev": true } } }, @@ -10189,6 +10340,14 @@ "chalk": "^2.0.1", "jest-util": "^24.9.0", "string-length": "^2.0.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + } } }, "jest-worker": { @@ -10504,38 +10663,36 @@ } }, "lint-staged": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.4.2.tgz", - "integrity": "sha512-OFyGokJSWTn2M6vngnlLXjaHhi8n83VIZZ5/1Z26SULRUWgR3ITWpAEQC9Pnm3MC/EpCxlwts/mQWDHNji2+zA==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.4.2.tgz", + "integrity": "sha512-OLCA9K1hS+Sl179SO6kX0JtnsaKj/MZalEhUj5yAgXsb63qPI/Gfn6Ua1KuZdbfkZNEu3/n5C/obYCu70IMt9g==", "dev": true, "requires": { - "chalk": "^2.4.2", - "commander": "^2.20.0", - "cosmiconfig": "^5.2.1", + "chalk": "^4.1.0", + "cli-truncate": "^2.1.0", + "commander": "^6.0.0", + "cosmiconfig": "^7.0.0", "debug": "^4.1.1", "dedent": "^0.7.0", - "del": "^5.0.0", - "execa": "^2.0.3", - "listr": "^0.14.3", - "log-symbols": "^3.0.0", + "enquirer": "^2.3.6", + "execa": "^4.0.3", + "listr2": "^2.6.0", + "log-symbols": "^4.0.0", "micromatch": "^4.0.2", "normalize-path": "^3.0.0", - "please-upgrade-node": "^3.1.1", - "string-argv": "^0.3.0", + "please-upgrade-node": "^3.2.0", + "string-argv": "0.3.1", "stringify-object": "^3.3.0" }, "dependencies": { - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", - "dev": true - }, - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } }, "braces": { "version": "3.0.2", @@ -10546,82 +10703,87 @@ "fill-range": "^7.0.1" } }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "color-name": "~1.1.4" } }, - "del": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", - "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "commander": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz", + "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", + "dev": true + }, + "cosmiconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", "dev": true, "requires": { - "globby": "^10.0.1", - "graceful-fs": "^4.2.2", - "is-glob": "^4.0.1", - "is-path-cwd": "^2.2.0", - "is-path-inside": "^3.0.1", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "slash": "^3.0.0" + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" } }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "path-type": "^4.0.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" } }, "execa": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz", - "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz", + "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==", "dev": true, "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", + "human-signals": "^1.1.1", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^3.0.0", + "npm-run-path": "^4.0.0", "onetime": "^5.1.0", - "p-finally": "^2.0.0", "signal-exit": "^3.0.2", "strip-final-newline": "^2.0.0" } }, - "fast-glob": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", - "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -10632,48 +10794,36 @@ } }, "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" } }, - "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "import-fresh": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", + "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" } }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, - "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", - "dev": true - }, "is-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", @@ -10681,12 +10831,12 @@ "dev": true }, "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", "dev": true, "requires": { - "chalk": "^2.4.2" + "chalk": "^4.0.0" } }, "micromatch": { @@ -10712,29 +10862,23 @@ "dev": true }, "npm-run-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz", - "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { "path-key": "^3.0.0" } }, "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { "mimic-fn": "^2.1.0" } }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==", - "dev": true - }, "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -10747,14 +10891,11 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true }, "shebang-command": { "version": "2.0.0", @@ -10771,11 +10912,14 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } }, "to-regex-range": { "version": "5.0.1", @@ -10797,137 +10941,88 @@ } } }, - "listr": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", - "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", - "dev": true, - "requires": { - "@samverschueren/stream-to-observable": "^0.3.0", - "is-observable": "^1.1.0", - "is-promise": "^2.1.0", - "is-stream": "^1.1.0", - "listr-silent-renderer": "^1.1.1", - "listr-update-renderer": "^0.5.0", - "listr-verbose-renderer": "^0.5.0", - "p-map": "^2.0.0", - "rxjs": "^6.3.3" - }, - "dependencies": { - "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true - } - } - }, - "listr-silent-renderer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz", - "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=", - "dev": true - }, - "listr-update-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", - "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", + "listr2": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.6.2.tgz", + "integrity": "sha512-6x6pKEMs8DSIpA/tixiYY2m/GcbgMplMVmhQAaLFxEtNSKLeWTGjtmU57xvv6QCm2XcqzyNXL/cTSVf4IChCRA==", "dev": true, "requires": { - "chalk": "^1.1.3", - "cli-truncate": "^0.2.1", - "elegant-spinner": "^1.0.1", - "figures": "^1.7.0", - "indent-string": "^3.0.0", - "log-symbols": "^1.0.2", - "log-update": "^2.3.0", - "strip-ansi": "^3.0.1" + "chalk": "^4.1.0", + "cli-truncate": "^2.1.0", + "figures": "^3.2.0", + "indent-string": "^4.0.0", + "log-update": "^4.0.0", + "p-map": "^4.0.0", + "rxjs": "^6.6.2", + "through": "^2.3.8" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } }, "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" + "color-name": "~1.1.4" } }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "log-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", - "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "chalk": "^1.0.0" + "aggregate-error": "^3.0.0" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "rxjs": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "tslib": "^1.9.0" } }, "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "listr-verbose-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", - "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "cli-cursor": "^2.1.0", - "date-fns": "^1.27.2", - "figures": "^2.0.0" - }, - "dependencies": { - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", - "dev": true + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -11150,49 +11245,139 @@ } }, "log-update": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", - "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "cli-cursor": "^2.0.0", - "wrap-ansi": "^3.0.1" + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" }, "dependencies": { - "ansi-regex": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "^0.11.0" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "mimic-fn": "^2.1.0" } }, - "strip-ansi": { + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "slice-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + } + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + }, "wrap-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", - "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } } } @@ -11729,9 +11914,9 @@ "dev": true }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, "mz": { @@ -11990,12 +12175,6 @@ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, "nwsapi": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", @@ -13322,9 +13501,9 @@ "dev": true }, "prettier": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", - "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, "prettier-linter-helpers": { @@ -13777,9 +13956,9 @@ } }, "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", "dev": true }, "regexpu-core": { @@ -14047,12 +14226,6 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, "rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", @@ -14112,9 +14285,9 @@ } }, "rxjs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz", - "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -15319,12 +15492,6 @@ "util.promisify": "~1.0.0" } }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "dev": true - }, "symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -16208,6 +16375,12 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, + "v8-compile-cache": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", + "dev": true + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16283,37 +16456,70 @@ } }, "vue-eslint-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz", - "integrity": "sha512-AUeQsYdO6+7QXCems+WvGlrXd37PHv/zcRQSQdY1xdOMwdFAPEnMBsv7zPvk0TPGulXkK/5p/ITgrjiYB7k3ag==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz", + "integrity": "sha512-8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA==", "dev": true, "requires": { - "debug": "^4.1.0", - "eslint-scope": "^4.0.0", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.1.0", + "debug": "^4.1.1", + "eslint-scope": "^5.0.0", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.2.1", "esquery": "^1.0.1", - "lodash": "^4.17.11" + "lodash": "^4.17.15" }, "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" + } + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, "espree": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", - "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "dev": true, "requires": { - "acorn": "^6.0.2", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "ms": { @@ -17434,6 +17640,12 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, + "yaml": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==", + "dev": true + }, "yargs": { "version": "13.3.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", diff --git a/package.json b/package.json index 99a750d5..0f4c00de 100644 --- a/package.json +++ b/package.json @@ -46,11 +46,11 @@ "babel-eslint": "10.1.0", "check-node-version": "4.0.3", "compression-webpack-plugin": "6.0.3", - "eslint": "5.16.0", + "eslint": "7.11.0", "eslint-plugin-prettier": "3.1.4", - "eslint-plugin-vue": "5.0.0", - "lint-staged": "9.4.2", - "prettier": "1.18.2", + "eslint-plugin-vue": "7.1.0", + "lint-staged": "10.4.2", + "prettier": "2.1.2", "sass": "1.27.0", "sass-loader": "8.0.0", "vue-cli-plugin-i18n": "0.6.1", diff --git a/postcss.config.js b/postcss.config.js index 5bfb8f62..a47ef4f9 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,5 +1,5 @@ module.exports = { plugins: { - autoprefixer: {} - } + autoprefixer: {}, + }, }; diff --git a/src/App.vue b/src/App.vue index b57a91db..f6991c46 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,20 +4,20 @@ </div> </template> -<style lang="scss"> -@import '@/assets/styles/_obmc-custom'; -</style> - <script> export default { name: 'App', watch: { - $route: function(to) { + $route: function (to) { document.title = to.meta.title || 'Page is missing title'; - } + }, }, created() { document.title = this.$route.meta.title || 'Page is missing title'; - } + }, }; </script> + +<style lang="scss"> +@import '@/assets/styles/_obmc-custom'; +</style> diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index b1554121..01ebf5a1 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -69,7 +69,7 @@ right data-test-id="appHeader-container-user" > - <template v-slot:button-content> + <template #button-content> <icon-avatar :title="$t('appHeader.titleProfile')" /> <span class="responsive-text">{{ username }}</span> </template> @@ -110,13 +110,13 @@ export default { IconMenu, IconRenew, StatusIcon, - LoadingBar + LoadingBar, }, mixins: [BVToastMixin], data() { return { isNavigationOpen: false, - altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo` + altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo`, }; }, computed: { @@ -156,7 +156,7 @@ export default { }, username() { return this.$store.getters['global/username']; - } + }, }, watch: { isAuthorized(value) { @@ -166,7 +166,7 @@ export default { this.$t('global.toast.unAuthTitle') ); } - } + }, }, created() { // Reset auth state to check if user is authenticated based @@ -178,7 +178,7 @@ export default { mounted() { this.$root.$on( 'change:isNavigationOpen', - isNavigationOpen => (this.isNavigationOpen = isNavigationOpen) + (isNavigationOpen) => (this.isNavigationOpen = isNavigationOpen) ); }, methods: { @@ -196,8 +196,8 @@ export default { }, toggleNavigation() { this.$root.$emit('toggle:navigation'); - } - } + }, + }, }; </script> diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue index 5d8a17f5..18b80000 100644 --- a/src/components/AppNavigation/AppNavigation.vue +++ b/src/components/AppNavigation/AppNavigation.vue @@ -63,16 +63,16 @@ export default { mixins: [AppNavigationMixin], data() { return { - isNavigationOpen: false + isNavigationOpen: false, }; }, watch: { - $route: function() { + $route: function () { this.isNavigationOpen = false; }, - isNavigationOpen: function(isNavigationOpen) { + isNavigationOpen: function (isNavigationOpen) { this.$root.$emit('change:isNavigationOpen', isNavigationOpen); - } + }, }, mounted() { this.$root.$on('toggle:navigation', () => this.toggleIsOpen()); @@ -80,8 +80,8 @@ export default { methods: { toggleIsOpen() { this.isNavigationOpen = !this.isNavigationOpen; - } - } + }, + }, }; </script> diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index 498d6ca1..cf34b914 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -12,7 +12,7 @@ const AppNavigationMixin = { iconControl: IconSettingsAdjust, iconConfiguration: IconSettings, iconAccessControl: IconPassword, - iconExpand: IconChevronUp + iconExpand: IconChevronUp, }, data() { return { @@ -21,7 +21,7 @@ const AppNavigationMixin = { id: 'overview', label: this.$t('appNavigation.overview'), route: '/', - icon: 'iconOverview' + icon: 'iconOverview', }, { id: 'health', @@ -31,19 +31,19 @@ const AppNavigationMixin = { { id: 'event-logs', label: this.$t('appNavigation.eventLogs'), - route: '/health/event-logs' + route: '/health/event-logs', }, { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), - route: '/health/hardware-status' + route: '/health/hardware-status', }, { id: 'sensors', label: this.$t('appNavigation.sensors'), - route: '/health/sensors' - } - ] + route: '/health/sensors', + }, + ], }, { id: 'control', @@ -53,39 +53,39 @@ const AppNavigationMixin = { { id: 'kvm', label: this.$t('appNavigation.kvm'), - route: '/control/kvm' + route: '/control/kvm', }, { id: 'manage-power-usage', label: this.$t('appNavigation.managePowerUsage'), - route: '/control/manage-power-usage' + route: '/control/manage-power-usage', }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), - route: '/control/reboot-bmc' + route: '/control/reboot-bmc', }, { id: 'serial-over-lan', label: this.$t('appNavigation.serialOverLan'), - route: '/control/serial-over-lan' + route: '/control/serial-over-lan', }, { id: 'server-led', label: this.$t('appNavigation.serverLed'), - route: '/control/server-led' + route: '/control/server-led', }, { id: 'server-power-operations', label: this.$t('appNavigation.serverPowerOperations'), - route: '/control/server-power-operations' + route: '/control/server-power-operations', }, { id: 'virtual-media', label: this.$t('appNavigation.virtualMedia'), - route: '/control/virtual-media' - } - ] + route: '/control/virtual-media', + }, + ], }, { id: 'configuration', @@ -95,24 +95,24 @@ const AppNavigationMixin = { { id: 'date-time-settings', label: this.$t('appNavigation.dateTimeSettings'), - route: '/configuration/date-time-settings' + route: '/configuration/date-time-settings', }, { id: 'firmware', label: this.$t('appNavigation.firmware'), - route: '/configuration/firmware' + route: '/configuration/firmware', }, { id: 'network-settings', label: this.$t('appNavigation.networkSettings'), - route: '/configuration/network-settings' + route: '/configuration/network-settings', }, { id: 'snmp-settings', label: this.$t('appNavigation.snmpSettings'), - route: '' - } - ] + route: '', + }, + ], }, { id: 'access-control', @@ -122,23 +122,23 @@ const AppNavigationMixin = { { id: 'ldap', label: this.$t('appNavigation.ldap'), - route: '/access-control/ldap' + route: '/access-control/ldap', }, { id: 'local-user-management', label: this.$t('appNavigation.localUserManagement'), - route: '/access-control/local-user-management' + route: '/access-control/local-user-management', }, { id: 'ssl-certificates', label: this.$t('appNavigation.sslCertificates'), - route: '/access-control/ssl-certificates' - } - ] - } - ] + route: '/access-control/ssl-certificates', + }, + ], + }, + ], }; - } + }, }; export default AppNavigationMixin; diff --git a/src/components/Global/Alert.vue b/src/components/Global/Alert.vue index 88a4ae3d..e8de9e27 100644 --- a/src/components/Global/Alert.vue +++ b/src/components/Global/Alert.vue @@ -3,9 +3,9 @@ <div v-if=" variant == 'info' || - variant == 'success' || - variant == 'warning' || - variant == 'danger' + variant == 'success' || + variant == 'warning' || + variant == 'danger' " class="alert-icon" > @@ -30,18 +30,18 @@ export default { name: 'Alert', components: { BAlert: BAlert, - StatusIcon: StatusIcon + StatusIcon: StatusIcon, }, props: { show: { type: Boolean, - default: true + default: true, }, variant: { type: String, - default: '' + default: '', }, - small: Boolean - } + small: Boolean, + }, }; </script> diff --git a/src/components/Global/InfoTooltip.vue b/src/components/Global/InfoTooltip.vue index 15141660..f3cb7f12 100644 --- a/src/components/Global/InfoTooltip.vue +++ b/src/components/Global/InfoTooltip.vue @@ -13,9 +13,9 @@ export default { props: { title: { type: String, - default: '' - } - } + default: '', + }, + }, }; </script> diff --git a/src/components/Global/InputPasswordToggle.vue b/src/components/Global/InputPasswordToggle.vue index 228746cf..bf3e4ca5 100644 --- a/src/components/Global/InputPasswordToggle.vue +++ b/src/components/Global/InputPasswordToggle.vue @@ -31,7 +31,7 @@ export default { components: { IconView, IconViewOff }, data() { return { - isVisible: false + isVisible: false, }; }, methods: { @@ -44,8 +44,8 @@ export default { if (inputEl.nodeName === 'INPUT') { inputEl.type = this.isVisible ? 'text' : 'password'; } - } - } + }, + }, }; </script> diff --git a/src/components/Global/LoadingBar.vue b/src/components/Global/LoadingBar.vue index 3f503c8b..d62ef1e2 100644 --- a/src/components/Global/LoadingBar.vue +++ b/src/components/Global/LoadingBar.vue @@ -18,7 +18,7 @@ export default { loadingIndicatorValue: 0, isLoadingComplete: false, loadingIntervalId: null, - timeoutId: null + timeoutId: null, }; }, created() { @@ -66,8 +66,8 @@ export default { clearTimeout() { if (this.timeoutId) clearTimeout(this.timeoutId); this.timeoutId = null; - } - } + }, + }, }; </script> diff --git a/src/components/Global/PageContainer.vue b/src/components/Global/PageContainer.vue index 8396bd5b..e766d38d 100644 --- a/src/components/Global/PageContainer.vue +++ b/src/components/Global/PageContainer.vue @@ -6,7 +6,7 @@ <script> export default { - name: 'PageContainer' + name: 'PageContainer', }; </script> diff --git a/src/components/Global/PageSection.vue b/src/components/Global/PageSection.vue index 303b6e1e..dd39ddd5 100644 --- a/src/components/Global/PageSection.vue +++ b/src/components/Global/PageSection.vue @@ -11,9 +11,9 @@ export default { props: { sectionTitle: { type: String, - default: '' - } - } + default: '', + }, + }, }; </script> diff --git a/src/components/Global/PageTitle.vue b/src/components/Global/PageTitle.vue index e3dc8d0c..45c75edb 100644 --- a/src/components/Global/PageTitle.vue +++ b/src/components/Global/PageTitle.vue @@ -11,14 +11,14 @@ export default { props: { description: { type: String, - default: '' - } + default: '', + }, }, data() { return { - title: this.$route.meta.title + title: this.$route.meta.title, }; - } + }, }; </script> diff --git a/src/components/Global/Search.vue b/src/components/Global/Search.vue index eeb909a8..778965e1 100644 --- a/src/components/Global/Search.vue +++ b/src/components/Global/Search.vue @@ -43,14 +43,14 @@ export default { props: { placeholder: { type: String, - default: function() { + default: function () { return this.$t('global.form.search'); - } - } + }, + }, }, data() { return { - filter: null + filter: null, }; }, methods: { @@ -61,8 +61,8 @@ export default { this.filter = ''; this.$emit('clearSearch'); this.$refs.searchInput.focus(); - } - } + }, + }, }; </script> diff --git a/src/components/Global/StatusIcon.vue b/src/components/Global/StatusIcon.vue index 4b2b47dd..4552633e 100644 --- a/src/components/Global/StatusIcon.vue +++ b/src/components/Global/StatusIcon.vue @@ -22,14 +22,14 @@ export default { iconSuccess: IconCheckmark, iconDanger: IconMisuse, iconSecondary: IconError, - iconWarning: IconWarning + iconWarning: IconWarning, }, props: { status: { type: String, - default: '' - } - } + default: '', + }, + }, }; </script> diff --git a/src/components/Global/TableCellCount.vue b/src/components/Global/TableCellCount.vue index 4f44ec29..75617093 100644 --- a/src/components/Global/TableCellCount.vue +++ b/src/components/Global/TableCellCount.vue @@ -7,7 +7,7 @@ {{ $t('global.table.selectedItems', { count: totalNumberOfCells, - filterCount: filteredItemsCount + filterCount: filteredItemsCount, }) }} </p> @@ -19,17 +19,17 @@ export default { props: { filteredItemsCount: { type: Number, - required: true + required: true, }, totalNumberOfCells: { type: Number, - required: true - } + required: true, + }, }, computed: { filterActive() { return this.filteredItemsCount !== this.totalNumberOfCells; - } - } + }, + }, }; </script> diff --git a/src/components/Global/TableDateFilter.vue b/src/components/Global/TableDateFilter.vue index c0008dea..73b2b832 100644 --- a/src/components/Global/TableDateFilter.vue +++ b/src/components/Global/TableDateFilter.vue @@ -23,7 +23,7 @@ {{ $t('global.form.dateMustBeBefore', { date: toDate }) }} </template> </b-form-invalid-feedback> - <template slot:append> + <template #append> <b-form-datepicker v-model="fromDate" class="input-action" @@ -38,7 +38,7 @@ button-variant="link" aria-controls="input-from-date" > - <template v-slot:button-content> + <template #button-content> <icon-calendar :title="$t('global.calendar.openDatePicker')" aria-hidden="true" @@ -73,7 +73,7 @@ {{ $t('global.form.dateMustBeAfter', { date: fromDate }) }} </template> </b-form-invalid-feedback> - <template slot:append> + <template #append> <b-form-datepicker v-model="toDate" class="input-action" @@ -88,7 +88,7 @@ button-variant="link" aria-controls="input-to-date" > - <template v-slot:button-content> + <template #button-content> <icon-calendar :title="$t('global.calendar.openDatePicker')" aria-hidden="true" @@ -121,31 +121,31 @@ export default { fromDate: '', toDate: '', offsetToDate: '', - locale: this.$store.getters['global/languagePreference'] + locale: this.$store.getters['global/languagePreference'], }; }, validations() { return { fromDate: { pattern: helpers.regex('pattern', isoDateRegex), - maxDate: value => { + maxDate: (value) => { if (!this.toDate) return true; const date = new Date(value); const maxDate = new Date(this.toDate); if (date.getTime() > maxDate.getTime()) return false; return true; - } + }, }, toDate: { pattern: helpers.regex('pattern', isoDateRegex), - minDate: value => { + minDate: (value) => { if (!this.fromDate) return true; const date = new Date(value); const minDate = new Date(this.fromDate); if (date.getTime() < minDate.getTime()) return false; return true; - } - } + }, + }, }; }, watch: { @@ -157,7 +157,7 @@ export default { // entries from selected end date are included in filter this.offsetToDate = new Date(newVal).setUTCHours(23, 59, 59, 999); this.emitChange(); - } + }, }, methods: { emitChange() { @@ -165,9 +165,9 @@ export default { this.$v.$reset(); //reset to re-validate on blur this.$emit('change', { fromDate: this.fromDate ? new Date(this.fromDate) : null, - toDate: this.toDate ? new Date(this.offsetToDate) : null + toDate: this.toDate ? new Date(this.offsetToDate) : null, }); - } - } + }, + }, }; </script> diff --git a/src/components/Global/TableFilter.vue b/src/components/Global/TableFilter.vue index d6a954be..c9fb1068 100644 --- a/src/components/Global/TableFilter.vue +++ b/src/components/Global/TableFilter.vue @@ -18,7 +18,7 @@ @hide="dropdownVisible = false" @show="dropdownVisible = true" > - <template v-slot:button-content> + <template #button-content> <icon-filter /> {{ $t('global.action.filter') }} </template> @@ -62,12 +62,12 @@ export default { filters: { type: Array, default: () => [], - validator: prop => { + validator: (prop) => { return prop.every( - filter => 'label' in filter && 'values' in filter && 'key' in filter + (filter) => 'label' in filter && 'values' in filter && 'key' in filter ); - } - } + }, + }, }, data() { return { @@ -75,9 +75,9 @@ export default { activeFilters: this.filters.map(({ key }) => { return { key, - values: [] + values: [], }; - }) + }), }; }, computed: { @@ -89,44 +89,38 @@ export default { }, set(value) { return value; - } - } + }, + }, }, methods: { removeTag(tag) { - this.activeFilters.forEach(filter => { - filter.values = filter.values.filter(val => val !== tag); + this.activeFilters.forEach((filter) => { + filter.values = filter.values.filter((val) => val !== tag); }); this.emitChange(); }, clearAllTags() { - this.activeFilters.forEach(filter => { + this.activeFilters.forEach((filter) => { filter.values = []; }); this.emitChange(); }, emitChange() { this.$emit('filterChange', { - activeFilters: this.activeFilters + activeFilters: this.activeFilters, }); }, - onChange( - checked, - { - filter: { key }, - value - } - ) { - this.activeFilters.forEach(filter => { + onChange(checked, { filter: { key }, value }) { + this.activeFilters.forEach((filter) => { if (filter.key === key) { checked ? filter.values.push(value) - : (filter.values = filter.values.filter(val => val !== value)); + : (filter.values = filter.values.filter((val) => val !== value)); } }); this.emitChange(); - } - } + }, + }, }; </script> diff --git a/src/components/Global/TableRowAction.vue b/src/components/Global/TableRowAction.vue index f86bce22..7e4af499 100644 --- a/src/components/Global/TableRowAction.vue +++ b/src/components/Global/TableRowAction.vue @@ -36,24 +36,24 @@ export default { props: { value: { type: String, - required: true + required: true, }, enabled: { type: Boolean, - default: true + default: true, }, title: { type: String, - default: null + default: null, }, rowData: { type: Object, - default: () => {} + default: () => {}, }, exportName: { type: String, - default: 'export' - } + default: 'export', + }, }, computed: { dataForExport() { @@ -64,7 +64,7 @@ export default { }, href() { return `data:text/json;charset=utf-8,${this.dataForExport}`; - } - } + }, + }, }; </script> diff --git a/src/components/Global/TableToolbar.vue b/src/components/Global/TableToolbar.vue index 97d8f641..6a856b44 100644 --- a/src/components/Global/TableToolbar.vue +++ b/src/components/Global/TableToolbar.vue @@ -36,34 +36,34 @@ export default { props: { selectedItemsCount: { type: Number, - required: true + required: true, }, actions: { type: Array, default: () => [], - validator: prop => { - return prop.every(action => { + validator: (prop) => { + return prop.every((action) => { return ( action.hasOwnProperty('value') && action.hasOwnProperty('label') ); }); - } - } + }, + }, }, data() { return { - isToolbarActive: false + isToolbarActive: false, }; }, watch: { - selectedItemsCount: function(selectedItemsCount) { + selectedItemsCount: function (selectedItemsCount) { if (selectedItemsCount > 0) { this.isToolbarActive = true; } else { this.isToolbarActive = false; } - } - } + }, + }, }; </script> diff --git a/src/components/Global/TableToolbarExport.vue b/src/components/Global/TableToolbarExport.vue index 59642f52..69646ea6 100644 --- a/src/components/Global/TableToolbarExport.vue +++ b/src/components/Global/TableToolbarExport.vue @@ -14,12 +14,12 @@ export default { props: { data: { type: Array, - default: () => [] + default: () => [], }, fileName: { type: String, - default: 'data' - } + default: 'data', + }, }, computed: { dataForExport() { @@ -30,7 +30,7 @@ export default { }, href() { return `data:text/json;charset=utf-8,${this.dataForExport}`; - } - } + }, + }, }; </script> diff --git a/src/components/Mixins/BVPaginationMixin.js b/src/components/Mixins/BVPaginationMixin.js index 84c46aa4..8b52f8ba 100644 --- a/src/components/Mixins/BVPaginationMixin.js +++ b/src/components/Mixins/BVPaginationMixin.js @@ -6,32 +6,32 @@ const BVPaginationMixin = { itemsPerPageOptions: [ { value: 10, - text: '10' + text: '10', }, { value: 20, - text: '20' + text: '20', }, { value: 30, - text: '30' + text: '30', }, { value: 40, - text: '40' + text: '40', }, { value: 0, - text: this.$t('global.table.viewAll') - } - ] + text: this.$t('global.table.viewAll'), + }, + ], }; }, methods: { getTotalRowCount(count) { return this.perPage === 0 ? 0 : count; - } - } + }, + }, }; export default BVPaginationMixin; diff --git a/src/components/Mixins/BVTableSelectableMixin.js b/src/components/Mixins/BVTableSelectableMixin.js index fba2f2b8..cee7d0c9 100644 --- a/src/components/Mixins/BVTableSelectableMixin.js +++ b/src/components/Mixins/BVTableSelectableMixin.js @@ -3,7 +3,7 @@ const BVTableSelectableMixin = { return { tableHeaderCheckboxModel: false, tableHeaderCheckboxIndeterminate: false, - selectedRows: [] + selectedRows: [], }; }, methods: { @@ -37,8 +37,8 @@ const BVTableSelectableMixin = { if (this.tableHeaderCheckboxModel) tableRef.clearSelected(); else tableRef.selectAllRows(); } - } - } + }, + }, }; export default BVTableSelectableMixin; diff --git a/src/components/Mixins/BVToastMixin.js b/src/components/Mixins/BVToastMixin.js index 95ac5312..5e8ec006 100644 --- a/src/components/Mixins/BVToastMixin.js +++ b/src/components/Mixins/BVToastMixin.js @@ -2,7 +2,7 @@ import i18n from '@/i18n'; import StatusIcon from '../Global/StatusIcon'; const BVToastMixin = { components: { - StatusIcon + StatusIcon, }, methods: { toastTitle(title, status) { @@ -12,7 +12,7 @@ const BVToastMixin = { { class: 'toast-icon' }, [ this.$createElement('StatusIcon', { props: { status: status } }), - title + title, ] ); return titleWithIcon; @@ -23,7 +23,7 @@ const BVToastMixin = { variant: 'success', autoHideDelay: 10000, //auto hide in milliseconds isStatus: true, - solid: true + solid: true, }); }, errorToast(message, title = i18n.t('global.status.error')) { @@ -32,7 +32,7 @@ const BVToastMixin = { variant: 'danger', noAutoHide: true, isStatus: true, - solid: true + solid: true, }); }, warningToast(message, title = i18n.t('global.status.warning')) { @@ -41,7 +41,7 @@ const BVToastMixin = { variant: 'warning', noAutoHide: true, isStatus: true, - solid: true + solid: true, }); }, infoToast(message, title = i18n.t('global.status.informational')) { @@ -50,10 +50,10 @@ const BVToastMixin = { variant: 'info', noAutoHide: true, isStatus: true, - solid: true + solid: true, }); - } - } + }, + }, }; export default BVToastMixin; diff --git a/src/components/Mixins/LoadingBarMixin.js b/src/components/Mixins/LoadingBarMixin.js index fffb1cab..9b6b1957 100644 --- a/src/components/Mixins/LoadingBarMixin.js +++ b/src/components/Mixins/LoadingBarMixin.js @@ -1,7 +1,7 @@ const LoadingBarMixin = { data() { return { - loading: true + loading: true, }; }, methods: { @@ -15,8 +15,8 @@ const LoadingBarMixin = { }, hideLoader() { this.$root.$emit('loader::hide'); - } - } + }, + }, }; export default LoadingBarMixin; diff --git a/src/components/Mixins/LocalTimezoneLabelMixin.js b/src/components/Mixins/LocalTimezoneLabelMixin.js index 0f96a45f..6b4141c6 100644 --- a/src/components/Mixins/LocalTimezoneLabelMixin.js +++ b/src/components/Mixins/LocalTimezoneLabelMixin.js @@ -7,8 +7,8 @@ const LocalTimezoneLabelMixin = { const shortTz = this.$options.filters.shortTimeZone(new Date()); const pattern = `'${shortTz}' O`; return format(new Date(), pattern, { timezone }).replace('GMT', 'UTC'); - } - } + }, + }, }; export default LocalTimezoneLabelMixin; diff --git a/src/components/Mixins/SearchFilterMixin.js b/src/components/Mixins/SearchFilterMixin.js index 856975dc..41f93b1a 100644 --- a/src/components/Mixins/SearchFilterMixin.js +++ b/src/components/Mixins/SearchFilterMixin.js @@ -1,7 +1,7 @@ const SearchFilterMixin = { data() { return { - searchFilter: null + searchFilter: null, }; }, methods: { @@ -10,8 +10,8 @@ const SearchFilterMixin = { }, onClearSearchInput() { this.searchFilter = null; - } - } + }, + }, }; export default SearchFilterMixin; diff --git a/src/components/Mixins/TableDataFormatterMixin.js b/src/components/Mixins/TableDataFormatterMixin.js index 3e15926a..026f8749 100644 --- a/src/components/Mixins/TableDataFormatterMixin.js +++ b/src/components/Mixins/TableDataFormatterMixin.js @@ -23,8 +23,8 @@ const TableDataFormatterMixin = { }, tableFormatterArray(value) { return value.join(', '); - } - } + }, + }, }; export default TableDataFormatterMixin; diff --git a/src/components/Mixins/TableFilterMixin.js b/src/components/Mixins/TableFilterMixin.js index 1a5425f9..7a2cc540 100644 --- a/src/components/Mixins/TableFilterMixin.js +++ b/src/components/Mixins/TableFilterMixin.js @@ -11,7 +11,7 @@ const TableFilterMixin = { // Check if row property value is included in list of // active filters - return tableData.filter(row => { + return tableData.filter((row) => { let returnRow = false; for (const { key, values } of filters) { const rowProperty = row[key]; @@ -45,14 +45,14 @@ const TableFilterMixin = { : Number.POSITIVE_INFINITY; } - return tableData.filter(row => { + return tableData.filter((row) => { const date = row[propertyKey]; if (!(date instanceof Date)) return; const dateInMs = date.getTime(); if (dateInMs >= startDateInMs && dateInMs <= endDateInMs) return row; }); - } - } + }, + }, }; export default TableFilterMixin; diff --git a/src/components/Mixins/TableRowExpandMixin.js b/src/components/Mixins/TableRowExpandMixin.js index fad63c61..d5246cda 100644 --- a/src/components/Mixins/TableRowExpandMixin.js +++ b/src/components/Mixins/TableRowExpandMixin.js @@ -1,7 +1,7 @@ const TableRowExpandMixin = { data() { return { - expandRowLabel: this.$t('global.table.expandTableRow') + expandRowLabel: this.$t('global.table.expandTableRow'), }; }, methods: { @@ -10,8 +10,8 @@ const TableRowExpandMixin = { row.detailsShowing ? (this.expandRowLabel = this.$t('global.table.expandTableRow')) : (this.expandRowLabel = this.$t('global.table.collapseTableRow')); - } - } + }, + }, }; export default TableRowExpandMixin; diff --git a/src/components/Mixins/TableSortMixin.js b/src/components/Mixins/TableSortMixin.js index 7e988503..c0997350 100644 --- a/src/components/Mixins/TableSortMixin.js +++ b/src/components/Mixins/TableSortMixin.js @@ -4,8 +4,8 @@ const TableSortMixin = { methods: { sortStatus(a, b, key) { return STATUS.indexOf(a[key]) - STATUS.indexOf(b[key]); - } - } + }, + }, }; export default TableSortMixin; diff --git a/src/components/Mixins/VuelidateMixin.js b/src/components/Mixins/VuelidateMixin.js index 8c617791..fec85251 100644 --- a/src/components/Mixins/VuelidateMixin.js +++ b/src/components/Mixins/VuelidateMixin.js @@ -3,8 +3,8 @@ const VuelidateMixin = { getValidationState(model) { const { $dirty, $error } = model; return $dirty ? !$error : null; - } - } + }, + }, }; export default VuelidateMixin; diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index 1f25230a..a9870d3b 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -12,7 +12,7 @@ const AppNavigationMixin = { iconControl: IconSettingsAdjust, iconConfiguration: IconSettings, iconAccessControl: IconPassword, - iconExpand: IconChevronUp + iconExpand: IconChevronUp, }, data() { return { @@ -21,7 +21,7 @@ const AppNavigationMixin = { id: 'overview', label: this.$t('appNavigation.overview'), route: '/', - icon: 'iconOverview' + icon: 'iconOverview', }, { id: 'health', @@ -31,19 +31,19 @@ const AppNavigationMixin = { { id: 'event-logs', label: this.$t('appNavigation.eventLogs'), - route: '/health/event-logs' + route: '/health/event-logs', }, { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), - route: '/health/hardware-status' + route: '/health/hardware-status', }, { id: 'sensors', label: this.$t('appNavigation.sensors'), - route: '/health/sensors' - } - ] + route: '/health/sensors', + }, + ], }, { id: 'control', @@ -53,29 +53,29 @@ const AppNavigationMixin = { { id: 'manage-power-usage', label: this.$t('appNavigation.managePowerUsage'), - route: '/control/manage-power-usage' + route: '/control/manage-power-usage', }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), - route: '/control/reboot-bmc' + route: '/control/reboot-bmc', }, { id: 'serial-over-lan', label: this.$t('appNavigation.serialOverLan'), - route: '/control/serial-over-lan' + route: '/control/serial-over-lan', }, { id: 'server-led', label: this.$t('appNavigation.serverLed'), - route: '/control/server-led' + route: '/control/server-led', }, { id: 'server-power-operations', label: this.$t('appNavigation.serverPowerOperations'), - route: '/control/server-power-operations' - } - ] + route: '/control/server-power-operations', + }, + ], }, { id: 'configuration', @@ -85,24 +85,24 @@ const AppNavigationMixin = { { id: 'date-time-settings', label: this.$t('appNavigation.dateTimeSettings'), - route: '/configuration/date-time-settings' + route: '/configuration/date-time-settings', }, { id: 'firmware', label: this.$t('appNavigation.firmware'), - route: '/configuration/firmware' + route: '/configuration/firmware', }, { id: 'network-settings', label: this.$t('appNavigation.networkSettings'), - route: '/configuration/network-settings' + route: '/configuration/network-settings', }, { id: 'snmp-settings', label: this.$t('appNavigation.snmpSettings'), - route: '' - } - ] + route: '', + }, + ], }, { id: 'access-control', @@ -112,23 +112,23 @@ const AppNavigationMixin = { { id: 'ldap', label: this.$t('appNavigation.ldap'), - route: '/access-control/ldap' + route: '/access-control/ldap', }, { id: 'local-user-management', label: this.$t('appNavigation.localUserManagement'), - route: '/access-control/local-user-management' + route: '/access-control/local-user-management', }, { id: 'ssl-certificates', label: this.$t('appNavigation.sslCertificates'), - route: '/access-control/ssl-certificates' - } - ] - } - ] + route: '/access-control/ssl-certificates', + }, + ], + }, + ], }; - } + }, }; export default AppNavigationMixin; diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue index 3ad717e5..03f5af4c 100644 --- a/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImage.vue @@ -13,7 +13,7 @@ {{ $t('pageFirmware.alert.serverShutdownRequiredBeforeUpdate') }} </p> {{ $t('pageFirmware.alert.serverShutdownRequiredInfo') }} - <template v-slot:action> + <template #action> <b-btn variant="link" class="text-nowrap" @click="onClickShutDown"> {{ $t('pageFirmware.alert.shutDownServer') }} </b-btn> @@ -26,7 +26,7 @@ <b-card-group deck> <!-- Current FW --> <b-card header-bg-variant="success"> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.current') }}</dt> <dd class="mb-0">{{ systemFirmwareVersion }}</dd> @@ -58,7 +58,7 @@ <!-- Backup FW --> <b-card> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.backup') }}</dt> <dd class="mb-0">{{ backupFirmwareVersion }}</dd> @@ -226,7 +226,7 @@ export default { ModalRebootBackup, ModalUpload, PageSection, - PageTitle + PageTitle, }, mixins: [BVToastMixin, LoadingBarMixin, VuelidateMixin], data() { @@ -235,7 +235,7 @@ export default { file: null, tftpIpAddress: null, tftpFileName: null, - timeoutId: null + timeoutId: null, }; }, computed: { @@ -252,26 +252,26 @@ export default { 'backupFirmwareStatus', 'backupFirmwareVersion', 'isRebootFromBackupAvailable', - 'systemFirmwareVersion' + 'systemFirmwareVersion', ]), isPageDisabled() { return !this.isHostOff || this.loading || this.isOperationInProgress; - } + }, }, watch: { - isWorkstationSelected: function() { + isWorkstationSelected: function () { this.$v.$reset(); this.file = null; this.tftpIpAddress = null; this.tftpFileName = null; - } + }, }, created() { this.startLoader(); this.$store.dispatch('firmwareSingleImage/getUpdateServiceApplyTime'); Promise.all([ this.$store.dispatch('global/getHostStatus'), - this.$store.dispatch('firmwareSingleImage/getFirmwareInformation') + this.$store.dispatch('firmwareSingleImage/getFirmwareInformation'), ]).finally(() => this.endLoader()); }, beforeRouteLeave(to, from, next) { @@ -282,20 +282,20 @@ export default { validations() { return { file: { - required: requiredIf(function() { + required: requiredIf(function () { return this.isWorkstationSelected; - }) + }), }, tftpIpAddress: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.isWorkstationSelected; - }) + }), }, tftpFileName: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.isWorkstationSelected; - }) - } + }), + }, }; }, methods: { @@ -315,7 +315,7 @@ export default { dispatchWorkstationUpload() { this.$store .dispatch('firmwareSingleImage/uploadFirmware', this.file) - .then(success => + .then((success) => this.infoToast( success, this.$t('pageFirmware.toast.successUploadTitle') @@ -329,11 +329,11 @@ export default { dispatchTftpUpload() { const data = { address: this.tftpIpAddress, - filename: this.tftpFileName + filename: this.tftpFileName, }; this.$store .dispatch('firmwareSingleImage/uploadFirmwareTFTP', data) - .then(success => + .then((success) => this.infoToast( success, this.$t('pageFirmware.toast.successUploadTitle') @@ -348,7 +348,7 @@ export default { this.setRebootTimeout(); this.$store .dispatch('firmwareSingleImage/switchFirmwareAndReboot') - .then(success => + .then((success) => this.infoToast(success, this.$t('global.status.success')) ) .catch(({ message }) => { @@ -384,14 +384,14 @@ export default { .msgBoxConfirm(this.$t('pageFirmware.modal.serverShutdownMessage'), { title: this.$t('pageFirmware.modal.serverShutdownWillCauseOutage'), okTitle: this.$t('pageFirmware.modal.shutDownServer'), - okVariant: 'danger' + okVariant: 'danger', }) - .then(shutdownConfirmed => { + .then((shutdownConfirmed) => { if (shutdownConfirmed) this.$store.dispatch('controls/hostSoftPowerOff'); }); - } - } + }, + }, }; </script> diff --git a/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue index a8fb3ad5..5b700f2c 100644 --- a/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue +++ b/src/env/components/FirmwareSingleImage/FirmwareSingleImageModalRebootBackup.vue @@ -22,12 +22,12 @@ export default { props: { current: { type: String, - required: true + required: true, }, backup: { type: String, - required: true - } - } + required: true, + }, + }, }; </script> diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 5b69475d..a6473720 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -35,8 +35,8 @@ const routes = [ name: 'login', component: Login, meta: { - title: i18n.t('appPageTitle.login') - } + title: i18n.t('appPageTitle.login'), + }, }, { path: '/change-password', @@ -44,16 +44,16 @@ const routes = [ component: ChangePassword, meta: { title: i18n.t('appPageTitle.changePassword'), - requiresAuth: true - } - } - ] + requiresAuth: true, + }, + }, + ], }, { path: '/console', component: ConsoleLayout, meta: { - requiresAuth: true + requiresAuth: true, }, children: [ { @@ -61,15 +61,15 @@ const routes = [ name: 'serial-over-lan-console', component: SerialOverLanConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan') - } - } - ] + title: i18n.t('appPageTitle.serialOverLan'), + }, + }, + ], }, { path: '/', meta: { - requiresAuth: true + requiresAuth: true, }, component: AppLayout, children: [ @@ -78,139 +78,139 @@ const routes = [ name: 'overview', component: Overview, meta: { - title: i18n.t('appPageTitle.overview') - } + title: i18n.t('appPageTitle.overview'), + }, }, { path: '/profile-settings', name: 'profile-settings', component: ProfileSettings, meta: { - title: i18n.t('appPageTitle.profileSettings') - } + title: i18n.t('appPageTitle.profileSettings'), + }, }, { path: '/health/event-logs', name: 'event-logs', component: EventLogs, meta: { - title: i18n.t('appPageTitle.eventLogs') - } + title: i18n.t('appPageTitle.eventLogs'), + }, }, { path: '/health/hardware-status', name: 'hardware-status', component: HardwareStatus, meta: { - title: i18n.t('appPageTitle.hardwareStatus') - } + title: i18n.t('appPageTitle.hardwareStatus'), + }, }, { path: '/health/sensors', name: 'sensors', component: Sensors, meta: { - title: i18n.t('appPageTitle.sensors') - } + title: i18n.t('appPageTitle.sensors'), + }, }, { path: '/access-control/ldap', name: 'ldap', component: Ldap, meta: { - title: i18n.t('appPageTitle.ldap') - } + title: i18n.t('appPageTitle.ldap'), + }, }, { path: '/access-control/local-user-management', name: 'local-users', component: LocalUserManagement, meta: { - title: i18n.t('appPageTitle.localUserManagement') - } + title: i18n.t('appPageTitle.localUserManagement'), + }, }, { path: '/access-control/ssl-certificates', name: 'ssl-certificates', component: SslCertificates, meta: { - title: i18n.t('appPageTitle.sslCertificates') - } + title: i18n.t('appPageTitle.sslCertificates'), + }, }, { path: '/configuration/date-time-settings', name: 'date-time-settings', component: DateTimeSettings, meta: { - title: i18n.t('appPageTitle.dateTimeSettings') - } + title: i18n.t('appPageTitle.dateTimeSettings'), + }, }, { path: '/configuration/firmware', name: 'firmware', component: FirmwareSingleImage, meta: { - title: i18n.t('appPageTitle.firmware') - } + title: i18n.t('appPageTitle.firmware'), + }, }, { path: '/control/manage-power-usage', name: 'manage-power-usage', component: ManagePowerUsage, meta: { - title: i18n.t('appPageTitle.managePowerUsage') - } + title: i18n.t('appPageTitle.managePowerUsage'), + }, }, { path: '/configuration/network-settings', name: 'network-settings', component: NetworkSettings, meta: { - title: i18n.t('appPageTitle.networkSettings') - } + title: i18n.t('appPageTitle.networkSettings'), + }, }, { path: '/control/reboot-bmc', name: 'reboot-bmc', component: RebootBmc, meta: { - title: i18n.t('appPageTitle.rebootBmc') - } + title: i18n.t('appPageTitle.rebootBmc'), + }, }, { path: '/control/server-led', name: 'server-led', component: ServerLed, meta: { - title: i18n.t('appPageTitle.serverLed') - } + title: i18n.t('appPageTitle.serverLed'), + }, }, { path: '/control/serial-over-lan', name: 'serial-over-lan', component: SerialOverLan, meta: { - title: i18n.t('appPageTitle.serialOverLan') - } + title: i18n.t('appPageTitle.serialOverLan'), + }, }, { path: '/control/server-power-operations', name: 'server-power-operations', component: ServerPowerOperations, meta: { - title: i18n.t('appPageTitle.serverPowerOperations') - } + title: i18n.t('appPageTitle.serverPowerOperations'), + }, }, { path: '*', name: 'page-not-found', component: PageNotFound, meta: { - title: i18n.t('appPageTitle.pageNotFound') - } - } - ] - } + title: i18n.t('appPageTitle.pageNotFound'), + }, + }, + ], + }, ]; export default routes; diff --git a/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js b/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js index 98f86fd5..ffc4bc4b 100644 --- a/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js +++ b/src/env/store/FirmwareSingleImage/FirmwareSingleImageStore.js @@ -7,23 +7,23 @@ const FirmwareSingleImageStore = { activeFirmware: { version: '--', id: null, - location: null + location: null, }, backupFirmware: { version: '--', id: null, location: null, - status: '--' + status: '--', }, - applyTime: null + applyTime: null, }, getters: { - systemFirmwareVersion: state => state.activeFirmware.version, - backupFirmwareVersion: state => state.backupFirmware.version, - backupFirmwareStatus: state => state.backupFirmware.status, - isRebootFromBackupAvailable: state => + systemFirmwareVersion: (state) => state.activeFirmware.version, + backupFirmwareVersion: (state) => state.backupFirmware.version, + backupFirmwareStatus: (state) => state.backupFirmware.status, + isRebootFromBackupAvailable: (state) => state.backupFirmware.id ? true : false, - bmcFirmwareCurrentVersion: state => state.activeFirmware.version //this getter is needed for the Overview page + bmcFirmwareCurrentVersion: (state) => state.activeFirmware.version, //this getter is needed for the Overview page }, mutations: { setActiveFirmware: (state, { version, id, location }) => { @@ -37,7 +37,7 @@ const FirmwareSingleImageStore = { state.backupFirmware.location = location; state.backupFirmware.status = status; }, - setApplyTime: (state, applyTime) => (state.applyTime = applyTime) + setApplyTime: (state, applyTime) => (state.applyTime = applyTime), }, actions: { async getFirmwareInformation({ commit }) { @@ -47,8 +47,8 @@ const FirmwareSingleImageStore = { const currentLocation = Links.ActiveSoftwareImage['@odata.id']; // Check SoftwareImages list for not ActiveSoftwareImage id const backupLocation = Links.SoftwareImages.map( - item => item['@odata.id'] - ).find(location => { + (item) => item['@odata.id'] + ).find((location) => { const id = location.split('/').pop(); const currentId = currentLocation.split('/').pop(); return id !== currentId; @@ -66,16 +66,16 @@ const FirmwareSingleImageStore = { commit('setActiveFirmware', { version: currentData?.data?.Version, id: currentData?.data?.Id, - location: currentData?.data?.['@odata.id'] + location: currentData?.data?.['@odata.id'], }); commit('setBackupFirmware', { version: backupData.data?.Version, id: backupData.data?.Id, location: backupData.data?.['@odata.id'], - status: backupData.data?.Status?.State + status: backupData.data?.Status?.State, }); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, getUpdateServiceApplyTime({ commit }) { api @@ -85,20 +85,20 @@ const FirmwareSingleImageStore = { data.HttpPushUriOptions.HttpPushUriApplyTime.ApplyTime; commit('setApplyTime', applyTime); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, setApplyTimeImmediate({ commit }) { const data = { HttpPushUriOptions: { HttpPushUriApplyTime: { - ApplyTime: 'Immediate' - } - } + ApplyTime: 'Immediate', + }, + }, }; return api .patch('/redfish/v1/UpdateService', data) .then(() => commit('setApplyTime', 'Immediate')) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async uploadFirmware({ state, dispatch }, image) { if (state.applyTime !== 'Immediate') { @@ -108,11 +108,11 @@ const FirmwareSingleImageStore = { } return await api .post('/redfish/v1/UpdateService', image, { - headers: { 'Content-Type': 'application/octet-stream' } + headers: { 'Content-Type': 'application/octet-stream' }, }) .then(() => dispatch('getSystemFirwareVersion')) .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); }); @@ -120,7 +120,7 @@ const FirmwareSingleImageStore = { async uploadFirmwareTFTP({ state, dispatch }, { address, filename }) { const data = { TransferProtocol: 'TFTP', - ImageURI: `${address}/${filename}` + ImageURI: `${address}/${filename}`, }; if (state.applyTime !== 'Immediate') { // ApplyTime must be set to Immediate before making @@ -134,7 +134,7 @@ const FirmwareSingleImageStore = { ) .then(() => dispatch('getSystemFirwareVersion')) .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); }); @@ -144,19 +144,19 @@ const FirmwareSingleImageStore = { const data = { Links: { ActiveSoftwareImage: { - '@odata.id': backupLoaction - } - } + '@odata.id': backupLoaction, + }, + }, }; return await api .patch('/redfish/v1/Managers/bmc', data) .then(() => i18n.t('pageFirmware.toast.successRebootFromBackup')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorRebootFromBackup')); }); - } - } + }, + }, }; export default FirmwareSingleImageStore; diff --git a/src/i18n.js b/src/i18n.js index b06f48ad..919c363f 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -10,7 +10,7 @@ function loadLocaleMessages() { /[A-Za-z0-9-_,\s]+\.json$/i ); const messages = {}; - locales.keys().forEach(key => { + locales.keys().forEach((key) => { const matched = key.match(/([A-Za-z0-9-_]+)\./i); if (matched && matched.length > 1) { const locale = matched[1]; @@ -28,5 +28,5 @@ export default new VueI18n({ // Falling back to fallbackLocale generates two console warnings // Silent fallback suppresses console warnings when using fallback silentFallbackWarn: true, - messages: loadLocaleMessages() + messages: loadLocaleMessages(), }); diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue index e040bef8..a4f73daf 100644 --- a/src/layouts/AppLayout.vue +++ b/src/layouts/AppLayout.vue @@ -17,17 +17,17 @@ export default { components: { AppHeader, AppNavigation, - PageContainer + PageContainer, }, data() { return { - routerKey: 0 + routerKey: 0, }; }, watch: { - $route: function() { + $route: function () { // $nextTick = DOM updated - this.$nextTick(function() { + this.$nextTick(function () { // Get the focusTarget DOM element let focusTarget = this.$refs.focusTarget.$el; @@ -41,15 +41,15 @@ export default { // Reason: https://axesslab.com/skip-links/#update-3-a-comment-from-gov-uk focusTarget.removeAttribute('tabindex'); }); - } + }, }, methods: { refresh() { // Changing the component :key value will trigger // a component re-rendering and 'refresh' the view this.routerKey += 1; - } - } + }, + }, }; </script> diff --git a/src/layouts/ConsoleLayout.vue b/src/layouts/ConsoleLayout.vue index 99f8d9f5..9f8175bf 100644 --- a/src/layouts/ConsoleLayout.vue +++ b/src/layouts/ConsoleLayout.vue @@ -4,6 +4,6 @@ <script> export default { - name: 'Console' + name: 'Console', }; </script> diff --git a/src/layouts/LoginLayout.vue b/src/layouts/LoginLayout.vue index ab6fbe20..c2b9af57 100644 --- a/src/layouts/LoginLayout.vue +++ b/src/layouts/LoginLayout.vue @@ -26,9 +26,9 @@ export default { name: 'LoginLayout', data() { return { - altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo` + altLogo: `${process.env.VUE_APP_COMPANY_NAME} logo`, }; - } + }, }; </script> diff --git a/src/main.js b/src/main.js index 05a76429..8c72580e 100644 --- a/src/main.js +++ b/src/main.js @@ -35,14 +35,14 @@ import { ProgressPlugin, TablePlugin, ToastPlugin, - TooltipPlugin + TooltipPlugin, } from 'bootstrap-vue'; import Vuelidate from 'vuelidate'; import i18n from './i18n'; import { format } from 'date-fns-tz'; // Filters -Vue.filter('shortTimeZone', function(value) { +Vue.filter('shortTimeZone', function (value) { const longTZ = value .toString() .match(/\((.*)\)/) @@ -51,7 +51,7 @@ Vue.filter('shortTimeZone', function(value) { return longTZ.replace(regexNotUpper, ''); }); -Vue.filter('formatDate', function(value) { +Vue.filter('formatDate', function (value) { const isUtcDisplay = store.getters['global/isUtcDisplay']; if (value instanceof Date) { @@ -64,14 +64,14 @@ Vue.filter('formatDate', function(value) { } }); -Vue.filter('formatTime', function(value) { +Vue.filter('formatTime', function (value) { const isUtcDisplay = store.getters['global/isUtcDisplay']; if (value instanceof Date) { if (isUtcDisplay) { let timeOptions = { timeZone: 'UTC', - hour12: false + hour12: false, }; return `${value.toLocaleTimeString('default', timeOptions)} UTC`; } @@ -90,15 +90,15 @@ Vue.use(BVConfigPlugin, { BFormText: { textVariant: 'secondary' }, BTable: { headVariant: 'light', - footVariant: 'light' + footVariant: 'light', }, BFormTags: { tagVariant: 'primary', - addButtonVariant: 'link-primary' + addButtonVariant: 'link-primary', }, BBadge: { - variant: 'primary' - } + variant: 'primary', + }, }); Vue.use(CardPlugin); Vue.use(CollapsePlugin); @@ -131,5 +131,5 @@ new Vue({ router, store, i18n, - render: h => h(App) + render: (h) => h(App), }).$mount('#app'); diff --git a/src/router/index.js b/src/router/index.js index 3f447de3..3cd52264 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,11 +12,11 @@ Vue.use(VueRouter); const router = new VueRouter({ base: process.env.BASE_URL, routes, - linkExactActiveClass: 'nav-link--current' + linkExactActiveClass: 'nav-link--current', }); router.beforeEach((to, from, next) => { - if (to.matched.some(record => record.meta.requiresAuth)) { + if (to.matched.some((record) => record.meta.requiresAuth)) { if (store.getters['authentication/isLoggedIn']) { next(); return; diff --git a/src/router/routes.js b/src/router/routes.js index 968a5ea7..3be1a1e4 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -36,8 +36,8 @@ const routes = [ name: 'login', component: Login, meta: { - title: i18n.t('appPageTitle.login') - } + title: i18n.t('appPageTitle.login'), + }, }, { path: '/change-password', @@ -45,16 +45,16 @@ const routes = [ component: ChangePassword, meta: { title: i18n.t('appPageTitle.changePassword'), - requiresAuth: true - } - } - ] + requiresAuth: true, + }, + }, + ], }, { path: '/console', component: ConsoleLayout, meta: { - requiresAuth: true + requiresAuth: true, }, children: [ { @@ -62,23 +62,23 @@ const routes = [ name: 'serial-over-lan-console', component: SerialOverLanConsole, meta: { - title: i18n.t('appPageTitle.serialOverLan') - } + title: i18n.t('appPageTitle.serialOverLan'), + }, }, { path: 'kvm', name: 'kvm-console', component: KvmConsole, meta: { - title: i18n.t('appPageTitle.kvm') - } - } - ] + title: i18n.t('appPageTitle.kvm'), + }, + }, + ], }, { path: '/', meta: { - requiresAuth: true + requiresAuth: true, }, component: AppLayout, children: [ @@ -87,155 +87,155 @@ const routes = [ name: 'overview', component: Overview, meta: { - title: i18n.t('appPageTitle.overview') - } + title: i18n.t('appPageTitle.overview'), + }, }, { path: '/profile-settings', name: 'profile-settings', component: ProfileSettings, meta: { - title: i18n.t('appPageTitle.profileSettings') - } + title: i18n.t('appPageTitle.profileSettings'), + }, }, { path: '/health/event-logs', name: 'event-logs', component: EventLogs, meta: { - title: i18n.t('appPageTitle.eventLogs') - } + title: i18n.t('appPageTitle.eventLogs'), + }, }, { path: '/health/hardware-status', name: 'hardware-status', component: HardwareStatus, meta: { - title: i18n.t('appPageTitle.hardwareStatus') - } + title: i18n.t('appPageTitle.hardwareStatus'), + }, }, { path: '/health/sensors', name: 'sensors', component: Sensors, meta: { - title: i18n.t('appPageTitle.sensors') - } + title: i18n.t('appPageTitle.sensors'), + }, }, { path: '/access-control/ldap', name: 'ldap', component: Ldap, meta: { - title: i18n.t('appPageTitle.ldap') - } + title: i18n.t('appPageTitle.ldap'), + }, }, { path: '/access-control/local-user-management', name: 'local-users', component: LocalUserManagement, meta: { - title: i18n.t('appPageTitle.localUserManagement') - } + title: i18n.t('appPageTitle.localUserManagement'), + }, }, { path: '/access-control/ssl-certificates', name: 'ssl-certificates', component: SslCertificates, meta: { - title: i18n.t('appPageTitle.sslCertificates') - } + title: i18n.t('appPageTitle.sslCertificates'), + }, }, { path: '/configuration/date-time-settings', name: 'date-time-settings', component: DateTimeSettings, meta: { - title: i18n.t('appPageTitle.dateTimeSettings') - } + title: i18n.t('appPageTitle.dateTimeSettings'), + }, }, { path: '/configuration/firmware', name: 'firmware', component: Firmware, meta: { - title: i18n.t('appPageTitle.firmware') - } + title: i18n.t('appPageTitle.firmware'), + }, }, { path: '/control/kvm', name: 'kvm', component: Kvm, meta: { - title: i18n.t('appPageTitle.kvm') - } + title: i18n.t('appPageTitle.kvm'), + }, }, { path: '/control/manage-power-usage', name: 'manage-power-usage', component: ManagePowerUsage, meta: { - title: i18n.t('appPageTitle.managePowerUsage') - } + title: i18n.t('appPageTitle.managePowerUsage'), + }, }, { path: '/configuration/network-settings', name: 'network-settings', component: NetworkSettings, meta: { - title: i18n.t('appPageTitle.networkSettings') - } + title: i18n.t('appPageTitle.networkSettings'), + }, }, { path: '/control/reboot-bmc', name: 'reboot-bmc', component: RebootBmc, meta: { - title: i18n.t('appPageTitle.rebootBmc') - } + title: i18n.t('appPageTitle.rebootBmc'), + }, }, { path: '/control/server-led', name: 'server-led', component: ServerLed, meta: { - title: i18n.t('appPageTitle.serverLed') - } + title: i18n.t('appPageTitle.serverLed'), + }, }, { path: '/control/serial-over-lan', name: 'serial-over-lan', component: SerialOverLan, meta: { - title: i18n.t('appPageTitle.serialOverLan') - } + title: i18n.t('appPageTitle.serialOverLan'), + }, }, { path: '/control/server-power-operations', name: 'server-power-operations', component: ServerPowerOperations, meta: { - title: i18n.t('appPageTitle.serverPowerOperations') - } + title: i18n.t('appPageTitle.serverPowerOperations'), + }, }, { path: '/control/virtual-media', name: 'virtual-media', component: VirtualMedia, meta: { - title: i18n.t('appPageTitle.virtualMedia') - } + title: i18n.t('appPageTitle.virtualMedia'), + }, }, { path: '*', name: 'page-not-found', component: PageNotFound, meta: { - title: i18n.t('appPageTitle.pageNotFound') - } - } - ] - } + title: i18n.t('appPageTitle.pageNotFound'), + }, + }, + ], + }, ]; export default routes; diff --git a/src/store/api.js b/src/store/api.js index 77d94329..02472881 100644 --- a/src/store/api.js +++ b/src/store/api.js @@ -5,10 +5,10 @@ import Axios from 'axios'; import store from '../store'; const api = Axios.create({ - withCredentials: true + withCredentials: true, }); -api.interceptors.response.use(undefined, error => { +api.interceptors.response.use(undefined, (error) => { let response = error.response; // TODO: Provide user with a notification and way to keep system active @@ -51,20 +51,20 @@ export default { }, spread(callback) { return Axios.spread(callback); - } + }, }; -export const getResponseCount = responses => { +export const getResponseCount = (responses) => { let successCount = 0; let errorCount = 0; - responses.forEach(response => { + responses.forEach((response) => { if (response instanceof Error) errorCount++; else successCount++; }); return { successCount, - errorCount + errorCount, }; }; diff --git a/src/store/index.js b/src/store/index.js index 3844511c..e6153b1b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,7 @@ export default new Vuex.Store({ chassis: ChassisStore, bmc: BmcStore, processors: ProcessorStore, - virtualMedia: VirtualMediaStore + virtualMedia: VirtualMediaStore, }, - plugins: [WebSocketPlugin] + plugins: [WebSocketPlugin], }); diff --git a/src/store/modules/AccessControl/LdapStore.js b/src/store/modules/AccessControl/LdapStore.js index 780de38e..722384c1 100644 --- a/src/store/modules/AccessControl/LdapStore.js +++ b/src/store/modules/AccessControl/LdapStore.js @@ -13,7 +13,7 @@ const LdapStore = { baseDn: null, userAttribute: null, groupsAttribute: null, - roleGroups: [] + roleGroups: [], }, activeDirectory: { serviceEnabled: null, @@ -22,14 +22,14 @@ const LdapStore = { baseDn: null, userAttribute: null, groupsAttribute: null, - roleGroups: [] - } + roleGroups: [], + }, }, getters: { - isServiceEnabled: state => state.isServiceEnabled, - ldap: state => state.ldap, - activeDirectory: state => state.activeDirectory, - isActiveDirectoryEnabled: state => { + isServiceEnabled: (state) => state.isServiceEnabled, + ldap: (state) => state.ldap, + activeDirectory: (state) => state.activeDirectory, + isActiveDirectoryEnabled: (state) => { return state.activeDirectory.serviceEnabled; }, enabledRoleGroups: (state, getters) => { @@ -37,7 +37,7 @@ const LdapStore = { ? 'activeDirectory' : 'ldap'; return state[serviceType].roleGroups; - } + }, }, mutations: { setServiceEnabled: (state, serviceEnabled) => @@ -49,7 +49,7 @@ const LdapStore = { ServiceAddresses, Authentication = {}, LDAPService: { SearchSettings = {} } = {}, - RemoteRoleMapping = [] + RemoteRoleMapping = [], } ) => { state.ldap.serviceAddress = ServiceAddresses[0]; @@ -67,7 +67,7 @@ const LdapStore = { ServiceAddresses, Authentication = {}, LDAPService: { SearchSettings = {} } = {}, - RemoteRoleMapping = [] + RemoteRoleMapping = [], } ) => { state.activeDirectory.serviceEnabled = ServiceEnabled; @@ -77,7 +77,7 @@ const LdapStore = { state.activeDirectory.userAttribute = SearchSettings.UsernameAttribute; state.activeDirectory.groupsAttribute = SearchSettings.GroupsAttribute; state.activeDirectory.roleGroups = RemoteRoleMapping; - } + }, }, actions: { async getAccountSettings({ commit }) { @@ -91,21 +91,21 @@ const LdapStore = { commit('setLdapProperties', LDAP); commit('setActiveDirectoryProperties', ActiveDirectory); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async saveLdapSettings({ state, dispatch }, properties) { const data = { LDAP: properties }; if (state.activeDirectory.serviceEnabled) { // Disable Active Directory service if enabled await api.patch('/redfish/v1/AccountService', { - ActiveDirectory: { ServiceEnabled: false } + ActiveDirectory: { ServiceEnabled: false }, }); } return await api .patch('/redfish/v1/AccountService', data) .then(() => dispatch('getAccountSettings')) .then(() => i18n.t('pageLdap.toast.successSaveLdapSettings')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageLdap.toast.errorSaveLdapSettings')); }); @@ -115,14 +115,14 @@ const LdapStore = { if (state.ldap.serviceEnabled) { // Disable LDAP service if enabled await api.patch('/redfish/v1/AccountService', { - LDAP: { ServiceEnabled: false } + LDAP: { ServiceEnabled: false }, }); } return await api .patch('/redfish/v1/AccountService', data) .then(() => dispatch('getAccountSettings')) .then(() => i18n.t('pageLdap.toast.successSaveActiveDirectorySettings')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageLdap.toast.errorSaveActiveDirectorySettings') @@ -139,7 +139,7 @@ const LdapStore = { bindPassword, baseDn, userIdAttribute, - groupIdAttribute + groupIdAttribute, } ) { const data = { @@ -147,13 +147,13 @@ const LdapStore = { ServiceAddresses: [serviceAddress], Authentication: { Username: bindDn, - Password: bindPassword + Password: bindPassword, }, LDAPService: { SearchSettings: { - BaseDistinguishedNames: [baseDn] - } - } + BaseDistinguishedNames: [baseDn], + }, + }, }; if (groupIdAttribute) data.LDAPService.SearchSettings.GroupsAttribute = groupIdAttribute; @@ -177,8 +177,8 @@ const LdapStore = { ...enabledRoleGroups, { LocalRole: groupPrivilege, - RemoteGroup: groupName - } + RemoteGroup: groupName, + }, ]; if (isActiveDirectoryEnabled) { data.ActiveDirectory = { RemoteRoleMapping }; @@ -190,10 +190,10 @@ const LdapStore = { .then(() => dispatch('getAccountSettings')) .then(() => i18n.t('pageLdap.toast.successAddRoleGroup', { - groupName + groupName, }) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageLdap.toast.errorAddRoleGroup')); }); @@ -202,11 +202,11 @@ const LdapStore = { const data = {}; const enabledRoleGroups = getters['enabledRoleGroups']; const isActiveDirectoryEnabled = getters['isActiveDirectoryEnabled']; - const RemoteRoleMapping = enabledRoleGroups.map(group => { + const RemoteRoleMapping = enabledRoleGroups.map((group) => { if (group.RemoteGroup === groupName) { return { RemoteGroup: groupName, - LocalRole: groupPrivilege + LocalRole: groupPrivilege, }; } else { return {}; @@ -223,7 +223,7 @@ const LdapStore = { .then(() => i18n.t('pageLdap.toast.successSaveRoleGroup', { groupName }) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageLdap.toast.errorSaveRoleGroup')); }); @@ -232,7 +232,7 @@ const LdapStore = { const data = {}; const enabledRoleGroups = getters['enabledRoleGroups']; const isActiveDirectoryEnabled = getters['isActiveDirectoryEnabled']; - const RemoteRoleMapping = enabledRoleGroups.map(group => { + const RemoteRoleMapping = enabledRoleGroups.map((group) => { if (find(roleGroups, { groupName: group.RemoteGroup })) { return null; } else { @@ -250,14 +250,14 @@ const LdapStore = { .then(() => i18n.tc('pageLdap.toast.successDeleteRoleGroup', roleGroups.length) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.tc('pageLdap.toast.errorDeleteRoleGroup', roleGroups.length) ); }); - } - } + }, + }, }; export default LdapStore; diff --git a/src/store/modules/AccessControl/LocalUserMangementStore.js b/src/store/modules/AccessControl/LocalUserMangementStore.js index e9de3cc1..6bc6ec5d 100644 --- a/src/store/modules/AccessControl/LocalUserMangementStore.js +++ b/src/store/modules/AccessControl/LocalUserMangementStore.js @@ -9,7 +9,7 @@ const LocalUserManagementStore = { accountLockoutDuration: null, accountLockoutThreshold: null, accountMinPasswordLength: null, - accountMaxPasswordLength: null + accountMaxPasswordLength: null, }, getters: { allUsers(state) { @@ -21,15 +21,15 @@ const LocalUserManagementStore = { accountSettings(state) { return { lockoutDuration: state.accountLockoutDuration, - lockoutThreshold: state.accountLockoutThreshold + lockoutThreshold: state.accountLockoutThreshold, }; }, accountPasswordRequirements(state) { return { minLength: state.accountMinPasswordLength, - maxLength: state.accountMaxPasswordLength + maxLength: state.accountMaxPasswordLength, }; - } + }, }, mutations: { setUsers(state, allUsers) { @@ -49,19 +49,21 @@ const LocalUserManagementStore = { }, setAccountMaxPasswordLength(state, maxPasswordLength) { state.accountMaxPasswordLength = maxPasswordLength; - } + }, }, actions: { async getUsers({ commit }) { return await api .get('/redfish/v1/AccountService/Accounts') - .then(response => response.data.Members.map(user => user['@odata.id'])) - .then(userIds => api.all(userIds.map(user => api.get(user)))) - .then(users => { - const userData = users.map(user => user.data); + .then((response) => + response.data.Members.map((user) => user['@odata.id']) + ) + .then((userIds) => api.all(userIds.map((user) => api.get(user)))) + .then((users) => { + const userData = users.map((user) => user.data); commit('setUsers', userData); }) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorLoadUsers' @@ -78,7 +80,7 @@ const LocalUserManagementStore = { commit('setAccountMinPasswordLength', data.MinPasswordLength); commit('setAccountMaxPasswordLength', data.MaxPasswordLength); }) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorLoadAccountSettings' @@ -90,29 +92,29 @@ const LocalUserManagementStore = { api .get('/redfish/v1/AccountService/Roles') .then(({ data: { Members = [] } = {} }) => { - const roles = Members.map(role => { + const roles = Members.map((role) => { return role['@odata.id'].split('/').pop(); }); commit('setAccountRoles', roles); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async createUser({ dispatch }, { username, password, privilege, status }) { const data = { UserName: username, Password: password, RoleId: privilege, - Enabled: status + Enabled: status, }; return await api .post('/redfish/v1/AccountService/Accounts', data) .then(() => dispatch('getUsers')) .then(() => i18n.t('pageLocalUserManagement.toast.successCreateUser', { - username + username, }) ) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorCreateUser', @@ -136,10 +138,10 @@ const LocalUserManagementStore = { .then(() => dispatch('getUsers')) .then(() => i18n.t('pageLocalUserManagement.toast.successUpdateUser', { - username: originalUsername + username: originalUsername, }) ) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorUpdateUser', @@ -154,10 +156,10 @@ const LocalUserManagementStore = { .then(() => dispatch('getUsers')) .then(() => i18n.t('pageLocalUserManagement.toast.successDeleteUser', { - username + username, }) ) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorDeleteUser', @@ -170,14 +172,14 @@ const LocalUserManagementStore = { const promises = users.map(({ username }) => { return api .delete(`/redfish/v1/AccountService/Accounts/${username}`) - .catch(error => { + .catch((error) => { console.log(error); return error; }); }); return await api .all(promises) - .then(response => { + .then((response) => { dispatch('getUsers'); return response; }) @@ -208,19 +210,19 @@ const LocalUserManagementStore = { }, async enableUsers({ dispatch }, users) { const data = { - Enabled: true + Enabled: true, }; const promises = users.map(({ username }) => { return api .patch(`/redfish/v1/AccountService/Accounts/${username}`, data) - .catch(error => { + .catch((error) => { console.log(error); return error; }); }); return await api .all(promises) - .then(response => { + .then((response) => { dispatch('getUsers'); return response; }) @@ -251,19 +253,19 @@ const LocalUserManagementStore = { }, async disableUsers({ dispatch }, users) { const data = { - Enabled: false + Enabled: false, }; const promises = users.map(({ username }) => { return api .patch(`/redfish/v1/AccountService/Accounts/${username}`, data) - .catch(error => { + .catch((error) => { console.log(error); return error; }); }); return await api .all(promises) - .then(response => { + .then((response) => { dispatch('getUsers'); return response; }) @@ -309,15 +311,15 @@ const LocalUserManagementStore = { //GET new settings to update view .then(() => dispatch('getAccountSettings')) .then(() => i18n.t('pageLocalUserManagement.toast.successSaveSettings')) - .catch(error => { + .catch((error) => { console.log(error); const message = i18n.t( 'pageLocalUserManagement.toast.errorSaveSettings' ); throw new Error(message); }); - } - } + }, + }, }; export default LocalUserManagementStore; diff --git a/src/store/modules/AccessControl/SslCertificatesStore.js b/src/store/modules/AccessControl/SslCertificatesStore.js index 73a74b23..752c2124 100644 --- a/src/store/modules/AccessControl/SslCertificatesStore.js +++ b/src/store/modules/AccessControl/SslCertificatesStore.js @@ -5,12 +5,12 @@ export const CERTIFICATE_TYPES = [ { type: 'HTTPS Certificate', location: '/redfish/v1/Managers/bmc/NetworkProtocol/HTTPS/Certificates/', - label: i18n.t('pageSslCertificates.httpsCertificate') + label: i18n.t('pageSslCertificates.httpsCertificate'), }, { type: 'LDAP Certificate', location: '/redfish/v1/AccountService/LDAP/Certificates/', - label: i18n.t('pageSslCertificates.ldapCertificate') + label: i18n.t('pageSslCertificates.ldapCertificate'), }, { type: 'TrustStore Certificate', @@ -18,13 +18,13 @@ export const CERTIFICATE_TYPES = [ // Web UI will show 'CA Certificate' instead of // 'TrustStore Certificate' after user testing revealed // the term 'TrustStore Certificate' wasn't recognized/was unfamilar - label: i18n.t('pageSslCertificates.caCertificate') - } + label: i18n.t('pageSslCertificates.caCertificate'), + }, ]; const getCertificateProp = (type, prop) => { const certificate = CERTIFICATE_TYPES.find( - certificate => certificate.type === type + (certificate) => certificate.type === type ); return certificate ? certificate[prop] : null; }; @@ -33,11 +33,11 @@ const SslCertificatesStore = { namespaced: true, state: { allCertificates: [], - availableUploadTypes: [] + availableUploadTypes: [], }, getters: { - allCertificates: state => state.allCertificates, - availableUploadTypes: state => state.availableUploadTypes + allCertificates: (state) => state.allCertificates, + availableUploadTypes: (state) => state.availableUploadTypes, }, mutations: { setCertificates(state, certificates) { @@ -45,17 +45,17 @@ const SslCertificatesStore = { }, setAvailableUploadTypes(state, availableUploadTypes) { state.availableUploadTypes = availableUploadTypes; - } + }, }, actions: { async getCertificates({ commit }) { return await api .get('/redfish/v1/CertificateService/CertificateLocations') .then(({ data: { Links: { Certificates } } }) => - Certificates.map(certificate => certificate['@odata.id']) + Certificates.map((certificate) => certificate['@odata.id']) ) - .then(certificateLocations => { - const promises = certificateLocations.map(location => + .then((certificateLocations) => { + const promises = certificateLocations.map((location) => api.get(location) ); api.all(promises).then( @@ -66,7 +66,7 @@ const SslCertificatesStore = { ValidNotAfter, ValidNotBefore, Issuer = {}, - Subject = {} + Subject = {}, } = data; return { type: Name, @@ -75,13 +75,13 @@ const SslCertificatesStore = { issuedBy: Issuer.CommonName, issuedTo: Subject.CommonName, validFrom: new Date(ValidNotBefore), - validUntil: new Date(ValidNotAfter) + validUntil: new Date(ValidNotAfter), }; }); const availableUploadTypes = CERTIFICATE_TYPES.filter( ({ type }) => !certificates - .map(certificate => certificate.type) + .map((certificate) => certificate.type) .includes(type) ); @@ -94,15 +94,15 @@ const SslCertificatesStore = { async addNewCertificate({ dispatch }, { file, type }) { return await api .post(getCertificateProp(type, 'location'), file, { - headers: { 'Content-Type': 'application/x-pem-file' } + headers: { 'Content-Type': 'application/x-pem-file' }, }) .then(() => dispatch('getCertificates')) .then(() => i18n.t('pageSslCertificates.toast.successAddCertificate', { - certificate: getCertificateProp(type, 'label') + certificate: getCertificateProp(type, 'label'), }) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageSslCertificates.toast.errorAddCertificate') @@ -126,10 +126,10 @@ const SslCertificatesStore = { .then(() => dispatch('getCertificates')) .then(() => i18n.t('pageSslCertificates.toast.successReplaceCertificate', { - certificate: getCertificateProp(type, 'label') + certificate: getCertificateProp(type, 'label'), }) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageSslCertificates.toast.errorReplaceCertificate') @@ -142,10 +142,10 @@ const SslCertificatesStore = { .then(() => dispatch('getCertificates')) .then(() => i18n.t('pageSslCertificates.toast.successDeleteCertificate', { - certificate: getCertificateProp(type, 'label') + certificate: getCertificateProp(type, 'label'), }) ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageSslCertificates.toast.errorDeleteCertificate') @@ -167,12 +167,12 @@ const SslCertificatesStore = { challengePassword, contactPerson, emailAddress, - alternateName + alternateName, } = userData; const data = {}; data.CertificateCollection = { - '@odata.id': getCertificateProp(certificateType, 'location') + '@odata.id': getCertificateProp(certificateType, 'location'), }; data.Country = country; data.State = state; @@ -196,9 +196,9 @@ const SslCertificatesStore = { ) //TODO: Success response also throws error so // can't accurately show legitimate error in UI - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default SslCertificatesStore; diff --git a/src/store/modules/Authentication/AuthenticanStore.js b/src/store/modules/Authentication/AuthenticanStore.js index c42b9da1..e08f5b03 100644 --- a/src/store/modules/Authentication/AuthenticanStore.js +++ b/src/store/modules/Authentication/AuthenticanStore.js @@ -7,16 +7,16 @@ const AuthenticationStore = { state: { authError: false, xsrfCookie: Cookies.get('XSRF-TOKEN'), - isAuthenticatedCookie: Cookies.get('IsAuthenticated') + isAuthenticatedCookie: Cookies.get('IsAuthenticated'), }, getters: { - authError: state => state.authError, - isLoggedIn: state => { + authError: (state) => state.authError, + isLoggedIn: (state) => { return ( state.xsrfCookie !== undefined || state.isAuthenticatedCookie == 'true' ); }, - token: state => state.xsrfCookie + token: (state) => state.xsrfCookie, }, mutations: { authSuccess(state) { @@ -32,7 +32,7 @@ const AuthenticationStore = { localStorage.removeItem('storedUsername'); state.xsrfCookie = undefined; state.isAuthenticatedCookie = undefined; - } + }, }, actions: { login({ commit }, { username, password }) { @@ -40,7 +40,7 @@ const AuthenticationStore = { return api .post('/login', { data: [username, password] }) .then(() => commit('authSuccess')) - .catch(error => { + .catch((error) => { commit('authError'); throw new Error(error); }); @@ -50,20 +50,20 @@ const AuthenticationStore = { .post('/logout', { data: [] }) .then(() => commit('logout')) .then(() => router.go('/login')) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async checkPasswordChangeRequired(_, username) { return await api .get(`/redfish/v1/AccountService/Accounts/${username}`) .then(({ data: { PasswordChangeRequired } }) => PasswordChangeRequired) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, resetStoreState({ state }) { state.authError = false; state.xsrfCookie = Cookies.get('XSRF-TOKEN'); state.isAuthenticatedCookie = Cookies.get('IsAuthenticated'); - } - } + }, + }, }; export default AuthenticationStore; diff --git a/src/store/modules/Configuration/DateTimeSettingsStore.js b/src/store/modules/Configuration/DateTimeSettingsStore.js index 08489905..f431a740 100644 --- a/src/store/modules/Configuration/DateTimeSettingsStore.js +++ b/src/store/modules/Configuration/DateTimeSettingsStore.js @@ -5,36 +5,36 @@ const DateTimeStore = { namespaced: true, state: { ntpServers: [], - isNtpProtocolEnabled: null + isNtpProtocolEnabled: null, }, getters: { - ntpServers: state => state.ntpServers, - isNtpProtocolEnabled: state => state.isNtpProtocolEnabled + ntpServers: (state) => state.ntpServers, + isNtpProtocolEnabled: (state) => state.isNtpProtocolEnabled, }, mutations: { setNtpServers: (state, ntpServers) => (state.ntpServers = ntpServers), setIsNtpProtocolEnabled: (state, isNtpProtocolEnabled) => - (state.isNtpProtocolEnabled = isNtpProtocolEnabled) + (state.isNtpProtocolEnabled = isNtpProtocolEnabled), }, actions: { async getNtpData({ commit }) { return await api .get('/redfish/v1/Managers/bmc/NetworkProtocol') - .then(response => { + .then((response) => { const ntpServers = response.data.NTP.NTPServers; const isNtpProtocolEnabled = response.data.NTP.ProtocolEnabled; commit('setNtpServers', ntpServers); commit('setIsNtpProtocolEnabled', isNtpProtocolEnabled); }) - .catch(error => { + .catch((error) => { console.log(error); }); }, async updateDateTimeSettings({ state }, dateTimeForm) { const ntpData = { NTP: { - ProtocolEnabled: dateTimeForm.ntpProtocolEnabled - } + ProtocolEnabled: dateTimeForm.ntpProtocolEnabled, + }, }; if (dateTimeForm.ntpProtocolEnabled) { ntpData.NTP.NTPServers = dateTimeForm.ntpServersArray; @@ -44,7 +44,7 @@ const DateTimeStore = { .then(async () => { if (!dateTimeForm.ntpProtocolEnabled) { const dateTimeData = { - DateTime: dateTimeForm.updatedDateTime + DateTime: dateTimeForm.updatedDateTime, }; /** * https://github.com/openbmc/phosphor-time-manager/blob/master/README.md#special-note-on-changing-ntp-setting @@ -72,14 +72,14 @@ const DateTimeStore = { 'pageDateTimeSettings.toast.successSaveDateTimeSettings' ); }) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageDateTimeSettings.toast.errorSaveDateTimeSettings') ); }); - } - } + }, + }, }; export default DateTimeStore; diff --git a/src/store/modules/Configuration/FirmwareStore.js b/src/store/modules/Configuration/FirmwareStore.js index c99e7eb8..be9f50b6 100644 --- a/src/store/modules/Configuration/FirmwareStore.js +++ b/src/store/modules/Configuration/FirmwareStore.js @@ -10,8 +10,8 @@ import i18n from '@/i18n'; */ function getBackupFirmwareLocation(list, currentLocation) { return list - .map(item => item['@odata.id']) - .find(location => { + .map((item) => item['@odata.id']) + .find((location) => { const id = location.split('/').pop(); const currentId = currentLocation.split('/').pop(); return id !== currentId; @@ -27,7 +27,7 @@ const FirmwareStore = { currentLocation: null, backupVersion: null, backupState: null, - backupLocation: null + backupLocation: null, }, hostFirmware: { currentVersion: null, @@ -35,19 +35,19 @@ const FirmwareStore = { currentLocation: null, backupVersion: null, backupState: null, - backupLocation: null + backupLocation: null, }, - applyTime: null + applyTime: null, }, getters: { - bmcFirmwareCurrentVersion: state => state.bmcFirmware.currentVersion, - bmcFirmwareCurrentState: state => state.bmcFirmware.currentState, - bmcFirmwareBackupVersion: state => state.bmcFirmware.backupVersion, - bmcFirmwareBackupState: state => state.bmcFirmware.backupState, - hostFirmwareCurrentVersion: state => state.hostFirmware.currentVersion, - hostFirmwareCurrentState: state => state.hostFirmware.currentState, - hostFirmwareBackupVersion: state => state.hostFirmware.backupVersion, - hostFirmwareBackupState: state => state.hostFirmware.backupState + bmcFirmwareCurrentVersion: (state) => state.bmcFirmware.currentVersion, + bmcFirmwareCurrentState: (state) => state.bmcFirmware.currentState, + bmcFirmwareBackupVersion: (state) => state.bmcFirmware.backupVersion, + bmcFirmwareBackupState: (state) => state.bmcFirmware.backupState, + hostFirmwareCurrentVersion: (state) => state.hostFirmware.currentVersion, + hostFirmwareCurrentState: (state) => state.hostFirmware.currentState, + hostFirmwareBackupVersion: (state) => state.hostFirmware.backupVersion, + hostFirmwareBackupState: (state) => state.hostFirmware.backupState, }, mutations: { setBmcFirmwareCurrent: (state, { version, location, status }) => { @@ -70,13 +70,13 @@ const FirmwareStore = { state.hostFirmware.backupState = status; state.hostFirmware.backupLocation = location; }, - setApplyTime: (state, applyTime) => (state.applyTime = applyTime) + setApplyTime: (state, applyTime) => (state.applyTime = applyTime), }, actions: { async getFirmwareInformation({ dispatch }) { return await api.all([ dispatch('getBmcFirmware'), - dispatch('getHostFirmware') + dispatch('getHostFirmware'), ]); }, async getBmcFirmware({ commit }) { @@ -102,15 +102,15 @@ const FirmwareStore = { commit('setBmcFirmwareCurrent', { version: currentData?.data?.Version, location: currentData?.data?.['@odata.id'], - status: currentData?.data?.Status?.State + status: currentData?.data?.Status?.State, }); commit('setBmcFirmwareBackup', { version: backupData.data?.Version, location: backupData.data?.['@odata.id'], - status: backupData.data?.Status?.State + status: backupData.data?.Status?.State, }); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async getHostFirmware({ commit }) { return await api @@ -134,15 +134,15 @@ const FirmwareStore = { commit('setHostFirmwareCurrent', { version: currentData?.data?.Version, location: currentData?.data?.['@odata.id'], - status: currentData?.data?.Status?.State + status: currentData?.data?.Status?.State, }); commit('setHostFirmwareBackup', { version: backupData.data?.Version, location: backupData.data?.['@odata.id'], - status: backupData.data?.Status?.State + status: backupData.data?.Status?.State, }); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, getUpdateServiceApplyTime({ commit }) { api @@ -152,20 +152,20 @@ const FirmwareStore = { data.HttpPushUriOptions.HttpPushUriApplyTime.ApplyTime; commit('setApplyTime', applyTime); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, setApplyTimeImmediate({ commit }) { const data = { HttpPushUriOptions: { HttpPushUriApplyTime: { - ApplyTime: 'Immediate' - } - } + ApplyTime: 'Immediate', + }, + }, }; return api .patch('/redfish/v1/UpdateService', data) .then(() => commit('setApplyTime', 'Immediate')) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async uploadFirmware({ state, dispatch }, image) { if (state.applyTime !== 'Immediate') { @@ -175,11 +175,11 @@ const FirmwareStore = { } return await api .post('/redfish/v1/UpdateService', image, { - headers: { 'Content-Type': 'application/octet-stream' } + headers: { 'Content-Type': 'application/octet-stream' }, }) .then(() => dispatch('getSystemFirwareVersion')) .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); }); @@ -187,7 +187,7 @@ const FirmwareStore = { async uploadFirmwareTFTP({ state, dispatch }, { address, filename }) { const data = { TransferProtocol: 'TFTP', - ImageURI: `${address}/${filename}` + ImageURI: `${address}/${filename}`, }; if (state.applyTime !== 'Immediate') { // ApplyTime must be set to Immediate before making @@ -201,7 +201,7 @@ const FirmwareStore = { ) .then(() => dispatch('getSystemFirwareVersion')) .then(() => i18n.t('pageFirmware.toast.successUploadMessage')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorUploadAndReboot')); }); @@ -211,19 +211,19 @@ const FirmwareStore = { const data = { Links: { ActiveSoftwareImage: { - '@odata.id': backupLoaction - } - } + '@odata.id': backupLoaction, + }, + }, }; return await api .patch('/redfish/v1/Managers/bmc', data) .then(() => i18n.t('pageFirmware.toast.successRebootFromBackup')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageFirmware.toast.errorRebootFromBackup')); }); - } - } + }, + }, }; export default FirmwareStore; diff --git a/src/store/modules/Configuration/NetworkSettingsStore.js b/src/store/modules/Configuration/NetworkSettingsStore.js index ae1de3d2..9cdcd415 100644 --- a/src/store/modules/Configuration/NetworkSettingsStore.js +++ b/src/store/modules/Configuration/NetworkSettingsStore.js @@ -7,12 +7,12 @@ const NetworkSettingsStore = { state: { defaultGateway: '', ethernetData: [], - interfaceOptions: [] + interfaceOptions: [], }, getters: { - defaultGateway: state => state.defaultGateway, - ethernetData: state => state.ethernetData, - interfaceOptions: state => state.interfaceOptions + defaultGateway: (state) => state.defaultGateway, + ethernetData: (state) => state.ethernetData, + interfaceOptions: (state) => state.interfaceOptions, }, mutations: { setDefaultGateway: (state, defaultGateway) => @@ -20,35 +20,35 @@ const NetworkSettingsStore = { setEthernetData: (state, ethernetData) => (state.ethernetData = ethernetData), setInterfaceOptions: (state, interfaceOptions) => - (state.interfaceOptions = interfaceOptions) + (state.interfaceOptions = interfaceOptions), }, actions: { async getEthernetData({ commit }) { return await api .get('/redfish/v1/Managers/bmc/EthernetInterfaces') - .then(response => + .then((response) => response.data.Members.map( - ethernetInterface => ethernetInterface['@odata.id'] + (ethernetInterface) => ethernetInterface['@odata.id'] ) ) - .then(ethernetInterfaceIds => + .then((ethernetInterfaceIds) => api.all( - ethernetInterfaceIds.map(ethernetInterface => + ethernetInterfaceIds.map((ethernetInterface) => api.get(ethernetInterface) ) ) ) - .then(ethernetInterfaces => { + .then((ethernetInterfaces) => { const ethernetData = ethernetInterfaces.map( - ethernetInterface => ethernetInterface.data + (ethernetInterface) => ethernetInterface.data ); const interfaceOptions = ethernetInterfaces.map( - ethernetName => ethernetName.data.Id + (ethernetName) => ethernetName.data.Id ); const addresses = ethernetData[0].IPv4StaticAddresses; // Default gateway manually set to first gateway saved on the first interface. Default gateway property is WIP on backend - const defaultGateway = addresses.map(ipv4 => { + const defaultGateway = addresses.map((ipv4) => { return ipv4.Gateway; }); @@ -56,7 +56,7 @@ const NetworkSettingsStore = { commit('setEthernetData', ethernetData); commit('setInterfaceOptions', interfaceOptions); }) - .catch(error => { + .catch((error) => { console.log('Network Data:', error); }); }, @@ -67,10 +67,10 @@ const NetworkSettingsStore = { state.ethernetData[networkSettingsForm.selectedInterfaceIndex] .IPv4StaticAddresses; - const addressArray = originalAddresses.map(item => { + const addressArray = originalAddresses.map((item) => { const address = item.Address; if (find(updatedAddresses, { Address: address })) { - remove(updatedAddresses, item => { + remove(updatedAddresses, (item) => { return item.Address === address; }); return {}; @@ -81,7 +81,7 @@ const NetworkSettingsStore = { const data = { HostName: networkSettingsForm.hostname, - MACAddress: networkSettingsForm.macAddress + MACAddress: networkSettingsForm.macAddress, }; // If DHCP disabled, update static DNS or static ipv4 @@ -99,14 +99,14 @@ const NetworkSettingsStore = { .then(() => { return i18n.t('pageNetworkSettings.toast.successSaveNetworkSettings'); }) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageNetworkSettings.toast.errorSaveNetworkSettings') ); }); - } - } + }, + }, }; export default NetworkSettingsStore; diff --git a/src/store/modules/Control/BootSettingsStore.js b/src/store/modules/Control/BootSettingsStore.js index ff5f5050..99542b88 100644 --- a/src/store/modules/Control/BootSettingsStore.js +++ b/src/store/modules/Control/BootSettingsStore.js @@ -7,13 +7,13 @@ const BootSettingsStore = { bootSourceOptions: [], bootSource: null, overrideEnabled: null, - tpmEnabled: null + tpmEnabled: null, }, getters: { - bootSourceOptions: state => state.bootSourceOptions, - bootSource: state => state.bootSource, - overrideEnabled: state => state.overrideEnabled, - tpmEnabled: state => state.tpmEnabled + bootSourceOptions: (state) => state.bootSourceOptions, + bootSource: (state) => state.bootSource, + overrideEnabled: (state) => state.overrideEnabled, + tpmEnabled: (state) => state.tpmEnabled, }, mutations: { setBootSourceOptions: (state, bootSourceOptions) => @@ -27,7 +27,7 @@ const BootSettingsStore = { state.overrideEnabled = false; } }, - setTpmPolicy: (state, tpmEnabled) => (state.tpmEnabled = tpmEnabled) + setTpmPolicy: (state, tpmEnabled) => (state.tpmEnabled = tpmEnabled), }, actions: { async getBootSettings({ commit }) { @@ -41,7 +41,7 @@ const BootSettingsStore = { commit('setOverrideEnabled', Boot.BootSourceOverrideEnabled); commit('setBootSource', Boot.BootSourceOverrideTarget); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, saveBootSettings({ commit, dispatch }, { bootSource, overrideEnabled }) { const data = { Boot: {} }; @@ -57,13 +57,13 @@ const BootSettingsStore = { return api .patch('/redfish/v1/Systems/system', data) - .then(response => { + .then((response) => { // If request success, commit the values commit('setBootSource', data.Boot.BootSourceOverrideTarget); commit('setOverrideEnabled', data.Boot.BootSourceOverrideEnabled); return response; }) - .catch(error => { + .catch((error) => { console.log(error); // If request error, GET saved options dispatch('getBootSettings'); @@ -77,7 +77,7 @@ const BootSettingsStore = { .then(({ data: { data: { TPMEnable } } }) => commit('setTpmPolicy', TPMEnable) ) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, saveTpmPolicy({ commit, dispatch }, tpmEnabled) { // TODO: switch to Redfish when available @@ -87,12 +87,12 @@ const BootSettingsStore = { '/xyz/openbmc_project/control/host0/TPMEnable/attr/TPMEnable', data ) - .then(response => { + .then((response) => { // If request success, commit the values commit('setTpmPolicy', tpmEnabled); return response; }) - .catch(error => { + .catch((error) => { console.log(error); // If request error, GET saved policy dispatch('getTpmPolicy'); @@ -119,7 +119,7 @@ const BootSettingsStore = { let message = i18n.t( 'pageServerPowerOperations.toast.successSaveSettings' ); - responses.forEach(response => { + responses.forEach((response) => { if (response instanceof Error) { throw new Error( i18n.t('pageServerPowerOperations.toast.errorSaveSettings') @@ -129,8 +129,8 @@ const BootSettingsStore = { return message; }) ); - } - } + }, + }, }; export default BootSettingsStore; diff --git a/src/store/modules/Control/ControlStore.js b/src/store/modules/Control/ControlStore.js index ade5da69..82940f81 100644 --- a/src/store/modules/Control/ControlStore.js +++ b/src/store/modules/Control/ControlStore.js @@ -9,15 +9,15 @@ import i18n from '@/i18n'; * @param {string} hostStatus * @returns {Promise} */ -const checkForHostStatus = function(hostStatus) { - return new Promise(resolve => { +const checkForHostStatus = function (hostStatus) { + return new Promise((resolve) => { const timer = setTimeout(() => { resolve(); unwatch(); }, 300000 /*5mins*/); const unwatch = this.watch( - state => state.global.hostStatus, - value => { + (state) => state.global.hostStatus, + (value) => { if (value === hostStatus) { resolve(); unwatch(); @@ -33,12 +33,12 @@ const ControlStore = { state: { isOperationInProgress: false, lastPowerOperationTime: null, - lastBmcRebootTime: null + lastBmcRebootTime: null, }, getters: { - isOperationInProgress: state => state.isOperationInProgress, - lastPowerOperationTime: state => state.lastPowerOperationTime, - lastBmcRebootTime: state => state.lastBmcRebootTime + isOperationInProgress: (state) => state.isOperationInProgress, + lastPowerOperationTime: (state) => state.lastPowerOperationTime, + lastBmcRebootTime: (state) => state.lastBmcRebootTime, }, mutations: { setOperationInProgress: (state, inProgress) => @@ -46,28 +46,28 @@ const ControlStore = { setLastPowerOperationTime: (state, lastPowerOperationTime) => (state.lastPowerOperationTime = lastPowerOperationTime), setLastBmcRebootTime: (state, lastBmcRebootTime) => - (state.lastBmcRebootTime = lastBmcRebootTime) + (state.lastBmcRebootTime = lastBmcRebootTime), }, actions: { async getLastPowerOperationTime({ commit }) { return await api .get('/redfish/v1/Systems/system') - .then(response => { + .then((response) => { const lastReset = response.data.LastResetTime; const lastPowerOperationTime = new Date(lastReset); commit('setLastPowerOperationTime', lastPowerOperationTime); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, getLastBmcRebootTime({ commit }) { return api .get('/redfish/v1/Managers/bmc') - .then(response => { + .then((response) => { const lastBmcReset = response.data.LastResetTime; const lastBmcRebootTime = new Date(lastBmcReset); commit('setLastBmcRebootTime', lastBmcRebootTime); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async rebootBmc({ dispatch }) { const data = { ResetType: 'GracefulRestart' }; @@ -75,7 +75,7 @@ const ControlStore = { .post('/redfish/v1/Managers/bmc/Actions/Manager.Reset', data) .then(() => dispatch('getLastBmcRebootTime')) .then(() => i18n.t('pageRebootBmc.toast.successRebootStart')) - .catch(error => { + .catch((error) => { console.log(error); throw new Error(i18n.t('pageRebootBmc.toast.errorRebootStart')); }); @@ -119,12 +119,12 @@ const ControlStore = { commit('setOperationInProgress', true); api .post('/redfish/v1/Systems/system/Actions/ComputerSystem.Reset', data) - .catch(error => { + .catch((error) => { console.log(error); commit('setOperationInProgress', false); }); - } - } + }, + }, }; export default ControlStore; diff --git a/src/store/modules/Control/PowerControlStore.js b/src/store/modules/Control/PowerControlStore.js index 3a2434a6..9dbddf05 100644 --- a/src/store/modules/Control/PowerControlStore.js +++ b/src/store/modules/Control/PowerControlStore.js @@ -5,17 +5,17 @@ const PowerControlStore = { namespaced: true, state: { powerCapValue: null, - powerConsumptionValue: null + powerConsumptionValue: null, }, getters: { - powerCapValue: state => state.powerCapValue, - powerConsumptionValue: state => state.powerConsumptionValue + powerCapValue: (state) => state.powerCapValue, + powerConsumptionValue: (state) => state.powerConsumptionValue, }, mutations: { setPowerCapValue: (state, powerCapValue) => (state.powerCapValue = powerCapValue), setPowerConsumptionValue: (state, powerConsumptionValue) => - (state.powerConsumptionValue = powerConsumptionValue) + (state.powerConsumptionValue = powerConsumptionValue), }, actions: { setPowerCapUpdatedValue({ commit }, value) { @@ -24,7 +24,7 @@ const PowerControlStore = { async getPowerControl({ commit }) { return await api .get('/redfish/v1/Chassis/chassis/Power') - .then(response => { + .then((response) => { const powerControl = response.data.PowerControl; const powerCap = powerControl[0].PowerLimit.LimitInWatts; // If system is powered off, power consumption does not exist in the PowerControl @@ -33,13 +33,13 @@ const PowerControlStore = { commit('setPowerCapValue', powerCap); commit('setPowerConsumptionValue', powerConsumption); }) - .catch(error => { + .catch((error) => { console.log('Power control', error); }); }, async setPowerControl(_, powerCapValue) { const data = { - PowerControl: [{ PowerLimit: { LimitInWatts: powerCapValue } }] + PowerControl: [{ PowerLimit: { LimitInWatts: powerCapValue } }], }; return await api @@ -47,14 +47,14 @@ const PowerControlStore = { .then(() => i18n.t('pageServerPowerOperations.toast.successSaveSettings') ) - .catch(error => { + .catch((error) => { console.log(error); throw new Error( i18n.t('pageServerPowerOperations.toast.errorSaveSettings') ); }); - } - } + }, + }, }; export default PowerControlStore; diff --git a/src/store/modules/Control/ServerLedStore.js b/src/store/modules/Control/ServerLedStore.js index 2be7722f..51e09206 100644 --- a/src/store/modules/Control/ServerLedStore.js +++ b/src/store/modules/Control/ServerLedStore.js @@ -4,24 +4,24 @@ import i18n from '@/i18n'; const ServerLedStore = { namespaced: true, state: { - indicatorValue: 'Off' + indicatorValue: 'Off', }, getters: { - getIndicatorValue: state => state.indicatorValue + getIndicatorValue: (state) => state.indicatorValue, }, mutations: { setIndicatorValue(state, indicatorValue) { state.indicatorValue = indicatorValue; - } + }, }, actions: { async getIndicatorValue({ commit }) { return await api .get('/redfish/v1/Systems/system') - .then(response => { + .then((response) => { commit('setIndicatorValue', response.data.IndicatorLED); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async saveIndicatorLedValue({ commit }, payload) { return await api @@ -34,7 +34,7 @@ const ServerLedStore = { return i18n.t('pageServerLed.toast.successServerLedOff'); } }) - .catch(error => { + .catch((error) => { console.log(error); if (payload === 'Lit') { throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn')); @@ -42,8 +42,8 @@ const ServerLedStore = { throw new Error(i18n.t('pageServerLed.toast.errorServerLedOff')); } }); - } - } + }, + }, }; export default ServerLedStore; diff --git a/src/store/modules/Control/VirtualMediaStore.js b/src/store/modules/Control/VirtualMediaStore.js index 6785f5fd..7c183b0e 100644 --- a/src/store/modules/Control/VirtualMediaStore.js +++ b/src/store/modules/Control/VirtualMediaStore.js @@ -6,17 +6,17 @@ const VirtualMediaStore = { state: { proxyDevices: [], legacyDevices: [], - connections: [] + connections: [], }, getters: { - proxyDevices: state => state.proxyDevices, - legacyDevices: state => state.legacyDevices + proxyDevices: (state) => state.proxyDevices, + legacyDevices: (state) => state.legacyDevices, }, mutations: { setProxyDevicesData: (state, deviceData) => (state.proxyDevices = deviceData), setLegacyDevicesData: (state, deviceData) => - (state.legacyDevices = deviceData) + (state.legacyDevices = deviceData), }, actions: { async getData({ commit }) { @@ -30,7 +30,7 @@ const VirtualMediaStore = { websocket: '/vm/0/0', file: null, transferProtocolType: 'OEM', - isActive: false + isActive: false, }; commit('setProxyDevicesData', [device]); return; @@ -38,43 +38,43 @@ const VirtualMediaStore = { return await api .get('/redfish/v1/Managers/bmc/VirtualMedia') - .then(response => - response.data.Members.map(virtualMedia => virtualMedia['@odata.id']) + .then((response) => + response.data.Members.map((virtualMedia) => virtualMedia['@odata.id']) ) - .then(devices => api.all(devices.map(device => api.get(device)))) - .then(devices => { - const deviceData = devices.map(device => { + .then((devices) => api.all(devices.map((device) => api.get(device)))) + .then((devices) => { + const deviceData = devices.map((device) => { const isActive = device.data?.Inserted === true ? true : false; return { id: device.data?.Id, transferProtocolType: device.data?.TransferProtocolType, websocket: device.data?.Oem?.OpenBMC?.WebSocketEndpoint, - isActive: isActive + isActive: isActive, }; }); const proxyDevices = deviceData - .filter(d => d.transferProtocolType === 'OEM') - .map(device => { + .filter((d) => d.transferProtocolType === 'OEM') + .map((device) => { return { ...device, - file: null + file: null, }; }); const legacyDevices = deviceData - .filter(d => !d.transferProtocolType) - .map(device => { + .filter((d) => !d.transferProtocolType) + .map((device) => { return { ...device, serverUri: '', username: '', password: '', - isRW: false + isRW: false, }; }); commit('setProxyDevicesData', proxyDevices); commit('setLegacyDevicesData', legacyDevices); }) - .catch(error => { + .catch((error) => { console.log('Virtual Media:', error); }); }, @@ -84,7 +84,7 @@ const VirtualMediaStore = { `/redfish/v1/Managers/bmc/VirtualMedia/${id}/Actions/VirtualMedia.InsertMedia`, data ) - .catch(error => { + .catch((error) => { console.log('Mount image:', error); throw new Error(); }); @@ -94,12 +94,12 @@ const VirtualMediaStore = { .post( `/redfish/v1/Managers/bmc/VirtualMedia/${id}/Actions/VirtualMedia.EjectMedia` ) - .catch(error => { + .catch((error) => { console.log('Unmount image:', error); throw new Error(); }); - } - } + }, + }, }; export default VirtualMediaStore; diff --git a/src/store/modules/GlobalStore.js b/src/store/modules/GlobalStore.js index 5af5dfe6..218feb67 100644 --- a/src/store/modules/GlobalStore.js +++ b/src/store/modules/GlobalStore.js @@ -4,10 +4,10 @@ const HOST_STATE = { on: 'xyz.openbmc_project.State.Host.HostState.Running', off: 'xyz.openbmc_project.State.Host.HostState.Off', error: 'xyz.openbmc_project.State.Host.HostState.Quiesced', - diagnosticMode: 'xyz.openbmc_project.State.Host.HostState.DiagnosticMode' + diagnosticMode: 'xyz.openbmc_project.State.Host.HostState.DiagnosticMode', }; -const hostStateMapper = hostState => { +const hostStateMapper = (hostState) => { switch (hostState) { case HOST_STATE.on: case 'On': // Redfish PowerState @@ -36,15 +36,15 @@ const GlobalStore = { ? JSON.parse(localStorage.getItem('storedUtcDisplay')) : true, username: localStorage.getItem('storedUsername'), - isAuthorized: true + isAuthorized: true, }, getters: { - hostStatus: state => state.hostStatus, - bmcTime: state => state.bmcTime, - languagePreference: state => state.languagePreference, - isUtcDisplay: state => state.isUtcDisplay, - username: state => state.username, - isAuthorized: state => state.isAuthorized + hostStatus: (state) => state.hostStatus, + bmcTime: (state) => state.bmcTime, + languagePreference: (state) => state.languagePreference, + isUtcDisplay: (state) => state.isUtcDisplay, + username: (state) => state.username, + isAuthorized: (state) => state.isAuthorized, }, mutations: { setBmcTime: (state, bmcTime) => (state.bmcTime = bmcTime), @@ -54,23 +54,23 @@ const GlobalStore = { (state.languagePreference = language), setUsername: (state, username) => (state.username = username), setUtcTime: (state, isUtcDisplay) => (state.isUtcDisplay = isUtcDisplay), - setUnauthorized: state => { + setUnauthorized: (state) => { state.isAuthorized = false; window.setTimeout(() => { state.isAuthorized = true; }, 100); - } + }, }, actions: { async getBmcTime({ commit }) { return await api .get('/redfish/v1/Managers/bmc') - .then(response => { + .then((response) => { const bmcDateTime = response.data.DateTime; const date = new Date(bmcDateTime); commit('setBmcTime', date); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, getHostStatus({ commit }) { api @@ -85,9 +85,9 @@ const GlobalStore = { commit('setHostStatus', PowerState); } }) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default GlobalStore; diff --git a/src/store/modules/Health/BmcStore.js b/src/store/modules/Health/BmcStore.js index 784bd449..73df10b8 100644 --- a/src/store/modules/Health/BmcStore.js +++ b/src/store/modules/Health/BmcStore.js @@ -3,10 +3,10 @@ import api from '@/store/api'; const ChassisStore = { namespaced: true, state: { - bmc: null + bmc: null, }, getters: { - bmc: state => state.bmc + bmc: (state) => state.bmc, }, mutations: { setBmcInfo: (state, data) => { @@ -32,16 +32,16 @@ const ChassisStore = { bmc.statusState = data.Status.State; bmc.uuid = data.UUID; state.bmc = bmc; - } + }, }, actions: { async getBmcInfo({ commit }) { return await api .get('/redfish/v1/Managers/bmc') .then(({ data }) => commit('setBmcInfo', data)) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default ChassisStore; diff --git a/src/store/modules/Health/ChassisStore.js b/src/store/modules/Health/ChassisStore.js index e9e58e72..251279e6 100644 --- a/src/store/modules/Health/ChassisStore.js +++ b/src/store/modules/Health/ChassisStore.js @@ -3,14 +3,14 @@ import api from '@/store/api'; const ChassisStore = { namespaced: true, state: { - chassis: [] + chassis: [], }, getters: { - chassis: state => state.chassis + chassis: (state) => state.chassis, }, mutations: { setChassisInfo: (state, data) => { - state.chassis = data.map(chassis => { + state.chassis = data.map((chassis) => { const { Id, Status = {}, @@ -18,7 +18,7 @@ const ChassisStore = { SerialNumber, ChassisType, Manufacturer, - PowerState + PowerState, } = chassis; return { @@ -30,26 +30,26 @@ const ChassisStore = { manufacturer: Manufacturer, powerState: PowerState, statusState: Status.State, - healthRollup: Status.HealthRollup + healthRollup: Status.HealthRollup, }; }); - } + }, }, actions: { async getChassisInfo({ commit }) { return await api .get('/redfish/v1/Chassis') .then(({ data: { Members = [] } }) => - Members.map(member => api.get(member['@odata.id'])) + Members.map((member) => api.get(member['@odata.id'])) ) - .then(promises => api.all(promises)) - .then(response => { + .then((promises) => api.all(promises)) + .then((response) => { const data = response.map(({ data }) => data); commit('setChassisInfo', data); }) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default ChassisStore; diff --git a/src/store/modules/Health/EventLogStore.js b/src/store/modules/Health/EventLogStore.js index 79bee02a..bf1de2f4 100644 --- a/src/store/modules/Health/EventLogStore.js +++ b/src/store/modules/Health/EventLogStore.js @@ -17,31 +17,32 @@ const getHealthStatus = (events, loadedEvents) => { // TODO: High priority events should also check if Log // is resolved when the property is available in Redfish -const getHighPriorityEvents = events => +const getHighPriorityEvents = (events) => events.filter(({ severity }) => severity === 'Critical'); const EventLogStore = { namespaced: true, state: { allEvents: [], - loadedEvents: false + loadedEvents: false, }, getters: { - allEvents: state => state.allEvents, - highPriorityEvents: state => getHighPriorityEvents(state.allEvents), - healthStatus: state => getHealthStatus(state.allEvents, state.loadedEvents) + allEvents: (state) => state.allEvents, + highPriorityEvents: (state) => getHighPriorityEvents(state.allEvents), + healthStatus: (state) => + getHealthStatus(state.allEvents, state.loadedEvents), }, mutations: { setAllEvents: (state, allEvents) => ( (state.allEvents = allEvents), (state.loadedEvents = true) - ) + ), }, actions: { async getEventLogData({ commit }) { return await api .get('/redfish/v1/Systems/system/LogServices/EventLog/Entries') .then(({ data: { Members = [] } = {} }) => { - const eventLogs = Members.map(log => { + const eventLogs = Members.map((log) => { const { Id, Severity, Created, EntryType, Message } = log; return { id: Id, @@ -49,25 +50,25 @@ const EventLogStore = { date: new Date(Created), type: EntryType, description: Message, - uri: log['@odata.id'] + uri: log['@odata.id'], }; }); commit('setAllEvents', eventLogs); }) - .catch(error => { + .catch((error) => { console.log('Event Log Data:', error); }); }, async deleteEventLogs({ dispatch }, uris = []) { - const promises = uris.map(uri => - api.delete(uri).catch(error => { + const promises = uris.map((uri) => + api.delete(uri).catch((error) => { console.log(error); return error; }) ); return await api .all(promises) - .then(response => { + .then((response) => { dispatch('getEventLogData'); return response; }) @@ -95,8 +96,8 @@ const EventLogStore = { return toastMessages; }) ); - } - } + }, + }, }; export default EventLogStore; diff --git a/src/store/modules/Health/FanStore.js b/src/store/modules/Health/FanStore.js index 2de388bf..b4a4189a 100644 --- a/src/store/modules/Health/FanStore.js +++ b/src/store/modules/Health/FanStore.js @@ -3,33 +3,33 @@ import api from '@/store/api'; const FanStore = { namespaced: true, state: { - fans: [] + fans: [], }, getters: { - fans: state => state.fans + fans: (state) => state.fans, }, mutations: { setFanInfo: (state, data) => { - state.fans = data.map(fan => { + state.fans = data.map((fan) => { const { MemberId, Status = {}, PartNumber, SerialNumber } = fan; return { id: MemberId, health: Status.Health, partNumber: PartNumber, serialNumber: SerialNumber, - statusState: Status.State + statusState: Status.State, }; }); - } + }, }, actions: { async getFanInfo({ commit }) { return await api .get('/redfish/v1/Chassis/chassis/Thermal') .then(({ data: { Fans = [] } }) => commit('setFanInfo', Fans)) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default FanStore; diff --git a/src/store/modules/Health/MemoryStore.js b/src/store/modules/Health/MemoryStore.js index 63e08e6a..cd2478de 100644 --- a/src/store/modules/Health/MemoryStore.js +++ b/src/store/modules/Health/MemoryStore.js @@ -3,10 +3,10 @@ import api from '@/store/api'; const MemoryStore = { namespaced: true, state: { - dimms: [] + dimms: [], }, getters: { - dimms: state => state.dimms + dimms: (state) => state.dimms, }, mutations: { setMemoryInfo: (state, data) => { @@ -17,23 +17,23 @@ const MemoryStore = { health: Status.Health, partNumber: PartNumber, serialNumber: SerialNumber, - statusState: Status.State + statusState: Status.State, }; }); - } + }, }, actions: { async getDimms({ commit }) { return await api .get('/redfish/v1/Systems/system/Memory') .then(({ data: { Members } }) => { - const promises = Members.map(item => api.get(item['@odata.id'])); + const promises = Members.map((item) => api.get(item['@odata.id'])); return api.all(promises); }) - .then(response => commit('setMemoryInfo', response)) - .catch(error => console.log(error)); - } - } + .then((response) => commit('setMemoryInfo', response)) + .catch((error) => console.log(error)); + }, + }, }; export default MemoryStore; diff --git a/src/store/modules/Health/PowerSupplyStore.js b/src/store/modules/Health/PowerSupplyStore.js index 4e3d5fef..565715fa 100644 --- a/src/store/modules/Health/PowerSupplyStore.js +++ b/src/store/modules/Health/PowerSupplyStore.js @@ -3,14 +3,14 @@ import api from '@/store/api'; const PowerSupplyStore = { namespaced: true, state: { - powerSupplies: [] + powerSupplies: [], }, getters: { - powerSupplies: state => state.powerSupplies + powerSupplies: (state) => state.powerSupplies, }, mutations: { setPowerSupply: (state, data) => { - state.powerSupplies = data.map(powerSupply => { + state.powerSupplies = data.map((powerSupply) => { const { EfficiencyPercent, FirmwareVersion, @@ -20,7 +20,7 @@ const PowerSupplyStore = { PartNumber, PowerInputWatts, SerialNumber, - Status + Status, } = powerSupply; return { id: MemberId, @@ -32,10 +32,10 @@ const PowerSupplyStore = { indicatorLed: IndicatorLED, model: Model, powerInputWatts: PowerInputWatts, - statusState: Status.State + statusState: Status.State, }; }); - } + }, }, actions: { async getPowerSupply({ commit }) { @@ -44,9 +44,9 @@ const PowerSupplyStore = { .then(({ data: { PowerSupplies } }) => commit('setPowerSupply', PowerSupplies) ) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default PowerSupplyStore; diff --git a/src/store/modules/Health/ProcessorStore.js b/src/store/modules/Health/ProcessorStore.js index a1411eb2..4a67c6b0 100644 --- a/src/store/modules/Health/ProcessorStore.js +++ b/src/store/modules/Health/ProcessorStore.js @@ -3,14 +3,14 @@ import api from '@/store/api'; const ProcessorStore = { namespaced: true, state: { - processors: [] + processors: [], }, getters: { - processors: state => state.processors + processors: (state) => state.processors, }, mutations: { setProcessorsInfo: (state, data) => { - state.processors = data.map(processor => { + state.processors = data.map((processor) => { const { Id, Status = {}, @@ -22,7 +22,7 @@ const ProcessorStore = { Name, ProcessorArchitecture, ProcessorType, - TotalCores + TotalCores, } = processor; return { id: Id, @@ -36,26 +36,26 @@ const ProcessorStore = { name: Name, processorArchitecture: ProcessorArchitecture, processorType: ProcessorType, - totalCores: TotalCores + totalCores: TotalCores, }; }); - } + }, }, actions: { async getProcessorsInfo({ commit }) { return await api .get('/redfish/v1/Systems/system/Processors') .then(({ data: { Members = [] } }) => - Members.map(member => api.get(member['@odata.id'])) + Members.map((member) => api.get(member['@odata.id'])) ) - .then(promises => api.all(promises)) - .then(response => { + .then((promises) => api.all(promises)) + .then((response) => { const data = response.map(({ data }) => data); commit('setProcessorsInfo', data); }) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default ProcessorStore; diff --git a/src/store/modules/Health/SensorsStore.js b/src/store/modules/Health/SensorsStore.js index 5f2bf52e..1c0de0db 100644 --- a/src/store/modules/Health/SensorsStore.js +++ b/src/store/modules/Health/SensorsStore.js @@ -4,15 +4,15 @@ import { uniqBy } from 'lodash'; const SensorsStore = { namespaced: true, state: { - sensors: [] + sensors: [], }, getters: { - sensors: state => state.sensors + sensors: (state) => state.sensors, }, mutations: { setSensors: (state, sensors) => { state.sensors = uniqBy([...state.sensors, ...sensors], 'name'); - } + }, }, actions: { async getAllSensors({ dispatch }) { @@ -30,18 +30,18 @@ const SensorsStore = { return await api .get('/redfish/v1/Chassis') .then(({ data: { Members } }) => - Members.map(member => member['@odata.id']) + Members.map((member) => member['@odata.id']) ) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async getSensors({ commit }, id) { const sensors = await api .get(`${id}/Sensors`) - .then(response => response.data.Members) - .catch(error => console.log(error)); + .then((response) => response.data.Members) + .catch((error) => console.log(error)); if (!sensors) return; - const promises = sensors.map(sensor => { - return api.get(sensor['@odata.id']).catch(error => { + const promises = sensors.map((sensor) => { + return api.get(sensor['@odata.id']).catch((error) => { console.log(error); return error; }); @@ -57,7 +57,7 @@ const SensorsStore = { upperCaution: data.Thresholds?.UpperCaution?.Reading, lowerCritical: data.Thresholds?.LowerCritical?.Reading, upperCritical: data.Thresholds?.UpperCritical?.Reading, - units: data.ReadingUnits + units: data.ReadingUnits, }; }); commit('setSensors', sensorData); @@ -69,16 +69,16 @@ const SensorsStore = { .get(`${id}/Thermal`) .then(({ data: { Fans = [], Temperatures = [] } }) => { const sensorData = []; - Fans.forEach(sensor => { + Fans.forEach((sensor) => { sensorData.push({ // TODO: add upper/lower threshold name: sensor.Name, status: sensor.Status.Health, currentValue: sensor.Reading, - units: sensor.ReadingUnits + units: sensor.ReadingUnits, }); }); - Temperatures.forEach(sensor => { + Temperatures.forEach((sensor) => { sensorData.push({ name: sensor.Name, status: sensor.Status.Health, @@ -87,18 +87,18 @@ const SensorsStore = { upperCaution: sensor.UpperThresholdNonCritical, lowerCritical: sensor.LowerThresholdCritical, upperCritical: sensor.UpperThresholdCritical, - units: '℃' + units: '℃', }); }); commit('setSensors', sensorData); }) - .catch(error => console.log(error)); + .catch((error) => console.log(error)); }, async getPowerSensors({ commit }, id) { return await api .get(`${id}/Power`) .then(({ data: { Voltages = [] } }) => { - const sensorData = Voltages.map(sensor => { + const sensorData = Voltages.map((sensor) => { return { name: sensor.Name, status: sensor.Status.Health, @@ -107,14 +107,14 @@ const SensorsStore = { upperCaution: sensor.UpperThresholdNonCritical, lowerCritical: sensor.LowerThresholdCritical, upperCritical: sensor.UpperThresholdCritical, - units: 'Volts' + units: 'Volts', }; }); commit('setSensors', sensorData); }) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default SensorsStore; diff --git a/src/store/modules/Health/SystemStore.js b/src/store/modules/Health/SystemStore.js index 828b78bd..30ae66be 100644 --- a/src/store/modules/Health/SystemStore.js +++ b/src/store/modules/Health/SystemStore.js @@ -3,10 +3,10 @@ import api from '@/store/api'; const SystemStore = { namespaced: true, state: { - systems: [] + systems: [], }, getters: { - systems: state => state.systems + systems: (state) => state.systems, }, mutations: { setSystemInfo: (state, data) => { @@ -26,16 +26,16 @@ const SystemStore = { system.statusState = data.Status.State; system.systemType = data.SystemType; state.systems = [system]; - } + }, }, actions: { async getSystem({ commit }) { return await api .get('/redfish/v1/Systems/system') .then(({ data }) => commit('setSystemInfo', data)) - .catch(error => console.log(error)); - } - } + .catch((error) => console.log(error)); + }, + }, }; export default SystemStore; diff --git a/src/store/plugins/WebSocketPlugin.js b/src/store/plugins/WebSocketPlugin.js index 1d420679..5780d749 100644 --- a/src/store/plugins/WebSocketPlugin.js +++ b/src/store/plugins/WebSocketPlugin.js @@ -9,14 +9,14 @@ import { debounce } from 'lodash'; * * https://github.com/openbmc/docs/blob/b41aff0fabe137cdb0cfff584b5fe4a41c0c8e77/rest-api.md#event-subscription-protocol */ -const WebSocketPlugin = store => { +const WebSocketPlugin = (store) => { let ws; const data = { paths: ['/xyz/openbmc_project/state/host0', '/xyz/openbmc_project/logging'], interfaces: [ 'xyz.openbmc_project.State.Host', - 'xyz.openbmc_project.Logging.Entry' - ] + 'xyz.openbmc_project.Logging.Entry', + ], }; const initWebSocket = () => { @@ -28,10 +28,10 @@ const WebSocketPlugin = store => { ws.onopen = () => { ws.send(JSON.stringify(data)); }; - ws.onerror = event => { + ws.onerror = (event) => { console.error(event); }; - ws.onmessage = debounce(event => { + ws.onmessage = debounce((event) => { const data = JSON.parse(event.data); const eventInterface = data.interface; const path = data.path; diff --git a/src/utilities/NBDServer.js b/src/utilities/NBDServer.js index 7c0419ae..57c79ce9 100644 --- a/src/utilities/NBDServer.js +++ b/src/utilities/NBDServer.js @@ -41,7 +41,7 @@ export default class NBDServer { this.ws = null; this.state = NBD_STATE_UNKNOWN; this.msgbuf = null; - this.start = function() { + this.start = function () { this.ws = new WebSocket(this.endpoint, [token]); this.state = NBD_STATE_OPEN; this.ws.binaryType = 'arraybuffer'; @@ -51,17 +51,17 @@ export default class NBDServer { this.ws.onerror = this._on_ws_error.bind(this); this.socketStarted(); }; - this.stop = function() { + this.stop = function () { if (this.ws.readyState == 1) { this.ws.close(); this.state = NBD_STATE_UNKNOWN; } }; - this._on_ws_error = function(ev) { + this._on_ws_error = function (ev) { console.log(`${endpoint} error: ${ev.error}`); console.log(JSON.stringify(ev)); }; - this._on_ws_close = function(ev) { + this._on_ws_close = function (ev) { console.log( `${endpoint} closed with code: ${ev.code} + reason: ${ev.reason}` ); @@ -69,14 +69,14 @@ export default class NBDServer { this.socketClosed(ev.code); }; /* websocket event handlers */ - this._on_ws_open = function() { + this._on_ws_open = function () { console.log(endpoint + ' opened'); this.client = { - flags: 0 + flags: 0, }; this._negotiate(); }; - this._on_ws_message = function(ev) { + this._on_ws_message = function (ev) { var data = ev.data; if (this.msgbuf == null) { this.msgbuf = data; @@ -113,7 +113,7 @@ export default class NBDServer { } } }; - this._negotiate = function() { + this._negotiate = function () { var buf = new ArrayBuffer(18); var data = new DataView(buf, 0, 18); /* NBD magic: NBDMAGIC */ @@ -128,7 +128,7 @@ export default class NBDServer { this.ws.send(buf); }; /* handlers */ - this._handle_cflags = function(buf) { + this._handle_cflags = function (buf) { if (buf.byteLength < 4) { return 0; } @@ -137,7 +137,7 @@ export default class NBDServer { this.state = NBD_STATE_WAIT_OPTION; return 4; }; - this._handle_option = function(buf) { + this._handle_option = function (buf) { if (buf.byteLength < 16) return 0; var data = new DataView(buf, 0, 16); if (data.getUint32(0) != 0x49484156 || data.getUint32(4) != 0x454f5054) { @@ -179,7 +179,7 @@ export default class NBDServer { } return 16 + len; }; - this._create_cmd_response = function(req, rc, data = null) { + this._create_cmd_response = function (req, rc, data = null) { var len = 16; if (data) len += data.byteLength; var resp = new ArrayBuffer(len); @@ -191,7 +191,7 @@ export default class NBDServer { if (data) new Uint8Array(resp, 16).set(new Uint8Array(data)); return resp; }; - this._handle_cmd = function(buf) { + this._handle_cmd = function (buf) { if (buf.byteLength < 28) { return 0; } @@ -207,7 +207,7 @@ export default class NBDServer { handle_lsB: view.getUint32(12), offset_msB: view.getUint32(16), offset_lsB: view.getUint32(20), - length: view.getUint32(24) + length: view.getUint32(24), }; /* we don't support writes, so nothing needs the data at present */ /* req.data = buf.slice(28); */ @@ -251,7 +251,7 @@ export default class NBDServer { } return consumed; }; - this._handle_cmd_read = function(req) { + this._handle_cmd_read = function (req) { var offset; // eslint-disable-next-line prettier/prettier offset = (req.offset_msB * 2 ** 32) + req.offset_lsB; @@ -261,14 +261,14 @@ export default class NBDServer { var blob = this.file.slice(offset, offset + req.length); var reader = new FileReader(); - reader.onload = function(ev) { + reader.onload = function (ev) { var reader = ev.target; if (reader.readyState != FileReader.DONE) return; var resp = this._create_cmd_response(req, 0, reader.result); this.ws.send(resp); }.bind(this); - reader.onerror = function(ev) { + reader.onerror = function (ev) { var reader = ev.target; console.log('error reading file: ' + reader.error); var resp = this._create_cmd_response(req, EIO); @@ -277,14 +277,14 @@ export default class NBDServer { reader.readAsArrayBuffer(blob); return 0; }; - this._handle_cmd_disconnect = function() { + this._handle_cmd_disconnect = function () { this.stop(); return 0; }; this.recv_handlers = Object.freeze({ [NBD_STATE_WAIT_CFLAGS]: this._handle_cflags.bind(this), [NBD_STATE_WAIT_OPTION]: this._handle_option.bind(this), - [NBD_STATE_TRANSMISSION]: this._handle_cmd.bind(this) + [NBD_STATE_TRANSMISSION]: this._handle_cmd.bind(this), }); } } diff --git a/src/views/AccessControl/Ldap/Ldap.vue b/src/views/AccessControl/Ldap/Ldap.vue index 40164a5a..27172019 100644 --- a/src/views/AccessControl/Ldap/Ldap.vue +++ b/src/views/AccessControl/Ldap/Ldap.vue @@ -96,7 +96,7 @@ <b-row> <b-col sm="6" xl="4"> <b-form-group label-for="server-uri"> - <template v-slot:label> + <template #label> {{ $t('pageLdap.form.serverUri') }} <info-tooltip :title="$t('pageLdap.form.serverUriTooltip')" @@ -174,7 +174,7 @@ </b-col> <b-col sm="6" xl="4"> <b-form-group label-for="user-id-attribute"> - <template v-slot:label> + <template #label> {{ $t('pageLdap.form.userIdAttribute') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -190,7 +190,7 @@ </b-col> <b-col sm="6" xl="4"> <b-form-group label-for="group-id-attribute"> - <template v-slot:label> + <template #label> {{ $t('pageLdap.form.groupIdAttribute') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -252,9 +252,13 @@ export default { InputPasswordToggle, PageTitle, PageSection, - TableRoleGroups + TableRoleGroups, }, mixins: [BVToastMixin, VuelidateMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { form: { @@ -268,8 +272,8 @@ export default { bindPassword: '', baseDn: '', userIdAttribute: '', - groupIdAttribute: '' - } + groupIdAttribute: '', + }, }; }, computed: { @@ -277,70 +281,70 @@ export default { 'isServiceEnabled', 'isActiveDirectoryEnabled', 'ldap', - 'activeDirectory' + 'activeDirectory', ]), sslCertificates() { return this.$store.getters['sslCertificates/allCertificates']; }, caCertificateExpiration() { const caCertificate = find(this.sslCertificates, { - type: 'TrustStore Certificate' + type: 'TrustStore Certificate', }); if (caCertificate === undefined) return null; return caCertificate.validUntil; }, ldapCertificateExpiration() { const ldapCertificate = find(this.sslCertificates, { - type: 'LDAP Certificate' + type: 'LDAP Certificate', }); if (ldapCertificate === undefined) return null; return ldapCertificate.validUntil; }, ldapProtocol() { return this.form.secureLdapEnabled ? 'ldaps://' : 'ldap://'; - } + }, }, watch: { - isServiceEnabled: function(value) { + isServiceEnabled: function (value) { this.form.ldapAuthenticationEnabled = value; }, - isActiveDirectoryEnabled: function(value) { + isActiveDirectoryEnabled: function (value) { this.form.activeDirectoryEnabled = value; this.setFormValues(); - } + }, }, validations: { form: { ldapAuthenticationEnabled: {}, secureLdapEnabled: {}, activeDirectoryEnabled: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.ldapAuthenticationEnabled; - }) + }), }, serverUri: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.ldapAuthenticationEnabled; - }) + }), }, bindDn: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.ldapAuthenticationEnabled; - }) + }), }, bindPassword: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.ldapAuthenticationEnabled; - }) + }), }, baseDn: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.ldapAuthenticationEnabled; - }) + }), }, userIdAttribute: {}, - groupIdAttribute: {} - } + groupIdAttribute: {}, + }, }, created() { this.startLoader(); @@ -350,10 +354,6 @@ export default { this.$store.dispatch('sslCertificates/getCertificates'); this.setFormValues(); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { setFormValues(serviceType) { if (!serviceType) { @@ -366,7 +366,7 @@ export default { bindDn = '', baseDn = '', userAttribute = '', - groupsAttribute = '' + groupsAttribute = '', } = serviceType; const secureLdap = serviceAddress && serviceAddress.includes('ldaps://') ? true : false; @@ -392,12 +392,12 @@ export default { bindPassword: this.form.bindPassword, baseDn: this.form.baseDn, userIdAttribute: this.form.userIdAttribute, - groupIdAttribute: this.form.groupIdAttribute + groupIdAttribute: this.form.groupIdAttribute, }; this.startLoader(); this.$store .dispatch('ldap/saveAccountSettings', data) - .then(success => { + .then((success) => { this.successToast(success); this.$v.form.$reset(); }) @@ -426,7 +426,7 @@ export default { // disables the service. this.setFormValues(); } - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/Ldap/ModalAddRoleGroup.vue b/src/views/AccessControl/Ldap/ModalAddRoleGroup.vue index e2da1eb1..b9b1f5aa 100644 --- a/src/views/AccessControl/Ldap/ModalAddRoleGroup.vue +++ b/src/views/AccessControl/Ldap/ModalAddRoleGroup.vue @@ -1,6 +1,6 @@ <template> <b-modal id="modal-role-group" ref="modal" @ok="onOk" @hidden="resetForm"> - <template v-slot:modal-title> + <template #modal-title> <template v-if="roleGroup"> {{ $t('pageLdap.modal.editRoleGroup') }} </template> @@ -49,7 +49,7 @@ :state="getValidationState($v.form.groupPrivilege)" @input="$v.form.groupPrivilege.$touch()" > - <template v-if="!roleGroup" v-slot:first> + <template v-if="!roleGroup" #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -63,7 +63,7 @@ </b-col> </b-row> </b-container> - <template v-slot:modal-footer="{ ok, cancel }"> + <template #modal-footer="{ ok, cancel }"> <b-button variant="secondary" @click="cancel()"> {{ $t('global.action.cancel') }} </b-button> @@ -89,47 +89,47 @@ export default { roleGroup: { type: Object, default: null, - validator: prop => { + validator: (prop) => { if (prop === null) return true; return ( prop.hasOwnProperty('groupName') && prop.hasOwnProperty('groupPrivilege') ); - } - } + }, + }, }, data() { return { form: { groupName: null, - groupPrivilege: null - } + groupPrivilege: null, + }, }; }, computed: { accountRoles() { return this.$store.getters['localUsers/accountRoles']; - } + }, }, watch: { - roleGroup: function(value) { + roleGroup: function (value) { if (value === null) return; this.form.groupName = value.groupName; this.form.groupPrivilege = value.groupPrivilege; - } + }, }, validations() { return { form: { groupName: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.roleGroup; - }) + }), }, groupPrivilege: { - required - } - } + required, + }, + }, }; }, methods: { @@ -139,7 +139,7 @@ export default { this.$emit('ok', { addNew: !this.roleGroup, groupName: this.form.groupName, - groupPrivilege: this.form.groupPrivilege + groupPrivilege: this.form.groupPrivilege, }); this.closeModal(); }, @@ -158,7 +158,7 @@ export default { // prevent modal close bvModalEvt.preventDefault(); this.handleSubmit(); - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/Ldap/TableRoleGroups.vue b/src/views/AccessControl/Ldap/TableRoleGroups.vue index 9daf1fd7..ef300ea5 100644 --- a/src/views/AccessControl/Ldap/TableRoleGroups.vue +++ b/src/views/AccessControl/Ldap/TableRoleGroups.vue @@ -43,7 +43,7 @@ @row-selected="onRowSelected($event, tableItems.length)" > <!-- Checkbox column --> - <template v-slot:head(checkbox)> + <template #head(checkbox)> <b-form-checkbox v-model="tableHeaderCheckboxModel" :indeterminate="tableHeaderCheckboxIndeterminate" @@ -51,7 +51,7 @@ @change="onChangeHeaderCheckbox($refs.table)" /> </template> - <template v-slot:cell(checkbox)="row"> + <template #cell(checkbox)="row"> <b-form-checkbox v-model="row.rowSelected" :disabled="!isServiceEnabled" @@ -60,7 +60,7 @@ </template> <!-- table actions column --> - <template v-slot:cell(actions)="{ item }"> + <template #cell(actions)="{ item }"> <table-row-action v-for="(action, index) in item.actions" :key="index" @@ -69,7 +69,7 @@ :title="action.title" @click:tableAction="onTableRowAction($event, item)" > - <template v-slot:icon> + <template #icon> <icon-edit v-if="action.value === 'edit'" /> <icon-trashcan v-if="action.value === 'delete'" /> </template> @@ -108,7 +108,7 @@ export default { IconTrashcan, ModalAddRoleGroup, TableRowAction, - TableToolbar + TableToolbar, }, mixins: [BVTableSelectableMixin, BVToastMixin, LoadingBarMixin], data() { @@ -117,31 +117,31 @@ export default { fields: [ { key: 'checkbox', - sortable: false + sortable: false, }, { key: 'groupName', sortable: true, - label: this.$t('pageLdap.tableRoleGroups.groupName') + label: this.$t('pageLdap.tableRoleGroups.groupName'), }, { key: 'groupPrivilege', sortable: true, - label: this.$t('pageLdap.tableRoleGroups.groupPrivilege') + label: this.$t('pageLdap.tableRoleGroups.groupPrivilege'), }, { key: 'actions', sortable: false, label: '', - tdClass: 'text-right' - } + tdClass: 'text-right', + }, ], batchActions: [ { value: 'delete', - label: this.$t('global.action.delete') - } - ] + label: this.$t('global.action.delete'), + }, + ], }; }, computed: { @@ -155,17 +155,17 @@ export default { { value: 'edit', title: this.$t('global.action.edit'), - enabled: this.isServiceEnabled + enabled: this.isServiceEnabled, }, { value: 'delete', title: this.$t('global.action.delete'), - enabled: this.isServiceEnabled - } - ] + enabled: this.isServiceEnabled, + }, + ], }; }); - } + }, }, created() { this.$store.dispatch('localUsers/getAccountRoles'); @@ -180,17 +180,17 @@ export default { ), { title: this.$t('pageLdap.modal.deleteRoleGroup'), - okTitle: this.$t('global.action.delete') + okTitle: this.$t('global.action.delete'), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) { this.startLoader(); this.$store .dispatch('ldap/deleteRoleGroup', { - roleGroups: this.selectedRows + roleGroups: this.selectedRows, }) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } @@ -205,19 +205,19 @@ export default { this.$bvModal .msgBoxConfirm( this.$t('pageLdap.modal.deleteRoleGroupConfirmMessage', { - groupName: row.groupName + groupName: row.groupName, }), { title: this.$t('pageLdap.modal.deleteRoleGroup'), - okTitle: this.$t('global.action.delete') + okTitle: this.$t('global.action.delete'), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) { this.startLoader(); this.$store .dispatch('ldap/deleteRoleGroup', { roleGroups: [row] }) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } @@ -236,17 +236,17 @@ export default { if (addNew) { this.$store .dispatch('ldap/addNewRoleGroup', data) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } else { this.$store .dispatch('ldap/saveRoleGroup', data) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue index 9978f4a7..5c2d7f1b 100644 --- a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue +++ b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue @@ -39,7 +39,7 @@ @row-selected="onRowSelected($event, tableItems.length)" > <!-- Checkbox column --> - <template v-slot:head(checkbox)> + <template #head(checkbox)> <b-form-checkbox v-model="tableHeaderCheckboxModel" data-test-id="localUserManagement-checkbox-tableHeaderCheckbox" @@ -47,7 +47,7 @@ @change="onChangeHeaderCheckbox($refs.table)" /> </template> - <template v-slot:cell(checkbox)="row"> + <template #cell(checkbox)="row"> <b-form-checkbox v-model="row.rowSelected" data-test-id="localUserManagement-checkbox-toggleSelectRow" @@ -56,7 +56,7 @@ </template> <!-- table actions column --> - <template v-slot:cell(actions)="{ item }"> + <template #cell(actions)="{ item }"> <table-row-action v-for="(action, index) in item.actions" :key="index" @@ -65,18 +65,14 @@ :title="action.title" @click:tableAction="onTableRowAction($event, item)" > - <template v-slot:icon> + <template #icon> <icon-edit v-if="action.value === 'edit'" - :data-test-id=" - `localUserManagement-tableRowAction-edit-${index}` - " + :data-test-id="`localUserManagement-tableRowAction-edit-${index}`" /> <icon-trashcan v-if="action.value === 'delete'" - :data-test-id=" - `localUserManagement-tableRowAction-delete-${index}` - " + :data-test-id="`localUserManagement-tableRowAction-delete-${index}`" /> </template> </table-row-action> @@ -142,48 +138,52 @@ export default { PageTitle, TableRoles, TableRowAction, - TableToolbar + TableToolbar, }, mixins: [BVTableSelectableMixin, BVToastMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { activeUser: null, fields: [ { - key: 'checkbox' + key: 'checkbox', }, { key: 'username', - label: this.$t('pageLocalUserManagement.table.username') + label: this.$t('pageLocalUserManagement.table.username'), }, { key: 'privilege', - label: this.$t('pageLocalUserManagement.table.privilege') + label: this.$t('pageLocalUserManagement.table.privilege'), }, { key: 'status', - label: this.$t('pageLocalUserManagement.table.status') + label: this.$t('pageLocalUserManagement.table.status'), }, { key: 'actions', label: '', - tdClass: 'text-right text-nowrap' - } + tdClass: 'text-right text-nowrap', + }, ], tableToolbarActions: [ { value: 'delete', - label: this.$t('global.action.delete') + label: this.$t('global.action.delete'), }, { value: 'enable', - label: this.$t('global.action.enable') + label: this.$t('global.action.enable'), }, { value: 'disable', - label: this.$t('global.action.disable') - } - ] + label: this.$t('global.action.disable'), + }, + ], }; }, computed: { @@ -192,7 +192,7 @@ export default { }, tableItems() { // transform user data to table data - return this.allUsers.map(user => { + return this.allUsers.map((user) => { return { username: user.UserName, privilege: user.RoleId, @@ -205,15 +205,15 @@ export default { { value: 'edit', enabled: true, - title: this.$t('pageLocalUserManagement.editUser') + title: this.$t('pageLocalUserManagement.editUser'), }, { value: 'delete', enabled: user.UserName === 'root' ? false : true, - title: this.$tc('pageLocalUserManagement.deleteUser') - } + title: this.$tc('pageLocalUserManagement.deleteUser'), + }, ], - ...user + ...user, }; }); }, @@ -222,7 +222,7 @@ export default { }, passwordRequirements() { return this.$store.getters['localUsers/accountPasswordRequirements']; - } + }, }, created() { this.startLoader(); @@ -230,10 +230,6 @@ export default { this.$store.dispatch('localUsers/getAccountSettings'); this.$store.dispatch('localUsers/getAccountRoles'); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { initModalUser(user) { this.activeUser = user; @@ -243,14 +239,14 @@ export default { this.$bvModal .msgBoxConfirm( this.$t('pageLocalUserManagement.modal.deleteConfirmMessage', { - user: user.username + user: user.username, }), { title: this.$tc('pageLocalUserManagement.deleteUser'), - okTitle: this.$tc('pageLocalUserManagement.deleteUser') + okTitle: this.$tc('pageLocalUserManagement.deleteUser'), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) { this.deleteUser(user); } @@ -264,13 +260,13 @@ export default { if (isNewUser) { this.$store .dispatch('localUsers/createUser', userData) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } else { this.$store .dispatch('localUsers/updateUser', userData) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); } @@ -279,7 +275,7 @@ export default { this.startLoader(); this.$store .dispatch('localUsers/deleteUser', username) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); }, @@ -300,15 +296,15 @@ export default { okTitle: this.$tc( 'pageLocalUserManagement.deleteUser', this.selectedRows.length - ) + ), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) { this.startLoader(); this.$store .dispatch('localUsers/deleteUsers', this.selectedRows) - .then(messages => { + .then((messages) => { messages.forEach(({ type, message }) => { if (type === 'success') this.successToast(message); if (type === 'error') this.errorToast(message); @@ -322,7 +318,7 @@ export default { this.startLoader(); this.$store .dispatch('localUsers/enableUsers', this.selectedRows) - .then(messages => { + .then((messages) => { messages.forEach(({ type, message }) => { if (type === 'success') this.successToast(message); if (type === 'error') this.errorToast(message); @@ -334,7 +330,7 @@ export default { this.startLoader(); this.$store .dispatch('localUsers/disableUsers', this.selectedRows) - .then(messages => { + .then((messages) => { messages.forEach(({ type, message }) => { if (type === 'success') this.successToast(message); if (type === 'error') this.errorToast(message); @@ -360,11 +356,11 @@ export default { this.startLoader(); this.$store .dispatch('localUsers/saveAccountSettings', settings) - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue index a611c590..89a1ebca 100644 --- a/src/views/AccessControl/LocalUserManagement/ModalSettings.vue +++ b/src/views/AccessControl/LocalUserManagement/ModalSettings.vue @@ -19,7 +19,7 @@ {{ $t('global.form.valueMustBeBetween', { min: 0, - max: 65535 + max: 65535, }) }} </b-form-text> @@ -39,13 +39,13 @@ <template v-if=" !$v.form.lockoutThreshold.minLength || - !$v.form.lockoutThreshold.maxLength + !$v.form.lockoutThreshold.maxLength " > {{ $t('global.form.valueMustBeBetween', { min: 0, - max: 65535 + max: 65535, }) }} </template> @@ -104,7 +104,7 @@ </b-row> </b-container> </b-form> - <template v-slot:modal-footer="{ ok, cancel }"> + <template #modal-footer="{ ok, cancel }"> <b-button variant="secondary" data-test-id="localUserManagement-button-cancel" @@ -131,7 +131,7 @@ import { required, requiredIf, minValue, - maxValue + maxValue, } from 'vuelidate/lib/validators'; export default { @@ -139,42 +139,42 @@ export default { props: { settings: { type: Object, - required: true - } + required: true, + }, }, data() { return { form: { lockoutThreshold: 0, unlockMethod: 0, - lockoutDuration: null - } + lockoutDuration: null, + }, }; }, watch: { - settings: function({ lockoutThreshold, lockoutDuration }) { + settings: function ({ lockoutThreshold, lockoutDuration }) { this.form.lockoutThreshold = lockoutThreshold; this.form.unlockMethod = lockoutDuration ? 1 : 0; this.form.lockoutDuration = lockoutDuration ? lockoutDuration : null; - } + }, }, validations: { form: { lockoutThreshold: { minValue: minValue(0), maxValue: maxValue(65535), - required + required, }, unlockMethod: { required }, lockoutDuration: { - minValue: function(value) { + minValue: function (value) { return this.form.unlockMethod === 0 || value > 0; }, - required: requiredIf(function() { + required: requiredIf(function () { return this.form.unlockMethod === 1; - }) - } - } + }), + }, + }, }, methods: { handleSubmit() { @@ -213,7 +213,7 @@ export default { ? this.settings.lockoutDuration : null; this.$v.$reset(); // clear validations - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/LocalUserManagement/ModalUser.vue b/src/views/AccessControl/LocalUserManagement/ModalUser.vue index 0fec8944..962718b9 100644 --- a/src/views/AccessControl/LocalUserManagement/ModalUser.vue +++ b/src/views/AccessControl/LocalUserManagement/ModalUser.vue @@ -1,6 +1,6 @@ <template> <b-modal id="modal-user" ref="modal" @hidden="resetForm"> - <template v-slot:modal-title> + <template #modal-title> <template v-if="newUser"> {{ $t('pageLocalUserManagement.addUser') }} </template> @@ -131,7 +131,7 @@ {{ $t('pageLocalUserManagement.modal.passwordMustBeBetween', { min: passwordRequirements.minLength, - max: passwordRequirements.maxLength + max: passwordRequirements.maxLength, }) }} </b-form-text> @@ -160,7 +160,7 @@ 'pageLocalUserManagement.modal.passwordMustBeBetween', { min: passwordRequirements.minLength, - max: passwordRequirements.maxLength + max: passwordRequirements.maxLength, } ) }} @@ -200,7 +200,7 @@ </b-row> </b-container> </b-form> - <template v-slot:modal-footer="{ ok, cancel }"> + <template #modal-footer="{ ok, cancel }"> <b-button variant="secondary" data-test-id="localUserManagement-button-cancel" @@ -233,7 +233,7 @@ import { minLength, sameAs, helpers, - requiredIf + requiredIf, } from 'vuelidate/lib/validators'; import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; import InputPasswordToggle from '@/components/Global/InputPasswordToggle'; @@ -245,12 +245,12 @@ export default { props: { user: { type: Object, - default: null + default: null, }, passwordRequirements: { type: Object, - required: true - } + required: true, + }, }, data() { return { @@ -261,8 +261,8 @@ export default { privilege: '', password: '', passwordConfirmation: '', - manualUnlock: false - } + manualUnlock: false, + }, }; }, computed: { @@ -277,46 +277,46 @@ export default { }, privilegeTypes() { return this.$store.getters['localUsers/accountRoles']; - } + }, }, watch: { - user: function(value) { + user: function (value) { if (value === null) return; this.originalUsername = value.username; this.form.username = value.username; this.form.status = value.Enabled; this.form.privilege = value.privilege; - } + }, }, validations() { return { form: { status: { - required + required, }, username: { required, maxLength: maxLength(16), - pattern: helpers.regex('pattern', /^([a-zA-Z_][a-zA-Z0-9_]*)/) + pattern: helpers.regex('pattern', /^([a-zA-Z_][a-zA-Z0-9_]*)/), }, privilege: { - required + required, }, password: { - required: requiredIf(function() { + required: requiredIf(function () { return this.requirePassword(); }), minLength: minLength(this.passwordRequirements.minLength), - maxLength: maxLength(this.passwordRequirements.maxLength) + maxLength: maxLength(this.passwordRequirements.maxLength), }, passwordConfirmation: { - required: requiredIf(function() { + required: requiredIf(function () { return this.requirePassword(); }), - sameAsPassword: sameAs('password') + sameAsPassword: sameAs('password'), }, - manualUnlock: {} - } + manualUnlock: {}, + }, }; }, methods: { @@ -384,7 +384,7 @@ export default { // prevent modal close bvModalEvt.preventDefault(); this.handleSubmit(); - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/LocalUserManagement/TableRoles.vue b/src/views/AccessControl/LocalUserManagement/TableRoles.vue index bf300f50..9c2e5fe5 100644 --- a/src/views/AccessControl/LocalUserManagement/TableRoles.vue +++ b/src/views/AccessControl/LocalUserManagement/TableRoles.vue @@ -1,21 +1,21 @@ <template> <b-table stacked="sm" hover small :items="items" :fields="fields"> - <template v-slot:cell(administrator)="data"> + <template #cell(administrator)="data"> <template v-if="data.value"> <checkmark20 /> </template> </template> - <template v-slot:cell(operator)="data"> + <template #cell(operator)="data"> <template v-if="data.value"> <checkmark20 /> </template> </template> - <template v-slot:cell(readonly)="data"> + <template #cell(readonly)="data"> <template v-if="data.value"> <checkmark20 /> </template> </template> - <template v-slot:cell(noaccess)="data"> + <template #cell(noaccess)="data"> <template v-if="data.value"> <checkmark20 /> </template> @@ -28,7 +28,7 @@ import Checkmark20 from '@carbon/icons-vue/es/checkmark/20'; export default { components: { - Checkmark20 + Checkmark20, }, data() { return { @@ -40,7 +40,7 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -49,7 +49,7 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -58,7 +58,7 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -67,7 +67,7 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -76,7 +76,7 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -85,7 +85,7 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -94,7 +94,7 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -103,7 +103,7 @@ export default { administrator: true, operator: false, readonly: false, - noaccess: false + noaccess: false, }, { description: this.$t( @@ -112,17 +112,17 @@ export default { administrator: true, operator: true, readonly: true, - noaccess: false - } + noaccess: false, + }, ], fields: [ { key: 'description', label: 'Privilege' }, { key: 'administrator', label: 'Administrator', class: 'text-center' }, { key: 'operator', label: 'Operator', class: 'text-center' }, { key: 'readonly', label: 'ReadOnly', class: 'text-center' }, - { key: 'noaccess', label: 'NoAccess', class: 'text-center' } - ] + { key: 'noaccess', label: 'NoAccess', class: 'text-center' }, + ], }; - } + }, }; </script> diff --git a/src/views/AccessControl/SslCertificates/CsrCountryCodes.js b/src/views/AccessControl/SslCertificates/CsrCountryCodes.js index 59e724b7..a2d70007 100644 --- a/src/views/AccessControl/SslCertificates/CsrCountryCodes.js +++ b/src/views/AccessControl/SslCertificates/CsrCountryCodes.js @@ -30,12 +30,12 @@ export const COUNTRY_LIST = [ { name: 'Bonaire, Sint Eustatius and Saba', code: 'BQ', - label: i18n.t('countries.BQ') + label: i18n.t('countries.BQ'), }, { name: 'Bosnia and Herzegovina ', code: 'BA', - label: i18n.t('countries.BA') + label: i18n.t('countries.BA'), }, { name: 'Bostwana', code: 'BW', label: i18n.t('countries.BW') }, { name: 'Bouvet Island', code: 'BV', label: i18n.t('countries.BV') }, @@ -43,7 +43,7 @@ export const COUNTRY_LIST = [ { name: 'British Indian Ocean Territory', code: 'IO', - label: i18n.t('countries.IO') + label: i18n.t('countries.IO'), }, { name: 'Brunei Darussalam ', code: 'BN', label: i18n.t('countries.BN') }, { name: 'Bulgaria', code: 'BG', label: i18n.t('countries.BG') }, @@ -57,7 +57,7 @@ export const COUNTRY_LIST = [ { name: 'Central African Republic', code: 'CF', - label: i18n.t('countries.CF') + label: i18n.t('countries.CF'), }, { name: 'Chad', code: 'TD', label: i18n.t('countries.TD') }, { name: 'Chile', code: 'CL', label: i18n.t('countries.CL') }, @@ -69,7 +69,7 @@ export const COUNTRY_LIST = [ { name: 'Congo, The Democratic Republic of the', code: 'CD', - label: i18n.t('countries.CD') + label: i18n.t('countries.CD'), }, { name: 'Congo', code: 'CG', label: i18n.t('countries.CG') }, { name: 'Cook Islands', code: 'CK', label: i18n.t('countries.CK') }, @@ -95,7 +95,7 @@ export const COUNTRY_LIST = [ { name: 'Falkland Islands (Malvinas)', code: 'FK', - label: i18n.t('countries.FK') + label: i18n.t('countries.FK'), }, { name: 'Faroe Islands', code: 'FO', label: i18n.t('countries.FO') }, { name: 'Fiji', code: 'FJ', label: i18n.t('countries.FJ') }, @@ -106,7 +106,7 @@ export const COUNTRY_LIST = [ { name: 'French Southern Territories', code: 'TF', - label: i18n.t('countries.TF') + label: i18n.t('countries.TF'), }, { name: 'Gabon', code: 'GA', label: i18n.t('countries.GA') }, { name: 'Gambia, The', code: 'GM', label: i18n.t('countries.GM') }, @@ -128,7 +128,7 @@ export const COUNTRY_LIST = [ { name: 'Heard Island and McDonald Islands', code: 'HM', - label: i18n.t('countries.HM') + label: i18n.t('countries.HM'), }, { name: 'Holy See', code: 'VA', label: i18n.t('countries.VA') }, { name: 'Honduras', code: 'HN', label: i18n.t('countries.HN') }, @@ -140,7 +140,7 @@ export const COUNTRY_LIST = [ { name: 'Iran, Islamic Republic of', code: 'IR', - label: i18n.t('countries.IR') + label: i18n.t('countries.IR'), }, { name: 'Iraq', code: 'IQ', label: i18n.t('countries.IQ') }, { name: 'Ireland', code: 'IE', label: i18n.t('countries.IE') }, @@ -158,14 +158,14 @@ export const COUNTRY_LIST = [ { name: "Korea, Democratic People's Republic of", code: 'KP', - label: i18n.t('countries.KP') + label: i18n.t('countries.KP'), }, { name: 'Kuwait', code: 'KW', label: i18n.t('countries.KW') }, { name: 'Kyrgyzstan', code: 'KG', label: i18n.t('countries.KG') }, { name: "Lao People's Democratic Republic", code: 'LA', - label: i18n.t('countries.LA') + label: i18n.t('countries.LA'), }, { name: 'Latvia', code: 'LV', label: i18n.t('countries.LV') }, { name: 'Lebanon', code: 'LB', label: i18n.t('countries.LB') }, @@ -179,7 +179,7 @@ export const COUNTRY_LIST = [ { name: 'Macedonia, The Former Yugoslav Republic of', code: 'MK', - label: i18n.t('countries.MK') + label: i18n.t('countries.MK'), }, { name: 'Madagascar', code: 'MG', label: i18n.t('countries.MG') }, { name: 'Malawi', code: 'MW', label: i18n.t('countries.MW') }, @@ -196,7 +196,7 @@ export const COUNTRY_LIST = [ { name: 'Micronesia, Federated States of', code: 'FM', - label: i18n.t('countries.FM') + label: i18n.t('countries.FM'), }, { name: 'Moldova, Republic of', code: 'MD', label: i18n.t('countries.MD') }, { name: 'Monaco', code: 'MC', label: i18n.t('countries.MC') }, @@ -220,7 +220,7 @@ export const COUNTRY_LIST = [ { name: 'Northern Mariana Islands', code: 'MP', - label: i18n.t('countries.MP') + label: i18n.t('countries.MP'), }, { name: 'Norway', code: 'NO', label: i18n.t('countries.NO') }, { name: 'Oman', code: 'OM', label: i18n.t('countries.OM') }, @@ -245,7 +245,7 @@ export const COUNTRY_LIST = [ { name: 'Saint Helena, Ascension and Tristan da Cunha', code: 'SH', - label: i18n.t('countries.SH') + label: i18n.t('countries.SH'), }, { name: 'Saint Kitts and Nevis ', code: 'KN', label: i18n.t('countries.KN') }, { name: 'Saint Lucia', code: 'LC', label: i18n.t('countries.LC') }, @@ -253,12 +253,12 @@ export const COUNTRY_LIST = [ { name: 'Saint Pierre and Miquelon', code: 'PM', - label: i18n.t('countries.PM') + label: i18n.t('countries.PM'), }, { name: 'Saint Vincent and the Grenadines', code: 'VC', - label: i18n.t('countries.VC') + label: i18n.t('countries.VC'), }, { name: 'Samoa', code: 'WS', label: i18n.t('countries.WS') }, { name: 'San Marino ', code: 'SM', label: i18n.t('countries.SM') }, @@ -278,7 +278,7 @@ export const COUNTRY_LIST = [ { name: 'South Georgia and the South Sandwich Islands', code: 'GS', - label: i18n.t('countries.GS') + label: i18n.t('countries.GS'), }, { name: 'South Sudan', code: 'SS', label: i18n.t('countries.SS') }, { name: 'Spain', code: 'ES', label: i18n.t('countries.ES') }, @@ -294,7 +294,7 @@ export const COUNTRY_LIST = [ { name: 'Tanzania, United Republic of', code: 'TZ', - label: i18n.t('countries.TZ') + label: i18n.t('countries.TZ'), }, { name: 'Thailand', code: 'TH', label: i18n.t('countries.TH') }, { name: 'Timor-Leste', code: 'TL', label: i18n.t('countries.TL') }, @@ -308,7 +308,7 @@ export const COUNTRY_LIST = [ { name: 'Turks and Caicos Islands', code: 'TC', - label: i18n.t('countries.TC') + label: i18n.t('countries.TC'), }, { name: 'Tuvalu', code: 'TV', label: i18n.t('countries.TV') }, { name: 'Uganda', code: 'UG', label: i18n.t('countries.UG') }, @@ -318,12 +318,12 @@ export const COUNTRY_LIST = [ { name: 'United States Minor Outlying Islands', code: 'UM', - label: i18n.t('countries.UM') + label: i18n.t('countries.UM'), }, { name: 'United States of America', code: 'US', - label: i18n.t('countries.US') + label: i18n.t('countries.US'), }, { name: 'Uruguay', code: 'UY', label: i18n.t('countries.UY') }, { name: 'Uzbekistan', code: 'UZ', label: i18n.t('countries.UZ') }, @@ -333,7 +333,7 @@ export const COUNTRY_LIST = [ { name: 'Virgin Islands, British', code: 'VG', - label: i18n.t('countries.VG') + label: i18n.t('countries.VG'), }, { name: 'Virgin Islands, U.S', code: 'VI', label: i18n.t('countries.VI') }, { name: 'Wallis and Futuna', code: 'WF', label: i18n.t('countries.WF') }, @@ -341,5 +341,5 @@ export const COUNTRY_LIST = [ { name: 'Yemen', code: 'YE', label: i18n.t('countries.YE') }, { name: 'Zambia', code: 'ZM', label: i18n.t('countries.ZM') }, { name: 'Zimbabwe', code: 'ZW', label: i18n.t('countries.ZW') }, - { name: 'Åland Islands', code: 'AX', label: i18n.t('countries.AX') } + { name: 'Åland Islands', code: 'AX', label: i18n.t('countries.AX') }, ]; diff --git a/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue b/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue index 84f14c3b..da6b457c 100644 --- a/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue +++ b/src/views/AccessControl/SslCertificates/ModalGenerateCsr.vue @@ -30,7 +30,7 @@ :state="getValidationState($v.form.certificateType)" @input="$v.form.certificateType.$touch()" > - <template v-slot:first> + <template #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -54,7 +54,7 @@ :state="getValidationState($v.form.country)" @input="$v.form.country.$touch()" > - <template v-slot:first> + <template #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -158,7 +158,7 @@ </b-col> <b-col lg="6"> <b-form-group label-for="challenge-password"> - <template v-slot:label> + <template #label> {{ $t('pageSslCertificates.modal.challengePassword') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -176,7 +176,7 @@ <b-row> <b-col lg="6"> <b-form-group label-for="contact-person"> - <template v-slot:label> + <template #label> {{ $t('pageSslCertificates.modal.contactPerson') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -192,7 +192,7 @@ </b-col> <b-col lg="6"> <b-form-group label-for="email-address"> - <template v-slot:label> + <template #label> {{ $t('pageSslCertificates.modal.emailAddress') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -210,7 +210,7 @@ <b-row> <b-col lg="12"> <b-form-group label-for="alternate-name"> - <template v-slot:label> + <template #label> {{ $t('pageSslCertificates.modal.alternateName') }} - <span class="form-text d-inline"> {{ $t('global.form.optional') }} @@ -229,14 +229,14 @@ size="lg" separator=" " :input-attrs="{ - 'aria-describedby': 'alternate-name-help-block' + 'aria-describedby': 'alternate-name-help-block', }" :duplicate-tag-text=" $t('pageSslCertificates.modal.duplicateAlternateName') " placeholder="" > - <template v-slot:add-button-text> + <template #add-button-text> {{ $t('global.action.add') }} <icon-add /> </template> </b-form-tags> @@ -262,7 +262,7 @@ :state="getValidationState($v.form.keyPairAlgorithm)" @input="$v.form.keyPairAlgorithm.$touch()" > - <template v-slot:first> + <template #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -289,7 +289,7 @@ :state="getValidationState($v.form.keyCurveId)" @input="$v.form.keyCurveId.$touch()" > - <template v-slot:first> + <template #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -313,7 +313,7 @@ :state="getValidationState($v.form.keyBitLength)" @input="$v.form.keyBitLength.$touch()" > - <template v-slot:first> + <template #first> <b-form-select-option :value="null" disabled> {{ $t('global.form.selectAnOption') }} </b-form-select-option> @@ -330,7 +330,7 @@ </b-row> </b-container> </b-form> - <template v-slot:modal-footer="{ ok, cancel }"> + <template #modal-footer="{ ok, cancel }"> <b-button variant="secondary" @click="cancel()"> {{ $t('global.action.cancel') }} </b-button> @@ -353,7 +353,7 @@ @hidden="onHiddenCsrStringModal" > {{ csrString }} - <template v-slot:modal-footer> + <template #modal-footer> <b-btn variant="secondary" @click="copyCsrString"> <template v-if="csrStringCopied"> <icon-checkmark /> @@ -406,25 +406,25 @@ export default { alternateName: [], keyPairAlgorithm: null, keyCurveId: null, - keyBitLength: null + keyBitLength: null, }, certificateOptions: CERTIFICATE_TYPES.reduce((arr, cert) => { if (cert.type === 'TrustStore Certificate') return arr; arr.push({ text: cert.label, - value: cert.type + value: cert.type, }); return arr; }, []), - countryOptions: COUNTRY_LIST.map(country => ({ + countryOptions: COUNTRY_LIST.map((country) => ({ text: country.label, - value: country.code + value: country.code, })), keyPairAlgorithmOptions: ['EC', 'RSA'], keyCurveIdOptions: ['prime256v1', 'secp521r1', 'secp384r1'], keyBitLengthOptions: [2048], csrString: '', - csrStringCopied: false + csrStringCopied: false, }; }, validations: { @@ -442,16 +442,16 @@ export default { alternateName: {}, keyPairAlgorithm: { required }, keyCurveId: { - reuired: requiredIf(function(form) { + reuired: requiredIf(function (form) { return form.keyPairAlgorithm === 'EC'; - }) + }), }, keyBitLength: { - reuired: requiredIf(function(form) { + reuired: requiredIf(function (form) { return form.keyPairAlgorithm === 'RSA'; - }) - } - } + }), + }, + }, }, methods: { handleSubmit() { @@ -493,7 +493,7 @@ export default { this.csrStringCopied = false; }, 5000 /*5 seconds*/); }); - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/SslCertificates/ModalUploadCertificate.vue b/src/views/AccessControl/SslCertificates/ModalUploadCertificate.vue index 63c3b4e8..070dd0dc 100644 --- a/src/views/AccessControl/SslCertificates/ModalUploadCertificate.vue +++ b/src/views/AccessControl/SslCertificates/ModalUploadCertificate.vue @@ -1,6 +1,6 @@ <template> <b-modal id="upload-certificate" ref="modal" @ok="onOk" @hidden="resetForm"> - <template v-slot:modal-title> + <template #modal-title> <template v-if="certificate"> {{ $t('pageSslCertificates.replaceCertificate') }} </template> @@ -59,7 +59,7 @@ </b-form-invalid-feedback> </b-form-group> </b-form> - <template v-slot:modal-ok> + <template #modal-ok> <template v-if="certificate"> {{ $t('global.action.replace') }} </template> @@ -80,20 +80,20 @@ export default { certificate: { type: Object, default: null, - validator: prop => { + validator: (prop) => { if (prop === null) return true; return ( prop.hasOwnProperty('type') && prop.hasOwnProperty('certificate') ); - } - } + }, + }, }, data() { return { form: { certificateType: null, - file: null - } + file: null, + }, }; }, computed: { @@ -104,30 +104,30 @@ export default { return this.certificateTypes.map(({ type, label }) => { return { text: label, - value: type + value: type, }; }); - } + }, }, watch: { - certificateOptions: function(options) { + certificateOptions: function (options) { if (options.length) { this.form.certificateType = options[0].value; } - } + }, }, validations() { return { form: { certificateType: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.certificate; - }) + }), }, file: { - required - } - } + required, + }, + }, }; }, methods: { @@ -140,7 +140,7 @@ export default { location: this.certificate ? this.certificate.location : null, type: this.certificate ? this.certificate.type - : this.form.certificateType + : this.form.certificateType, }); this.closeModal(); }, @@ -160,7 +160,7 @@ export default { // prevent modal close bvModalEvt.preventDefault(); this.handleSubmit(); - } - } + }, + }, }; </script> diff --git a/src/views/AccessControl/SslCertificates/SslCertificates.vue b/src/views/AccessControl/SslCertificates/SslCertificates.vue index bce50d72..fe63bd99 100644 --- a/src/views/AccessControl/SslCertificates/SslCertificates.vue +++ b/src/views/AccessControl/SslCertificates/SslCertificates.vue @@ -11,7 +11,7 @@ <template v-else> {{ $t('pageSslCertificates.alert.certificateExpiredMessage', { - certificate: expiredCertificateTypes[0] + certificate: expiredCertificateTypes[0], }) }} </template> @@ -24,7 +24,7 @@ <template v-else> {{ $t('pageSslCertificates.alert.certificateExpiringMessage', { - certificate: expiringCertificateTypes[0] + certificate: expiringCertificateTypes[0], }) }} </template> @@ -61,11 +61,11 @@ :items="tableItems" :empty-text="$t('global.table.emptyMessage')" > - <template v-slot:cell(validFrom)="{ value }"> + <template #cell(validFrom)="{ value }"> {{ value | formatDate }} </template> - <template v-slot:cell(validUntil)="{ value }"> + <template #cell(validUntil)="{ value }"> <status-icon v-if="getDaysUntilExpired(value) < 31" :status="getIconStatus(value)" @@ -73,7 +73,7 @@ {{ value | formatDate }} </template> - <template v-slot:cell(actions)="{ value, item }"> + <template #cell(actions)="{ value, item }"> <table-row-action v-for="(action, index) in value" :key="index" @@ -82,7 +82,7 @@ :enabled="action.enabled" @click:tableAction="onTableRowAction($event, item)" > - <template v-slot:icon> + <template #icon> <icon-replace v-if="action.value === 'replace'" /> <icon-trashcan v-if="action.value === 'delete'" /> </template> @@ -124,39 +124,43 @@ export default { ModalUploadCertificate, PageTitle, StatusIcon, - TableRowAction + TableRowAction, }, mixins: [BVToastMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { modalCertificate: null, fields: [ { key: 'certificate', - label: this.$t('pageSslCertificates.table.certificate') + label: this.$t('pageSslCertificates.table.certificate'), }, { key: 'issuedBy', - label: this.$t('pageSslCertificates.table.issuedBy') + label: this.$t('pageSslCertificates.table.issuedBy'), }, { key: 'issuedTo', - label: this.$t('pageSslCertificates.table.issuedTo') + label: this.$t('pageSslCertificates.table.issuedTo'), }, { key: 'validFrom', - label: this.$t('pageSslCertificates.table.validFrom') + label: this.$t('pageSslCertificates.table.validFrom'), }, { key: 'validUntil', - label: this.$t('pageSslCertificates.table.validUntil') + label: this.$t('pageSslCertificates.table.validUntil'), }, { key: 'actions', label: '', - tdClass: 'text-right text-nowrap' - } - ] + tdClass: 'text-right text-nowrap', + }, + ], }; }, computed: { @@ -164,21 +168,21 @@ export default { return this.$store.getters['sslCertificates/allCertificates']; }, tableItems() { - return this.certificates.map(certificate => { + return this.certificates.map((certificate) => { return { ...certificate, actions: [ { value: 'replace', - title: this.$t('pageSslCertificates.replaceCertificate') + title: this.$t('pageSslCertificates.replaceCertificate'), }, { value: 'delete', title: this.$t('pageSslCertificates.deleteCertificate'), enabled: - certificate.type === 'TrustStore Certificate' ? true : false - } - ] + certificate.type === 'TrustStore Certificate' ? true : false, + }, + ], }; }); }, @@ -205,7 +209,7 @@ export default { } return acc; }, []); - } + }, }, async created() { this.startLoader(); @@ -214,10 +218,6 @@ export default { .dispatch('sslCertificates/getCertificates') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { onTableRowAction(event, rowItem) { switch (event) { @@ -240,14 +240,14 @@ export default { .msgBoxConfirm( this.$t('pageSslCertificates.modal.deleteConfirmMessage', { issuedBy: certificate.issuedBy, - certificate: certificate.certificate + certificate: certificate.certificate, }), { title: this.$t('pageSslCertificates.deleteCertificate'), - okTitle: this.$t('global.action.delete') + okTitle: this.$t('global.action.delete'), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) this.deleteCertificate(certificate); }); }, @@ -264,7 +264,7 @@ export default { this.startLoader(); this.$store .dispatch('sslCertificates/addNewCertificate', { file, type }) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); }, @@ -272,15 +272,15 @@ export default { this.startLoader(); const reader = new FileReader(); reader.readAsBinaryString(file); - reader.onloadend = event => { + reader.onloadend = (event) => { const certificateString = event.target.result; this.$store .dispatch('sslCertificates/replaceCertificate', { certificateString, type, - location + location, }) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); }; @@ -290,9 +290,9 @@ export default { this.$store .dispatch('sslCertificates/deleteCertificate', { type, - location + location, }) - .then(success => this.successToast(success)) + .then((success) => this.successToast(success)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); }, @@ -312,7 +312,7 @@ export default { } else if (daysUntilExpired < 31) { return 'warning'; } - } - } + }, + }, }; </script> diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue index fbf95d9d..039dd0b6 100644 --- a/src/views/ChangePassword/ChangePassword.vue +++ b/src/views/ChangePassword/ChangePassword.vue @@ -84,10 +84,10 @@ export default { return { form: { password: null, - passwordConfirm: null + passwordConfirm: null, }, username: this.$store.getters['global/username'], - changePasswordError: false + changePasswordError: false, }; }, validations() { @@ -96,9 +96,9 @@ export default { password: { required }, passwordConfirm: { required, - sameAsPassword: sameAs('password') - } - } + sameAsPassword: sameAs('password'), + }, + }, }; }, methods: { @@ -111,15 +111,15 @@ export default { if (this.$v.$invalid) return; let data = { originalUsername: this.username, - password: this.form.password + password: this.form.password, }; this.$store .dispatch('localUsers/updateUser', data) .then(() => this.$router.push('/')) .catch(() => (this.changePasswordError = true)); - } - } + }, + }, }; </script> diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue index 33e097c4..79cdbc1e 100644 --- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue +++ b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue @@ -84,7 +84,7 @@ button-variant="link" aria-controls="input-manual-date" > - <template v-slot:button-content> + <template #button-content> <icon-calendar :title="$t('global.calendar.openDatePicker')" aria-hidden="true" @@ -227,8 +227,12 @@ export default { BVToastMixin, LoadingBarMixin, LocalTimezoneLabelMixin, - VuelidateMixin + VuelidateMixin, ], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { locale: this.$store.getters['global/languagePreference'], @@ -236,10 +240,10 @@ export default { configurationSelected: '', manual: { date: '', - time: '' + time: '', }, - ntp: { firstAddress: '', secondAddress: '', thirdAddress: '' } - } + ntp: { firstAddress: '', secondAddress: '', thirdAddress: '' }, + }, }; }, validations() { @@ -247,28 +251,28 @@ export default { form: { manual: { date: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.configurationSelected === 'manual'; }), - pattern: helpers.regex('pattern', isoDateRegex) + pattern: helpers.regex('pattern', isoDateRegex), }, time: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.configurationSelected === 'manual'; }), - pattern: helpers.regex('pattern', isoTimeRegex) - } + pattern: helpers.regex('pattern', isoTimeRegex), + }, }, ntp: { firstAddress: { - required: requiredIf(function() { + required: requiredIf(function () { return this.form.configurationSelected === 'ntp'; - }) + }), }, secondAddress: {}, - thirdAddress: {} - } - } + thirdAddress: {}, + }, + }, }; }, computed: { @@ -284,7 +288,7 @@ export default { return 'UTC'; } return this.localOffset(); - } + }, }, watch: { ntpServers() { @@ -300,25 +304,21 @@ export default { this.form.manual.time = this.$options.filters .formatTime(this.$store.getters['global/bmcTime']) .slice(0, 5); - } + }, }, created() { this.startLoader(); Promise.all([ this.$store.dispatch('global/getBmcTime'), - this.$store.dispatch('dateTime/getNtpData') + this.$store.dispatch('dateTime/getNtpData'), ]).finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { emitChange() { if (this.$v.$invalid) return; this.$v.$reset(); //reset to re-validate on blur this.$emit('change', { - manualDate: this.manualDate ? new Date(this.manualDate) : null + manualDate: this.manualDate ? new Date(this.manualDate) : null, }); }, setNtpValues() { @@ -367,13 +367,13 @@ export default { dateTimeForm.ntpServersArray = [ ntpFirstAddress, ntpSecondAddress, - ntpThirdAddress + ntpThirdAddress, ]; } this.$store .dispatch('dateTime/updateDateTimeSettings', dateTimeForm) - .then(success => { + .then((success) => { this.successToast(success); if (!isNTPEnabled) return; // Shift address up if second address is empty @@ -407,7 +407,7 @@ export default { timeArray[1] // User input minute ); return new Date(utcDate); - } - } + }, + }, }; </script> diff --git a/src/views/Configuration/Firmware/Firmware.vue b/src/views/Configuration/Firmware/Firmware.vue index e1f97c4e..48c29ebc 100644 --- a/src/views/Configuration/Firmware/Firmware.vue +++ b/src/views/Configuration/Firmware/Firmware.vue @@ -8,7 +8,7 @@ <b-card-group deck> <!-- Current FW --> <b-card header-bg-variant="success"> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.current') }}</dt> <dd class="mb-0">{{ bmcFirmwareCurrentVersion }}</dd> @@ -18,12 +18,12 @@ <dt>{{ $t('pageFirmware.state') }}:</dt> <dd>{{ bmcFirmwareCurrentState }}</dd> </dl> - <template v-slot:footer></template> + <template #footer></template> </b-card> <!-- Backup FW --> <b-card footer-class="p-0"> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.backup') }}</dt> <dd class="mb-0">{{ bmcFirmwareBackupVersion }}</dd> @@ -33,7 +33,7 @@ <dt>{{ $t('pageFirmware.state') }}:</dt> <dd>{{ bmcFirmwareBackupState }}</dd> </dl> - <template v-slot:footer> + <template #footer> <b-btn v-b-modal.modal-reboot-backup-bmc :disabled="!bmcFirmwareBackupVersion" @@ -53,7 +53,7 @@ <b-card-group deck> <!-- Current FW --> <b-card header-bg-variant="success"> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.current') }}</dt> <dd class="mb-0">{{ hostFirmwareCurrentVersion }}</dd> @@ -68,7 +68,7 @@ <!-- Backup FW --> <b-card> - <template v-slot:header> + <template #header> <dl class="mb-0"> <dt>{{ $t('pageFirmware.backup') }}</dt> <dd class="mb-0">{{ hostFirmwareBackupVersion }}</dd> @@ -212,16 +212,21 @@ export default { ModalRebootBackupBmc, ModalUpload, PageSection, - PageTitle + PageTitle, }, mixins: [BVToastMixin, LoadingBarMixin, VuelidateMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + this.clearRebootTimeout(); + next(); + }, data() { return { isWorkstationSelected: true, file: null, tftpIpAddress: null, tftpFileName: null, - timeoutId: null + timeoutId: null, }; }, computed: { @@ -233,16 +238,16 @@ export default { 'hostFirmwareCurrentVersion', 'hostFirmwareCurrentState', 'hostFirmwareBackupVersion', - 'hostFirmwareBackupState' - ]) + 'hostFirmwareBackupState', + ]), }, watch: { - isWorkstationSelected: function() { + isWorkstationSelected: function () { this.$v.$reset(); this.file = null; this.tftpIpAddress = null; this.tftpFileName = null; - } + }, }, created() { this.startLoader(); @@ -251,28 +256,23 @@ export default { .dispatch('firmware/getFirmwareInformation') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - this.clearRebootTimeout(); - next(); - }, validations() { return { file: { - required: requiredIf(function() { + required: requiredIf(function () { return this.isWorkstationSelected; - }) + }), }, tftpIpAddress: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.isWorkstationSelected; - }) + }), }, tftpFileName: { - required: requiredIf(function() { + required: requiredIf(function () { return !this.isWorkstationSelected; - }) - } + }), + }, }; }, methods: { @@ -292,7 +292,7 @@ export default { dispatchWorkstationUpload() { this.$store .dispatch('firmware/uploadFirmware', this.file) - .then(success => + .then((success) => this.infoToast( success, this.$t('pageFirmware.toast.successUploadTitle') @@ -306,11 +306,11 @@ export default { dispatchTftpUpload() { const data = { address: this.tftpIpAddress, - filename: this.tftpFileName + filename: this.tftpFileName, }; this.$store .dispatch('firmware/uploadFirmwareTFTP', data) - .then(success => + .then((success) => this.infoToast( success, this.$t('pageFirmware.toast.successUploadTitle') @@ -325,7 +325,7 @@ export default { this.setRebootTimeout(); this.$store .dispatch('firmware/switchBmcFirmware') - .then(success => + .then((success) => this.infoToast(success, this.$t('global.status.success')) ) .catch(({ message }) => { @@ -355,8 +355,8 @@ export default { this.$v.$touch(); if (this.$v.$invalid) return; this.$bvModal.show('modal-upload'); - } - } + }, + }, }; </script> diff --git a/src/views/Configuration/Firmware/FirmwareModalRebootBackupBmc.vue b/src/views/Configuration/Firmware/FirmwareModalRebootBackupBmc.vue index 06ab65d9..8f9a8f8c 100644 --- a/src/views/Configuration/Firmware/FirmwareModalRebootBackupBmc.vue +++ b/src/views/Configuration/Firmware/FirmwareModalRebootBackupBmc.vue @@ -22,12 +22,12 @@ export default { props: { current: { type: String, - required: true + required: true, }, backup: { type: String, - required: true - } - } + required: true, + }, + }, }; </script> diff --git a/src/views/Configuration/NetworkSettings/NetworkSettings.vue b/src/views/Configuration/NetworkSettings/NetworkSettings.vue index 4a181fd8..303077c5 100644 --- a/src/views/Configuration/NetworkSettings/NetworkSettings.vue +++ b/src/views/Configuration/NetworkSettings/NetworkSettings.vue @@ -109,14 +109,14 @@ :items="form.ipv4StaticTableItems" class="mb-0" > - <template v-slot:cell(Address)="{ item, index }"> + <template #cell(Address)="{ item, index }"> <b-form-input v-model.trim="item.Address" :data-test-id="`networkSettings-input-staticIpv4-${index}`" :aria-label=" $t('pageNetworkSettings.ariaLabel.staticIpv4AddressRow') + - ' ' + - (index + 1) + ' ' + + (index + 1) " :readonly="dhcpEnabled" :state=" @@ -149,14 +149,14 @@ </div> </b-form-invalid-feedback> </template> - <template v-slot:cell(SubnetMask)="{ item, index }"> + <template #cell(SubnetMask)="{ item, index }"> <b-form-input v-model.trim="item.SubnetMask" :data-test-id="`networkSettings-input-subnetMask-${index}`" :aria-label=" $t('pageNetworkSettings.ariaLabel.staticIpv4SubnetRow') + - ' ' + - (index + 1) + ' ' + + (index + 1) " :readonly="dhcpEnabled" :state=" @@ -190,7 +190,7 @@ </div> </b-form-invalid-feedback> </template> - <template v-slot:cell(actions)="{ item, index }"> + <template #cell(actions)="{ item, index }"> <table-row-action v-for="(action, actionIndex) in item.actions" :key="actionIndex" @@ -200,7 +200,7 @@ onDeleteIpv4StaticTableRow($event, index) " > - <template v-slot:icon> + <template #icon> <icon-trashcan v-if="action.value === 'delete'" /> </template> </table-row-action> @@ -223,14 +223,14 @@ :items="form.dnsStaticTableItems" class="mb-0" > - <template v-slot:cell(address)="{ item, index }"> + <template #cell(address)="{ item, index }"> <b-form-input v-model.trim="item.address" :data-test-id="`networkSettings-input-dnsAddress-${index}`" :aria-label=" $t('pageNetworkSettings.ariaLabel.staticDnsRow') + - ' ' + - (index + 1) + ' ' + + (index + 1) " :readonly="dhcpEnabled" :state=" @@ -263,7 +263,7 @@ </div> </b-form-invalid-feedback> </template> - <template v-slot:cell(actions)="{ item, index }"> + <template #cell(actions)="{ item, index }"> <table-row-action v-for="(action, actionIndex) in item.actions" :key="actionIndex" @@ -271,7 +271,7 @@ :title="action.title" @click:tableAction="onDeleteDnsTableRow($event, index)" > - <template v-slot:icon> + <template #icon> <icon-trashcan v-if="action.value === 'delete'" /> </template> </table-row-action> @@ -327,9 +327,13 @@ export default { PageSection, TableRowAction, IconTrashcan, - IconAdd + IconAdd, }, mixins: [BVToastMixin, VuelidateMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { dhcpEnabled: null, @@ -337,20 +341,20 @@ export default { ipv4StaticTableFields: [ { key: 'Address', - label: this.$t('pageNetworkSettings.table.ipAddress') + label: this.$t('pageNetworkSettings.table.ipAddress'), }, { key: 'SubnetMask', - label: this.$t('pageNetworkSettings.table.subnet') + label: this.$t('pageNetworkSettings.table.subnet'), }, - { key: 'actions', label: '', tdClass: 'text-right' } + { key: 'actions', label: '', tdClass: 'text-right' }, ], dnsTableFields: [ { key: 'address', - label: this.$t('pageNetworkSettings.table.ipAddress') + label: this.$t('pageNetworkSettings.table.ipAddress'), }, - { key: 'actions', label: '', tdClass: 'text-right' } + { key: 'actions', label: '', tdClass: 'text-right' }, ], selectedInterfaceIndex: 0, selectedInterface: {}, @@ -359,8 +363,8 @@ export default { hostname: '', macAddress: '', ipv4StaticTableItems: [], - dnsStaticTableItems: [] - } + dnsStaticTableItems: [], + }, }; }, validations() { @@ -372,45 +376,45 @@ export default { $each: { Address: { required, - validateAddress + validateAddress, }, SubnetMask: { required, - validateAddress - } - } + validateAddress, + }, + }, }, macAddress: { required, validateMacAddress }, dnsStaticTableItems: { $each: { address: { required, - validateAddress - } - } - } - } + validateAddress, + }, + }, + }, + }, }; }, computed: { ...mapState('networkSettings', [ 'ethernetData', 'interfaceOptions', - 'defaultGateway' + 'defaultGateway', ]), interfaceSelectOptions() { return this.interfaceOptions.map((option, index) => { return { text: option, - value: index + value: index, }; }); - } + }, }, watch: { - ethernetData: function() { + ethernetData: function () { this.selectInterface(); - } + }, }, created() { this.startLoader(); @@ -418,10 +422,6 @@ export default { .dispatch('networkSettings/getEthernetData') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { selectInterface() { this.selectedInterface = this.ethernetData[this.selectedInterfaceIndex]; @@ -437,16 +437,16 @@ export default { }, getDnsStaticTableItems() { const dns = this.selectedInterface.StaticNameServers || []; - this.form.dnsStaticTableItems = dns.map(server => { + this.form.dnsStaticTableItems = dns.map((server) => { return { address: server, actions: [ { value: 'delete', enabled: this.dhcpEnabled, - title: this.$t('pageNetworkSettings.table.deleteDns') - } - ] + title: this.$t('pageNetworkSettings.table.deleteDns'), + }, + ], }; }); }, @@ -458,9 +458,9 @@ export default { { value: 'delete', enabled: this.dhcpEnabled, - title: this.$t('pageNetworkSettings.table.deleteDns') - } - ] + title: this.$t('pageNetworkSettings.table.deleteDns'), + }, + ], }); }, deleteDnsTableRow(index) { @@ -472,7 +472,7 @@ export default { }, getIpv4StaticTableItems() { const addresses = this.selectedInterface.IPv4StaticAddresses || []; - this.form.ipv4StaticTableItems = addresses.map(ipv4 => { + this.form.ipv4StaticTableItems = addresses.map((ipv4) => { return { Address: ipv4.Address, SubnetMask: ipv4.SubnetMask, @@ -480,9 +480,9 @@ export default { { value: 'delete', enabled: this.dhcpEnabled, - title: this.$t('pageNetworkSettings.table.deleteStaticIpv4') - } - ] + title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'), + }, + ], }; }); }, @@ -495,9 +495,9 @@ export default { { value: 'delete', enabled: this.dhcpEnabled, - title: this.$t('pageNetworkSettings.table.deleteStaticIpv4') - } - ] + title: this.$t('pageNetworkSettings.table.deleteStaticIpv4'), + }, + ], }); }, deleteIpv4StaticTableRow(index) { @@ -522,17 +522,17 @@ export default { hostname, macAddress, selectedInterfaceIndex, - isDhcpEnabled + isDhcpEnabled, }; networkSettingsForm.staticIpv4 = this.form.ipv4StaticTableItems.map( - updateIpv4 => { + (updateIpv4) => { delete updateIpv4.actions; updateIpv4.Gateway = this.form.gateway; return updateIpv4; } ); networkSettingsForm.staticNameServers = this.form.dnsStaticTableItems.map( - updateDns => { + (updateDns) => { return updateDns.address; } ); @@ -541,7 +541,7 @@ export default { 'networkSettings/updateInterfaceSettings', networkSettingsForm ) - .then(success => { + .then((success) => { this.successToast(success); }) .catch(({ message }) => this.errorToast(message)) @@ -549,7 +549,7 @@ export default { this.$v.form.$reset(); this.endLoader(); }); - } - } + }, + }, }; </script> diff --git a/src/views/Control/Kvm/Kvm.vue b/src/views/Control/Kvm/Kvm.vue index 66b2e5f7..10322bde 100644 --- a/src/views/Control/Kvm/Kvm.vue +++ b/src/views/Control/Kvm/Kvm.vue @@ -13,7 +13,7 @@ import KvmConsole from './KvmConsole'; export default { name: 'Kvm', - components: { PageTitle, KvmConsole } + components: { PageTitle, KvmConsole }, }; </script> diff --git a/src/views/Control/Kvm/KvmConsole.vue b/src/views/Control/Kvm/KvmConsole.vue index 8438b35c..43dc7271 100644 --- a/src/views/Control/Kvm/KvmConsole.vue +++ b/src/views/Control/Kvm/KvmConsole.vue @@ -60,8 +60,8 @@ export default { props: { isFullWindow: { type: Boolean, - default: true - } + default: true, + }, }, data() { return { @@ -70,7 +70,7 @@ export default { terminalClass: this.isFullWindow ? 'full-window' : '', marginClass: this.isFullWindow ? 'margin-left-full-window' : '', status: Connecting, - convasRef: null + convasRef: null, }; }, computed: { @@ -89,7 +89,7 @@ export default { return this.$t('pageKvm.disconnected'); } return this.$t('pageKvm.connecting'); - } + }, }, mounted() { this.openTerminal(); @@ -141,8 +141,8 @@ export default { '_blank', 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=yes,width=700,height=550' ); - } - } + }, + }, }; </script> diff --git a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue index 5a7eed08..5fcf938b 100644 --- a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue +++ b/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue @@ -46,7 +46,7 @@ {{ $t('pageManagePowerUsage.powerCapLabelTextInfo', { min: 1, - max: 10000 + max: 10000, }) }} </b-form-text> @@ -97,9 +97,13 @@ export default { name: 'ManagePowerUsage', components: { PageTitle }, mixins: [VuelidateMixin, BVToastMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, computed: { ...mapGetters({ - powerConsumptionValue: 'powerControl/powerConsumptionValue' + powerConsumptionValue: 'powerControl/powerConsumptionValue', }), /** @@ -114,7 +118,7 @@ export default { let newValue = value ? '' : null; this.$v.$reset(); this.$store.dispatch('powerControl/setPowerCapUpdatedValue', newValue); - } + }, }, powerCapValue: { get() { @@ -123,8 +127,8 @@ export default { set(value) { this.$v.$touch(); this.$store.dispatch('powerControl/setPowerCapUpdatedValue', value); - } - } + }, + }, }, created() { this.startLoader(); @@ -132,17 +136,13 @@ export default { .dispatch('powerControl/getPowerControl') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, validations: { powerCapValue: { between: between(1, 10000), - required: requiredIf(function() { + required: requiredIf(function () { return this.isPowerCapFieldEnabled; - }) - } + }), + }, }, methods: { submitForm() { @@ -151,10 +151,10 @@ export default { this.startLoader(); this.$store .dispatch('powerControl/setPowerControl', this.powerCapValue) - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)) .finally(() => this.endLoader()); - } - } + }, + }, }; </script> diff --git a/src/views/Control/RebootBmc/RebootBmc.vue b/src/views/Control/RebootBmc/RebootBmc.vue index 29932535..03880b38 100644 --- a/src/views/Control/RebootBmc/RebootBmc.vue +++ b/src/views/Control/RebootBmc/RebootBmc.vue @@ -43,10 +43,14 @@ export default { name: 'RebootBmc', components: { PageTitle, PageSection }, mixins: [BVToastMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, computed: { lastBmcRebootTime() { return this.$store.getters['controls/lastBmcRebootTime']; - } + }, }, created() { this.startLoader(); @@ -54,28 +58,24 @@ export default { .dispatch('controls/getLastBmcRebootTime') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { onClick() { this.$bvModal .msgBoxConfirm(this.$t('pageRebootBmc.modal.confirmMessage'), { title: this.$t('pageRebootBmc.modal.confirmTitle'), - okTitle: this.$t('global.action.confirm') + okTitle: this.$t('global.action.confirm'), }) - .then(confirmed => { + .then((confirmed) => { if (confirmed) this.rebootBmc(); }); }, rebootBmc() { this.$store .dispatch('controls/rebootBmc') - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)); - } - } + }, + }, }; </script> diff --git a/src/views/Control/SerialOverLan/SerialOverLan.vue b/src/views/Control/SerialOverLan/SerialOverLan.vue index 037a4963..48a68345 100644 --- a/src/views/Control/SerialOverLan/SerialOverLan.vue +++ b/src/views/Control/SerialOverLan/SerialOverLan.vue @@ -18,7 +18,7 @@ export default { components: { PageSection, PageTitle, - SerialOverLanConsole - } + SerialOverLanConsole, + }, }; </script> diff --git a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue b/src/views/Control/SerialOverLan/SerialOverLanConsole.vue index d5e9b214..b734bb13 100644 --- a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue +++ b/src/views/Control/SerialOverLan/SerialOverLanConsole.vue @@ -42,13 +42,13 @@ export default { name: 'SerialOverLanConsole', components: { IconLaunch, - StatusIcon + StatusIcon, }, props: { isFullWindow: { type: Boolean, - default: true - } + default: true, + }, }, computed: { hostStatus() { @@ -61,7 +61,7 @@ export default { return this.hostStatus === 'on' ? this.$t('pageSerialOverLan.connected') : this.$t('pageSerialOverLan.disconnected'); - } + }, }, created() { this.$store.dispatch('global/getHostStatus'); @@ -74,7 +74,7 @@ export default { const token = this.$store.getters['authentication/token']; const ws = new WebSocket(`wss://${window.location.host}/console0`, [ - token + token, ]); // Refer https://github.com/xtermjs/xterm.js/ for xterm implementation and addons. @@ -82,7 +82,7 @@ export default { const term = new Terminal({ fontSize: 15, fontFamily: - 'SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace' + 'SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace', }); const attachAddon = new AttachAddon(ws); @@ -94,7 +94,7 @@ export default { const SOL_THEME = { background: '#19273c', cursor: 'rgba(83, 146, 255, .5)', - scrollbar: 'rgba(83, 146, 255, .5)' + scrollbar: 'rgba(83, 146, 255, .5)', }; term.setOption('theme', SOL_THEME); @@ -102,10 +102,10 @@ export default { fitAddon.fit(); try { - ws.onopen = function() { + ws.onopen = function () { console.log('websocket console0/ opened'); }; - ws.onclose = function(event) { + ws.onclose = function (event) { console.log( 'websocket console0/ closed. code: ' + event.code + @@ -123,8 +123,8 @@ export default { '_blank', 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=yes,width=600,height=550' ); - } - } + }, + }, }; </script> diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue index b2eab0e6..73ec704f 100644 --- a/src/views/Control/ServerLed/ServerLed.vue +++ b/src/views/Control/ServerLed/ServerLed.vue @@ -38,6 +38,10 @@ export default { name: 'ServerLed', components: { PageTitle, PageSection }, mixins: [LoadingBarMixin, BVToastMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, computed: { indicatorLed: { get() { @@ -45,8 +49,8 @@ export default { }, set(newValue) { return newValue; - } - } + }, + }, }, created() { this.startLoader(); @@ -54,15 +58,11 @@ export default { .dispatch('serverLed/getIndicatorValue') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { changeLedValue(indicatorLed) { this.$store .dispatch('serverLed/saveIndicatorLedValue', indicatorLed) - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => { this.errorToast(message); if (indicatorLed === 'Off') { @@ -71,7 +71,7 @@ export default { this.indicatorLed === 'Off'; } }); - } - } + }, + }, }; </script> diff --git a/src/views/Control/ServerPowerOperations/BootSettings.vue b/src/views/Control/ServerPowerOperations/BootSettings.vue index 3435f1c6..a94da0c3 100644 --- a/src/views/Control/ServerPowerOperations/BootSettings.vue +++ b/src/views/Control/ServerPowerOperations/BootSettings.vue @@ -62,8 +62,8 @@ export default { form: { bootOption: this.$store.getters['hostBootSettings/bootSource'], oneTimeBoot: this.$store.getters['hostBootSettings/overrideEnabled'], - tpmPolicyOn: this.$store.getters['hostBootSettings/tpmEnabled'] - } + tpmPolicyOn: this.$store.getters['hostBootSettings/tpmEnabled'], + }, }; }, computed: { @@ -71,19 +71,19 @@ export default { 'bootSourceOptions', 'bootSource', 'overrideEnabled', - 'tpmEnabled' - ]) + 'tpmEnabled', + ]), }, watch: { - bootSource: function(value) { + bootSource: function (value) { this.form.bootOption = value; }, - overrideEnabled: function(value) { + overrideEnabled: function (value) { this.form.oneTimeBoot = value; }, - tpmEnabled: function(value) { + tpmEnabled: function (value) { this.form.tpmPolicyOn = value; - } + }, }, validations: { // Empty validations to leverage vuelidate form states @@ -91,13 +91,13 @@ export default { form: { bootOption: {}, oneTimeBoot: {}, - tpmPolicyOn: {} - } + tpmPolicyOn: {}, + }, }, created() { Promise.all([ this.$store.dispatch('hostBootSettings/getBootSettings'), - this.$store.dispatch('hostBootSettings/getTpmPolicy') + this.$store.dispatch('hostBootSettings/getTpmPolicy'), ]).finally(() => this.$root.$emit('serverPowerOperations::bootSettings::complete') ); @@ -124,7 +124,7 @@ export default { this.$store .dispatch('hostBootSettings/saveSettings', settings) - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)) .finally(() => { this.$v.form.$reset(); @@ -135,7 +135,7 @@ export default { this.$v.form.bootOption.$touch(); // Disable one time boot if selected boot option is 'None' if (selectedOption === 'None') this.form.oneTimeBoot = false; - } - } + }, + }, }; </script> diff --git a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue index 32b2ea86..9bc259f8 100644 --- a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue +++ b/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue @@ -148,12 +148,16 @@ export default { name: 'ServerPowerOperations', components: { PageTitle, PageSection, BootSettings, Alert }, mixins: [BVToastMixin, LoadingBarMixin], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { form: { rebootOption: 'orderly', - shutdownOption: 'orderly' - } + shutdownOption: 'orderly', + }, }; }, computed: { @@ -168,24 +172,20 @@ export default { }, oneTimeBootEnabled() { return this.$store.getters['hostBootSettings/overrideEnabled']; - } + }, }, created() { this.startLoader(); - const bootSettingsPromise = new Promise(resolve => { + const bootSettingsPromise = new Promise((resolve) => { this.$root.$on('serverPowerOperations::bootSettings::complete', () => resolve() ); }); Promise.all([ this.$store.dispatch('controls/getLastPowerOperationTime'), - bootSettingsPromise + bootSettingsPromise, ]).finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { powerOn() { this.$store.dispatch('controls/hostPowerOn'); @@ -196,19 +196,19 @@ export default { ); const modalOptions = { title: this.$t('pageServerPowerOperations.modal.confirmRebootTitle'), - okTitle: this.$t('global.action.confirm') + okTitle: this.$t('global.action.confirm'), }; if (this.form.rebootOption === 'orderly') { this.$bvModal .msgBoxConfirm(modalMessage, modalOptions) - .then(confirmed => { + .then((confirmed) => { if (confirmed) this.$store.dispatch('controls/hostSoftReboot'); }); } else if (this.form.rebootOption === 'immediate') { this.$bvModal .msgBoxConfirm(modalMessage, modalOptions) - .then(confirmed => { + .then((confirmed) => { if (confirmed) this.$store.dispatch('controls/hostHardReboot'); }); } @@ -219,24 +219,24 @@ export default { ); const modalOptions = { title: this.$t('pageServerPowerOperations.modal.confirmShutdownTitle'), - okTitle: this.$t('global.action.confirm') + okTitle: this.$t('global.action.confirm'), }; if (this.form.shutdownOption === 'orderly') { this.$bvModal .msgBoxConfirm(modalMessage, modalOptions) - .then(confirmed => { + .then((confirmed) => { if (confirmed) this.$store.dispatch('controls/hostSoftPowerOff'); }); } if (this.form.shutdownOption === 'immediate') { this.$bvModal .msgBoxConfirm(modalMessage, modalOptions) - .then(confirmed => { + .then((confirmed) => { if (confirmed) this.$store.dispatch('controls/hostHardPowerOff'); }); } - } - } + }, + }, }; </script> diff --git a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue b/src/views/Control/VirtualMedia/ModalConfigureConnection.vue index 2c75ae2a..21907734 100644 --- a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue +++ b/src/views/Control/VirtualMedia/ModalConfigureConnection.vue @@ -6,7 +6,7 @@ @hidden="resetForm" @show="initModal" > - <template v-slot:modal-title> + <template #modal-title> {{ $t('pageVirtualMedia.modal.title') }} </template> <b-form> @@ -60,7 +60,7 @@ </b-form-checkbox> </b-form-group> </b-form> - <template v-slot:modal-ok> + <template #modal-ok> {{ $t('global.action.save') }} </template> </b-modal> @@ -76,11 +76,11 @@ export default { connection: { type: Object, default: null, - validator: prop => { + validator: (prop) => { console.log(prop); return true; - } - } + }, + }, }, data() { return { @@ -88,23 +88,23 @@ export default { serverUri: null, username: null, password: null, - isRW: false - } + isRW: false, + }, }; }, watch: { - connection: function(value) { + connection: function (value) { if (value === null) return; Object.assign(this.form, value); - } + }, }, validations() { return { form: { serverUri: { - required - } - } + required, + }, + }, }; }, methods: { @@ -136,7 +136,7 @@ export default { onOk(bvModalEvt) { bvModalEvt.preventDefault(); this.handleSubmit(); - } - } + }, + }, }; </script> diff --git a/src/views/Control/VirtualMedia/VirtualMedia.vue b/src/views/Control/VirtualMedia/VirtualMedia.vue index 5460eb46..a15f2cd9 100644 --- a/src/views/Control/VirtualMedia/VirtualMedia.vue +++ b/src/views/Control/VirtualMedia/VirtualMedia.vue @@ -111,7 +111,9 @@ export default { return { modalConfigureConnection: null, loadImageFromExternalServer: - process.env.VUE_APP_VIRTUAL_MEDIA_LIST_ENABLED === 'true' ? true : false + process.env.VUE_APP_VIRTUAL_MEDIA_LIST_ENABLED === 'true' + ? true + : false, }; }, computed: { @@ -120,7 +122,7 @@ export default { }, legacyDevices() { return this.$store.getters['virtualMedia/legacyDevices']; - } + }, }, created() { if (this.proxyDevices.length > 0 || this.legacyDevices.length > 0) return; @@ -142,7 +144,7 @@ export default { this.successToast(this.$t('pageVirtualMedia.toast.serverRunning')); device.nbd.errorReadingFile = () => this.errorToast(this.$t('pageVirtualMedia.toast.errorReadingFile')); - device.nbd.socketClosed = code => { + device.nbd.socketClosed = (code) => { if (code === 1000) this.successToast( this.$t('pageVirtualMedia.toast.serverClosedSuccessfully') @@ -171,7 +173,7 @@ export default { this.$store .dispatch('virtualMedia/mountImage', { id: connectionData.id, - data: data + data: data, }) .then(() => { this.successToast( @@ -208,7 +210,7 @@ export default { configureConnection(connectionData) { this.modalConfigureConnection = connectionData; this.$bvModal.show('configure-connection'); - } - } + }, + }, }; </script> diff --git a/src/views/Health/EventLogs/EventLogs.vue b/src/views/Health/EventLogs/EventLogs.vue index c345d8fb..90f589a3 100644 --- a/src/views/Health/EventLogs/EventLogs.vue +++ b/src/views/Health/EventLogs/EventLogs.vue @@ -33,7 +33,7 @@ @clearSelected="clearSelectedRows($refs.table)" @batchAction="onBatchAction" > - <template v-slot:export> + <template #export> <table-toolbar-export :data="batchExportData" :file-name="exportFileNameByDate()" @@ -64,7 +64,7 @@ @row-selected="onRowSelected($event, filteredLogs.length)" > <!-- Checkbox column --> - <template v-slot:head(checkbox)> + <template #head(checkbox)> <b-form-checkbox v-model="tableHeaderCheckboxModel" data-test-id="eventLogs-checkbox-selectAll" @@ -72,7 +72,7 @@ @change="onChangeHeaderCheckbox($refs.table)" /> </template> - <template v-slot:cell(checkbox)="row"> + <template #cell(checkbox)="row"> <b-form-checkbox v-model="row.rowSelected" :data-test-id="`eventLogs-checkbox-selectRow-${row.index}`" @@ -81,19 +81,19 @@ </template> <!-- Severity column --> - <template v-slot:cell(severity)="{ value }"> + <template #cell(severity)="{ value }"> <status-icon v-if="value" :status="statusIcon(value)" /> {{ value }} </template> <!-- Date column --> - <template v-slot:cell(date)="{ value }"> + <template #cell(date)="{ value }"> <p class="mb-0">{{ value | formatDate }}</p> <p class="mb-0">{{ value | formatTime }}</p> </template> <!-- Actions column --> - <template v-slot:cell(actions)="row"> + <template #cell(actions)="row"> <table-row-action v-for="(action, index) in row.item.actions" :key="index" @@ -104,7 +104,7 @@ :data-test-id="`eventLogs-button-deleteRow-${row.index}`" @click:tableAction="onTableRowAction($event, row.item)" > - <template v-slot:icon> + <template #icon> <icon-export v-if="action.value === 'export'" /> <icon-trashcan v-if="action.value === 'delete'" /> </template> @@ -179,7 +179,7 @@ export default { TableRowAction, TableToolbar, TableToolbarExport, - TableDateFilter + TableDateFilter, }, mixins: [ BVPaginationMixin, @@ -189,64 +189,70 @@ export default { TableFilterMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], + beforeRouteLeave(to, from, next) { + // Hide loader if the user navigates to another page + // before request is fulfilled. + this.hideLoader(); + next(); + }, data() { return { fields: [ { key: 'checkbox', - sortable: false + sortable: false, }, { key: 'id', label: this.$t('pageEventLogs.table.id'), - sortable: true + sortable: true, }, { key: 'severity', label: this.$t('pageEventLogs.table.severity'), sortable: true, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'type', label: this.$t('pageEventLogs.table.type'), - sortable: true + sortable: true, }, { key: 'date', label: this.$t('pageEventLogs.table.date'), - sortable: true + sortable: true, }, { key: 'description', - label: this.$t('pageEventLogs.table.description') + label: this.$t('pageEventLogs.table.description'), }, { key: 'actions', sortable: false, label: '', - tdClass: 'text-right text-nowrap' - } + tdClass: 'text-right text-nowrap', + }, ], tableFilters: [ { key: 'severity', label: this.$t('pageEventLogs.table.severity'), - values: ['OK', 'Warning', 'Critical'] - } + values: ['OK', 'Warning', 'Critical'], + }, ], activeFilters: [], batchActions: [ { value: 'delete', - label: this.$t('global.action.delete') - } + label: this.$t('global.action.delete'), + }, ], filterStartDate: null, filterEndDate: null, - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -256,24 +262,24 @@ export default { : this.filteredLogs.length; }, allLogs() { - return this.$store.getters['eventLog/allEvents'].map(event => { + return this.$store.getters['eventLog/allEvents'].map((event) => { return { ...event, actions: [ { value: 'export', - title: this.$t('global.action.export') + title: this.$t('global.action.export'), }, { value: 'delete', - title: this.$t('global.action.delete') - } - ] + title: this.$t('global.action.delete'), + }, + ], }; }); }, batchExportData() { - return this.selectedRows.map(row => omit(row, 'actions')); + return this.selectedRows.map((row) => omit(row, 'actions')); }, filteredLogsByDate() { return this.getFilteredTableDataByDate( @@ -287,7 +293,7 @@ export default { this.filteredLogsByDate, this.activeFilters ); - } + }, }, created() { this.startLoader(); @@ -295,23 +301,19 @@ export default { .dispatch('eventLog/getEventLogData') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - // Hide loader if the user navigates to another page - // before request is fulfilled. - this.hideLoader(); - next(); - }, methods: { deleteLogs(uris) { - this.$store.dispatch('eventLog/deleteEventLogs', uris).then(messages => { - messages.forEach(({ type, message }) => { - if (type === 'success') { - this.successToast(message); - } else if (type === 'error') { - this.errorToast(message); - } + this.$store + .dispatch('eventLog/deleteEventLogs', uris) + .then((messages) => { + messages.forEach(({ type, message }) => { + if (type === 'success') { + this.successToast(message); + } else if (type === 'error') { + this.errorToast(message); + } + }); }); - }); }, onFilterChange({ activeFilters }) { this.activeFilters = activeFilters; @@ -326,16 +328,16 @@ export default { this.$bvModal .msgBoxConfirm(this.$tc('pageEventLogs.modal.deleteMessage'), { title: this.$tc('pageEventLogs.modal.deleteTitle'), - okTitle: this.$t('global.action.delete') + okTitle: this.$t('global.action.delete'), }) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) this.deleteLogs([uri]); }); } }, onBatchAction(action) { if (action === 'delete') { - const uris = this.selectedRows.map(row => row.uri); + const uris = this.selectedRows.map((row) => row.uri); this.$bvModal .msgBoxConfirm( this.$tc( @@ -347,10 +349,10 @@ export default { 'pageEventLogs.modal.deleteTitle', this.selectedRows.length ), - okTitle: this.$t('global.action.delete') + okTitle: this.$t('global.action.delete'), } ) - .then(deleteConfirmed => { + .then((deleteConfirmed) => { if (deleteConfirmed) this.deleteLogs(uris); }); } @@ -368,13 +370,9 @@ export default { date = date.toISOString().slice(0, 10) + '_' + - date - .toString() - .split(':') - .join('-') - .split(' ')[4]; + date.toString().split(':').join('-').split(' ')[4]; return this.$t('pageEventLogs.exportFilePrefix') + date; - } - } + }, + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatus.vue b/src/views/Health/HardwareStatus/HardwareStatus.vue index fb203381..24f02953 100644 --- a/src/views/Health/HardwareStatus/HardwareStatus.vue +++ b/src/views/Health/HardwareStatus/HardwareStatus.vue @@ -45,32 +45,38 @@ export default { TableFans, TableBmcManager, TableChassis, - TableProcessors + TableProcessors, }, mixins: [LoadingBarMixin], + beforeRouteLeave(to, from, next) { + // Hide loader if user navigates away from page + // before requests complete + this.hideLoader(); + next(); + }, created() { this.startLoader(); - const systemTablePromise = new Promise(resolve => { + const systemTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::system::complete', () => resolve()); }); - const bmcManagerTablePromise = new Promise(resolve => { + const bmcManagerTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::bmcManager::complete', () => resolve()); }); - const chassisTablePromise = new Promise(resolve => { + const chassisTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::chassis::complete', () => resolve()); }); - const dimmSlotTablePromise = new Promise(resolve => { + const dimmSlotTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::dimmSlot::complete', () => resolve()); }); - const fansTablePromise = new Promise(resolve => { + const fansTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::fans::complete', () => resolve()); }); - const powerSuppliesTablePromise = new Promise(resolve => { + const powerSuppliesTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::powerSupplies::complete', () => resolve() ); }); - const processorsTablePromise = new Promise(resolve => { + const processorsTablePromise = new Promise((resolve) => { this.$root.$on('hardwareStatus::processors::complete', () => resolve()); }); // Combine all child component Promises to indicate @@ -82,14 +88,8 @@ export default { dimmSlotTablePromise, fansTablePromise, powerSuppliesTablePromise, - processorsTablePromise + processorsTablePromise, ]).finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - // Hide loader if user navigates away from page - // before requests complete - this.hideLoader(); - next(); - } }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue index e7ddf537..783cd649 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue @@ -9,7 +9,7 @@ :empty-text="$t('global.table.emptyMessage')" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandBmc" @@ -21,12 +21,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6"> @@ -153,30 +153,30 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand' + tdClass: 'table-row-expand', }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), - formatter: this.tableFormatter - } - ] + formatter: this.tableFormatter, + }, + ], }; }, computed: { @@ -189,13 +189,13 @@ export default { } else { return []; } - } + }, }, created() { this.$store.dispatch('bmc/getBmcInfo').finally(() => { // Emit initial data fetch complete to parent component this.$root.$emit('hardwareStatus::bmcManager::complete'); }); - } + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue index 0b56a9fe..fbdadcdd 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue @@ -9,7 +9,7 @@ :empty-text="$t('global.table.emptyMessage')" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandChassis" @@ -21,12 +21,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -82,42 +82,42 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand' + tdClass: 'table-row-expand', }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), - formatter: this.tableFormatter - } - ] + formatter: this.tableFormatter, + }, + ], }; }, computed: { chassis() { return this.$store.getters['chassis/chassis']; - } + }, }, created() { this.$store.dispatch('chassis/getChassisInfo').finally(() => { // Emit initial data fetch complete to parent component this.$root.$emit('hardwareStatus::chassis::complete'); }); - } + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue index babb8d07..2c901637 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue @@ -31,7 +31,7 @@ @filtered="onFiltered" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandDimms" @@ -43,12 +43,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -84,7 +84,7 @@ export default { TableRowExpandMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], data() { return { @@ -93,35 +93,35 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false + sortable: false, }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, sortable: true, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), formatter: this.tableFormatter, - sortable: true - } + sortable: true, + }, ], - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -132,7 +132,7 @@ export default { }, dimms() { return this.$store.getters['memory/dimms']; - } + }, }, created() { this.$store.dispatch('memory/getDimms').finally(() => { @@ -148,7 +148,7 @@ export default { }, onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; - } - } + }, + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue index 9ee9291c..6ade34bf 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue @@ -31,7 +31,7 @@ @filtered="onFiltered" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandFans" @@ -43,12 +43,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -83,7 +83,7 @@ export default { TableRowExpandMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], data() { return { @@ -92,35 +92,35 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false + sortable: false, }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, sortable: true, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), formatter: this.tableFormatter, - sortable: true - } + sortable: true, + }, ], - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -131,7 +131,7 @@ export default { }, fans() { return this.$store.getters['fan/fans']; - } + }, }, created() { this.$store.dispatch('fan/getFanInfo').finally(() => { @@ -147,7 +147,7 @@ export default { }, onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; - } - } + }, + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue index bd5cedb5..91c26a7d 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue @@ -31,7 +31,7 @@ @filtered="onFiltered" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandPowerSupplies" @@ -43,12 +43,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -106,7 +106,7 @@ export default { TableRowExpandMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], data() { return { @@ -115,35 +115,35 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false + sortable: false, }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, sortable: true, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), formatter: this.tableFormatter, - sortable: true - } + sortable: true, + }, ], - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -154,7 +154,7 @@ export default { }, powerSupplies() { return this.$store.getters['powerSupply/powerSupplies']; - } + }, }, created() { this.$store.dispatch('powerSupply/getPowerSupply').finally(() => { @@ -170,7 +170,7 @@ export default { }, onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; - } - } + }, + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue index de77243a..fba4cc4e 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue @@ -30,7 +30,7 @@ @filtered="onFiltered" > <!-- Expand button --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandProcessors" @@ -41,11 +41,11 @@ </b-button> </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -113,7 +113,7 @@ export default { TableRowExpandMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], data() { return { @@ -122,35 +122,35 @@ export default { key: 'expandRow', label: '', tdClass: 'table-row-expand', - sortable: false + sortable: false, }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, sortable: true, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), formatter: this.tableFormatter, - sortable: true + sortable: true, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), formatter: this.tableFormatter, - sortable: true - } + sortable: true, + }, ], - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -161,7 +161,7 @@ export default { }, processors() { return this.$store.getters['processors/processors']; - } + }, }, created() { this.$store.dispatch('processors/getProcessorsInfo').finally(() => { @@ -172,7 +172,7 @@ export default { methods: { onFiltered(filteredItems) { this.searchTotalFilteredRows = filteredItems.length; - } - } + }, + }, }; </script> diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue index da4d5467..fc65fbfb 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue @@ -9,7 +9,7 @@ :empty-text="$t('global.table.emptyMessage')" > <!-- Expand chevron icon --> - <template v-slot:cell(expandRow)="row"> + <template #cell(expandRow)="row"> <b-button variant="link" data-test-id="hardwareStatus-button-expandSystem" @@ -21,12 +21,12 @@ </template> <!-- Health --> - <template v-slot:cell(health)="{ value }"> + <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:row-details="{ item }"> + <template #row-details="{ item }"> <b-container fluid> <b-row> <b-col sm="6" xl="4"> @@ -94,42 +94,42 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand' + tdClass: 'table-row-expand', }, { key: 'id', label: this.$t('pageHardwareStatus.table.id'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'health', label: this.$t('pageHardwareStatus.table.health'), formatter: this.tableFormatter, - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'partNumber', label: this.$t('pageHardwareStatus.table.partNumber'), - formatter: this.tableFormatter + formatter: this.tableFormatter, }, { key: 'serialNumber', label: this.$t('pageHardwareStatus.table.serialNumber'), - formatter: this.tableFormatter - } - ] + formatter: this.tableFormatter, + }, + ], }; }, computed: { systems() { return this.$store.getters['system/systems']; - } + }, }, created() { this.$store.dispatch('system/getSystem').finally(() => { // Emit initial data fetch complete to parent component this.$root.$emit('hardwareStatus::system::complete'); }); - } + }, }; </script> diff --git a/src/views/Health/Sensors/Sensors.vue b/src/views/Health/Sensors/Sensors.vue index acd2d18b..384c64f6 100644 --- a/src/views/Health/Sensors/Sensors.vue +++ b/src/views/Health/Sensors/Sensors.vue @@ -26,7 +26,7 @@ :selected-items-count="selectedRows.length" @clearSelected="clearSelectedRows($refs.table)" > - <template v-slot:export> + <template #export> <table-toolbar-export :data="selectedRows" :file-name="exportFileNameByDate()" @@ -56,36 +56,36 @@ @row-selected="onRowSelected($event, filteredSensors.length)" > <!-- Checkbox column --> - <template v-slot:head(checkbox)> + <template #head(checkbox)> <b-form-checkbox v-model="tableHeaderCheckboxModel" :indeterminate="tableHeaderCheckboxIndeterminate" @change="onChangeHeaderCheckbox($refs.table)" /> </template> - <template v-slot:cell(checkbox)="row"> + <template #cell(checkbox)="row"> <b-form-checkbox v-model="row.rowSelected" @change="toggleSelectRow($refs.table, row.index)" /> </template> - <template v-slot:cell(status)="{ value }"> + <template #cell(status)="{ value }"> <status-icon :status="statusIcon(value)" /> {{ value }} </template> - <template v-slot:cell(currentValue)="data"> + <template #cell(currentValue)="data"> {{ data.value }} {{ data.item.units }} </template> - <template v-slot:cell(lowerCaution)="data"> + <template #cell(lowerCaution)="data"> {{ data.value }} {{ data.item.units }} </template> - <template v-slot:cell(upperCaution)="data"> + <template #cell(upperCaution)="data"> {{ data.value }} {{ data.item.units }} </template> - <template v-slot:cell(lowerCritical)="data"> + <template #cell(lowerCritical)="data"> {{ data.value }} {{ data.item.units }} </template> - <template v-slot:cell(upperCritical)="data"> + <template #cell(upperCritical)="data"> {{ data.value }} {{ data.item.units }} </template> </b-table> @@ -119,7 +119,7 @@ export default { TableCellCount, TableFilter, TableToolbar, - TableToolbarExport + TableToolbarExport, }, mixins: [ TableFilterMixin, @@ -127,63 +127,67 @@ export default { LoadingBarMixin, TableDataFormatterMixin, TableSortMixin, - SearchFilterMixin + SearchFilterMixin, ], + beforeRouteLeave(to, from, next) { + this.hideLoader(); + next(); + }, data() { return { fields: [ { key: 'checkbox', sortable: false, - label: '' + label: '', }, { key: 'name', sortable: true, - label: this.$t('pageSensors.table.name') + label: this.$t('pageSensors.table.name'), }, { key: 'status', sortable: true, label: this.$t('pageSensors.table.status'), - tdClass: 'text-nowrap' + tdClass: 'text-nowrap', }, { key: 'lowerCritical', formatter: this.tableFormatter, - label: this.$t('pageSensors.table.lowerCritical') + label: this.$t('pageSensors.table.lowerCritical'), }, { key: 'lowerCaution', formatter: this.tableFormatter, - label: this.$t('pageSensors.table.lowerWarning') + label: this.$t('pageSensors.table.lowerWarning'), }, { key: 'currentValue', formatter: this.tableFormatter, - label: this.$t('pageSensors.table.currentValue') + label: this.$t('pageSensors.table.currentValue'), }, { key: 'upperCaution', formatter: this.tableFormatter, - label: this.$t('pageSensors.table.upperWarning') + label: this.$t('pageSensors.table.upperWarning'), }, { key: 'upperCritical', formatter: this.tableFormatter, - label: this.$t('pageSensors.table.upperCritical') - } + label: this.$t('pageSensors.table.upperCritical'), + }, ], tableFilters: [ { key: 'status', label: this.$t('pageSensors.table.status'), - values: ['OK', 'Warning', 'Critical'] - } + values: ['OK', 'Warning', 'Critical'], + }, ], activeFilters: [], - searchTotalFilteredRows: 0 + searchTotalFilteredRows: 0, }; }, computed: { @@ -197,7 +201,7 @@ export default { }, filteredSensors() { return this.getFilteredTableData(this.allSensors, this.activeFilters); - } + }, }, created() { this.startLoader(); @@ -205,10 +209,6 @@ export default { .dispatch('sensors/getAllSensors') .finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, methods: { sortCompare(a, b, key) { if (key === 'status') { @@ -230,13 +230,9 @@ export default { date = date.toISOString().slice(0, 10) + '_' + - date - .toString() - .split(':') - .join('-') - .split(' ')[4]; + date.toString().split(':').join('-').split(' ')[4]; return this.$t('pageSensors.exportFilePrefix') + date; - } - } + }, + }, }; </script> diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index dd0a415b..1936cd48 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,6 +1,6 @@ <template> <b-form - class="login-form mx-auto ml-md-5 mb-3" + class="login-form mx-auto ml-md-5 mb-3" novalidate @submit.prevent="login" > @@ -79,38 +79,38 @@ export default { return { userInfo: { username: null, - password: null + password: null, }, disableSubmitButton: false, languages: [ { value: 'en-US', - text: 'English' + text: 'English', }, { value: 'es', - text: 'Español' - } - ] + text: 'Español', + }, + ], }; }, computed: { authError() { return this.$store.getters['authentication/authError']; - } + }, }, validations: { userInfo: { username: { - required + required, }, password: { - required - } - } + required, + }, + }, }, methods: { - login: function() { + login: function () { this.$v.$touch(); if (this.$v.$invalid) return; this.disableSubmitButton = true; @@ -128,17 +128,17 @@ export default { username ); }) - .then(passwordChangeRequired => { + .then((passwordChangeRequired) => { if (passwordChangeRequired) { this.$router.push('/change-password'); } else { this.$router.push('/'); } }) - .catch(error => console.log(error)) + .catch((error) => console.log(error)) .finally(() => (this.disableSubmitButton = false)); - } - } + }, + }, }; </script> diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue index 27a599b9..13138601 100644 --- a/src/views/Overview/Overview.vue +++ b/src/views/Overview/Overview.vue @@ -101,21 +101,22 @@ export default { OverviewEvents, OverviewNetwork, PageTitle, - PageSection + PageSection, }, mixins: [LoadingBarMixin], data() { return { firmwareStoreModuleName: this.$store.hasModule('firmwareSingleImage') ? 'firmwareSingleImage' - : 'firmware' + : 'firmware', }; }, computed: { ...mapState({ - server: state => state.system.systems[0], - powerCapValue: state => state.powerControl.powerCapValue, - powerConsumptionValue: state => state.powerControl.powerConsumptionValue, + server: (state) => state.system.systems[0], + powerCapValue: (state) => state.powerControl.powerCapValue, + powerConsumptionValue: (state) => + state.powerControl.powerConsumptionValue, serverManufacturer() { if (this.server) return this.server.manufacturer || '--'; return '--'; @@ -131,23 +132,23 @@ export default { hostFirmwareVersion() { if (this.server) return this.server.firmwareVersion || '--'; return '--'; - } + }, }), bmcFirmwareVersion() { return this.$store.getters[ `${this.firmwareStoreModuleName}/bmcFirmwareCurrentVersion` ]; - } + }, }, created() { this.startLoader(); - const quicklinksPromise = new Promise(resolve => { + const quicklinksPromise = new Promise((resolve) => { this.$root.$on('overview::quicklinks::complete', () => resolve()); }); - const networkPromise = new Promise(resolve => { + const networkPromise = new Promise((resolve) => { this.$root.$on('overview::network::complete', () => resolve()); }); - const eventsPromise = new Promise(resolve => { + const eventsPromise = new Promise((resolve) => { this.$root.$on('overview::events::complete', () => resolve()); }); Promise.all([ @@ -158,13 +159,9 @@ export default { this.$store.dispatch('powerControl/getPowerControl'), quicklinksPromise, networkPromise, - eventsPromise + eventsPromise, ]).finally(() => this.endLoader()); }, - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - } }; </script> diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue index ac39a2b3..83aa677d 100644 --- a/src/views/Overview/OverviewEvents.vue +++ b/src/views/Overview/OverviewEvents.vue @@ -20,11 +20,11 @@ :fields="fields" :empty-text="$t('pageOverview.events.noHighEventsMsg')" > - <template v-slot:cell(severity)="{ value }"> + <template #cell(severity)="{ value }"> <status-icon status="danger" /> {{ value }} </template> - <template v-slot:cell(date)="{ value }"> + <template #cell(date)="{ value }"> <p class="mb-0">{{ value | formatDate }}</p> <p class="mb-0">{{ value | formatTime }}</p> </template> @@ -43,36 +43,36 @@ export default { fields: [ { key: 'id', - label: this.$t('pageOverview.events.id') + label: this.$t('pageOverview.events.id'), }, { key: 'severity', - label: this.$t('pageOverview.events.severity') + label: this.$t('pageOverview.events.severity'), }, { key: 'type', - label: this.$t('pageOverview.events.type') + label: this.$t('pageOverview.events.type'), }, { key: 'date', - label: this.$t('pageOverview.events.date') + label: this.$t('pageOverview.events.date'), }, { key: 'description', - label: this.$t('pageOverview.events.description') - } - ] + label: this.$t('pageOverview.events.description'), + }, + ], }; }, computed: { eventLogData() { return this.$store.getters['eventLog/highPriorityEvents']; - } + }, }, created() { this.$store.dispatch('eventLog/getEventLogData').finally(() => { this.$root.$emit('overview::events::complete'); }); - } + }, }; </script> diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue index 14b4d4af..ec9fd6b5 100644 --- a/src/views/Overview/OverviewNetwork.vue +++ b/src/views/Overview/OverviewNetwork.vue @@ -46,13 +46,13 @@ export default { computed: { ethernetData() { return this.$store.getters['networkSettings/ethernetData']; - } + }, }, created() { this.$store.dispatch('networkSettings/getEthernetData').finally(() => { this.$root.$emit('overview::network::complete'); }); - } + }, }; </script> diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue index e0b4487f..1cbc64d5 100644 --- a/src/views/Overview/OverviewQuickLinks.vue +++ b/src/views/Overview/OverviewQuickLinks.vue @@ -62,7 +62,7 @@ import BVToastMixin from '@/components/Mixins/BVToastMixin'; export default { name: 'QuickLinks', components: { - IconArrowRight: ArrowRight16 + IconArrowRight: ArrowRight16, }, mixins: [BVToastMixin], computed: { @@ -75,13 +75,13 @@ export default { }, set(value) { return value; - } - } + }, + }, }, created() { Promise.all([ this.$store.dispatch('global/getBmcTime'), - this.$store.dispatch('serverLed/getIndicatorValue') + this.$store.dispatch('serverLed/getIndicatorValue'), ]).finally(() => { this.$root.$emit('overview::quicklinks::complete'); }); @@ -90,10 +90,10 @@ export default { onChangeServerLed(value) { this.$store .dispatch('serverLed/saveIndicatorLedValue', value) - .then(message => this.successToast(message)) + .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)); - } - } + }, + }, }; </script> diff --git a/src/views/PageNotFound/PageNotFound.vue b/src/views/PageNotFound/PageNotFound.vue index be4b3c49..91341dbb 100644 --- a/src/views/PageNotFound/PageNotFound.vue +++ b/src/views/PageNotFound/PageNotFound.vue @@ -7,6 +7,6 @@ import PageTitle from '@/components/Global/PageTitle'; export default { name: 'PageNotFound', - components: { PageTitle } + components: { PageTitle }, }; </script> diff --git a/src/views/ProfileSettings/ProfileSettings.vue b/src/views/ProfileSettings/ProfileSettings.vue index 8c68839d..65c722ab 100644 --- a/src/views/ProfileSettings/ProfileSettings.vue +++ b/src/views/ProfileSettings/ProfileSettings.vue @@ -32,7 +32,7 @@ {{ $t('pageLocalUserManagement.modal.passwordMustBeBetween', { min: passwordRequirements.minLength, - max: passwordRequirements.maxLength + max: passwordRequirements.maxLength, }) }} </b-form-text> @@ -51,13 +51,13 @@ <template v-if=" !$v.form.newPassword.minLength || - !$v.form.newPassword.maxLength + !$v.form.newPassword.maxLength " > {{ $t('pageProfileSettings.newPassLabelTextInfo', { min: passwordRequirements.minLength, - max: passwordRequirements.maxLength + max: passwordRequirements.maxLength, }) }} </template> @@ -110,7 +110,7 @@ > {{ $t('pageProfileSettings.browserOffset', { - timezone + timezone, }) }} </b-form-radio> @@ -137,7 +137,7 @@ import { maxLength, minLength, required, - sameAs + sameAs, } from 'vuelidate/lib/validators'; import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin'; @@ -152,15 +152,15 @@ export default { BVToastMixin, LocalTimezoneLabelMixin, LoadingBarMixin, - VuelidateMixin + VuelidateMixin, ], data() { return { form: { newPassword: '', confirmPassword: '', - isUtcDisplay: this.$store.getters['global/isUtcDisplay'] - } + isUtcDisplay: this.$store.getters['global/isUtcDisplay'], + }, }; }, computed: { @@ -172,7 +172,7 @@ export default { }, timezone() { return this.localOffset(); - } + }, }, created() { this.startLoader(); @@ -186,12 +186,12 @@ export default { isUtcDisplay: { required }, newPassword: { minLength: minLength(this.passwordRequirements.minLength), - maxLength: maxLength(this.passwordRequirements.maxLength) + maxLength: maxLength(this.passwordRequirements.maxLength), }, confirmPassword: { - sameAsPassword: sameAs('newPassword') - } - } + sameAsPassword: sameAs('newPassword'), + }, + }, }; }, methods: { @@ -201,12 +201,12 @@ export default { if (this.$v.$invalid) return; let userData = { originalUsername: this.username, - password: this.form.newPassword + password: this.form.newPassword, }; this.$store .dispatch('localUsers/updateUser', userData) - .then(message => { + .then((message) => { (this.form.newPassword = ''), (this.form.confirmPassword = ''); this.$v.$reset(); this.successToast(message); @@ -227,7 +227,7 @@ export default { if (this.$v.form.isUtcDisplay.$anyDirty) { this.saveTimeZonePrefrenceData(); } - } - } + }, + }, }; </script> diff --git a/tests/unit/AppHeader.spec.js b/tests/unit/AppHeader.spec.js index be52ef8f..f9a65395 100644 --- a/tests/unit/AppHeader.spec.js +++ b/tests/unit/AppHeader.spec.js @@ -11,7 +11,7 @@ localVue.use(Vuex); describe('AppHeader.vue', () => { const actions = { 'global/getHostStatus': jest.fn(), - 'eventLog/getEventLogData': jest.fn() + 'eventLog/getEventLogData': jest.fn(), }; const store = new Vuex.Store({ actions }); @@ -19,8 +19,8 @@ describe('AppHeader.vue', () => { store, localVue, mocks: { - $t: key => key - } + $t: (key) => key, + }, }); // Reset dispatch between tests so that multiple diff --git a/tests/unit/AppNavigation.spec.js b/tests/unit/AppNavigation.spec.js index 58eaae91..33efb8e4 100644 --- a/tests/unit/AppNavigation.spec.js +++ b/tests/unit/AppNavigation.spec.js @@ -9,8 +9,8 @@ describe('AppNavigation.vue', () => { wrapper = mount(AppNavigation, { mocks: { - $t: key => key - } + $t: (key) => key, + }, }); it('should exist', async () => { diff --git a/vue.config.js b/vue.config.js index 6cb0df7e..cb33616e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -32,26 +32,26 @@ module.exports = { @import "@/assets/styles/bootstrap/_helpers"; `; } - } - } - } + }, + }, + }, }, devServer: { https: true, proxy: { '/': { target: process.env.BASE_URL, - onProxyRes: proxyRes => { + onProxyRes: (proxyRes) => { // This header is ignored in the browser so removing // it so we don't see warnings in the browser console delete proxyRes.headers['strict-transport-security']; - } - } + }, + }, }, - port: 8000 + port: 8000, }, productionSourceMap: false, - configureWebpack: config => { + configureWebpack: (config) => { const envName = process.env.VUE_APP_ENV_NAME; const hasCustomStore = process.env.CUSTOM_STORE === 'true' ? true : false; const hasCustomRouter = process.env.CUSTOM_ROUTER === 'true' ? true : false; @@ -80,7 +80,7 @@ module.exports = { if (process.env.NODE_ENV === 'production') { config.plugins.push( new CompressionPlugin({ - deleteOriginalAssets: true + deleteOriginalAssets: true, }) ); } @@ -88,7 +88,7 @@ module.exports = { pluginOptions: { i18n: { localeDir: 'locales', - enableInSFC: true - } - } + enableInSFC: true, + }, + }, }; |