From 91ed2dc3bf28e8ae10a6210707846bd6a03ba758 Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Thu, 4 Jan 2024 01:20:58 +0900 Subject: [PATCH] chage-case 5.3.0 to 4.1.2 / Fix Iris --- package-lock.json | 210 +++++++++++++++--- package.json | 2 +- .../config/alert/ConfigAlertIris.vue | 49 ++-- src/store/config/alert.js | 7 +- src/store/config/index.js | 14 +- tests/unit/specs/alert/ConfigYamlIris.spec.js | 1 + .../specs/alert/ConfigYamlIris002.spec.js | 1 - 7 files changed, 229 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdaa5c1..cf07610 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "praeco", - "version": "1.8.17", + "version": "1.8.18", "dependencies": { "@babel/core": "^7.23.7", "@browser-bunyan/server-stream": "1.8.0", @@ -20,7 +20,7 @@ "axios": "1.6.3", "browser-bunyan": "1.8.0", "canvas": "^2.11.2", - "change-case": "5.3.0", + "change-case": "4.1.2", "comma-number": "2.1.0", "core-js": "^3.35.0", "cron-ui": "1.0.3", @@ -5305,7 +5305,6 @@ }, "node_modules/camel-case": { "version": "4.1.2", - "dev": true, "license": "MIT", "dependencies": { "pascal-case": "^3.1.2", @@ -5314,7 +5313,6 @@ }, "node_modules/camel-case/node_modules/tslib": { "version": "2.4.0", - "dev": true, "license": "0BSD" }, "node_modules/camelcase": { @@ -5385,6 +5383,16 @@ "node": ">=6" } }, + "node_modules/capital-case": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "node_modules/case-sensitive-paths-webpack-plugin": { "version": "2.3.0", "dev": true, @@ -5430,9 +5438,23 @@ } }, "node_modules/change-case": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.3.0.tgz", - "integrity": "sha512-Eykca0fGS/xYlx2fG5NqnGSnsWauhSGiSXYhB1kO6E909GUfo8S54u4UZNS7lMJmgZumZ2SUpWaoLgAcfQRICg==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", + "dependencies": { + "camel-case": "^4.1.2", + "capital-case": "^1.0.4", + "constant-case": "^3.0.4", + "dot-case": "^3.0.4", + "header-case": "^2.0.4", + "no-case": "^3.0.4", + "param-case": "^3.0.4", + "pascal-case": "^3.1.2", + "path-case": "^3.0.4", + "sentence-case": "^3.0.4", + "snake-case": "^3.0.4", + "tslib": "^2.0.3" + } }, "node_modules/check-error": { "version": "1.0.3", @@ -6079,6 +6101,16 @@ "node": ">= 0.10.0" } }, + "node_modules/constant-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case": "^2.0.2" + } + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -7557,7 +7589,6 @@ }, "node_modules/dot-case": { "version": "3.0.4", - "dev": true, "license": "MIT", "dependencies": { "no-case": "^3.0.4", @@ -10078,6 +10109,15 @@ "he": "bin/he" } }, + "node_modules/header-case": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", + "dependencies": { + "capital-case": "^1.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/highlight.js": { "version": "10.7.3", "dev": true, @@ -12203,7 +12243,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, "dependencies": { "tslib": "^2.0.3" } @@ -13303,7 +13342,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, "dependencies": { "lower-case": "^2.0.2", "tslib": "^2.0.3" @@ -14525,7 +14563,6 @@ }, "node_modules/param-case": { "version": "3.0.4", - "dev": true, "license": "MIT", "dependencies": { "dot-case": "^3.0.4", @@ -14534,7 +14571,6 @@ }, "node_modules/param-case/node_modules/tslib": { "version": "2.4.0", - "dev": true, "license": "0BSD" }, "node_modules/parent-module": { @@ -14590,13 +14626,21 @@ }, "node_modules/pascal-case": { "version": "3.1.2", - "dev": true, "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, + "node_modules/path-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", @@ -16568,6 +16612,16 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "node_modules/sentence-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "node_modules/serialize-javascript": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", @@ -16868,6 +16922,15 @@ "npm": ">= 3.0.0" } }, + "node_modules/snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -17945,6 +18008,22 @@ "browserslist": ">= 4.21.0" } }, + "node_modules/upper-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/upper-case-first": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, "node_modules/uri-js": { "version": "4.2.2", "license": "BSD-2-Clause", @@ -23256,15 +23335,13 @@ }, "camel-case": { "version": "4.1.2", - "dev": true, "requires": { "pascal-case": "^3.1.2", "tslib": "^2.0.3" }, "dependencies": { "tslib": { - "version": "2.4.0", - "dev": true + "version": "2.4.0" } } }, @@ -23308,6 +23385,16 @@ "simple-get": "^3.0.3" } }, + "capital-case": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "case-sensitive-paths-webpack-plugin": { "version": "2.3.0", "dev": true @@ -23342,9 +23429,23 @@ } }, "change-case": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.3.0.tgz", - "integrity": "sha512-Eykca0fGS/xYlx2fG5NqnGSnsWauhSGiSXYhB1kO6E909GUfo8S54u4UZNS7lMJmgZumZ2SUpWaoLgAcfQRICg==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", + "requires": { + "camel-case": "^4.1.2", + "capital-case": "^1.0.4", + "constant-case": "^3.0.4", + "dot-case": "^3.0.4", + "header-case": "^2.0.4", + "no-case": "^3.0.4", + "param-case": "^3.0.4", + "pascal-case": "^3.1.2", + "path-case": "^3.0.4", + "sentence-case": "^3.0.4", + "snake-case": "^3.0.4", + "tslib": "^2.0.3" + } }, "check-error": { "version": "1.0.3", @@ -23801,6 +23902,16 @@ "bluebird": "^3.1.1" } }, + "constant-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case": "^2.0.2" + } + }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -24819,7 +24930,6 @@ }, "dot-case": { "version": "3.0.4", - "dev": true, "requires": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -26648,6 +26758,15 @@ "version": "1.2.0", "dev": true }, + "header-case": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", + "requires": { + "capital-case": "^1.0.4", + "tslib": "^2.0.3" + } + }, "highlight.js": { "version": "10.7.3", "dev": true @@ -28144,7 +28263,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, "requires": { "tslib": "^2.0.3" } @@ -28960,7 +29078,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, "requires": { "lower-case": "^2.0.2", "tslib": "^2.0.3" @@ -29843,15 +29960,13 @@ }, "param-case": { "version": "3.0.4", - "dev": true, "requires": { "dot-case": "^3.0.4", "tslib": "^2.0.3" }, "dependencies": { "tslib": { - "version": "2.4.0", - "dev": true + "version": "2.4.0" } } }, @@ -29894,12 +30009,20 @@ }, "pascal-case": { "version": "3.1.2", - "dev": true, "requires": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, + "path-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", @@ -31268,6 +31391,16 @@ } } }, + "sentence-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "serialize-javascript": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", @@ -31506,6 +31639,15 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" }, + "snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -32276,6 +32418,22 @@ "picocolors": "^1.0.0" } }, + "upper-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", + "requires": { + "tslib": "^2.0.3" + } + }, + "upper-case-first": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", + "requires": { + "tslib": "^2.0.3" + } + }, "uri-js": { "version": "4.2.2", "requires": { diff --git a/package.json b/package.json index ebd4bfb..fb93fe7 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "axios": "1.6.3", "browser-bunyan": "1.8.0", "canvas": "^2.11.2", - "change-case": "5.3.0", + "change-case": "4.1.2", "comma-number": "2.1.0", "core-js": "^3.35.0", "cron-ui": "1.0.3", diff --git a/src/components/config/alert/ConfigAlertIris.vue b/src/components/config/alert/ConfigAlertIris.vue index c7c6d06..37e9506 100644 --- a/src/components/config/alert/ConfigAlertIris.vue +++ b/src/components/config/alert/ConfigAlertIris.vue @@ -14,6 +14,17 @@ + + + - - - - - + @@ -57,10 +60,10 @@ - none + alert - full + case @@ -74,14 +77,14 @@ - + - + @@ -95,7 +98,7 @@ - + @@ -152,17 +155,20 @@ export default { ); } }, - irisCaCerts: { + /* + TODO: Error saving config, are all fields filled out? + irisCaCert: { get() { - return this.$store.state.config.alert.irisCaCerts; + return this.$store.state.config.alert.irisCaCert; }, set(value) { this.$store.commit( - 'config/alert/UPDATE_IRIS_CA_CERTS', + 'config/alert/UPDATE_IRIS_CA_CERT', value ); } }, + */ irisDescription: { get() { return this.$store.state.config.alert.irisDescription; @@ -272,13 +278,16 @@ export default { this.irisIgnoreSslErrors = false; } }, - changeIrisCaCerts(val) { + /* + TODO: Error saving config, are all fields filled out? + changeIrisCaCert(val) { if (val) { - this.irisCaCerts = true; + this.irisCaCert = true; } else { - this.irisCaCerts = false; + this.irisCaCert = false; } }, + */ changeIrisOverwriteTimestamp(val) { if (val) { this.irisOverwriteTimestamp = true; diff --git a/src/store/config/alert.js b/src/store/config/alert.js index 20e7e1e..2373772 100644 --- a/src/store/config/alert.js +++ b/src/store/config/alert.js @@ -200,7 +200,7 @@ function initialState() { irisApiToken: '', irisCustomerId: 0, irisIgnoreSslErrors: false, - irisCaCerts: false, + irisCaCert: false, irisDescription: '', irisOverwriteTimestamp: false, irisType: 'alert', @@ -1262,8 +1262,9 @@ export default { state.irisIgnoreSslErrors = irisIgnoreSslErrors; }, - UPDATE_IRIS_CA_CERTS(state, irisCaCerts) { - state.irisCaCerts = irisCaCerts; + // TODO: Error saving config, are all fields filled out? + UPDATE_IRIS_CA_CERT(state, irisCaCert) { + state.irisCaCert = irisCaCert; }, UPDATE_IRIS_DESCRIPTION(state, irisDescription) { diff --git a/src/store/config/index.js b/src/store/config/index.js index e793e63..973e192 100644 --- a/src/store/config/index.js +++ b/src/store/config/index.js @@ -281,14 +281,19 @@ export default { commit('alert/UPDATE_IRIS_API_TOKEN', config.iris_api_token); - commit('alert/UPDATE_IRIS_CUSTOMER_ID', config.iris_customer_id); + if (config.iris_customer_id) { + commit('alert/UPDATE_IRIS_CUSTOMER_ID', config.iris_customer_id); + } else { + commit('alert/UPDATE_IRIS_CUSTOMER_ID', 1); + } if (config.iris_ignore_ssl_errors) { commit('alert/UPDATE_IRIS_IGNORE_SSL_ERRORS', config.iris_ignore_ssl_errors); } + // TODO: Error saving config, are all fields filled out? if (config.iris_ca_cert) { - commit('alert/UPDATE_IRIS_CA_CERTS', config.iris_ca_cert); + commit('alert/UPDATE_IRIS_CA_CERT', config.iris_ca_cert); } commit('alert/UPDATE_IRIS_DESCRIPTION', config.iris_description); @@ -1590,8 +1595,9 @@ export default { config.iris_ignore_ssl_errors = state.alert.irisIgnoreSslErrors; } - if (state.alert.irisCaCerts) { - config.iris_ca_cert = state.alert.irisCaCerts; + // TODO: Error saving config, are all fields filled out? + if (state.alert.irisCaCert) { + config.iris_ca_cert = state.alert.irisCaCert; } if (state.alert.irisDescription) { diff --git a/tests/unit/specs/alert/ConfigYamlIris.spec.js b/tests/unit/specs/alert/ConfigYamlIris.spec.js index e71d703..e306dc7 100644 --- a/tests/unit/specs/alert/ConfigYamlIris.spec.js +++ b/tests/unit/specs/alert/ConfigYamlIris.spec.js @@ -29,6 +29,7 @@ index: "hannibal-*" iris_alert_severity_id: 1 iris_alert_status_id: 2 iris_api_token: "abcdefghijklmnopqrstuvwxyz" +iris_customer_id: 1 iris_host: "testserver" iris_type: "alert" is_enabled: false diff --git a/tests/unit/specs/alert/ConfigYamlIris002.spec.js b/tests/unit/specs/alert/ConfigYamlIris002.spec.js index 784fd52..9a1cc0f 100644 --- a/tests/unit/specs/alert/ConfigYamlIris002.spec.js +++ b/tests/unit/specs/alert/ConfigYamlIris002.spec.js @@ -32,7 +32,6 @@ iris_alert_source_link: "b" iris_alert_status_id: 3 iris_alert_tags: "c" iris_api_token: "abcdefghijklmnopqrstuvwxyz" -iris_ca_cert: true iris_case_template_id: 5 iris_customer_id: 4 iris_description: "d"