diff --git a/static/package-lock.json b/static/package-lock.json index 330f3b0..705b141 100644 --- a/static/package-lock.json +++ b/static/package-lock.json @@ -4224,13 +4224,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4243,18 +4241,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -4357,8 +4352,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -4368,7 +4362,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4381,20 +4374,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.2.4", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4411,7 +4401,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -4484,8 +4473,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -4495,7 +4483,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -4601,7 +4588,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7754,11 +7740,12 @@ "integrity": "sha512-ni91yYtn8ldgf/pxrlwl9lkVcLURGzopSpJnEbbgG1v1EZWTobI8y7J3mx4Kxptkn0EeiQwnLel67G7XJSox4A==" }, "ngx-clipboard": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-8.1.1.tgz", - "integrity": "sha1-V0OQpt1IqhpYNQoUsaDXZCBElfU=", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/ngx-clipboard/-/ngx-clipboard-11.1.1.tgz", + "integrity": "sha512-dtS9u5B4tVheyAUwVvLva5PeWzx15DKvSYaYQL7sIsiWbo3kKbB9z9UTq8nFMRiHa8jMJKyhJ4gHHV7cUJSSzw==", "requires": { - "ngx-window-token": "0.0.4" + "ngx-window-token": "^1.0.0", + "tslib": "^1.9.0" } }, "ngx-cookie-service": { @@ -7772,9 +7759,12 @@ "integrity": "sha1-8xrvxeeOazUuaPKG8WxN6tGA1Dw=" }, "ngx-window-token": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/ngx-window-token/-/ngx-window-token-0.0.4.tgz", - "integrity": "sha1-R+eqpGVBHEq197oXYBvFk8lWxzY=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ngx-window-token/-/ngx-window-token-1.0.0.tgz", + "integrity": "sha512-n+ZTyuNKHGccKoaofIgNCSJ7XgfujDodSYOxauY5eE6s4sxCriMBZelBIMqjaEuIE2GleViIwlCzb/j45rakPA==", + "requires": { + "tslib": "^1.9.0" + } }, "no-case": { "version": "2.3.2", diff --git a/static/package.json b/static/package.json index 495615f..483a7c9 100644 --- a/static/package.json +++ b/static/package.json @@ -37,7 +37,7 @@ "jquery-ui": "^1.12.0", "jquery-ui-bundle": "^1.11.4", "ngx-bootstrap": "^3.0.1", - "ngx-clipboard": "^8.1.0", + "ngx-clipboard": "^11.1.1", "ngx-cookie-service": "^1.0.9", "ngx-infinite-scroll": "^0.5.2", "rxjs-compat": "^6.2.1", diff --git a/static/src/app/ranks/rank-list/rank-list.component.ts b/static/src/app/ranks/rank-list/rank-list.component.ts index 3d27787..11a54db 100644 --- a/static/src/app/ranks/rank-list/rank-list.component.ts +++ b/static/src/app/ranks/rank-list/rank-list.component.ts @@ -62,7 +62,7 @@ export class RankListComponent implements OnInit { this.router.navigate([{outlets: {'right': ['edit', rankId]}}], {relativeTo: this.route}); } - filterRanks(group: MatButtonToggleGroup) { + filterRanks(group?: MatButtonToggleGroup) { this.radioModel = UIHelpers.toggleReleaseButton(this.radioModel, group); this.ranks$ = this.rankService.findRanks(this.searchTerm.value, this.radioModel); } diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 408f163..0d174da 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -71,7 +71,7 @@ export class SquadListComponent implements OnInit { } } - filterSquads(group: MatButtonToggleGroup) { + filterSquads(group?: MatButtonToggleGroup) { this.radioModel = UIHelpers.toggleReleaseButton(this.radioModel, group); this.squads$ = this.squadService.findSquads(this.searchTerm.value, this.radioModel); } diff --git a/static/src/app/utils/global.helpers.ts b/static/src/app/utils/global.helpers.ts index f534699..ef317e3 100644 --- a/static/src/app/utils/global.helpers.ts +++ b/static/src/app/utils/global.helpers.ts @@ -11,11 +11,14 @@ export const CSSHelpers = { }; export const UIHelpers = { - toggleReleaseButton: (currentVal, group: MatButtonToggleGroup) => { - if (currentVal === group.value) { - group.value = ''; - return ''; + toggleReleaseButton: (currentVal, group?: MatButtonToggleGroup) => { + if (group) { + if (currentVal === group.value) { + group.value = ''; + return ''; + } + return group.value; } - return group.value; + return currentVal; } };