From 3fc10bb16d19a4e1849cf3a06034471b4380e1a8 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 5 Mar 2020 17:37:23 -0100 Subject: [PATCH] mgr/dashboard: Update prettier Fix all new linting errors. Fixes: https://tracker.ceph.com/issues/44451 Signed-off-by: Tiago Melo (cherry picked from commit bd08daad2e380c1df2d9ba49609210095a28470d) --- .../e2e/cluster/mgr-modules.e2e-spec.ts | 10 +- .../dashboard/frontend/e2e/page-helper.po.ts | 6 +- .../mgr/dashboard/frontend/package-lock.json | 1515 ++++++++++------- .../mgr/dashboard/frontend/package.json | 4 +- .../ceph/block/iscsi/iscsi.component.spec.ts | 12 +- .../rbd-snapshot-list.component.spec.ts | 2 +- .../cephfs-chart.component.spec.ts | 7 +- .../cephfs-directories.component.spec.ts | 38 +- .../cluster/monitor/monitor.component.spec.ts | 24 +- .../osd/osd-list/osd-list.component.spec.ts | 10 +- .../ceph/dashboard/osd-summary.pipe.spec.ts | 24 +- .../nfs/nfs-form/nfs-form.component.spec.ts | 12 +- .../crush-rule-form-modal.component.ts | 5 +- .../pool-form/pool-form.component.spec.ts | 12 +- .../pool/pool-form/pool-form.component.ts | 3 +- .../pool-list/pool-list.component.spec.ts | 9 +- .../app/shared/api/prometheus.service.spec.ts | 15 +- ...tical-confirmation-modal.component.spec.ts | 4 +- .../table-key-value.component.spec.ts | 36 +- .../datatable/table/table.component.spec.ts | 20 +- .../app/shared/forms/cd-validators.spec.ts | 5 +- .../prometheus-notification.service.ts | 10 +- 22 files changed, 1063 insertions(+), 720 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts index 56a9d4cae6d29..d14f35a4514ee 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts @@ -27,7 +27,10 @@ describe('Manager modules page', () => { }); it('should test editing on diskprediction_local module', async () => { - const diskpredLocalArr = [['11', 'predict_interval'], ['0122', 'sleep_interval']]; + const diskpredLocalArr = [ + ['11', 'predict_interval'], + ['0122', 'sleep_interval'] + ]; await mgrmodules.editMgrModule('diskprediction_local', diskpredLocalArr); }); @@ -37,7 +40,10 @@ describe('Manager modules page', () => { }); it('should test editing on dashboard module', async () => { - const dashboardArr = [['rq', 'RGW_API_USER_ID'], ['rafa', 'GRAFANA_API_PASSWORD']]; + const dashboardArr = [ + ['rq', 'RGW_API_USER_ID'], + ['rafa', 'GRAFANA_API_PASSWORD'] + ]; await mgrmodules.editMgrModule('dashboard', dashboardArr); }); diff --git a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts index 55b84eaed49e1..aea78626d8740 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts @@ -327,9 +327,9 @@ export abstract class PageHelper { * Uncheck all checked table rows. */ async uncheckAllTableRows() { - await $$('.datatable-body-cell-label .datatable-checkbox input[type=checkbox]:checked').each( - (e: ElementFinder) => e.click() - ); + await $$( + '.datatable-body-cell-label .datatable-checkbox input[type=checkbox]:checked' + ).each((e: ElementFinder) => e.click()); } async filterTable(name: string, option: string) { diff --git a/src/pybind/mgr/dashboard/frontend/package-lock.json b/src/pybind/mgr/dashboard/frontend/package-lock.json index a042d28572f60..ff5e632f74387 100644 --- a/src/pybind/mgr/dashboard/frontend/package-lock.json +++ b/src/pybind/mgr/dashboard/frontend/package-lock.json @@ -1036,13 +1036,13 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dependencies": { - "abbrev": { + "npm-bundled": { "version": "1.1.1", "bundled": true, "optional": true }, - "ansi-regex": { - "version": "2.1.1", + "semver": { + "version": "5.7.1", "bundled": true, "optional": true }, @@ -1060,27 +1060,29 @@ "readable-stream": "^2.0.6" } }, - "balanced-match": { - "version": "1.0.0", + "safe-buffer": { + "version": "5.1.2", "bundled": true, "optional": true }, - "brace-expansion": { - "version": "1.1.11", + "process-nextick-args": { + "version": "2.0.1", "bundled": true, "optional": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, - "chownr": { - "version": "1.1.3", + "safer-buffer": { + "version": "2.1.2", "bundled": true, "optional": true }, - "code-point-at": { - "version": "1.1.0", + "wide-align": { + "version": "1.1.3", "bundled": true, "optional": true }, @@ -1104,11 +1106,11 @@ "bundled": true, "optional": true, "requires": { - "ms": "^2.1.1" + "string-width": "^1.0.2 || 2" } }, - "deep-extend": { - "version": "0.6.0", + "once": { + "version": "1.4.0", "bundled": true, "optional": true }, @@ -1127,11 +1129,11 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.6.0" + "wrappy": "1" } }, - "fs.realpath": { - "version": "1.0.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "optional": true }, @@ -1140,66 +1142,61 @@ "bundled": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "ansi-regex": "^2.0.0" } }, - "glob": { - "version": "7.1.6", + "nopt": { + "version": "4.0.1", "bundled": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "abbrev": "1", + "osenv": "^0.1.4" } }, - "has-unicode": { - "version": "2.0.1", + "console-control-strings": { + "version": "1.1.0", "bundled": true, "optional": true }, - "iconv-lite": { - "version": "0.4.24", + "fs.realpath": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, - "ignore-walk": { - "version": "3.0.3", + "tar": { + "version": "4.4.13", "bundled": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, - "inflight": { - "version": "1.0.6", + "brace-expansion": { + "version": "1.1.11", "bundled": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "inherits": { - "version": "2.0.4", + "os-tmpdir": { + "version": "1.0.2", "bundled": true, "optional": true }, - "ini": { - "version": "1.3.5", + "minipass": { + "version": "2.9.0", "bundled": true, "optional": true }, @@ -1208,24 +1205,35 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, - "isarray": { - "version": "1.0.0", + "yallist": { + "version": "3.1.1", "bundled": true, "optional": true }, - "minimatch": { - "version": "3.0.4", + "code-point-at": { + "version": "1.1.0", "bundled": true, "optional": true, "requires": { - "brace-expansion": "^1.1.7" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } } }, - "minimist": { - "version": "0.0.8", + "deep-extend": { + "version": "0.6.0", "bundled": true, "optional": true }, @@ -1246,29 +1254,33 @@ "minipass": "^2.9.0" } }, - "mkdirp": { - "version": "0.5.1", + "osenv": { + "version": "0.1.5", "bundled": true, "optional": true, "requires": { - "minimist": "0.0.8" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "ms": { - "version": "2.1.2", + "signal-exit": { + "version": "3.0.2", "bundled": true, "optional": true }, - "needle": { - "version": "2.4.0", + "is-fullwidth-code-point": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "number-is-nan": "^1.0.0" } }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, "node-pre-gyp": { "version": "0.14.0", "bundled": true, @@ -1285,30 +1297,36 @@ "tar": "^4.4.2" } }, - "nopt": { - "version": "4.0.1", + "gauge": { + "version": "2.7.4", "bundled": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, - "npm-bundled": { - "version": "1.1.1", + "ansi-regex": { + "version": "2.1.1", "bundled": true, "optional": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, - "npm-normalize-package-bin": { - "version": "1.0.1", + "has-unicode": { + "version": "2.0.1", "bundled": true, "optional": true }, - "npm-packlist": { - "version": "1.4.7", + "os-homedir": { + "version": "1.0.2", "bundled": true, "optional": true, "requires": { @@ -1316,66 +1334,69 @@ "npm-bundled": "^1.0.1" } }, - "npmlog": { - "version": "4.1.2", + "ms": { + "version": "2.1.2", "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "number-is-nan": { - "version": "1.0.1", + "aproba": { + "version": "1.2.0", "bundled": true, "optional": true }, - "object-assign": { - "version": "4.1.1", + "strip-json-comments": { + "version": "2.0.1", "bundled": true, "optional": true }, - "once": { - "version": "1.4.0", + "inherits": { + "version": "2.0.4", "bundled": true, "optional": true, "requires": { - "wrappy": "1" + "ms": "^2.1.1" } }, - "os-homedir": { + "util-deprecate": { "version": "1.0.2", "bundled": true, "optional": true }, - "os-tmpdir": { - "version": "1.0.2", + "chownr": { + "version": "1.1.3", "bundled": true, "optional": true }, - "osenv": { - "version": "0.1.5", + "npm-packlist": { + "version": "1.4.7", "bundled": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, - "path-is-absolute": { - "version": "1.0.1", + "balanced-match": { + "version": "1.0.0", "bundled": true, "optional": true }, - "process-nextick-args": { - "version": "2.0.1", + "string-width": { + "version": "1.0.2", "bundled": true, "optional": true }, - "rc": { - "version": "1.2.8", + "needle": { + "version": "2.4.0", "bundled": true, "optional": true, "requires": { @@ -1392,118 +1413,110 @@ } } }, - "readable-stream": { - "version": "2.3.6", + "ini": { + "version": "1.3.5", "bundled": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "brace-expansion": "^1.1.7" } }, - "rimraf": { - "version": "2.7.1", + "mkdirp": { + "version": "0.5.1", "bundled": true, "optional": true, "requires": { - "glob": "^7.1.3" + "minimist": "0.0.8" } }, - "safe-buffer": { - "version": "5.1.2", + "set-blocking": { + "version": "2.0.0", "bundled": true, "optional": true }, - "safer-buffer": { - "version": "2.1.2", + "wrappy": { + "version": "1.0.2", "bundled": true, "optional": true }, - "sax": { - "version": "1.2.4", + "fs-minipass": { + "version": "1.2.7", "bundled": true, "optional": true }, - "semver": { - "version": "5.7.1", + "number-is-nan": { + "version": "1.0.1", "bundled": true, "optional": true }, - "set-blocking": { - "version": "2.0.0", + "isarray": { + "version": "1.0.0", "bundled": true, "optional": true }, - "signal-exit": { - "version": "3.0.2", + "rimraf": { + "version": "2.7.1", "bundled": true, "optional": true }, - "string-width": { - "version": "1.0.2", + "glob": { + "version": "7.1.6", "bundled": true, "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "string_decoder": { - "version": "1.1.1", + "object-assign": { + "version": "4.1.1", "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "minimatch": "^3.0.4" } }, - "strip-ansi": { - "version": "3.0.1", + "inflight": { + "version": "1.0.6", "bundled": true, "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "once": "^1.3.0", + "wrappy": "1" } }, - "strip-json-comments": { - "version": "2.0.1", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "optional": true }, - "tar": { - "version": "4.4.13", + "iconv-lite": { + "version": "0.4.24", "bundled": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "safer-buffer": ">= 2.1.2 < 3" } }, - "util-deprecate": { - "version": "1.0.2", + "detect-libc": { + "version": "1.0.3", "bundled": true, "optional": true }, - "wide-align": { - "version": "1.1.3", + "string_decoder": { + "version": "1.1.1", "bundled": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "safe-buffer": "~5.1.0" } }, - "wrappy": { - "version": "1.0.2", + "abbrev": { + "version": "1.1.1", "bundled": true, "optional": true }, @@ -11641,13 +11654,13 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dependencies": { - "abbrev": { + "npm-bundled": { "version": "1.1.1", "bundled": true, "optional": true }, - "ansi-regex": { - "version": "2.1.1", + "semver": { + "version": "5.7.1", "bundled": true, "optional": true }, @@ -11665,27 +11678,29 @@ "readable-stream": "^2.0.6" } }, - "balanced-match": { - "version": "1.0.0", + "safe-buffer": { + "version": "5.1.2", "bundled": true, "optional": true }, - "brace-expansion": { - "version": "1.1.11", + "process-nextick-args": { + "version": "2.0.1", "bundled": true, "optional": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, - "chownr": { - "version": "1.1.3", + "safer-buffer": { + "version": "2.1.2", "bundled": true, "optional": true }, - "code-point-at": { - "version": "1.1.0", + "wide-align": { + "version": "1.1.3", "bundled": true, "optional": true }, @@ -11709,11 +11724,11 @@ "bundled": true, "optional": true, "requires": { - "ms": "^2.1.1" + "string-width": "^1.0.2 || 2" } }, - "deep-extend": { - "version": "0.6.0", + "once": { + "version": "1.4.0", "bundled": true, "optional": true }, @@ -11732,11 +11747,11 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.6.0" + "wrappy": "1" } }, - "fs.realpath": { - "version": "1.0.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "optional": true }, @@ -11745,66 +11760,61 @@ "bundled": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "ansi-regex": "^2.0.0" } }, - "glob": { - "version": "7.1.6", + "nopt": { + "version": "4.0.1", "bundled": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "abbrev": "1", + "osenv": "^0.1.4" } }, - "has-unicode": { - "version": "2.0.1", + "console-control-strings": { + "version": "1.1.0", "bundled": true, "optional": true }, - "iconv-lite": { - "version": "0.4.24", + "fs.realpath": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, - "ignore-walk": { - "version": "3.0.3", + "tar": { + "version": "4.4.13", "bundled": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, - "inflight": { - "version": "1.0.6", + "brace-expansion": { + "version": "1.1.11", "bundled": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "inherits": { - "version": "2.0.4", + "os-tmpdir": { + "version": "1.0.2", "bundled": true, "optional": true }, - "ini": { - "version": "1.3.5", + "minipass": { + "version": "2.9.0", "bundled": true, "optional": true }, @@ -11813,24 +11823,35 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, - "isarray": { - "version": "1.0.0", + "yallist": { + "version": "3.1.1", "bundled": true, "optional": true }, - "minimatch": { - "version": "3.0.4", + "code-point-at": { + "version": "1.1.0", "bundled": true, "optional": true, "requires": { - "brace-expansion": "^1.1.7" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } } }, - "minimist": { - "version": "0.0.8", + "deep-extend": { + "version": "0.6.0", "bundled": true, "optional": true }, @@ -11851,29 +11872,33 @@ "minipass": "^2.9.0" } }, - "mkdirp": { - "version": "0.5.1", + "osenv": { + "version": "0.1.5", "bundled": true, "optional": true, "requires": { - "minimist": "0.0.8" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "ms": { - "version": "2.1.2", + "signal-exit": { + "version": "3.0.2", "bundled": true, "optional": true }, - "needle": { - "version": "2.4.0", + "is-fullwidth-code-point": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "number-is-nan": "^1.0.0" } }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, "node-pre-gyp": { "version": "0.14.0", "bundled": true, @@ -11890,30 +11915,36 @@ "tar": "^4.4.2" } }, - "nopt": { - "version": "4.0.1", + "gauge": { + "version": "2.7.4", "bundled": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, - "npm-bundled": { - "version": "1.1.1", + "ansi-regex": { + "version": "2.1.1", "bundled": true, "optional": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, - "npm-normalize-package-bin": { - "version": "1.0.1", + "has-unicode": { + "version": "2.0.1", "bundled": true, "optional": true }, - "npm-packlist": { - "version": "1.4.7", + "os-homedir": { + "version": "1.0.2", "bundled": true, "optional": true, "requires": { @@ -11921,66 +11952,69 @@ "npm-bundled": "^1.0.1" } }, - "npmlog": { - "version": "4.1.2", + "ms": { + "version": "2.1.2", "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "number-is-nan": { - "version": "1.0.1", + "aproba": { + "version": "1.2.0", "bundled": true, "optional": true }, - "object-assign": { - "version": "4.1.1", + "strip-json-comments": { + "version": "2.0.1", "bundled": true, "optional": true }, - "once": { - "version": "1.4.0", + "inherits": { + "version": "2.0.4", "bundled": true, "optional": true, "requires": { - "wrappy": "1" + "ms": "^2.1.1" } }, - "os-homedir": { + "util-deprecate": { "version": "1.0.2", "bundled": true, "optional": true }, - "os-tmpdir": { - "version": "1.0.2", + "chownr": { + "version": "1.1.3", "bundled": true, "optional": true }, - "osenv": { - "version": "0.1.5", + "npm-packlist": { + "version": "1.4.7", "bundled": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, - "path-is-absolute": { - "version": "1.0.1", + "balanced-match": { + "version": "1.0.0", "bundled": true, "optional": true }, - "process-nextick-args": { - "version": "2.0.1", + "string-width": { + "version": "1.0.2", "bundled": true, "optional": true }, - "rc": { - "version": "1.2.8", + "needle": { + "version": "2.4.0", "bundled": true, "optional": true, "requires": { @@ -11997,118 +12031,110 @@ } } }, - "readable-stream": { - "version": "2.3.6", + "ini": { + "version": "1.3.5", "bundled": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "brace-expansion": "^1.1.7" } }, - "rimraf": { - "version": "2.7.1", + "mkdirp": { + "version": "0.5.1", "bundled": true, "optional": true, "requires": { - "glob": "^7.1.3" + "minimist": "0.0.8" } }, - "safe-buffer": { - "version": "5.1.2", + "set-blocking": { + "version": "2.0.0", "bundled": true, "optional": true }, - "safer-buffer": { - "version": "2.1.2", + "wrappy": { + "version": "1.0.2", "bundled": true, "optional": true }, - "sax": { - "version": "1.2.4", + "fs-minipass": { + "version": "1.2.7", "bundled": true, "optional": true }, - "semver": { - "version": "5.7.1", + "number-is-nan": { + "version": "1.0.1", "bundled": true, "optional": true }, - "set-blocking": { - "version": "2.0.0", + "isarray": { + "version": "1.0.0", "bundled": true, "optional": true }, - "signal-exit": { - "version": "3.0.2", + "rimraf": { + "version": "2.7.1", "bundled": true, "optional": true }, - "string-width": { - "version": "1.0.2", + "glob": { + "version": "7.1.6", "bundled": true, "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "string_decoder": { - "version": "1.1.1", + "object-assign": { + "version": "4.1.1", "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "minimatch": "^3.0.4" } }, - "strip-ansi": { - "version": "3.0.1", + "inflight": { + "version": "1.0.6", "bundled": true, "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "once": "^1.3.0", + "wrappy": "1" } }, - "strip-json-comments": { - "version": "2.0.1", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "optional": true }, - "tar": { - "version": "4.4.13", + "iconv-lite": { + "version": "0.4.24", "bundled": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "safer-buffer": ">= 2.1.2 < 3" } }, - "util-deprecate": { - "version": "1.0.2", + "detect-libc": { + "version": "1.0.3", "bundled": true, "optional": true }, - "wide-align": { - "version": "1.1.3", + "string_decoder": { + "version": "1.1.1", "bundled": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "safe-buffer": "~5.1.0" } }, - "wrappy": { - "version": "1.0.2", + "abbrev": { + "version": "1.1.1", "bundled": true, "optional": true }, @@ -14248,9 +14274,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": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, "pretty-format": { @@ -14274,51 +14300,192 @@ } }, "pretty-quick": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-1.11.1.tgz", - "integrity": "sha512-kSXCkcETfak7EQXz6WOkCeCqpbC4GIzrN/vaneTGMP/fAtD8NerA9bPhCUqHAks1geo7biZNl5uEMPceeneLuA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-2.0.1.tgz", + "integrity": "sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg==", "dev": true, "requires": { - "chalk": "^2.3.0", - "execa": "^0.8.0", - "find-up": "^2.1.0", - "ignore": "^3.3.7", - "mri": "^1.1.0", - "multimatch": "^3.0.0" + "chalk": "^2.4.2", + "execa": "^2.1.0", + "find-up": "^4.1.0", + "ignore": "^5.1.4", + "mri": "^1.1.4", + "multimatch": "^4.0.0" }, "dependencies": { "array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "dev": true + }, + "array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz", - "integrity": "sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, + "arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "dev": true }, + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, "execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz", + "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^3.0.0", + "onetime": "^5.1.0", + "p-finally": "^2.0.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "dev": true + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" } }, "multimatch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz", - "integrity": "sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz", + "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==", "dev": true, "requires": { - "array-differ": "^2.0.3", - "array-union": "^1.0.2", - "arrify": "^1.0.1", + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", "minimatch": "^3.0.4" } + }, + "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==", + "dev": true, + "requires": { + "path-key": "^3.0.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 + }, + "p-limit": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "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 + }, + "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": { + "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 + }, + "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" + } } } }, @@ -16696,6 +16863,12 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true + }, "style-loader": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz", @@ -18402,13 +18575,13 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dependencies": { - "abbrev": { + "npm-bundled": { "version": "1.1.1", "bundled": true, "optional": true }, - "ansi-regex": { - "version": "2.1.1", + "semver": { + "version": "5.7.1", "bundled": true, "optional": true }, @@ -18426,27 +18599,29 @@ "readable-stream": "^2.0.6" } }, - "balanced-match": { - "version": "1.0.0", + "safe-buffer": { + "version": "5.1.2", "bundled": true, "optional": true }, - "brace-expansion": { - "version": "1.1.11", + "process-nextick-args": { + "version": "2.0.1", "bundled": true, "optional": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, - "chownr": { - "version": "1.1.3", + "safer-buffer": { + "version": "2.1.2", "bundled": true, "optional": true }, - "code-point-at": { - "version": "1.1.0", + "wide-align": { + "version": "1.1.3", "bundled": true, "optional": true }, @@ -18470,11 +18645,11 @@ "bundled": true, "optional": true, "requires": { - "ms": "^2.1.1" + "string-width": "^1.0.2 || 2" } }, - "deep-extend": { - "version": "0.6.0", + "once": { + "version": "1.4.0", "bundled": true, "optional": true }, @@ -18493,11 +18668,11 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.6.0" + "wrappy": "1" } }, - "fs.realpath": { - "version": "1.0.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "optional": true }, @@ -18506,66 +18681,61 @@ "bundled": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "ansi-regex": "^2.0.0" } }, - "glob": { - "version": "7.1.6", + "nopt": { + "version": "4.0.1", "bundled": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "abbrev": "1", + "osenv": "^0.1.4" } }, - "has-unicode": { - "version": "2.0.1", + "console-control-strings": { + "version": "1.1.0", "bundled": true, "optional": true }, - "iconv-lite": { - "version": "0.4.24", + "fs.realpath": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, - "ignore-walk": { - "version": "3.0.3", + "tar": { + "version": "4.4.13", "bundled": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, - "inflight": { - "version": "1.0.6", + "brace-expansion": { + "version": "1.1.11", "bundled": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "inherits": { - "version": "2.0.4", + "os-tmpdir": { + "version": "1.0.2", "bundled": true, "optional": true }, - "ini": { - "version": "1.3.5", + "minipass": { + "version": "2.9.0", "bundled": true, "optional": true }, @@ -18574,24 +18744,35 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, - "isarray": { - "version": "1.0.0", + "yallist": { + "version": "3.1.1", "bundled": true, "optional": true }, - "minimatch": { - "version": "3.0.4", + "code-point-at": { + "version": "1.1.0", "bundled": true, "optional": true, "requires": { - "brace-expansion": "^1.1.7" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } } }, - "minimist": { - "version": "0.0.8", + "deep-extend": { + "version": "0.6.0", "bundled": true, "optional": true }, @@ -18612,29 +18793,33 @@ "minipass": "^2.9.0" } }, - "mkdirp": { - "version": "0.5.1", + "osenv": { + "version": "0.1.5", "bundled": true, "optional": true, "requires": { - "minimist": "0.0.8" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "ms": { - "version": "2.1.2", + "signal-exit": { + "version": "3.0.2", "bundled": true, "optional": true }, - "needle": { - "version": "2.4.0", + "is-fullwidth-code-point": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "number-is-nan": "^1.0.0" } }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, "node-pre-gyp": { "version": "0.14.0", "bundled": true, @@ -18651,30 +18836,36 @@ "tar": "^4.4.2" } }, - "nopt": { - "version": "4.0.1", + "gauge": { + "version": "2.7.4", "bundled": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, - "npm-bundled": { - "version": "1.1.1", + "ansi-regex": { + "version": "2.1.1", "bundled": true, "optional": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, - "npm-normalize-package-bin": { - "version": "1.0.1", + "has-unicode": { + "version": "2.0.1", "bundled": true, "optional": true }, - "npm-packlist": { - "version": "1.4.7", + "os-homedir": { + "version": "1.0.2", "bundled": true, "optional": true, "requires": { @@ -18682,66 +18873,69 @@ "npm-bundled": "^1.0.1" } }, - "npmlog": { - "version": "4.1.2", + "ms": { + "version": "2.1.2", "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "number-is-nan": { - "version": "1.0.1", + "aproba": { + "version": "1.2.0", "bundled": true, "optional": true }, - "object-assign": { - "version": "4.1.1", + "strip-json-comments": { + "version": "2.0.1", "bundled": true, "optional": true }, - "once": { - "version": "1.4.0", + "inherits": { + "version": "2.0.4", "bundled": true, "optional": true, "requires": { - "wrappy": "1" + "ms": "^2.1.1" } }, - "os-homedir": { + "util-deprecate": { "version": "1.0.2", "bundled": true, "optional": true }, - "os-tmpdir": { - "version": "1.0.2", + "chownr": { + "version": "1.1.3", "bundled": true, "optional": true }, - "osenv": { - "version": "0.1.5", + "npm-packlist": { + "version": "1.4.7", "bundled": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, - "path-is-absolute": { - "version": "1.0.1", + "balanced-match": { + "version": "1.0.0", "bundled": true, "optional": true }, - "process-nextick-args": { - "version": "2.0.1", + "string-width": { + "version": "1.0.2", "bundled": true, "optional": true }, - "rc": { - "version": "1.2.8", + "needle": { + "version": "2.4.0", "bundled": true, "optional": true, "requires": { @@ -18758,118 +18952,110 @@ } } }, - "readable-stream": { - "version": "2.3.6", + "ini": { + "version": "1.3.5", "bundled": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "brace-expansion": "^1.1.7" } }, - "rimraf": { - "version": "2.7.1", + "mkdirp": { + "version": "0.5.1", "bundled": true, "optional": true, "requires": { - "glob": "^7.1.3" + "minimist": "0.0.8" } }, - "safe-buffer": { - "version": "5.1.2", + "set-blocking": { + "version": "2.0.0", "bundled": true, "optional": true }, - "safer-buffer": { - "version": "2.1.2", + "wrappy": { + "version": "1.0.2", "bundled": true, "optional": true }, - "sax": { - "version": "1.2.4", + "fs-minipass": { + "version": "1.2.7", "bundled": true, "optional": true }, - "semver": { - "version": "5.7.1", + "number-is-nan": { + "version": "1.0.1", "bundled": true, "optional": true }, - "set-blocking": { - "version": "2.0.0", + "isarray": { + "version": "1.0.0", "bundled": true, "optional": true }, - "signal-exit": { - "version": "3.0.2", + "rimraf": { + "version": "2.7.1", "bundled": true, "optional": true }, - "string-width": { - "version": "1.0.2", + "glob": { + "version": "7.1.6", "bundled": true, "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "string_decoder": { - "version": "1.1.1", + "object-assign": { + "version": "4.1.1", "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "minimatch": "^3.0.4" } }, - "strip-ansi": { - "version": "3.0.1", + "inflight": { + "version": "1.0.6", "bundled": true, "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "once": "^1.3.0", + "wrappy": "1" } }, - "strip-json-comments": { - "version": "2.0.1", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "optional": true }, - "tar": { - "version": "4.4.13", + "iconv-lite": { + "version": "0.4.24", "bundled": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "safer-buffer": ">= 2.1.2 < 3" } }, - "util-deprecate": { - "version": "1.0.2", + "detect-libc": { + "version": "1.0.3", "bundled": true, "optional": true }, - "wide-align": { - "version": "1.1.3", + "string_decoder": { + "version": "1.1.1", "bundled": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "safe-buffer": "~5.1.0" } }, - "wrappy": { - "version": "1.0.2", + "abbrev": { + "version": "1.1.1", "bundled": true, "optional": true }, @@ -19805,13 +19991,13 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", "dependencies": { - "abbrev": { + "npm-bundled": { "version": "1.1.1", "bundled": true, "optional": true }, - "ansi-regex": { - "version": "2.1.1", + "semver": { + "version": "5.7.1", "bundled": true, "optional": true }, @@ -19829,27 +20015,29 @@ "readable-stream": "^2.0.6" } }, - "balanced-match": { - "version": "1.0.0", + "safe-buffer": { + "version": "5.1.2", "bundled": true, "optional": true }, - "brace-expansion": { - "version": "1.1.11", + "process-nextick-args": { + "version": "2.0.1", "bundled": true, "optional": true, "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, - "chownr": { - "version": "1.1.3", + "safer-buffer": { + "version": "2.1.2", "bundled": true, "optional": true }, - "code-point-at": { - "version": "1.1.0", + "wide-align": { + "version": "1.1.3", "bundled": true, "optional": true }, @@ -19873,11 +20061,11 @@ "bundled": true, "optional": true, "requires": { - "ms": "^2.1.1" + "string-width": "^1.0.2 || 2" } }, - "deep-extend": { - "version": "0.6.0", + "once": { + "version": "1.4.0", "bundled": true, "optional": true }, @@ -19896,11 +20084,11 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.6.0" + "wrappy": "1" } }, - "fs.realpath": { - "version": "1.0.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "optional": true }, @@ -19909,66 +20097,61 @@ "bundled": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "ansi-regex": "^2.0.0" } }, - "glob": { - "version": "7.1.6", + "nopt": { + "version": "4.0.1", "bundled": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "abbrev": "1", + "osenv": "^0.1.4" } }, - "has-unicode": { - "version": "2.0.1", + "console-control-strings": { + "version": "1.1.0", "bundled": true, "optional": true }, - "iconv-lite": { - "version": "0.4.24", + "fs.realpath": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } }, - "ignore-walk": { - "version": "3.0.3", + "tar": { + "version": "4.4.13", "bundled": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" } }, - "inflight": { - "version": "1.0.6", + "brace-expansion": { + "version": "1.1.11", "bundled": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "inherits": { - "version": "2.0.4", + "os-tmpdir": { + "version": "1.0.2", "bundled": true, "optional": true }, - "ini": { - "version": "1.3.5", + "minipass": { + "version": "2.9.0", "bundled": true, "optional": true }, @@ -19977,24 +20160,35 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, - "isarray": { - "version": "1.0.0", + "yallist": { + "version": "3.1.1", "bundled": true, "optional": true }, - "minimatch": { - "version": "3.0.4", + "code-point-at": { + "version": "1.1.0", "bundled": true, "optional": true, "requires": { - "brace-expansion": "^1.1.7" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } } }, - "minimist": { - "version": "0.0.8", + "deep-extend": { + "version": "0.6.0", "bundled": true, "optional": true }, @@ -20015,29 +20209,33 @@ "minipass": "^2.9.0" } }, - "mkdirp": { - "version": "0.5.1", + "osenv": { + "version": "0.1.5", "bundled": true, "optional": true, "requires": { - "minimist": "0.0.8" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "ms": { - "version": "2.1.2", + "signal-exit": { + "version": "3.0.2", "bundled": true, "optional": true }, - "needle": { - "version": "2.4.0", + "is-fullwidth-code-point": { + "version": "1.0.0", "bundled": true, "optional": true, "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "number-is-nan": "^1.0.0" } }, + "sax": { + "version": "1.2.4", + "bundled": true, + "optional": true + }, "node-pre-gyp": { "version": "0.14.0", "bundled": true, @@ -20054,30 +20252,36 @@ "tar": "^4.4.2" } }, - "nopt": { - "version": "4.0.1", + "gauge": { + "version": "2.7.4", "bundled": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, - "npm-bundled": { - "version": "1.1.1", + "ansi-regex": { + "version": "2.1.1", "bundled": true, "optional": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, - "npm-normalize-package-bin": { - "version": "1.0.1", + "has-unicode": { + "version": "2.0.1", "bundled": true, "optional": true }, - "npm-packlist": { - "version": "1.4.7", + "os-homedir": { + "version": "1.0.2", "bundled": true, "optional": true, "requires": { @@ -20085,66 +20289,69 @@ "npm-bundled": "^1.0.1" } }, - "npmlog": { - "version": "4.1.2", + "ms": { + "version": "2.1.2", "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "number-is-nan": { - "version": "1.0.1", + "aproba": { + "version": "1.2.0", "bundled": true, "optional": true }, - "object-assign": { - "version": "4.1.1", + "strip-json-comments": { + "version": "2.0.1", "bundled": true, "optional": true }, - "once": { - "version": "1.4.0", + "inherits": { + "version": "2.0.4", "bundled": true, "optional": true, "requires": { - "wrappy": "1" + "ms": "^2.1.1" } }, - "os-homedir": { + "util-deprecate": { "version": "1.0.2", "bundled": true, "optional": true }, - "os-tmpdir": { - "version": "1.0.2", + "chownr": { + "version": "1.1.3", "bundled": true, "optional": true }, - "osenv": { - "version": "0.1.5", + "npm-packlist": { + "version": "1.4.7", "bundled": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, - "path-is-absolute": { - "version": "1.0.1", + "balanced-match": { + "version": "1.0.0", "bundled": true, "optional": true }, - "process-nextick-args": { - "version": "2.0.1", + "string-width": { + "version": "1.0.2", "bundled": true, "optional": true }, - "rc": { - "version": "1.2.8", + "needle": { + "version": "2.4.0", "bundled": true, "optional": true, "requires": { @@ -20161,118 +20368,110 @@ } } }, - "readable-stream": { - "version": "2.3.6", + "ini": { + "version": "1.3.5", "bundled": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "brace-expansion": "^1.1.7" } }, - "rimraf": { - "version": "2.7.1", + "mkdirp": { + "version": "0.5.1", "bundled": true, "optional": true, "requires": { - "glob": "^7.1.3" + "minimist": "0.0.8" } }, - "safe-buffer": { - "version": "5.1.2", + "set-blocking": { + "version": "2.0.0", "bundled": true, "optional": true }, - "safer-buffer": { - "version": "2.1.2", + "wrappy": { + "version": "1.0.2", "bundled": true, "optional": true }, - "sax": { - "version": "1.2.4", + "fs-minipass": { + "version": "1.2.7", "bundled": true, "optional": true }, - "semver": { - "version": "5.7.1", + "number-is-nan": { + "version": "1.0.1", "bundled": true, "optional": true }, - "set-blocking": { - "version": "2.0.0", + "isarray": { + "version": "1.0.0", "bundled": true, "optional": true }, - "signal-exit": { - "version": "3.0.2", + "rimraf": { + "version": "2.7.1", "bundled": true, "optional": true }, - "string-width": { - "version": "1.0.2", + "glob": { + "version": "7.1.6", "bundled": true, "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "string_decoder": { - "version": "1.1.1", + "object-assign": { + "version": "4.1.1", "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "minimatch": "^3.0.4" } }, - "strip-ansi": { - "version": "3.0.1", + "inflight": { + "version": "1.0.6", "bundled": true, "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "once": "^1.3.0", + "wrappy": "1" } }, - "strip-json-comments": { - "version": "2.0.1", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "optional": true }, - "tar": { - "version": "4.4.13", + "iconv-lite": { + "version": "0.4.24", "bundled": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.8.6", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" + "safer-buffer": ">= 2.1.2 < 3" } }, - "util-deprecate": { - "version": "1.0.2", + "detect-libc": { + "version": "1.0.3", "bundled": true, "optional": true }, - "wide-align": { - "version": "1.1.3", + "string_decoder": { + "version": "1.1.1", "bundled": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "safe-buffer": "~5.1.0" } }, - "wrappy": { - "version": "1.0.2", + "abbrev": { + "version": "1.1.1", "bundled": true, "optional": true }, diff --git a/src/pybind/mgr/dashboard/frontend/package.json b/src/pybind/mgr/dashboard/frontend/package.json index 7890e3560203d..1a632fe7c2db8 100644 --- a/src/pybind/mgr/dashboard/frontend/package.json +++ b/src/pybind/mgr/dashboard/frontend/package.json @@ -135,8 +135,8 @@ "ng-mocks": "^9.0.0", "npm-force-resolutions": "0.0.3", "npm-run-all": "4.1.5", - "prettier": "1.18.2", - "pretty-quick": "1.11.1", + "prettier": "1.19.1", + "pretty-quick": "2.0.1", "protractor": "5.4.2", "protractor-fail-fast": "3.1.0", "protractor-screenshoter-plugin": "0.10.3", diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts index f599c7f00a975..fc41d5e4042a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts @@ -66,8 +66,16 @@ describe('IscsiComponent', () => { it('should refresh with stats', () => { tcmuiscsiData.images.push({ stats_history: { - rd_bytes: [[1540551220, 0.0], [1540551225, 0.0], [1540551230, 0.0]], - wr_bytes: [[1540551220, 0.0], [1540551225, 0.0], [1540551230, 0.0]] + rd_bytes: [ + [1540551220, 0.0], + [1540551225, 0.0], + [1540551230, 0.0] + ], + wr_bytes: [ + [1540551220, 0.0], + [1540551225, 0.0], + [1540551230, 0.0] + ] } }); component.refresh(); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts index 4e4936171ca15..ea95a5540a6bc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts @@ -113,7 +113,7 @@ describe('RbdSnapshotListComponent', () => { }; }); - it('should call stopLoadingSpinner if the request fails', fakeAsync(() => { + it('should call stopLoadingSpinner if the request fails', fakeAsync(() => { expect(called).toBe(false); component._asyncTask('deleteSnapshot', 'rbd/snap/delete', 'someName'); tick(500); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts index 71cc4c4a6c184..9c8e4f95b6519 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts @@ -9,7 +9,12 @@ describe('CephfsChartComponent', () => { let component: CephfsChartComponent; let fixture: ComponentFixture; - const counter = [[0, 15], [5, 15], [10, 25], [15, 50]]; + const counter = [ + [0, 15], + [5, 15], + [10, 25], + [15, 50] + ]; configureTestBed({ imports: [ChartsModule], diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts index 0cdcdb4496bb0..f92a61475851c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts @@ -434,8 +434,14 @@ describe('CephfsDirectoriesComponent', () => { it('tests dir mock', () => { const path = '/a/b/c'; - mockData.createdSnaps = [{ path, name: 's1' }, { path, name: 's2' }]; - mockData.deletedSnaps = [{ path, name: 'someSnapshot2' }, { path, name: 's2' }]; + mockData.createdSnaps = [ + { path, name: 's1' }, + { path, name: 's2' } + ]; + mockData.deletedSnaps = [ + { path, name: 'someSnapshot2' }, + { path, name: 's2' } + ]; const dir = mockLib.dir('/a/b', 'c', 2); expect(dir.path).toBe('/a/b/c'); expect(dir.parent).toBe('/a/b'); @@ -623,28 +629,48 @@ describe('CephfsDirectoriesComponent', () => { describe('used quotas', () => { it('should use no quota if none is set', () => { - mockLib.setFourQuotaDirs([[0, 0], [0, 0], [0, 0], [0, 0]]); + mockLib.setFourQuotaDirs([ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ]); assert.noQuota('files'); assert.noQuota('bytes'); assert.dirQuotas(0, 0); }); it('should use quota from upper parents', () => { - mockLib.setFourQuotaDirs([[100, 0], [0, 8], [0, 0], [0, 0]]); + mockLib.setFourQuotaDirs([ + [100, 0], + [0, 8], + [0, 0], + [0, 0] + ]); assert.quotaIsInherited('files', 100, '/1'); assert.quotaIsInherited('bytes', '8 KiB', '/1/2'); assert.dirQuotas(0, 0); }); it('should use quota from the parent with the lowest value (deep inheritance)', () => { - mockLib.setFourQuotaDirs([[200, 1], [100, 4], [400, 3], [300, 2]]); + mockLib.setFourQuotaDirs([ + [200, 1], + [100, 4], + [400, 3], + [300, 2] + ]); assert.quotaIsInherited('files', 100, '/1/2'); assert.quotaIsInherited('bytes', '1 KiB', '/1'); assert.dirQuotas(2048, 300); }); it('should use current value', () => { - mockLib.setFourQuotaDirs([[200, 2], [300, 4], [400, 3], [100, 1]]); + mockLib.setFourQuotaDirs([ + [200, 2], + [300, 4], + [400, 3], + [100, 1] + ]); assert.quotaIsNotInherited('files', 100, 200); assert.quotaIsNotInherited('bytes', '1 KiB', 2048); assert.dirQuotas(1024, 100); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts index b7ade11d31dd2..029266474d239 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts @@ -29,13 +29,31 @@ describe('MonitorComponent', () => { stats: { num_sessions: [[1, 5]] } }, { - stats: { num_sessions: [[1, 1], [2, 10], [3, 1]] } + stats: { + num_sessions: [ + [1, 1], + [2, 10], + [3, 1] + ] + } }, { - stats: { num_sessions: [[1, 0], [2, 3]] } + stats: { + num_sessions: [ + [1, 0], + [2, 3] + ] + } }, { - stats: { num_sessions: [[1, 2], [2, 1], [3, 7], [4, 5]] } + stats: { + num_sessions: [ + [1, 2], + [2, 1], + [3, 7], + [4, 5] + ] + } } ], mon_status: null, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts index 501943515e1a9..bba92939450b3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts @@ -140,8 +140,14 @@ describe('OsdListComponent', () => { device_class: 'ssd' }, stats_history: { - op_out_bytes: [[n, n], [n * 2, n * 2]], - op_in_bytes: [[n * 3, n * 3], [n * 4, n * 4]] + op_out_bytes: [ + [n, n], + [n * 2, n * 2] + ], + op_in_bytes: [ + [n * 3, n * 3], + [n * 4, n * 4] + ] }, stats: { stat_bytes_used: n * n, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts index 6332017dd718f..5b7010907d340 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts @@ -23,7 +23,11 @@ describe('OsdSummaryPipe', () => { it('transforms having 3 osd with 3 up, 3 in, 0 down, 0 out', () => { const value = { - osds: [{ up: 1, in: 1 }, { up: 1, in: 1 }, { up: 1, in: 1 }] + osds: [ + { up: 1, in: 1 }, + { up: 1, in: 1 }, + { up: 1, in: 1 } + ] }; expect(pipe.transform(value)).toEqual([ { @@ -43,7 +47,11 @@ describe('OsdSummaryPipe', () => { it('transforms having 3 osd with 2 up, 1 in, 1 down, 1 out', () => { const value = { - osds: [{ up: 1, in: 1 }, { up: 1, in: 0 }, { up: 0, in: 0 }] + osds: [ + { up: 1, in: 1 }, + { up: 1, in: 0 }, + { up: 0, in: 0 } + ] }; expect(pipe.transform(value)).toEqual([ { @@ -71,7 +79,11 @@ describe('OsdSummaryPipe', () => { it('transforms having 3 osd with 2 up, 2 in, 1 down, 0 out', () => { const value = { - osds: [{ up: 1, in: 1 }, { up: 1, in: 1 }, { up: 0, in: 0 }] + osds: [ + { up: 1, in: 1 }, + { up: 1, in: 1 }, + { up: 0, in: 0 } + ] }; expect(pipe.transform(value)).toEqual([ { @@ -99,7 +111,11 @@ describe('OsdSummaryPipe', () => { it('transforms having 3 osd with 3 up, 2 in, 0 down, 1 out', () => { const value = { - osds: [{ up: 1, in: 1 }, { up: 1, in: 1 }, { up: 1, in: 0 }] + osds: [ + { up: 1, in: 1 }, + { up: 1, in: 1 }, + { up: 1, in: 0 } + ] }; expect(pipe.transform(value)).toEqual([ { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts index fcce5b21cbd40..2b138eba7bf26 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts @@ -61,13 +61,11 @@ describe('NfsFormComponent', () => { fixture.detectChanges(); httpTesting.expectOne('api/summary').flush([]); - httpTesting - .expectOne('api/nfs-ganesha/daemon') - .flush([ - { daemon_id: 'node1', cluster_id: 'cluster1' }, - { daemon_id: 'node2', cluster_id: 'cluster1' }, - { daemon_id: 'node5', cluster_id: 'cluster2' } - ]); + httpTesting.expectOne('api/nfs-ganesha/daemon').flush([ + { daemon_id: 'node1', cluster_id: 'cluster1' }, + { daemon_id: 'node2', cluster_id: 'cluster1' }, + { daemon_id: 'node5', cluster_id: 'cluster2' } + ]); httpTesting.expectOne('ui-api/nfs-ganesha/fsals').flush(['CEPH', 'RGW']); httpTesting.expectOne('ui-api/nfs-ganesha/cephx/clients').flush(['admin', 'fs', 'rgw']); httpTesting.expectOne('ui-api/nfs-ganesha/cephfs/filesystems').flush([{ id: 1, name: 'a' }]); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts index 58d7a450bb21a..27f30fbedfa22 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts @@ -80,7 +80,10 @@ export class CrushRuleFormModalComponent implements OnInit { nodes.forEach((node) => { this.easyNodes[node.id] = node; }); - this.buckets = _.sortBy(nodes.filter((n) => n.children), 'name'); + this.buckets = _.sortBy( + nodes.filter((n) => n.children), + 'name' + ); this.names = names; this.preSelectRoot(); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts index 8a9128ce1fb21..85c0fe6cd19c7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts @@ -1283,9 +1283,15 @@ describe('PoolFormComponent', () => { form.get(controlName).markAsPristine(); beforeEach(() => { - ['algorithm', 'maxBlobSize', 'minBlobSize', 'mode', 'pgNum', 'ratio', 'name'].forEach( - (name) => markControlAsPreviouslySet(name) - ); + [ + 'algorithm', + 'maxBlobSize', + 'minBlobSize', + 'mode', + 'pgNum', + 'ratio', + 'name' + ].forEach((name) => markControlAsPreviouslySet(name)); fixture.detectChanges(); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts index d8ceabe1b1a0d..7c1b409155ea5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts @@ -107,7 +107,8 @@ export class PoolFormComponent implements OnInit { this.permission = this.authStorageService.getPermissions().pool; if ( !this.permission.read || - ((!this.permission.update && this.editing) || (!this.permission.create && !this.editing)) + (!this.permission.update && this.editing) || + (!this.permission.create && !this.editing) ) { this.router.navigate(['/404']); } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts index d31eed16658f9..1650421002c7f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts @@ -320,7 +320,14 @@ describe('PoolListComponent', () => { stats: { bytes_used: { latest: 5, rate: 0, rates: [] }, max_avail: { latest: 15, rate: 0, rates: [] }, - rd_bytes: { latest: 6, rate: 4, rates: [[0, 2], [1, 6]] } + rd_bytes: { + latest: 6, + rate: 4, + rates: [ + [0, 2], + [1, 6] + ] + } }, pg_status: { 'active+clean': 8, down: 2 } }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts index b7e4e565ac057..f552a20134cca 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts @@ -128,7 +128,10 @@ describe('PrometheusService', () => { it('should get rewrite rules only', () => { service.getRules('rewrites').subscribe((rules) => { expect(rules).toEqual({ - groups: [{ name: 'test', rules: [] }, { name: 'recording_rule', rules: [] }] + groups: [ + { name: 'test', rules: [] }, + { name: 'recording_rule', rules: [] } + ] }); }); @@ -173,7 +176,10 @@ describe('PrometheusService', () => { beforeEach(() => { x = false; TestBed.get(SettingsService)['settings'] = {}; - service.ifAlertmanagerConfigured((v) => (x = v), () => (x = [])); + service.ifAlertmanagerConfigured( + (v) => (x = v), + () => (x = []) + ); host = 'http://localhost:9093'; }); @@ -211,7 +217,10 @@ describe('PrometheusService', () => { beforeEach(() => { x = false; TestBed.get(SettingsService)['settings'] = {}; - service.ifPrometheusConfigured((v) => (x = v), () => (x = [])); + service.ifPrometheusConfigured( + (v) => (x = v), + () => (x = []) + ); host = 'http://localhost:9090'; }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts index adcb95632cd4c..65a0288833966 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts @@ -202,7 +202,7 @@ describe('CriticalConfirmationModalComponent', () => { spyOn(mockComponent.ctrlRef, 'hide').and.callThrough(); }); - it('should test fake deletion that closes modal', fakeAsync(() => { + it('should test fake deletion that closes modal', fakeAsync(() => { // Before deletionCall expect(component.submitAction).not.toHaveBeenCalled(); // During deletionCall @@ -228,7 +228,7 @@ describe('CriticalConfirmationModalComponent', () => { spyOn(mockComponent, 'fakeDelete').and.callThrough(); }); - it('should delete and close modal', fakeAsync(() => { + it('should delete and close modal', fakeAsync(() => { // During deletionCall component.callSubmitAction(); expect(mockComponent.finished).toBe(undefined); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts index 90511da46f5cc..94a5d6f0f1bec 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts @@ -41,7 +41,11 @@ describe('TableKeyValueComponent', () => { }); it('should make key value object pairs out of arrays with length two', () => { - component.data = [['someKey', 0], ['arrayKey', [1, 2, 3]], [3, 'something']]; + component.data = [ + ['someKey', 0], + ['arrayKey', [1, 2, 3]], + [3, 'something'] + ]; component.ngOnInit(); const expected: any = [ { key: 'arrayKey', value: '1, 2, 3' }, @@ -52,14 +56,20 @@ describe('TableKeyValueComponent', () => { }); it('should not show data supposed to be have hidden by key', () => { - component.data = [['a', 1], ['b', 2]]; + component.data = [ + ['a', 1], + ['b', 2] + ]; component.hideKeys = ['a']; component.ngOnInit(); expect(component.tableData).toEqual([{ key: 'b', value: 2 }]); }); it('should remove items with objects as values', () => { - component.data = [[3, 'something'], ['will be removed', { a: 3, b: 4, c: 5 }]]; + component.data = [ + [3, 'something'], + ['will be removed', { a: 3, b: 4, c: 5 }] + ]; component.ngOnInit(); expect(component.tableData).toEqual([{ key: 3, value: 'something' }]); }); @@ -74,7 +84,10 @@ describe('TableKeyValueComponent', () => { }); it('does nothing if data does not need to be converted', () => { - component.data = [{ key: 3, value: 'something' }, { key: 'someKey', value: 0 }]; + component.data = [ + { key: 3, value: 'something' }, + { key: 'someKey', value: 0 } + ]; component.ngOnInit(); expect(component.tableData).toEqual(component.data); }); @@ -91,8 +104,14 @@ describe('TableKeyValueComponent', () => { it('tests makePairs()', () => { const makePairs = (data: any) => component['makePairs'](data); expect(makePairs([['dash', 'board']])).toEqual([{ key: 'dash', value: 'board' }]); - const pair = [{ key: 'dash', value: 'board' }, { key: 'ceph', value: 'mimic' }]; - const pairInverse = [{ key: 'ceph', value: 'mimic' }, { key: 'dash', value: 'board' }]; + const pair = [ + { key: 'dash', value: 'board' }, + { key: 'ceph', value: 'mimic' } + ]; + const pairInverse = [ + { key: 'ceph', value: 'mimic' }, + { key: 'dash', value: 'board' } + ]; expect(makePairs(pair)).toEqual(pairInverse); expect(makePairs({ dash: 'board' })).toEqual([{ key: 'dash', value: 'board' }]); expect(makePairs({ dash: 'board', ceph: 'mimic' })).toEqual(pairInverse); @@ -101,7 +120,10 @@ describe('TableKeyValueComponent', () => { it('tests makePairsFromArray()', () => { const makePairsFromArray = (data: any[]) => component['makePairsFromArray'](data); expect(makePairsFromArray([['dash', 'board']])).toEqual([{ key: 'dash', value: 'board' }]); - const pair = [{ key: 'dash', value: 'board' }, { key: 'ceph', value: 'mimic' }]; + const pair = [ + { key: 'dash', value: 'board' }, + { key: 'ceph', value: 'mimic' } + ]; expect(makePairsFromArray(pair)).toEqual(pair); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts index e87467396733d..42c5817a93708 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts @@ -161,7 +161,10 @@ describe('TableComponent', () => { // multiple expectColumnFiltered( - [{ filter: filterOdd, value: 'false' }, { filter: filterIndex, value: '2' }], + [ + { filter: filterOdd, value: 'false' }, + { filter: filterIndex, value: '2' } + ], [{ a: 2, b: 20, c: false }] ); @@ -361,14 +364,23 @@ describe('TableComponent', () => { }); it('should search through arrays', () => { - component.columns = [{ prop: 'a', name: 'Index' }, { prop: 'b', name: 'ArrayColumn' }]; + component.columns = [ + { prop: 'a', name: 'Index' }, + { prop: 'b', name: 'ArrayColumn' } + ]; - component.data = [{ a: 1, b: ['foo', 'bar'] }, { a: 2, b: ['baz', 'bazinga'] }]; + component.data = [ + { a: 1, b: ['foo', 'bar'] }, + { a: 2, b: ['baz', 'bazinga'] } + ]; expectSearch('bar', [{ a: 1, b: ['foo', 'bar'] }]); expectSearch('arraycolumn:bar arraycolumn:foo', [{ a: 1, b: ['foo', 'bar'] }]); expectSearch('arraycolumn:baz arraycolumn:inga', [{ a: 2, b: ['baz', 'bazinga'] }]); - component.data = [{ a: 1, b: [1, 2] }, { a: 2, b: [3, 4] }]; + component.data = [ + { a: 1, b: [1, 2] }, + { a: 2, b: [3, 4] } + ]; expectSearch('arraycolumn:1 arraycolumn:2', [{ a: 1, b: [1, 2] }]); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts index 6890a4d09a751..1c85540d78b89 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts @@ -321,7 +321,10 @@ describe('CdValidators', () => { describe('custom validation', () => { beforeEach(() => { form = new CdFormGroup({ - x: new FormControl(3, CdValidators.custom('odd', (x: number) => x % 2 === 1)), + x: new FormControl( + 3, + CdValidators.custom('odd', (x: number) => x % 2 === 1) + ), y: new FormControl( 5, CdValidators.custom('not-dividable-by-x', (y: number) => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.ts index d2b35b2599bd0..422c0b262ed99 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.ts @@ -25,12 +25,10 @@ export class PrometheusNotificationService { if (this.backendFailure) { return; } - this.prometheusService - .getNotifications(_.last(this.notifications)) - .subscribe( - (notifications) => this.handleNotifications(notifications), - () => (this.backendFailure = true) - ); + this.prometheusService.getNotifications(_.last(this.notifications)).subscribe( + (notifications) => this.handleNotifications(notifications), + () => (this.backendFailure = true) + ); } private handleNotifications(notifications: AlertmanagerNotification[]) { -- 2.39.5