From 4983af48d1180ee609118d6b3a48147bf66dc23f Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Sat, 23 Jan 2021 01:23:32 +0100 Subject: [PATCH 01/76] Initial implementation --- package.json | 9 +- src/app/app-routing.module.ts | 2 + src/app/app.module.ts | 9 +- src/app/components/help/help.component.html | 3 + src/app/components/help/help.component.scss | 4 + .../help/report-issue/issue-list.tsx | 6 + .../report-issue/report-issue.component.html | 1 + .../report-issue/report-issue.component.scss | 0 .../report-issue.component.spec.ts | 0 .../report-issue/report-issue.component.tsx | 53 ++++ tsconfig.base.json | 1 + yarn.lock | 254 +++++++++++++++++- 12 files changed, 335 insertions(+), 7 deletions(-) create mode 100644 src/app/components/help/report-issue/issue-list.tsx create mode 100644 src/app/components/help/report-issue/report-issue.component.html create mode 100644 src/app/components/help/report-issue/report-issue.component.scss create mode 100644 src/app/components/help/report-issue/report-issue.component.spec.ts create mode 100644 src/app/components/help/report-issue/report-issue.component.tsx diff --git a/package.json b/package.json index 7766874e..d1ce2ce2 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,8 @@ }, "private": true, "dependencies": { + "@angular-react/core": "^3.0.0", + "@angular-react/fabric": "^3.0.0", "@angular/animations": "^11.0.8", "@angular/cdk": "^11.0.3", "@angular/common": "^11.0.8", @@ -54,6 +56,8 @@ "@sentry/browser": "^5.29.2", "@types/jest": "^26.0.20", "@types/mocha": "^8.2.0", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", "angular-resizable-element": "^3.3.4", @@ -64,8 +68,6 @@ "command-exists": "^1.2.9", "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", - "file-saver": "^2.0.2", - "ini": "^1.3.6", "file-saver": "^2.0.5", "ini": "^1.3.8", "material-design-icons": "^3.0.1", @@ -76,6 +78,9 @@ "ngx-electron": "^2.1.1", "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", + "office-ui-fabric-react": "^7.156.0", + "react": "^17.0.1", + "react-dom": "^17.0.1", "rxjs": "^6.6.3", "rxjs-compat": "^6.6.3", "save-html-as-image": "^1.3.4", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 9bd6dd11..e1552e7c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -64,6 +64,7 @@ import { SystemStatusComponent } from './components/system-status/system-status. import { ServerResolve } from './resolvers/server-resolve'; import { WebConsoleFullWindowComponent } from './components/web-console-full-window/web-console-full-window.component'; import { ConsoleGuard } from './guards/console-guard'; +import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; const routes: Routes = [ { @@ -79,6 +80,7 @@ const routes: Routes = [ resolve: { server : ServerResolve } }, { path: 'help', component: HelpComponent }, + { path: 'help/reportissue', component: ReportIssueComponent }, { path: 'settings', component: SettingsComponent }, { path: 'settings/console', component: ConsoleComponent }, { path: 'installed-software', component: InstalledSoftwareComponent }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 86abe8c3..17d3db0a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -281,7 +281,9 @@ import { ApplianceInfoDialogComponent } from './components/project-map/new-templ import { InformationDialogComponent } from './components/dialogs/information-dialog.component'; import { TemplateNameDialogComponent } from './components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component'; import { UpdatesService } from './services/updates.service'; - +import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; +import { AngularReactBrowserModule } from '@angular-react/core'; +import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; @NgModule({ declarations: [ @@ -468,10 +470,11 @@ import { UpdatesService } from './services/updates.service'; InformationDialogComponent, TemplateNameDialogComponent, ConfigureCustomAdaptersDialogComponent, - EditNetworkConfigurationDialogComponent + EditNetworkConfigurationDialogComponent, + ReportIssueComponent ], imports: [ - BrowserModule, + AngularReactBrowserModule, HttpClientModule, AppRoutingModule, FormsModule, diff --git a/src/app/components/help/help.component.html b/src/app/components/help/help.component.html index 6f923b2b..fd84ad69 100644 --- a/src/app/components/help/help.component.html +++ b/src/app/components/help/help.component.html @@ -31,5 +31,8 @@ + diff --git a/src/app/components/help/help.component.scss b/src/app/components/help/help.component.scss index e69de29b..569d57ff 100644 --- a/src/app/components/help/help.component.scss +++ b/src/app/components/help/help.component.scss @@ -0,0 +1,4 @@ +.full-width { + width: 100%; + margin-top: 20px; +} diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx new file mode 100644 index 00000000..0bf785e0 --- /dev/null +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -0,0 +1,6 @@ +import * as React from 'react'; +import { FunctionComponent, useEffect, useRef, useState } from 'react'; + +export const MyReactComponent = () => { + return
inside react component
; +}; diff --git a/src/app/components/help/report-issue/report-issue.component.html b/src/app/components/help/report-issue/report-issue.component.html new file mode 100644 index 00000000..c9500cd1 --- /dev/null +++ b/src/app/components/help/report-issue/report-issue.component.html @@ -0,0 +1 @@ + diff --git a/src/app/components/help/report-issue/report-issue.component.scss b/src/app/components/help/report-issue/report-issue.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/help/report-issue/report-issue.component.spec.ts b/src/app/components/help/report-issue/report-issue.component.spec.ts new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/help/report-issue/report-issue.component.tsx b/src/app/components/help/report-issue/report-issue.component.tsx new file mode 100644 index 00000000..ed97c55a --- /dev/null +++ b/src/app/components/help/report-issue/report-issue.component.tsx @@ -0,0 +1,53 @@ +import { HttpClient } from '@angular/common/http'; +import { + AfterViewInit, + Component, + ElementRef, + EventEmitter, + Input, + OnInit, + OnChanges, + OnDestroy, + Output, + SimpleChanges, + ViewChild, + ViewEncapsulation + } from '@angular/core'; +import { MyReactComponent } from '../report-issue/issue-list'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; + +const containerElementName = 'myReactComponentContainer'; + +@Component({ +selector: 'app-report-issue', +templateUrl: './report-issue.component.html', +styleUrls: ['./report-issue.component.scss'] +}) +export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, AfterViewInit { + @ViewChild('myReactComponentContainer') containerRef: ElementRef; + + constructor() {} + + ngOnInit() { + //this.render(); + } + + ngOnChanges(changes: SimpleChanges): void { + //this.render(); + } + + ngAfterViewInit() { + this.render(); + } + + ngOnDestroy() { + ReactDOM.unmountComponentAtNode(this.containerRef.nativeElement); + } + + private render() { + ReactDOM.render(
+ +
, this.containerRef.nativeElement); + } +} diff --git a/tsconfig.base.json b/tsconfig.base.json index bb33fac1..8c7fe9cf 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -11,6 +11,7 @@ "experimentalDecorators": true, "importHelpers": true, "target": "es5", + "jsx": "react", "types": ["jasmine", "jest", "mocha", "node"], "typeRoots": [ "node_modules/@types" diff --git a/yarn.lock b/yarn.lock index f48ddbec..efc57c5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -170,6 +170,23 @@ ora "5.0.0" rxjs "6.6.2" +"@angular-react/core@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@angular-react/core/-/core-3.0.0.tgz#7698360141fc3b2afa81ff5ef554b1f758d1e1e2" + integrity sha512-FsoklrmJ/Zqk4RoVbw5KgQBZ0Ta3ab4MM34Au3JcjWE9Xh7lBGdXw87QKkYDzkV2fE9bdkHYpVdgujTKX/qSLw== + dependencies: + classnames "^2.2.6" + css-to-style "^1.2.1" + stylenames "^1.1.6" + tslib "^1.9.0" + +"@angular-react/fabric@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@angular-react/fabric/-/fabric-3.0.0.tgz#08f1c71d1301c68635d084cb1c74c62968db56a1" + integrity sha512-zPol+Xwq8ErDrQVUD8ixz4VKjK4w0YC9EpkC/uWhz3BmY+InURL9ppmt/kUdJMXLDBe25EVlZws417HKzZR14Q== + dependencies: + tslib "^1.9.0" + "@angular/animations@^11.0.8": version "11.0.8" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.8.tgz#abb3a016bc9164176d1edfcbd2783cc3ba6f9ca3" @@ -1204,6 +1221,59 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" +"@fluentui/date-time-utilities@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz#4c8570b3af8bc654963ecb034d0fd100010e7d6d" + integrity sha512-D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/dom-utilities@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz#b0bbab665fe726f245800bb9e7883b1ceb54248b" + integrity sha512-w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/keyboard-key@^0.2.12": + version "0.2.12" + resolved "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz#74eddf4657c164193b6c8855746e691af466441a" + integrity sha512-t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ== + dependencies: + tslib "^1.10.0" + +"@fluentui/react-focus@^7.17.1": + version "7.17.1" + resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-7.17.1.tgz#e1f136bfb0fce6e07fe4f6595a3f6270f110b126" + integrity sha512-Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ== + dependencies: + "@fluentui/keyboard-key" "^0.2.12" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.16.19" + "@uifabric/utilities" "^7.33.2" + tslib "^1.10.0" + +"@fluentui/react-window-provider@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz#8ec71db8cfd57e11f00ed42c5c1377ef4dfe5f6b" + integrity sha512-5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/theme@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-1.7.1.tgz#24ee99d756ea71c722d3027388dbbe0df3fc8105" + integrity sha512-cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA== + dependencies: + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.2" + tslib "^1.10.0" + "@istanbuljs/schema@^0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" @@ -1236,6 +1306,11 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== +"@microsoft/load-themed-styles@^1.10.26": + version "1.10.146" + resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.146.tgz#dd039865dfb21157a4b22c486e78da8957dee05d" + integrity sha512-qQZ4J58J2VMe/XRpr2YRDusQB9uRBJ1SjJB76x7uH94t9hqxjVVxn2qL99Bl+ERbfrACZ9peGn2uamt4ponqZQ== + "@ngtools/webpack@11.0.6": version "11.0.6" resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.6.tgz#1a1d7775022e7e6263f8d9ee2872d995163b3fc0" @@ -2015,6 +2090,11 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/prop-types@*": + version "15.7.3" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" + integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + "@types/q@^0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" @@ -2025,6 +2105,21 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== +"@types/react-dom@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" + integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" + integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -2068,6 +2163,74 @@ dependencies: "@types/yargs-parser" "*" +"@uifabric/foundation@^7.9.21": + version "7.9.21" + resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.9.21.tgz#7583f81cb70ee819422997e9f518ea0a5c43402c" + integrity sha512-z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A== + dependencies: + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.16.19" + "@uifabric/utilities" "^7.33.2" + tslib "^1.10.0" + +"@uifabric/icons@^7.5.18": + version "7.5.18" + resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.5.18.tgz#f50c1ce876c35ee8feab08dbaee77c4064c837cd" + integrity sha512-gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w== + dependencies: + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.16.19" + tslib "^1.10.0" + +"@uifabric/merge-styles@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz#446b3da48ce9925d1649edd0fc232221974b00c9" + integrity sha512-yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@uifabric/react-hooks@^7.13.9": + version "7.13.9" + resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz#82373cdfbccc81b6fa00586dd8994bb47c97e99b" + integrity sha512-VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg== + dependencies: + "@fluentui/react-window-provider" "^1.0.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.2" + tslib "^1.10.0" + +"@uifabric/set-version@^7.0.23": + version "7.0.23" + resolved "https://registry.yarnpkg.com/@uifabric/set-version/-/set-version-7.0.23.tgz#bfe10b6ba17a2518704cca856bdba8adbc11ffb0" + integrity sha512-9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA== + dependencies: + tslib "^1.10.0" + +"@uifabric/styling@^7.16.19": + version "7.16.19" + resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.16.19.tgz#5ee38e1c13cc2c6d0d006f275d40b4669f97cb09" + integrity sha512-T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag== + dependencies: + "@fluentui/theme" "^1.7.1" + "@microsoft/load-themed-styles" "^1.10.26" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.2" + tslib "^1.10.0" + +"@uifabric/utilities@^7.33.2": + version "7.33.2" + resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.33.2.tgz#426f9a8d1f9f7738e65abe4a9e36b65583476d81" + integrity sha512-v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw== + dependencies: + "@fluentui/dom-utilities" "^1.1.1" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + prop-types "^15.7.2" + tslib "^1.10.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -3442,6 +3605,11 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +classnames@^2.2.6: + version "2.2.6" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" + integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== + clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -3990,6 +4158,11 @@ css-selector-tokenizer@^0.7.1: cssesc "^3.0.0" fastparse "^1.1.2" +css-to-style@^1.2.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/css-to-style/-/css-to-style-1.4.0.tgz#2d91742041b77a700d387dfa7978e80f56abf32b" + integrity sha512-FxLJRS+zzAjICI/AwpXUQR+aXrDOksrMTPpoKVwcGP0ARCxY5K3eRfgPW+pJrFXG46SKuxWOufJheis8Bhc2kg== + css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" @@ -4108,6 +4281,11 @@ csso@^4.0.2: dependencies: css-tree "^1.1.2" +csstype@^3.0.2: + version "3.0.6" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef" + integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw== + custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -5183,7 +5361,7 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -6992,7 +7170,7 @@ jquery@^3.5.1: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== -js-tokens@^4.0.0: +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -7493,6 +7671,13 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== +loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -8318,6 +8503,25 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +office-ui-fabric-react@^7.156.0: + version "7.156.0" + resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.156.0.tgz#28c999a8f97cc8c34bd525b838337abd255f7cc5" + integrity sha512-e9EwmkTGRjt+PJiRqB2ZU+8dTOUtDzNcOhiZmyI7Rvmz1XK3LhNDgoExbMQfAuDFEr2TcyvrOidwTAAkoRyWYw== + dependencies: + "@fluentui/date-time-utilities" "^7.9.0" + "@fluentui/react-focus" "^7.17.1" + "@fluentui/react-window-provider" "^1.0.1" + "@microsoft/load-themed-styles" "^1.10.26" + "@uifabric/foundation" "^7.9.21" + "@uifabric/icons" "^7.5.18" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/react-hooks" "^7.13.9" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.16.19" + "@uifabric/utilities" "^7.33.2" + prop-types "^15.7.2" + tslib "^1.10.0" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -9280,6 +9484,15 @@ promise-retry@^1.1.1: dependencies: asap "~2.0.3" +prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.8.1" + proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -9517,11 +9730,33 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-dom@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" + integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.1" + +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + react-is@^17.0.1: version "17.0.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== +react@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" + integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -10084,6 +10319,14 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +scheduler@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" + integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -11186,6 +11429,13 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +stylenames@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/stylenames/-/stylenames-1.1.6.tgz#185641ea9261906a5c350ac6836f4ef67caf867f" + integrity sha1-GFZB6pJhkGpcNQrGg29O9nyvhn8= + dependencies: + es6-symbol "^3.1.0" + stylus-loader@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" From e319aa4c4e8bd3188640cc7972df2de146c6c6d4 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 25 Jan 2021 01:47:46 +0100 Subject: [PATCH 02/76] Fetching data from github api --- package.json | 1 + .../help/report-issue/issue-list.tsx | 44 ++++- .../report-issue/report-issue.component.tsx | 4 +- tsconfig.base.json | 1 + yarn.lock | 158 +++++++++++++++++- 5 files changed, 197 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d1ce2ce2..c563d76d 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "notosans-fontface": "1.2.2", "office-ui-fabric-react": "^7.156.0", "react": "^17.0.1", + "react-bootstrap": "^1.4.3", "react-dom": "^17.0.1", "rxjs": "^6.6.3", "rxjs-compat": "^6.6.3", diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index 0bf785e0..d3932c87 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -1,6 +1,44 @@ -import * as React from 'react'; +import React, { Component } from "react"; import { FunctionComponent, useEffect, useRef, useState } from 'react'; +import Card from 'react-bootstrap/Card'; -export const MyReactComponent = () => { - return
inside react component
; +const apiUrl = 'https://api.github.com/repos/GNS3/gns3-web-ui/issues'; + +class IssueListComponent extends Component { + constructor(props) { + super(props); + this.state = { + isFetching: false, + issues: [] + }; + } + + componentDidMount() { + fetch(apiUrl) + .then(response => response.json()) + .then(data => this.setState({ issues: data })); + } + + render() { + const { issues } = this.state; + + return ( +
+ {issues.map(issue => + + + {issue.title} + Status: {issue.state} + + Description: {issue.body} + + {issue.html_url} + + + )} +
+ ); + } }; + +export default IssueListComponent; \ No newline at end of file diff --git a/src/app/components/help/report-issue/report-issue.component.tsx b/src/app/components/help/report-issue/report-issue.component.tsx index ed97c55a..053e021a 100644 --- a/src/app/components/help/report-issue/report-issue.component.tsx +++ b/src/app/components/help/report-issue/report-issue.component.tsx @@ -13,7 +13,7 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; -import { MyReactComponent } from '../report-issue/issue-list'; +import IssueListComponent from '../report-issue/issue-list'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; @@ -47,7 +47,7 @@ export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, After private render() { ReactDOM.render(
- +
, this.containerRef.nativeElement); } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 8c7fe9cf..7849ffff 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "allowSyntheticDefaultImports": true, "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, diff --git a/yarn.lock b/yarn.lock index efc57c5d..d8c035e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1148,7 +1148,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.8.4": +"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== @@ -1353,6 +1353,24 @@ resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== +"@popperjs/core@^2.5.3": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f" + integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw== + +"@restart/context@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@restart/context/-/context-2.1.4.tgz#a99d87c299a34c28bd85bb489cb07bfd23149c02" + integrity sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q== + +"@restart/hooks@^0.3.21", "@restart/hooks@^0.3.25": + version "0.3.26" + resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.26.tgz#ade155a7b0b014ef1073391dda46972c3a14a129" + integrity sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g== + dependencies: + lodash "^4.17.20" + lodash-es "^4.17.20" + "@schematics/angular@11.0.6": version "11.0.6" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.0.6.tgz#5e52f8396e66138df0d6062130399fab830ee79e" @@ -1723,6 +1741,11 @@ "@types/node" "*" "@types/responselike" "*" +"@types/classnames@^2.2.10": + version "2.2.11" + resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf" + integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw== + "@types/d3-array@*": version "2.8.0" resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee" @@ -1994,6 +2017,11 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== +"@types/invariant@^2.2.33": + version "2.2.34" + resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.34.tgz#05e4f79f465c2007884374d4795452f995720bbe" + integrity sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg== + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" @@ -2090,7 +2118,7 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prop-types@*": +"@types/prop-types@*", "@types/prop-types@^15.7.3": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== @@ -2112,7 +2140,14 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^17.0.0": +"@types/react-transition-group@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d" + integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w== + dependencies: + "@types/react" "*" + +"@types/react@*", "@types/react@>=16.9.35", "@types/react@^17.0.0": version "17.0.0" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== @@ -2120,6 +2155,14 @@ "@types/prop-types" "*" csstype "^3.0.2" +"@types/react@^16.9.11": + version "16.14.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c" + integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -2142,6 +2185,11 @@ resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== +"@types/warning@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" + integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= + "@types/webpack-sources@^0.1.5": version "0.1.8" resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81" @@ -4960,6 +5008,14 @@ dockerfile-ast@0.0.30: dependencies: vscode-languageserver-types "^3.15.1" +dom-helpers@^5.0.1, dom-helpers@^5.1.2, dom-helpers@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" + integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + dom-serialize@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" @@ -6649,6 +6705,13 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" +invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -7556,6 +7619,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash-es@^4.17.20: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.20.tgz#29f6332eefc60e849f869c264bc71126ad61e8f7" + integrity sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA== + lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -7671,7 +7739,7 @@ loglevel@^1.6.8: resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== -loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -9484,7 +9552,15 @@ promise-retry@^1.1.1: dependencies: asap "~2.0.3" -prop-types@^15.7.2: +prop-types-extra@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b" + integrity sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew== + dependencies: + react-is "^16.3.2" + warning "^4.0.0" + +prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -9730,6 +9806,30 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-bootstrap@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.4.3.tgz#9a76a66800b57f422dd824c9dbe4c9dcef634790" + integrity sha512-4tYhk26KRnK0myMEp2wvNjOvnHMwWfa6pWFIiCtj9wewYaTxP7TrCf7MwcIMBgUzyX0SJXx6UbbDG0+hObiXNg== + dependencies: + "@babel/runtime" "^7.4.2" + "@restart/context" "^2.1.4" + "@restart/hooks" "^0.3.21" + "@types/classnames" "^2.2.10" + "@types/invariant" "^2.2.33" + "@types/prop-types" "^15.7.3" + "@types/react" ">=16.9.35" + "@types/react-transition-group" "^4.4.0" + "@types/warning" "^3.0.0" + classnames "^2.2.6" + dom-helpers "^5.1.2" + invariant "^2.2.4" + prop-types "^15.7.2" + prop-types-extra "^1.1.0" + react-overlays "^4.1.0" + react-transition-group "^4.4.1" + uncontrollable "^7.0.0" + warning "^4.0.3" + react-dom@^17.0.1: version "17.0.1" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" @@ -9739,7 +9839,7 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.1" -react-is@^16.8.1: +react-is@^16.3.2, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -9749,6 +9849,35 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-overlays@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-4.1.1.tgz#0060107cbe1c5171a744ccda3fbf0556d064bc5f" + integrity sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ== + dependencies: + "@babel/runtime" "^7.12.1" + "@popperjs/core" "^2.5.3" + "@restart/hooks" "^0.3.25" + "@types/warning" "^3.0.0" + dom-helpers "^5.2.0" + prop-types "^15.7.2" + uncontrollable "^7.0.0" + warning "^4.0.3" + +react-transition-group@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" + integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react@^17.0.1: version "17.0.1" resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" @@ -12011,6 +12140,16 @@ ua-parser-js@0.7.22: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== +uncontrollable@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556" + integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q== + dependencies: + "@babel/runtime" "^7.6.3" + "@types/react" "^16.9.11" + invariant "^2.2.4" + react-lifecycles-compat "^3.0.4" + unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" @@ -12289,6 +12428,13 @@ vscode-languageserver-types@^3.15.1: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== +warning@^4.0.0, warning@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== + dependencies: + loose-envify "^1.0.0" + watchpack-chokidar2@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" From df6d760444789e70acd6f9a01b3af6b752d85c81 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 25 Jan 2021 15:11:00 +0100 Subject: [PATCH 03/76] Update issue-list.tsx --- src/app/components/help/report-issue/issue-list.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index d3932c87..3c3d3c6d 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -1,6 +1,7 @@ import React, { Component } from "react"; import { FunctionComponent, useEffect, useRef, useState } from 'react'; import Card from 'react-bootstrap/Card'; +import CardGroup from 'react-bootstrap/CardGroup'; const apiUrl = 'https://api.github.com/repos/GNS3/gns3-web-ui/issues'; @@ -23,16 +24,16 @@ class IssueListComponent extends Component { const { issues } = this.state; return ( -
+
{issues.map(issue => - + - {issue.title} + {issue.title} Status: {issue.state} - - Description: {issue.body} + + {issue.body} - {issue.html_url} + {issue.html_url} )} From ad553a6aa27c5dd697eae63fbe103af391d517b0 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 25 Jan 2021 17:58:13 +0100 Subject: [PATCH 04/76] Update issue-list.tsx --- src/app/components/help/report-issue/issue-list.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index 3c3d3c6d..6798caec 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -4,6 +4,7 @@ import Card from 'react-bootstrap/Card'; import CardGroup from 'react-bootstrap/CardGroup'; const apiUrl = 'https://api.github.com/repos/GNS3/gns3-web-ui/issues'; +const newIssueLink = 'https://github.com/GNS3/gns3-web-ui/issues/new'; class IssueListComponent extends Component { constructor(props) { @@ -24,7 +25,7 @@ class IssueListComponent extends Component { const { issues } = this.state; return ( -
+
{issues.map(issue => @@ -37,6 +38,12 @@ class IssueListComponent extends Component { )} + + + Don't see your issue here? + Open new issue + +
); } From daf7da2189c8b5a1e296042de0e414dc9809938a Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 26 Jan 2021 17:19:19 +0100 Subject: [PATCH 05/76] Searching by keyword added --- .../components/help/report-issue/filter.tsx | 24 +++++ .../help/report-issue/issue-list.tsx | 92 +++++++++++++------ .../components/help/report-issue/issue.tsx | 42 +++++++++ 3 files changed, 131 insertions(+), 27 deletions(-) create mode 100644 src/app/components/help/report-issue/filter.tsx create mode 100644 src/app/components/help/report-issue/issue.tsx diff --git a/src/app/components/help/report-issue/filter.tsx b/src/app/components/help/report-issue/filter.tsx new file mode 100644 index 00000000..0ced31d4 --- /dev/null +++ b/src/app/components/help/report-issue/filter.tsx @@ -0,0 +1,24 @@ +import React, {Component} from "react"; +import Form from 'react-bootstrap/Form'; + +const formGroupStyle = { + margin: '20px' +}; + +class FilterComponent extends Component { + constructor(props) { + super(props); + } + + render() { + return ( +
+ + + +
+ ) + } +} + +export default FilterComponent; \ No newline at end of file diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index 6798caec..d7811e68 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -1,7 +1,26 @@ import React, { Component } from "react"; -import { FunctionComponent, useEffect, useRef, useState } from 'react'; import Card from 'react-bootstrap/Card'; -import CardGroup from 'react-bootstrap/CardGroup'; +import Spinner from 'react-bootstrap/Spinner'; +import IssueComponent from './issue'; +import FilterComponent from './filter'; + +const wrapperStyle = { + justifyContent: 'center', + display: 'flex', + flex: 1, + flexDirection: 'row', + flexWrap: 'wrap', + margin: '20px' +}; + +const cardStyle = { + width: '300px', + margin: '20px' +}; + +const cardTitleStyle = { + color: 'red' +}; const apiUrl = 'https://api.github.com/repos/GNS3/gns3-web-ui/issues'; const newIssueLink = 'https://github.com/GNS3/gns3-web-ui/issues/new'; @@ -10,41 +29,60 @@ class IssueListComponent extends Component { constructor(props) { super(props); this.state = { - isFetching: false, - issues: [] + issues: [], + filteredIssues: [], + isFetching: true }; } componentDidMount() { fetch(apiUrl) .then(response => response.json()) - .then(data => this.setState({ issues: data })); + .then(data => this.setState({ + issues: data, + filteredIssues: data, + isFetching: false + })); + } + + handleChange = (e) => { + let filter = e.target.value; + let filteredIssues = this.state.issues; + + filteredIssues = filteredIssues.filter((issue) => { + return issue.title.toLowerCase().includes(filter.toLowerCase()) + }); + + this.setState({ + filteredIssues: filteredIssues + }); } render() { - const { issues } = this.state; - return ( -
- {issues.map(issue => - - - {issue.title} - Status: {issue.state} - - {issue.body} - - {issue.html_url} - - - )} - - - Don't see your issue here? - Open new issue - - -
+
+
+ +
+ + {this.state.isFetching ? ( +
+ +
+ ) : ( +
+ {this.state.filteredIssues.map(issue => + + )} + + + Don't see your issue here? + Open new issue + + +
+ )} +
); } }; diff --git a/src/app/components/help/report-issue/issue.tsx b/src/app/components/help/report-issue/issue.tsx new file mode 100644 index 00000000..1fe0e53a --- /dev/null +++ b/src/app/components/help/report-issue/issue.tsx @@ -0,0 +1,42 @@ +import React, { Component } from "react"; +import Card from 'react-bootstrap/Card'; + +const cardStyle = { + width: '300px', + margin: '20px' +}; + +const cardTitleStyle = { + color: 'black' +}; + +const cardTextStyle = { + color: 'black', + overflowY: 'auto', + height: '100px' +}; + +class IssueComponent extends Component { + constructor(props) { + super(props); + this.state = { + data: this.props.data + } + } + + render() { + const issue = this.state.data; + return ( + + + {issue.title} + Status: {issue.state} + {issue.body} + {issue.html_url} + + + ); + } +}; + +export default IssueComponent; \ No newline at end of file From 32945dbd55dfc993b986801ea8e0550567c7cf7c Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 26 Jan 2021 17:48:10 +0100 Subject: [PATCH 06/76] Fixing css --- src/app/components/help/report-issue/issue-list.tsx | 6 +++--- src/app/components/help/report-issue/issue.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index d7811e68..18b5c22c 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -5,11 +5,11 @@ import IssueComponent from './issue'; import FilterComponent from './filter'; const wrapperStyle = { - justifyContent: 'center', + JustifyContent: 'center', display: 'flex', flex: 1, - flexDirection: 'row', - flexWrap: 'wrap', + FlexDirection: 'row', + FlexWrap: 'wrap', margin: '20px' }; diff --git a/src/app/components/help/report-issue/issue.tsx b/src/app/components/help/report-issue/issue.tsx index 1fe0e53a..08780c32 100644 --- a/src/app/components/help/report-issue/issue.tsx +++ b/src/app/components/help/report-issue/issue.tsx @@ -12,7 +12,7 @@ const cardTitleStyle = { const cardTextStyle = { color: 'black', - overflowY: 'auto', + OverflowY: 'auto', height: '100px' }; From 33e0fbb0b40aebc7595e4cc8f801c773493323d4 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 26 Jan 2021 23:55:13 +0100 Subject: [PATCH 07/76] Cleaning up code --- src/app/components/help/report-issue/issue-list.tsx | 6 +++--- src/app/components/help/report-issue/issue.tsx | 2 +- .../help/report-issue/report-issue.component.html | 2 +- .../components/help/report-issue/report-issue.component.tsx | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index 18b5c22c..a2790f22 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -5,11 +5,11 @@ import IssueComponent from './issue'; import FilterComponent from './filter'; const wrapperStyle = { - JustifyContent: 'center', + justifyContent: 'center' as 'center', display: 'flex', flex: 1, - FlexDirection: 'row', - FlexWrap: 'wrap', + flexDirection: 'row' as 'row', + flexWrap: 'wrap' as 'wrap', margin: '20px' }; diff --git a/src/app/components/help/report-issue/issue.tsx b/src/app/components/help/report-issue/issue.tsx index 08780c32..cc8e6dc7 100644 --- a/src/app/components/help/report-issue/issue.tsx +++ b/src/app/components/help/report-issue/issue.tsx @@ -12,7 +12,7 @@ const cardTitleStyle = { const cardTextStyle = { color: 'black', - OverflowY: 'auto', + overflow: 'auto', height: '100px' }; diff --git a/src/app/components/help/report-issue/report-issue.component.html b/src/app/components/help/report-issue/report-issue.component.html index c9500cd1..de3af182 100644 --- a/src/app/components/help/report-issue/report-issue.component.html +++ b/src/app/components/help/report-issue/report-issue.component.html @@ -1 +1 @@ - + diff --git a/src/app/components/help/report-issue/report-issue.component.tsx b/src/app/components/help/report-issue/report-issue.component.tsx index 053e021a..add3c093 100644 --- a/src/app/components/help/report-issue/report-issue.component.tsx +++ b/src/app/components/help/report-issue/report-issue.component.tsx @@ -25,7 +25,7 @@ templateUrl: './report-issue.component.html', styleUrls: ['./report-issue.component.scss'] }) export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, AfterViewInit { - @ViewChild('myReactComponentContainer') containerRef: ElementRef; + @ViewChild('issueListComponentContainer') containerRef: ElementRef; constructor() {} @@ -46,8 +46,8 @@ export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, After } private render() { - ReactDOM.render(
- + ReactDOM.render(
+
, this.containerRef.nativeElement); } } From c8ec9c12134b9a547d5e2b085c69a79e08ed5794 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 27 Jan 2021 12:23:20 +0100 Subject: [PATCH 08/76] Update angular.json --- angular.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/angular.json b/angular.json index caba6592..6eebf3ab 100644 --- a/angular.json +++ b/angular.json @@ -25,7 +25,12 @@ "@mattlewis92/dom-autoscroller", "rxjs/Rx", "rxjs/add/operator/map", - "rxjs-compat/add/operator/map" + "rxjs-compat/add/operator/map", + "angular-react-core.js", + "react", + "react-dom", + "classnames", + "stylenames" ], "aot": true, "outputPath": "dist", From b6fdc260c655ad9735224ad738c604d2f02b37ca Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 27 Jan 2021 18:14:41 +0100 Subject: [PATCH 09/76] Update report-issue.component.tsx --- src/app/components/help/report-issue/report-issue.component.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/components/help/report-issue/report-issue.component.tsx b/src/app/components/help/report-issue/report-issue.component.tsx index add3c093..e38858d2 100644 --- a/src/app/components/help/report-issue/report-issue.component.tsx +++ b/src/app/components/help/report-issue/report-issue.component.tsx @@ -17,8 +17,6 @@ import IssueListComponent from '../report-issue/issue-list'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; -const containerElementName = 'myReactComponentContainer'; - @Component({ selector: 'app-report-issue', templateUrl: './report-issue.component.html', From 5c1ed5de0621c5c8d633fc19b769ff4ca6bad4d0 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Thu, 28 Jan 2021 01:07:51 +0100 Subject: [PATCH 10/76] Eev for communication between components --- package.json | 1 + .../help/report-issue/issue-list.tsx | 13 ++++++--- .../report-issue/report-issue.component.tsx | 27 ++++++++++--------- src/app/event-bus/index.js | 5 ++++ yarn.lock | 5 ++++ 5 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 src/app/event-bus/index.js diff --git a/package.json b/package.json index c563d76d..7e23fea9 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "command-exists": "^1.2.9", "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", + "eev": "^0.1.5", "file-saver": "^2.0.5", "ini": "^1.3.8", "material-design-icons": "^3.0.1", diff --git a/src/app/components/help/report-issue/issue-list.tsx b/src/app/components/help/report-issue/issue-list.tsx index a2790f22..835f6099 100644 --- a/src/app/components/help/report-issue/issue-list.tsx +++ b/src/app/components/help/report-issue/issue-list.tsx @@ -3,6 +3,7 @@ import Card from 'react-bootstrap/Card'; import Spinner from 'react-bootstrap/Spinner'; import IssueComponent from './issue'; import FilterComponent from './filter'; +import e from '../../../event-bus'; const wrapperStyle = { justifyContent: 'center' as 'center', @@ -21,7 +22,7 @@ const cardStyle = { const cardTitleStyle = { color: 'red' }; - +const message = 'Thank you for reporting the issue!'; const apiUrl = 'https://api.github.com/repos/GNS3/gns3-web-ui/issues'; const newIssueLink = 'https://github.com/GNS3/gns3-web-ui/issues/new'; @@ -45,8 +46,8 @@ class IssueListComponent extends Component { })); } - handleChange = (e) => { - let filter = e.target.value; + handleChange = (event) => { + let filter = event.target.value; let filteredIssues = this.state.issues; filteredIssues = filteredIssues.filter((issue) => { @@ -58,6 +59,10 @@ class IssueListComponent extends Component { }); } + newIssueOpened = (event) => { + e.emit('message', { text: message }); + } + render() { return (
@@ -77,7 +82,7 @@ class IssueListComponent extends Component { Don't see your issue here? - Open new issue + Open new issue
diff --git a/src/app/components/help/report-issue/report-issue.component.tsx b/src/app/components/help/report-issue/report-issue.component.tsx index e38858d2..f56212a7 100644 --- a/src/app/components/help/report-issue/report-issue.component.tsx +++ b/src/app/components/help/report-issue/report-issue.component.tsx @@ -11,34 +11,35 @@ import { Output, SimpleChanges, ViewChild, - ViewEncapsulation + ViewEncapsulation, + AfterContentInit } from '@angular/core'; import IssueListComponent from '../report-issue/issue-list'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; - +import e from '../../../event-bus'; +import { ToasterService } from '../../../services/toaster.service'; + @Component({ selector: 'app-report-issue', templateUrl: './report-issue.component.html', styleUrls: ['./report-issue.component.scss'] }) -export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, AfterViewInit { +export class ReportIssueComponent implements OnDestroy, AfterViewInit, AfterContentInit { @ViewChild('issueListComponentContainer') containerRef: ElementRef; - constructor() {} - - ngOnInit() { - //this.render(); - } - - ngOnChanges(changes: SimpleChanges): void { - //this.render(); - } + constructor(private toasterService: ToasterService) {} ngAfterViewInit() { this.render(); } + ngAfterContentInit() { + e.on('message', message => { + this.toasterService.success(message.text); + }); + } + ngOnDestroy() { ReactDOM.unmountComponentAtNode(this.containerRef.nativeElement); } @@ -48,4 +49,4 @@ export class ReportIssueComponent implements OnInit, OnChanges, OnDestroy, After
, this.containerRef.nativeElement); } -} +} diff --git a/src/app/event-bus/index.js b/src/app/event-bus/index.js new file mode 100644 index 00000000..a2e306e2 --- /dev/null +++ b/src/app/event-bus/index.js @@ -0,0 +1,5 @@ +import Eev from 'eev' + +export const e = new Eev() + +export default e diff --git a/yarn.lock b/yarn.lock index d8c035e9..d42a4eb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5114,6 +5114,11 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +eev@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/eev/-/eev-0.1.5.tgz#800c04d450b31972b02660b97182cd28a3058e06" + integrity sha512-U7+up/+0JaC+ffyrMicGDzb+j2Q04Fy22tKK1Xh6hHFWdVtXwoBF8M2DwFofwsJzJcs3W3NPDvmxcMak5/iQaA== + ejs@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" From 8b7fb1f0d29ad0de72a136d2feca6d13b32c865d Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 13:43:26 +0100 Subject: [PATCH 11/76] Update package.json --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 7766874e..1341844a 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,6 @@ "command-exists": "^1.2.9", "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", - "file-saver": "^2.0.2", - "ini": "^1.3.6", "file-saver": "^2.0.5", "ini": "^1.3.8", "material-design-icons": "^3.0.1", From 9e7d11bf8a00b3f31c6eef4fefa7cae7c80f306f Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 15:23:49 +0100 Subject: [PATCH 12/76] Fix for imports --- package.json | 5 -- src/app/app.module.ts | 4 +- yarn.lock | 180 +----------------------------------------- 3 files changed, 4 insertions(+), 185 deletions(-) diff --git a/package.json b/package.json index 7e23fea9..7155da79 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,6 @@ }, "private": true, "dependencies": { - "@angular-react/core": "^3.0.0", - "@angular-react/fabric": "^3.0.0", "@angular/animations": "^11.0.8", "@angular/cdk": "^11.0.3", "@angular/common": "^11.0.8", @@ -69,8 +67,6 @@ "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", "eev": "^0.1.5", - "file-saver": "^2.0.5", - "ini": "^1.3.8", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", "ng2-file-upload": "^1.3.0", @@ -79,7 +75,6 @@ "ngx-electron": "^2.1.1", "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", - "office-ui-fabric-react": "^7.156.0", "react": "^17.0.1", "react-bootstrap": "^1.4.3", "react-dom": "^17.0.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 17d3db0a..5cc09b67 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -281,8 +281,6 @@ import { ApplianceInfoDialogComponent } from './components/project-map/new-templ import { InformationDialogComponent } from './components/dialogs/information-dialog.component'; import { TemplateNameDialogComponent } from './components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component'; import { UpdatesService } from './services/updates.service'; -import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; -import { AngularReactBrowserModule } from '@angular-react/core'; import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; @NgModule({ @@ -474,7 +472,7 @@ import { ReportIssueComponent } from './components/help/report-issue/report-issu ReportIssueComponent ], imports: [ - AngularReactBrowserModule, + BrowserModule, HttpClientModule, AppRoutingModule, FormsModule, diff --git a/yarn.lock b/yarn.lock index d42a4eb4..f290eca0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -170,23 +170,6 @@ ora "5.0.0" rxjs "6.6.2" -"@angular-react/core@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@angular-react/core/-/core-3.0.0.tgz#7698360141fc3b2afa81ff5ef554b1f758d1e1e2" - integrity sha512-FsoklrmJ/Zqk4RoVbw5KgQBZ0Ta3ab4MM34Au3JcjWE9Xh7lBGdXw87QKkYDzkV2fE9bdkHYpVdgujTKX/qSLw== - dependencies: - classnames "^2.2.6" - css-to-style "^1.2.1" - stylenames "^1.1.6" - tslib "^1.9.0" - -"@angular-react/fabric@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@angular-react/fabric/-/fabric-3.0.0.tgz#08f1c71d1301c68635d084cb1c74c62968db56a1" - integrity sha512-zPol+Xwq8ErDrQVUD8ixz4VKjK4w0YC9EpkC/uWhz3BmY+InURL9ppmt/kUdJMXLDBe25EVlZws417HKzZR14Q== - dependencies: - tslib "^1.9.0" - "@angular/animations@^11.0.8": version "11.0.8" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.8.tgz#abb3a016bc9164176d1edfcbd2783cc3ba6f9ca3" @@ -1221,59 +1204,6 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@fluentui/date-time-utilities@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz#4c8570b3af8bc654963ecb034d0fd100010e7d6d" - integrity sha512-D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw== - dependencies: - "@uifabric/set-version" "^7.0.23" - tslib "^1.10.0" - -"@fluentui/dom-utilities@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz#b0bbab665fe726f245800bb9e7883b1ceb54248b" - integrity sha512-w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g== - dependencies: - "@uifabric/set-version" "^7.0.23" - tslib "^1.10.0" - -"@fluentui/keyboard-key@^0.2.12": - version "0.2.12" - resolved "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz#74eddf4657c164193b6c8855746e691af466441a" - integrity sha512-t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ== - dependencies: - tslib "^1.10.0" - -"@fluentui/react-focus@^7.17.1": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-7.17.1.tgz#e1f136bfb0fce6e07fe4f6595a3f6270f110b126" - integrity sha512-Nulq2pE4pX6Pf+tGZl8uLp8VfqUzx3elC5v7QvYSBdjnZK8ykitdsa+Sd3PKYWW2EMlzVRSptlzbuJ6JyEDQKQ== - dependencies: - "@fluentui/keyboard-key" "^0.2.12" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.16.19" - "@uifabric/utilities" "^7.33.2" - tslib "^1.10.0" - -"@fluentui/react-window-provider@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz#8ec71db8cfd57e11f00ed42c5c1377ef4dfe5f6b" - integrity sha512-5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w== - dependencies: - "@uifabric/set-version" "^7.0.23" - tslib "^1.10.0" - -"@fluentui/theme@^1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-1.7.1.tgz#24ee99d756ea71c722d3027388dbbe0df3fc8105" - integrity sha512-cwx8gJ0O9d+Z8g6Lq7BgDgH8XPfSloUSy0GN3fWHJGrDCBPcnmz6/GKbbvxw9PZ2t1iNcAzJEJNT6NyuOOobPA== - dependencies: - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.2" - tslib "^1.10.0" - "@istanbuljs/schema@^0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" @@ -1306,11 +1236,6 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== -"@microsoft/load-themed-styles@^1.10.26": - version "1.10.146" - resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.146.tgz#dd039865dfb21157a4b22c486e78da8957dee05d" - integrity sha512-qQZ4J58J2VMe/XRpr2YRDusQB9uRBJ1SjJB76x7uH94t9hqxjVVxn2qL99Bl+ERbfrACZ9peGn2uamt4ponqZQ== - "@ngtools/webpack@11.0.6": version "11.0.6" resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.6.tgz#1a1d7775022e7e6263f8d9ee2872d995163b3fc0" @@ -2211,74 +2136,6 @@ dependencies: "@types/yargs-parser" "*" -"@uifabric/foundation@^7.9.21": - version "7.9.21" - resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.9.21.tgz#7583f81cb70ee819422997e9f518ea0a5c43402c" - integrity sha512-z58pcC0hJr6S0iYLxNFoqfrfLIMxbSxFHRirk5LDT2HXbiVIYbJwbK4O0InS+sz3chdx8GGSdIUz7muXeT/D+A== - dependencies: - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.16.19" - "@uifabric/utilities" "^7.33.2" - tslib "^1.10.0" - -"@uifabric/icons@^7.5.18": - version "7.5.18" - resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.5.18.tgz#f50c1ce876c35ee8feab08dbaee77c4064c837cd" - integrity sha512-gLPEccWlTER9NiXcOHZ+dSJ3tgLAQ4mTf3hTlKV7e7dKBTl95jzcemG5S2NJQ7xWPTH3+5K1Bpd+nqZo9EJw3w== - dependencies: - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.16.19" - tslib "^1.10.0" - -"@uifabric/merge-styles@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz#446b3da48ce9925d1649edd0fc232221974b00c9" - integrity sha512-yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A== - dependencies: - "@uifabric/set-version" "^7.0.23" - tslib "^1.10.0" - -"@uifabric/react-hooks@^7.13.9": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz#82373cdfbccc81b6fa00586dd8994bb47c97e99b" - integrity sha512-VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg== - dependencies: - "@fluentui/react-window-provider" "^1.0.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.2" - tslib "^1.10.0" - -"@uifabric/set-version@^7.0.23": - version "7.0.23" - resolved "https://registry.yarnpkg.com/@uifabric/set-version/-/set-version-7.0.23.tgz#bfe10b6ba17a2518704cca856bdba8adbc11ffb0" - integrity sha512-9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA== - dependencies: - tslib "^1.10.0" - -"@uifabric/styling@^7.16.19": - version "7.16.19" - resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.16.19.tgz#5ee38e1c13cc2c6d0d006f275d40b4669f97cb09" - integrity sha512-T5fjUCx0LbzUC8Myw15YCaBjdGbSrihWSiPHtLVW77k59yWAW947XnH73QngE8xU7kyKPH3AhQrUEBMB2NjHag== - dependencies: - "@fluentui/theme" "^1.7.1" - "@microsoft/load-themed-styles" "^1.10.26" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.2" - tslib "^1.10.0" - -"@uifabric/utilities@^7.33.2": - version "7.33.2" - resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.33.2.tgz#426f9a8d1f9f7738e65abe4a9e36b65583476d81" - integrity sha512-v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw== - dependencies: - "@fluentui/dom-utilities" "^1.1.1" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - prop-types "^15.7.2" - tslib "^1.10.0" - "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -4206,11 +4063,6 @@ css-selector-tokenizer@^0.7.1: cssesc "^3.0.0" fastparse "^1.1.2" -css-to-style@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/css-to-style/-/css-to-style-1.4.0.tgz#2d91742041b77a700d387dfa7978e80f56abf32b" - integrity sha512-FxLJRS+zzAjICI/AwpXUQR+aXrDOksrMTPpoKVwcGP0ARCxY5K3eRfgPW+pJrFXG46SKuxWOufJheis8Bhc2kg== - css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" @@ -5422,7 +5274,7 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -5769,7 +5621,7 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.2, file-saver@^2.0.5: +file-saver@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== @@ -6678,7 +6530,7 @@ ini@1.3.7: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -8576,25 +8428,6 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -office-ui-fabric-react@^7.156.0: - version "7.156.0" - resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.156.0.tgz#28c999a8f97cc8c34bd525b838337abd255f7cc5" - integrity sha512-e9EwmkTGRjt+PJiRqB2ZU+8dTOUtDzNcOhiZmyI7Rvmz1XK3LhNDgoExbMQfAuDFEr2TcyvrOidwTAAkoRyWYw== - dependencies: - "@fluentui/date-time-utilities" "^7.9.0" - "@fluentui/react-focus" "^7.17.1" - "@fluentui/react-window-provider" "^1.0.1" - "@microsoft/load-themed-styles" "^1.10.26" - "@uifabric/foundation" "^7.9.21" - "@uifabric/icons" "^7.5.18" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/react-hooks" "^7.13.9" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.16.19" - "@uifabric/utilities" "^7.33.2" - prop-types "^15.7.2" - tslib "^1.10.0" - on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -11563,13 +11396,6 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylenames@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/stylenames/-/stylenames-1.1.6.tgz#185641ea9261906a5c350ac6836f4ef67caf867f" - integrity sha1-GFZB6pJhkGpcNQrGg29O9nyvhn8= - dependencies: - es6-symbol "^3.1.0" - stylus-loader@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" From 703ceb177bc0e57e0442c5063f33424c0c67bee7 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 16:47:53 +0100 Subject: [PATCH 13/76] Update yarn.lock --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index f290eca0..ff9dbd21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5621,7 +5621,7 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.2: +file-saver@^2.0.2, file-saver@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== @@ -6530,7 +6530,7 @@ ini@1.3.7: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== From 0bc000f09653658d426cdbc36669539902e0b5f7 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:10:37 +0100 Subject: [PATCH 14/76] Update log-console.component.ts --- .../components/project-map/log-console/log-console.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 6692b3b4..2dd0e249 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -136,7 +136,7 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { } ngAfterViewInit() { - this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; + if (this.console.nativeElement) this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; } ngOnDestroy() { From e4ad03e1c66a2a63e5d6e4932c8e3fabdf109ebb Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 21:54:11 +0100 Subject: [PATCH 15/76] Update package.json --- package.json | 66 +- yarn.lock | 4101 ++++++++++++++++++++++++++++---------------------- 2 files changed, 2325 insertions(+), 1842 deletions(-) diff --git a/package.json b/package.json index 91a6a0fb..57d6c148 100644 --- a/package.json +++ b/package.json @@ -40,35 +40,35 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.0.8", - "@angular/cdk": "^11.0.3", - "@angular/common": "^11.0.8", - "@angular/compiler": "^11.0.8", - "@angular/core": "^11.0.8", - "@angular/forms": "^11.0.8", + "@angular/animations": "^11.2.0", + "@angular/cdk": "^11.2.0", + "@angular/common": "^11.2.0", + "@angular/compiler": "^11.2.0", + "@angular/core": "^11.2.0", + "@angular/forms": "^11.2.0", "@angular/http": "^7.2.16", - "@angular/material": "^11.0.3", - "@angular/platform-browser": "^11.0.8", - "@angular/platform-browser-dynamic": "^11.0.8", - "@angular/router": "^11.0.8", - "@sentry/browser": "^5.29.2", + "@angular/material": "^11.2.0", + "@angular/platform-browser": "^11.2.0", + "@angular/platform-browser-dynamic": "^11.2.0", + "@angular/router": "^11.2.0", + "@sentry/browser": "^6.1.0", "@types/jest": "^26.0.20", "@types/mocha": "^8.2.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^17.0.2", + "@types/react-dom": "^17.0.1", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", - "angular-resizable-element": "^3.3.4", + "angular-resizable-element": "^3.3.5", "angular2-draggable": "^2.3.2", "angular2-hotkeys": "^2.2.0", "angular2-indexeddb": "^1.2.3", - "bootstrap": "^4.5.3", + "bootstrap": "^4.6.0", "command-exists": "^1.2.9", - "core-js": "^3.8.2", + "core-js": "^3.8.3", "d3-ng2-service": "^2.1.0", "eev": "^0.1.5", "file-saver": "^2.0.5", - "ini": "^1.3.8", + "ini": "^2.0.0", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", "ng2-file-upload": "^1.3.0", @@ -85,36 +85,36 @@ "save-html-as-image": "^1.3.4", "save-svg-as-png": "^1.4.14", "schematics-scss-migrate": "^1.2.10", - "snyk": "^1.437.3", + "snyk": "^1.455.0", "spark-md5": "^3.0.1", "svg-crowbar": "^0.6.5", "tree-kill": "^1.2.1", "tslib": "^2.1.0", "typeface-roboto": "^1.1.13", - "xterm": "^4.9.0", + "xterm": "^4.10.0", "xterm-addon-attach": "^0.6.0", - "xterm-addon-fit": "^0.4.0", + "xterm-addon-fit": "^0.5.0", "yargs": "^16.2.0", "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1100.6", - "@angular/cli": "^11.0.6", - "@angular/compiler-cli": "^11.0.8", - "@angular/language-service": "^11.0.8", - "@sentry/cli": "^1.61.0", - "@sentry/electron": "^2.1.0", - "@types/jasmine": "~3.6.0", + "@angular-devkit/build-angular": "^0.1102.0", + "@angular/cli": "^11.2.0", + "@angular/compiler-cli": "^11.2.0", + "@angular/language-service": "^11.2.0", + "@sentry/cli": "^1.62.0", + "@sentry/electron": "^2.2.0", + "@types/jasmine": "~3.6.3", "@types/jasminewd2": "^2.0.8", - "@types/node": "14.14.10", + "@types/node": "14.14.28", "codelyzer": "^6.0.0", - "electron": "^11.2.0", + "electron": "^11.2.3", "electron-builder": "22.9.1", "file-loader": "^6.2.0", "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~5.0.0", + "jasmine-spec-reporter": "~6.0.0", "jquery": "^3.5.1", - "karma": "^5.2.3", + "karma": "^6.1.1", "karma-chrome-launcher": "~3.1.0", "karma-cli": "^2.0.0", "karma-coverage-istanbul-reporter": "~3.0.2", @@ -127,11 +127,11 @@ "replace": "^1.2.0", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.0.0", + "ts-node": "~9.1.1", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.0.2", - "webpack": "4.44.2", + "webpack": "5.22.0", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/yarn.lock b/yarn.lock index ff9dbd21..b121fcd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,113 +7,116 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== -"@angular-devkit/architect@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.6.tgz#ce90ffb78d1d945cafc339d4cfc63b3582cb8e6a" - integrity sha512-4O+cg3AimI2bNAxxdu5NrqSf4Oa8r8xL0+G2Ycd3jLoFv0h0ecJiNKEG5F6IpTprb4aexZD6pcxBJCqQ8MmzWQ== +"@angular-devkit/architect@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.0.tgz#0d4bee477d59318e8f3511fa6936bdcfa303df55" + integrity sha512-d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g== dependencies: - "@angular-devkit/core" "11.0.6" + "@angular-devkit/core" "11.2.0" rxjs "6.6.3" -"@angular-devkit/build-angular@^0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.6.tgz#4aa7635ab8fc1c6435b2b93954c08f2a7d7a8dd9" - integrity sha512-HcqsWiSIUxExGg3HRQScLOmF+ckVkCKolfpPcNOCCpBYxH/i8n4wDGLBP5Rtxky+0Qz+3nnAaFIpNb9p9aUmbg== +"@angular-devkit/build-angular@^0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1102.0.tgz#7996429000d4a707c8169b801f153819f04a2c24" + integrity sha512-9Yl6qBOR1o0ThyLhrWJ6Rhr3qLRe+RP3sbfUt4QA+8wsIXN7WakEXJALlq7TDeG66OaWyyjbtC2q3EPdNeBC/g== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/build-optimizer" "0.1100.6" - "@angular-devkit/build-webpack" "0.1100.6" - "@angular-devkit/core" "11.0.6" - "@babel/core" "7.12.3" - "@babel/generator" "7.12.1" - "@babel/plugin-transform-runtime" "7.12.1" - "@babel/preset-env" "7.12.1" - "@babel/runtime" "7.12.1" - "@babel/template" "7.10.4" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/build-optimizer" "0.1102.0" + "@angular-devkit/build-webpack" "0.1102.0" + "@angular-devkit/core" "11.2.0" + "@babel/core" "7.12.10" + "@babel/generator" "7.12.11" + "@babel/plugin-transform-async-to-generator" "7.12.1" + "@babel/plugin-transform-runtime" "7.12.10" + "@babel/preset-env" "7.12.11" + "@babel/runtime" "7.12.5" + "@babel/template" "7.12.7" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "11.0.6" + "@ngtools/webpack" "11.2.0" ansi-colors "4.1.1" - autoprefixer "9.8.6" - babel-loader "8.1.0" + autoprefixer "10.2.4" + babel-loader "8.2.2" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.0" - copy-webpack-plugin "6.2.1" - core-js "3.6.5" - css-loader "4.3.0" + circular-dependency-plugin "5.2.2" + copy-webpack-plugin "6.3.2" + core-js "3.8.3" + critters "0.0.6" + css-loader "5.0.1" cssnano "4.1.10" - file-loader "6.1.1" + file-loader "6.2.0" find-cache-dir "3.3.1" glob "7.1.6" + https-proxy-agent "5.0.0" inquirer "7.3.3" - jest-worker "26.5.0" + jest-worker "26.6.2" karma-source-map-support "1.4.0" - less "3.12.2" - less-loader "7.0.2" - license-webpack-plugin "2.3.1" + less "4.1.1" + less-loader "7.3.0" + license-webpack-plugin "2.3.11" loader-utils "2.0.0" - mini-css-extract-plugin "1.2.1" + mini-css-extract-plugin "1.3.5" minimatch "3.0.4" - open "7.3.0" - ora "5.1.0" + open "7.4.0" + ora "5.3.0" parse5-html-rewriting-stream "6.0.1" pnp-webpack-plugin "1.6.4" - postcss "7.0.32" - postcss-import "12.0.1" - postcss-loader "4.0.4" + postcss "8.2.4" + postcss-import "14.0.0" + postcss-loader "4.2.0" raw-loader "4.0.2" regenerator-runtime "0.13.7" resolve-url-loader "3.1.2" rimraf "3.0.2" - rollup "2.32.1" + rollup "2.38.4" rxjs "6.6.3" - sass "1.27.0" - sass-loader "10.0.5" - semver "7.3.2" + sass "1.32.6" + sass-loader "10.1.1" + semver "7.3.4" source-map "0.7.3" - source-map-loader "1.1.2" + source-map-loader "1.1.3" source-map-support "0.5.19" - speed-measure-webpack-plugin "1.3.3" + speed-measure-webpack-plugin "1.4.2" style-loader "2.0.0" stylus "0.54.8" - stylus-loader "4.3.1" - terser "5.3.7" + stylus-loader "4.3.3" + terser "5.5.1" terser-webpack-plugin "4.2.3" text-table "0.2.0" tree-kill "1.2.2" webpack "4.44.2" webpack-dev-middleware "3.7.2" - webpack-dev-server "3.11.0" - webpack-merge "5.2.0" - webpack-sources "2.0.1" - webpack-subresource-integrity "1.5.1" + webpack-dev-server "3.11.2" + webpack-merge "5.7.3" + webpack-sources "2.2.0" + webpack-subresource-integrity "1.5.2" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.6.tgz#4d6712ae75eeae71d74fd161a0a18c08402dc527" - integrity sha512-Qkq7n6510N+nXmfZqpqpI0I6Td+b+06RRNmS7KftSNJntU1z5QYh4FggwlthZ5P0QUT92cnBQsnT8OgYqGnwbg== +"@angular-devkit/build-optimizer@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.0.tgz#22e84487e915d3a3590fc8ef3b0025ce7f846301" + integrity sha512-0Xb7xR0iUrbo/BnKJPTsy5IuodfFUWbvXUu9qeKc+oHzwxObX4Y32X0yyRpIJc5UK7Ce43HkopRQ/tHdoJp2fQ== dependencies: loader-utils "2.0.0" source-map "0.7.3" - tslib "2.0.3" - typescript "4.0.5" - webpack-sources "2.0.1" + tslib "2.1.0" + typescript "4.1.3" + webpack-sources "2.2.0" -"@angular-devkit/build-webpack@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.6.tgz#301caf71bebed6e841cb15fb3af5147c3b2d9c97" - integrity sha512-kK0FlpYJHP25o1yzIGHQqIvO5kp+p6V5OwGpD2GGRZLlJqd3WdjY5DxnyZoX3/IofO6KsTnmm76fzTRqc62z/Q== +"@angular-devkit/build-webpack@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1102.0.tgz#c198d47a755c2ede6eb575b8addd271709f5207b" + integrity sha512-bfd6WlxcbWJ01HNNcFt4sBBaY+Bz2J/zFA6BSORvC5LpqawYCYeUbDJTY9Wb7gtp+aPEiNHI0HeUvoNkubsYfg== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/core" "11.0.6" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/core" "11.2.0" rxjs "6.6.3" -"@angular-devkit/core@10.2.1", "@angular-devkit/core@^10.1.0": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.1.tgz#3ae38be4ca56c745788481b3577173ac2007e9e0" - integrity sha512-dzlF9Gl7KNt9sPYT2HYq6ySZYwKzkyYR5mrBj3DZOD0OQsoc21LvLkWAHNSL2iYGdHJQS1oJDNs8iRYxYIOY3w== +"@angular-devkit/core@10.2.2", "@angular-devkit/core@^10.1.0": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.2.tgz#107b46618661845122e8b1b29eee18a392298986" + integrity sha512-kfSyk0J6vb+BgJsLazxpe4i01JtMpTrps95azqqNrZnUSuctwXRUJF3UkU64JhN13kb2E/QLdrGRibbXzu1J0w== dependencies: ajv "6.12.4" fast-json-stable-stringify "2.1.0" @@ -121,10 +124,10 @@ rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/core@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.6.tgz#b3ea815ecdea5f77dae58f3f410b268453d7eb8b" - integrity sha512-nhvU5hH01r9qcexAqvIFU233treWWeW3ncs9UFYjD9Hys9sDSvqC3+bvGvl9vCG5FsyY7oDsjaVAipyUc+SFAg== +"@angular-devkit/core@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.0.tgz#a9198a391723e865fc6b369752c176cd5ed1d452" + integrity sha512-qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q== dependencies: ajv "6.12.6" fast-json-stable-stringify "2.1.0" @@ -132,10 +135,10 @@ rxjs "6.6.3" source-map "0.7.3" -"@angular-devkit/core@9.1.13": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.13.tgz#47135a25c04ceb62579f0a50d4ad015c7741235a" - integrity sha512-bwehVRsva9OWfh/yuEh9VU+0Gr1T7DHJLe8tpZk/VsIkGOD0IszEPZOIEK23bg32yiff9bh6qJEPMA7ZBYEQHg== +"@angular-devkit/core@9.1.14": + version "9.1.14" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.14.tgz#d698d8322f4b231170c549bb52af4be475a9620d" + integrity sha512-xwGCDR8Wcn1/IPw0Sjabr9YNi/7T7I+dHKIWs3m7SYf4ebkqkIkQUdIlhzgB8KzXJboDUV9w8TNsVjHqgLyN2Q== dependencies: ajv "6.12.3" fast-json-stable-stringify "2.1.0" @@ -143,86 +146,88 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/schematics@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.0.6.tgz#06631190cb22609462597cd6659080fc3313582a" - integrity sha512-hCyu/SSSiC6dKl/NxdWctknIrBqKR6pRe7DMArWowrZX6P9oi36LpKEFnKutE8+tXjsOqQj8XMBq9L64sXZWqg== +"@angular-devkit/schematics@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.2.0.tgz#82192578ff2a9fb01a9d8c56237f4fc98946e757" + integrity sha512-sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w== dependencies: - "@angular-devkit/core" "11.0.6" - ora "5.1.0" + "@angular-devkit/core" "11.2.0" + ora "5.3.0" rxjs "6.6.3" -"@angular-devkit/schematics@9.1.13": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.13.tgz#cdbd4b9067b1c610f99bb64d494071e8a7ee1b2c" - integrity sha512-DZBmfYE6xIfC6PDMvQpR8B31TtLWOmSeTQPnmSm9gj6OZpyqFqoGWOz/0l05FH6zC8HLthAAFJSEnPYyhzWDvg== +"@angular-devkit/schematics@9.1.14": + version "9.1.14" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.14.tgz#38df5c0e3badc13f10d0a1f432fc5188edab6604" + integrity sha512-LlSRkoxeJIaptJEoSIds060qv8wcLvI9XZPhUnWHY+FddC/X3OO+Tag9U6CaJ5tfBRnKTS7GtBwQgI0Gip6rhA== dependencies: - "@angular-devkit/core" "9.1.13" + "@angular-devkit/core" "9.1.14" ora "4.0.3" rxjs "6.5.4" "@angular-devkit/schematics@^10.1.0": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.1.tgz#1d1aaf3875c9ed5eb3ad97af993af39fe9ed10a9" - integrity sha512-0oMhB1eM7hg5Xf4U7r193zrNTGyxfzl2okBsLJPuVmkb3KCBGQOyHYmU5HjDNadPc5iCFc+Xo2+DSDvXGuLmaA== + version "10.2.2" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.2.tgz#a037976e89768ad82d2cfa35b2a80939e34f6f32" + integrity sha512-HnNll8mxPQqcWrG/YcF8XXNvYq7Ixq2H/EJgbRUQDh9WHcS+5F2hD+WirnV2+co1H4+BZhMRc22bmec+o1aSGw== dependencies: - "@angular-devkit/core" "10.2.1" + "@angular-devkit/core" "10.2.2" ora "5.0.0" rxjs "6.6.2" -"@angular/animations@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.8.tgz#abb3a016bc9164176d1edfcbd2783cc3ba6f9ca3" - integrity sha512-LlKR5bO7WsykZGcPDnL7c4q2/eq2fqywD+KMw5FemGLI8mN1mnq30br9/8TgaFwY0Do1OTOUh1JSrn1ybQgTwA== +"@angular/animations@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387" + integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg== dependencies: tslib "^2.0.0" -"@angular/cdk@^11.0.3": - version "11.0.3" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.0.3.tgz#f5a119e28b4ba21a6f013dfd4de41b16083bd25a" - integrity sha512-hgbJXvZURKBnZawwxUrsZE/3a+HCJh2UhoLIng3cn5Q+WIW/4a37knDl8B9DYKBWrCqeINXNcUHVSKkWc/gjCA== +"@angular/cdk@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.0.tgz#4f0d8e9865d29ee1b2ab3ce7be9a7af0a87b0ef4" + integrity sha512-25k1giKAJ7DPzJBZfAVZmw/VfR4pZUaZnhgVAMwIdGPl5SaXJEW3e2znGlhzwkuQsiBgrSKfMgJmwKSyUbe2tg== dependencies: tslib "^2.0.0" optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.0.6.tgz#8d65d3ad3841aabe23ff38a41fa6c4f38dd12f66" - integrity sha512-bwrXXyU23HjUlFl0CNCU+XMGa/enooqpMLcTAA15StVpKFHyaA4c57il/aqu+1IuB+zR6rGDzhAABuvRcHd+mQ== +"@angular/cli@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.0.tgz#f611f0851f6f92008f0f5aaaade947751b27687f" + integrity sha512-waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" - "@schematics/angular" "11.0.6" - "@schematics/update" "0.1100.6" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" + "@schematics/angular" "11.2.0" + "@schematics/update" "0.1102.0" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" - debug "4.2.0" - ini "1.3.6" + debug "4.3.1" + ini "2.0.0" inquirer "7.3.3" + jsonc-parser "3.0.0" npm-package-arg "8.1.0" npm-pick-manifest "6.1.0" - open "7.3.0" - pacote "9.5.12" - resolve "1.18.1" + open "7.4.0" + ora "5.3.0" + pacote "11.2.4" + resolve "1.19.0" rimraf "3.0.2" - semver "7.3.2" - symbol-observable "2.0.3" + semver "7.3.4" + symbol-observable "3.0.0" universal-analytics "0.4.23" - uuid "8.3.1" + uuid "8.3.2" -"@angular/common@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.0.8.tgz#f3fd177af584a4e59b2a9bc1a90fa45dcb3dd672" - integrity sha512-Or7uSetk29wcKOsDVyJl/2JUC34e/gDNI3HNlpFh98miT8G4tqFKSmuLGRPPanIKqyQQQmquV93VNPOMA+rdYA== +"@angular/common@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f" + integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.0.8.tgz#4284fc6e9cc7bee5314738cd32ce8bbdba20237c" - integrity sha512-xblOhSgshNzAxNmLdBjdLHMc3Zoc12w5Bz70nrqtAfK9DY6kQx6aAxpbhOr/F5Jl5XFNbvIviOOkG9aqM1Iuuw== +"@angular/compiler-cli@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.0.tgz#850bee57566c00b28a0842bce775b8c4597a4185" + integrity sha512-FJ8OHWBQftmncDGV43ASFeCu3cW1W2P5fvub9fiBFEeTIkB/HXrMOMCQg/1XSdfA5kwFzj2NedMp573X9kq6ng== dependencies: "@babel/core" "^7.8.6" "@babel/types" "^7.8.6" @@ -245,10 +250,10 @@ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/compiler@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.8.tgz#da59389d805034a261b839d703bca3134b6157c4" - integrity sha512-v7NjxLvyJl2cxH7roVTMLnaFCLA9gStgndxJcsXtD+hI7hCOFvrzxwpm3J822KYEkwWhB1PMthJwrZ6OWtkp/A== +"@angular/compiler@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2" + integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ== dependencies: tslib "^2.0.0" @@ -257,17 +262,17 @@ resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e" integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w== -"@angular/core@>=4.3.1", "@angular/core@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.0.8.tgz#cc4ffc5506b393bf851fd7b94760d2a66efeb47c" - integrity sha512-NRKCgOtPFKcJpjjSV0NKuoNaD6ZQ3RqXBm9JURbnjVLaTwtCJlQ9H3N/e+HZNw8Ha2TDFJoiYX+RY071cyTMHQ== +"@angular/core@>=4.3.1", "@angular/core@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467" + integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g== dependencies: tslib "^2.0.0" -"@angular/forms@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.0.8.tgz#f0d68407b50174e4c8b6d3b134fafed792db5320" - integrity sha512-soTg9Zc3G08J/+LRq5FxFvVsKoDQb4F29nEVpbH7oK2hof9Qqois9lH8bJy5dHbNh1qNXYmlWjUd7CQ9p+bbUg== +"@angular/forms@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed" + integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA== dependencies: tslib "^2.0.0" @@ -278,74 +283,52 @@ dependencies: tslib "^1.9.0" -"@angular/language-service@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.0.8.tgz#2354589115c7f851c016c7d3a68952f37040b80c" - integrity sha512-5iKvCzb0YWCrEvCUCGsmwQxfUQjnAOdeaNHieLmfkpAutojtIrK59rNmyQqA2RBpo2OZMANz0/aOde1N2rHI0w== +"@angular/language-service@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.0.tgz#a233129970ccb05dab87093ae9410474a6e92128" + integrity sha512-0n7yrBiwpN6qUEDBoMHxEzxRN+w4tIe+42Ra68UQ5leBx5mSA6P6Ipi+nPwy8RXjqNEHgR0D//30Zp18O8UhCA== -"@angular/material@^11.0.3": - version "11.0.3" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.0.3.tgz#dd848f1804b07c9654b095d5b1accb13083e91e5" - integrity sha512-YTHmtKGwjAEFAOOmuivcwnINMPHxvM7iZQpTgZqDKNiqiv53cwry2Ctb54suRNT+D794z59D0/r+YocGkzFv3w== +"@angular/material@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.0.tgz#a5843f2964366daebab9edf2b0a3d6dcad451f5d" + integrity sha512-duTQdHtzdZ3KWn90JcN+eI0oNwr7E7JGEOp7tZ9XOtqty0h158SJUCYSuDxhFOqyAgaY41enNPHdB2c4Xz0iBQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.0.8.tgz#f7714f40e0cb3044f7dfd362371d39c9c4501b19" - integrity sha512-rirFL6R0R9wXTYfzZzsF7Zchq48439QQHAQ3Pi0nTDtyn3seHIEWMW1FcwjuPIt/ea5F+kRB4L8fxGK8G1/taA== +"@angular/platform-browser-dynamic@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7" + integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.0.8.tgz#aa3863512ad63373d9c6d13ecb64cc1357de959e" - integrity sha512-07nbExdtf2fRJh3XEicbCj1fK0/tWmIW/TaWJ9hv1xeQLjPDcplTF0MaPSlow36qyO+q83rsd3hxyFfBTqgOyw== +"@angular/platform-browser@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403" + integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow== dependencies: tslib "^2.0.0" -"@angular/router@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.0.8.tgz#771b4a235eb696d4411e867f13701532b0d95c67" - integrity sha512-vinpCct3r+6wFtGdYNa/l5PCpJqQSB/D9Z+zZBdmDUy9s32dggHG4msmVrYbFH/j7cKDAycqHGVFyj0hKGDQiQ== +"@angular/router@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.0.tgz#00dca75d6dce5a88259fea88866caa51ebf1d1a7" + integrity sha512-Gw08D6W4SGEIgm5zKdGs1yCW7FnwYjF8cycWczrpU8fmZh+WLbIjPAy/blI/nByCDU9BGyZ7cWGOiQJHEnzWmg== dependencies: tslib "^2.0.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: - "@babel/highlight" "^7.10.4" + "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" - integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== +"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" + integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== -"@babel/core@7.12.3": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5", "@babel/core@^7.8.6": +"@babel/core@7.12.10": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -366,16 +349,28 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" - integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg== +"@babel/core@^7.7.5", "@babel/core@^7.8.6": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" + integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== dependencies: - "@babel/types" "^7.12.1" - jsesc "^2.5.1" + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.15" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helpers" "^7.12.13" + "@babel/parser" "^7.12.16" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11": +"@babel/generator@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== @@ -384,155 +379,155 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" - integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== +"@babel/generator@^7.12.10", "@babel/generator@^7.12.13", "@babel/generator@^7.12.15": + version "7.12.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" + integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" + jsesc "^2.5.1" + source-map "^0.5.0" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" - integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== +"@babel/helper-annotate-as-pure@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" + integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" - integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" + integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== dependencies: - "@babel/compat-data" "^7.12.5" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-explode-assignable-expression" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-compilation-targets@^7.12.5": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz#6905238b4a5e02ba2d032c1a49dd1820fe8ce61b" + integrity sha512-dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg== + dependencies: + "@babel/compat-data" "^7.12.13" + "@babel/helper-validator-option" "^7.12.16" browserslist "^4.14.5" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" - integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== +"@babel/helper-create-class-features-plugin@^7.12.13": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz#955d5099fd093e5afb05542190f8022105082c61" + integrity sha512-KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-member-expression-to-functions" "^7.12.16" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" -"@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" - integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== +"@babel/helper-create-regexp-features-plugin@^7.12.13": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz#3b31d13f39f930fad975e151163b7df7d4ffe9d3" + integrity sha512-jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-map@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" - integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== +"@babel/helper-explode-assignable-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a" + integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.5" + "@babel/types" "^7.12.13" + +"@babel/helper-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" + integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== + dependencies: + "@babel/helper-get-function-arity" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-get-function-arity@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" + integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-hoist-variables@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd" + integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" + integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.12.5": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" + integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" + integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" lodash "^4.17.19" -"@babel/helper-explode-assignable-expression@^7.10.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" - integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== +"@babel/helper-optimise-call-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" + integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" -"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" - integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" + integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== + +"@babel/helper-remap-async-to-generator@^7.12.1", "@babel/helper-remap-async-to-generator@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" + integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA== dependencies: - "@babel/helper-get-function-arity" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/types" "^7.12.11" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-get-function-arity@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" - integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== +"@babel/helper-replace-supers@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" + integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== dependencies: - "@babel/types" "^7.12.10" + "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-hoist-variables@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" - integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== +"@babel/helper-simple-access@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" + integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" - integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== - dependencies: - "@babel/types" "^7.12.7" - -"@babel/helper-module-imports@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== - dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" - integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== - dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-remap-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" - integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-wrap-function" "^7.10.4" - "@babel/types" "^7.12.1" - -"@babel/helper-replace-supers@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" - integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.7" - "@babel/helper-optimise-call-expression" "^7.12.10" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.11" - -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== - dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1": version "7.12.1" @@ -541,162 +536,162 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" - integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== +"@babel/helper-split-export-declaration@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" + integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": +"@babel/helper-validator-identifier@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" - integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== +"@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz#f73cbd3bbba51915216c5dea908e9b206bb10051" + integrity sha512-uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ== -"@babel/helper-wrap-function@^7.10.4": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" - integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== +"@babel/helper-wrap-function@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff" + integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== +"@babel/helpers@^7.12.13", "@babel/helpers@^7.12.5": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" + integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/highlight@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" + integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.4", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" - integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== +"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.12.7": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" + integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== "@babel/plugin-proposal-async-generator-functions@^7.12.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" - integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5" + integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-proposal-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" - integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8" + integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-proposal-dynamic-import@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" - integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz#b9f33b252e3406d492a15a799c9d45a9a9613473" + integrity sha512-yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" - integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" + integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-proposal-json-strings@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" - integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d" + integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-json-strings" "^7.8.0" "@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" - integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350" + integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" - integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde" + integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" - integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== +"@babel/plugin-proposal-numeric-separator@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" + integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011" + integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.13" "@babel/plugin-proposal-optional-catch-binding@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" - integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5" + integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" - integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== +"@babel/plugin-proposal-optional-chaining@^7.12.7": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz#600c7531f754186b0f2096e495a92da7d88aa139" + integrity sha512-O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" - integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71" + integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" - integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" + integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" @@ -706,11 +701,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" @@ -776,20 +771,20 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-arrow-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" - integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe" + integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-async-to-generator@^7.12.1": +"@babel/plugin-transform-async-to-generator@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== @@ -798,259 +793,266 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.12.1" -"@babel/plugin-transform-block-scoped-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" - integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== +"@babel/plugin-transform-async-to-generator@^7.12.1": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" + integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" - integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== +"@babel/plugin-transform-block-scoped-functions@^7.12.1": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" + integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-block-scoping@^7.12.11": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" + integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-classes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" - integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6" + integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-define-map" "^7.10.4" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" - integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d" + integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-destructuring@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" - integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb" + integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" - integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" + integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-duplicate-keys@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" - integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" + integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-exponentiation-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" - integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" + integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-for-of@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" - integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6" + integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-function-name@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" - integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" + integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" - integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" + integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-member-expression-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" - integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" + integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-modules-amd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" - integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56" + integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" - integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50" + integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" - integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5" + integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA== dependencies: - "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-hoist-variables" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-umd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" - integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37" + integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" - integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" + integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/plugin-transform-new-target@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" - integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" + integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-object-super@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" - integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" + integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" -"@babel/plugin-transform-parameters@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" - integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853" + integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-property-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" - integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" + integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-regenerator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" - integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" + integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" - integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" + integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" - integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== +"@babel/plugin-transform-runtime@7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" + integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== dependencies: - "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - resolve "^1.8.1" semver "^5.5.1" "@babel/plugin-transform-shorthand-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" - integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" + integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" - integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949" + integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" - integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== +"@babel/plugin-transform-sticky-regex@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" + integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-template-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" - integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865" + integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-typeof-symbol@^7.12.1": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" - integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== +"@babel/plugin-transform-typeof-symbol@^7.12.10": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" + integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" - integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" + integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-unicode-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" - integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" + integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" - integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== +"@babel/preset-env@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-compilation-targets" "^7.12.1" - "@babel/helper-module-imports" "^7.12.1" + "@babel/compat-data" "^7.12.7" + "@babel/helper-compilation-targets" "^7.12.5" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1058,10 +1060,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.7" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1079,7 +1081,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1103,14 +1105,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.1" - core-js-compat "^3.6.2" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1124,30 +1126,21 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" - integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@7.12.5": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== +"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" + integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.12.7": +"@babel/template@7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== @@ -1156,25 +1149,34 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" - integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== +"@babel/template@^7.12.13", "@babel/template@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== dependencies: - "@babel/code-frame" "^7.12.11" - "@babel/generator" "^7.12.11" - "@babel/helper-function-name" "^7.12.11" - "@babel/helper-split-export-declaration" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/types" "^7.12.12" + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.12.10", "@babel/traverse@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" + integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" - integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== +"@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" + integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -1189,25 +1191,25 @@ ajv-keywords "^3.4.1" "@electron/get@^1.0.1": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3" - integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg== + version "1.12.4" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" + integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" - sanitize-filename "^1.6.2" + semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^2.0.2" global-tunnel-ng "^2.7.1" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/types@^26.6.2": version "26.6.2" @@ -1236,14 +1238,14 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== -"@ngtools/webpack@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.6.tgz#1a1d7775022e7e6263f8d9ee2872d995163b3fc0" - integrity sha512-vf5YNEpXWRa0fKC/BRq5sVVj2WnEqW8jn14YQRHwVt5ppUeyu8IKUF69p6W1MwZMgMqMaw/vPQ8LI5cFbyf3uw== +"@ngtools/webpack@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.2.0.tgz#720c3a50aae5aced2fe049f7efc3434320bbe539" + integrity sha512-2KYaA/fIw863jydXDolWp4kUNLODVIKs2834vW+oztocnYFe/z4dTz6rArKFUCixMCu12ieXrjAetzGA564bsg== dependencies: - "@angular-devkit/core" "11.0.6" - enhanced-resolve "5.3.1" - webpack-sources "2.0.1" + "@angular-devkit/core" "11.2.0" + enhanced-resolve "5.7.0" + webpack-sources "2.2.0" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1266,18 +1268,79 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" +"@npmcli/ci-detect@^1.0.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a" + integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q== + +"@npmcli/git@^2.0.1": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.6.tgz#47b97e96b2eede3f38379262fa3bdfa6eae57bf2" + integrity sha512-a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg== + dependencies: + "@npmcli/promise-spawn" "^1.1.0" + lru-cache "^6.0.0" + mkdirp "^1.0.3" + npm-pick-manifest "^6.0.0" + promise-inflight "^1.0.1" + promise-retry "^2.0.1" + semver "^7.3.2" + unique-filename "^1.1.1" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.5": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" + integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + "@npmcli/move-file@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" - integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== dependencies: mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@npmcli/node-gyp@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede" + integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg== + +"@npmcli/promise-spawn@^1.1.0", "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5" + integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg== + dependencies: + infer-owner "^1.0.4" + +"@npmcli/run-script@^1.3.0": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.3.tgz#07f440ed492400bb1114369bc37315eeaaae2bb3" + integrity sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ== + dependencies: + "@npmcli/node-gyp" "^1.0.2" + "@npmcli/promise-spawn" "^1.3.2" + infer-owner "^1.0.4" + node-gyp "^7.1.0" + puka "^1.0.1" + read-package-json-fast "^2.0.1" "@octetstream/promisify@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== +"@open-policy-agent/opa-wasm@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz#481b766093f70b00efefbee1e4192f375fd34ca2" + integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== + dependencies: + sprintf-js "^1.1.2" + utf8 "^3.0.0" + "@popperjs/core@^2.5.3": version "2.6.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f" @@ -1296,35 +1359,35 @@ lodash "^4.17.20" lodash-es "^4.17.20" -"@schematics/angular@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.0.6.tgz#5e52f8396e66138df0d6062130399fab830ee79e" - integrity sha512-XUcpOrlcp55PBHrgpIVx69lnhDY6ro35BSRmqNmjXik56qcOkfvdki8vvyW9EsWvu9/sfBSsVDdparlbVois7w== +"@schematics/angular@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.2.0.tgz#da903e0fc09e834cf53452a30ea7d2eb78608ebc" + integrity sha512-PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw== dependencies: - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" - jsonc-parser "2.3.1" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" + jsonc-parser "3.0.0" "@schematics/angular@^9.1.0": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.13.tgz#e4be3f8b71ef8b27f0d1f0b1325f9806f56cb683" - integrity sha512-coHvhu2jXVCN3P5Ux5ArDousMWDq4W6eInJPBpAI6yidRW1ViPVF58Bas/+Txcbhubv2cZViBXGq0OAGdJIvTQ== + version "9.1.14" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.14.tgz#bb80d082b00d4614aa416052b57799f52f62667b" + integrity sha512-FoPX+D/+Mg/pofTobRGG28Gf84kbXql+LrLRVrVZ2V9sPvdWSD1b0U/y6pYtbEYLBg5OQ0vC6d2BfOJLOxFAvA== dependencies: - "@angular-devkit/core" "9.1.13" - "@angular-devkit/schematics" "9.1.13" + "@angular-devkit/core" "9.1.14" + "@angular-devkit/schematics" "9.1.14" -"@schematics/update@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1100.6.tgz#8e76276a3daecfd698b39e7643bc21f3abb3a4d0" - integrity sha512-+B8n+k+zZ3VYOhjNBsLqzjp8O9ZdUWgdpf9L8XAA7mh/oPwufXpExyEc66uAS07imvUMmjz6i8E2eNWV/IjBJg== +"@schematics/update@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1102.0.tgz#6aa5e25cd18ab9e99d8cd06752583d1ed21a6a65" + integrity sha512-2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g== dependencies: - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" "@yarnpkg/lockfile" "1.1.0" - ini "1.3.6" + ini "2.0.0" npm-package-arg "^8.0.0" - pacote "9.5.12" - semver "7.3.2" + pacote "11.2.4" + semver "7.3.4" semver-intersect "1.4.0" "@sentry/browser@5.27.6": @@ -1337,20 +1400,20 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/browser@^5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.29.2.tgz#51adb4005511b1a4a70e4571880fc6653d651f91" - integrity sha512-uxZ7y7rp85tJll+RZtXRhXPbnFnOaxZqJEv05vJlXBtBNLQtlczV5iCtU9mZRLVHDtmZ5VVKUV8IKXntEqqDpQ== +"@sentry/browser@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.1.0.tgz#0e18a07b44bebed729bcf842af33203e388e2053" + integrity sha512-t3y2TLXDWgvfknyH8eKj/9mghJfSEqItFyp74zPu1Src6kOPjkd4Sa7o4+bdkNgA8dIIOrDAhRUbB2sq4sWMCA== dependencies: - "@sentry/core" "5.29.2" - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/core" "6.1.0" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" -"@sentry/cli@^1.61.0": - version "1.61.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.61.0.tgz#98be4cce2d61df91a8cb42afb740b46eba029925" - integrity sha512-pHEhqP1bB4sdO7N5ow/IkRBrPbKT9HZRinq4PhTVIvmG+NW4VVuVZ6k4tlbp+JXmzMcUc/iXynVkTL7zJIlTQw== +"@sentry/cli@^1.62.0": + version "1.62.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.62.0.tgz#2e2d8cacb5ec494f86c188ef95b41745605be028" + integrity sha512-MCkx+zjetdIWhAVaFuEuoD4MOAFlb3/GLR5B5uFZ1AcegcsggasLo/3rb2gq6jYIic/pubtRjH4ltmOL/s3cag== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" @@ -1369,21 +1432,21 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/core@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.29.2.tgz#9e05fe197234161d57aabaf52fab336a7c520d81" - integrity sha512-7WYkoxB5IdlNEbwOwqSU64erUKH4laavPsM0/yQ+jojM76ErxlgEF0u//p5WaLPRzh3iDSt6BH+9TL45oNZeZw== +"@sentry/core@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.1.0.tgz#7dd4584dcaf2188a78b94b766068342e6ee65229" + integrity sha512-57mXkp3NoyxRycXrL+Ec6bYS6UYJZp9tYX0lUp5Ry2M0FxDZ3Q4drkjr8MIQOhBaQXP2ukSX4QTVLGMPm60zMw== dependencies: - "@sentry/hub" "5.29.2" - "@sentry/minimal" "5.29.2" - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/hub" "6.1.0" + "@sentry/minimal" "6.1.0" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" -"@sentry/electron@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.1.0.tgz#82985f473590a99a5a19f879a4948617d185b3bb" - integrity sha512-ZOJmtAWNc2reJqgVPxuKGenXcl88gj7hqDk1dHo+kW4J+D28/pfbGEFr4aLvaUq5G8ZFGsxT0cZObAExIFv3Nw== +"@sentry/electron@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.2.0.tgz#e59d9cea4e5c3b003e2fc6fc9ecf1bfc1af15eb6" + integrity sha512-wNUIsRxb86zK1tV77MZaSLWHM2CxgC1QLJCWxr+Tkash6tESfMY2XlC4+7XQKHfASU3QHt5l4R55/rhrr7ChJA== dependencies: "@sentry/browser" "5.27.6" "@sentry/core" "5.27.6" @@ -1402,13 +1465,13 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/hub@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.29.2.tgz#208f10fe6674695575ad74182a1151f71d6df00a" - integrity sha512-LaAIo2hwUk9ykeh9RF0cwLy6IRw+DjEee8l1HfEaDFUM6TPGlNNGObMJNXb9/95jzWp7jWwOpQjoIE3jepdQJQ== +"@sentry/hub@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.1.0.tgz#fb22734c91c9d68564737996bf28b7e032e3d8ee" + integrity sha512-JnBSCgNg3VHiMojUl5tCHU8iWPVuE+qqENIzG9A722oJms1kKWBvWl+yQzhWBNdgk5qeAY3F5UzKWJZkbJ6xow== dependencies: - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" "@sentry/minimal@5.27.6": @@ -1420,13 +1483,13 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/minimal@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.29.2.tgz#420bebac8d03d30980fdb05c72d7b253d8aa541b" - integrity sha512-0aINSm8fGA1KyM7PavOBe1GDZDxrvnKt+oFnU0L+bTcw8Lr+of+v6Kwd97rkLRNOLw621xP076dL/7LSIzMuhw== +"@sentry/minimal@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.1.0.tgz#b3abf76d93b95477a3c1029db810818bdc56845f" + integrity sha512-g6sfNKenL7wnsr/tibp8nFiMv/XRH0s0Pt4p151npmNI+SmjuUz3GGYEXk8ChCyaKldYKilkNOFdVXJxUf5gZw== dependencies: - "@sentry/hub" "5.29.2" - "@sentry/types" "5.29.2" + "@sentry/hub" "6.1.0" + "@sentry/types" "6.1.0" tslib "^1.9.3" "@sentry/node@5.27.6": @@ -1460,10 +1523,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.6.tgz#b5054eafcb8ac11d4bc4787c7bc7fc113cad8b80" integrity sha512-XOW9W8DrMk++4Hk7gWi9o5VR0o/GrqGfTKyFsHSIjqt2hL6kiMPvKeb2Hhmp7Iq37N2bDmRdWpM5m+68S2Jk6w== -"@sentry/types@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.29.2.tgz#ac87383df1222c2d9b9f8f9ed7a6b86ea41a098a" - integrity sha512-dM9wgt8wy4WRty75QkqQgrw9FV9F+BOMfmc0iaX13Qos7i6Qs2Q0dxtJ83SoR4YGtW8URaHzlDtWlGs5egBiMA== +"@sentry/types@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.1.0.tgz#5f9379229423ca1325acf6709e95687180f67132" + integrity sha512-kIaN52Fw5K+2mKRaHE2YluJ+F/qMGSUzZXIFDNdC6OUMXQ4TM8gZTrITXs8CLDm7cK8iCqFCtzKOjKK6KyOKAg== "@sentry/utils@5.27.6": version "5.27.6" @@ -1473,12 +1536,12 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/utils@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.29.2.tgz#99a5cdda2ea19d34a41932f138d470adcb3ee673" - integrity sha512-nEwQIDjtFkeE4k6yIk4Ka5XjGRklNLThWLs2xfXlL7uwrYOH2B9UBBOOIRUraBm/g/Xrra3xsam/kRxuiwtXZQ== +"@sentry/utils@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.1.0.tgz#52e3d7050983e685d3a48f9d2efa1e6eb4ae3e6d" + integrity sha512-6JAplzUOS6bEwfX0PDRZBbYRvn9EN22kZfcL0qGHtM9L0QQ5ybjbbVwOpbXgRkiZx++dQbzLFtelxnDhsbFG+Q== dependencies: - "@sentry/types" "5.29.2" + "@sentry/types" "6.1.0" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1491,31 +1554,21 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== -"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": +"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": version "2.11.0" resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" -"@snyk/cli-interface@2.9.1": - version "2.9.1" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.9.1.tgz#e0466d183e7d4a13112ba098b1702a0d628dd380" - integrity sha512-2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA== +"@snyk/cocoapods-lockfile-parser@3.6.2": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz#803ae9466f408c48ba7c5a8ec51b9dbac6f633b3" + integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== dependencies: - "@snyk/dep-graph" "1.19.4" - "@types/graphlib" "^2.1.7" - tslib "^1.9.3" - -"@snyk/cocoapods-lockfile-parser@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.2.tgz#7f441ecf2fb9c0b488db7e392447d2c520b60cef" - integrity sha512-fIiUNCmhDp7lVKTs/nHCnLK1roMkG15HhuQhtZXxiFW3EZ5H9IqMdtrxqjXuzVWt7X2h7lbF5OMBzD07NODtug== - dependencies: - "@snyk/dep-graph" "1.19.4" + "@snyk/dep-graph" "^1.23.1" "@types/js-yaml" "^3.12.1" js-yaml "^3.13.1" - source-map-support "^0.5.7" tslib "^1.10.0" "@snyk/composer-lockfile-parser@^1.4.1": @@ -1528,36 +1581,27 @@ lodash.invert "^4.3.0" lodash.isempty "^4.4.0" -"@snyk/dep-graph@1.19.4": - version "1.19.4" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.4.tgz#d156c482bfdfba7505f1cf3e8a80b86dd9f45383" - integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== +"@snyk/dep-graph@1.23.1", "@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1": + version "1.23.1" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.23.1.tgz#c884811669983febb6685f9107b322b3c0603f42" + integrity sha512-bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ== dependencies: - graphlib "^2.1.8" - lodash.isequal "^4.5.0" - object-hash "^2.0.3" - semver "^6.0.0" - source-map-support "^0.5.19" - tslib "^1.13.0" - -"@snyk/dep-graph@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.21.0.tgz#02bc39598c7415d6d78d2ea6fd46f44514f9039c" - integrity sha512-+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw== - dependencies: - graphlib "^2.1.8" - lodash.isequal "^4.5.0" - object-hash "^2.0.3" - semver "^6.0.0" - tslib "^1.13.0" - -"@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.19.4", "@snyk/dep-graph@^1.19.5", "@snyk/dep-graph@^1.21.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.22.0.tgz#3c9090b3a52596a0758d007e5ae8fda88864601d" - integrity sha512-KBRCZieE3XD4sd7yi0kBODElZF2que9jEgPnxNBwKcECHNH+DKv0rUIHchpMMrY2jK/cmbbq8Dmv/rmFLVT7CQ== - dependencies: - graphlib "^2.1.8" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" lodash.isequal "^4.5.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" object-hash "^2.0.3" semver "^6.0.0" tslib "^1.13.0" @@ -1576,34 +1620,73 @@ resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== -"@snyk/java-call-graph-builder@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.17.0.tgz#b183a6bc21e3b05756c7bcb4b953fa9a78a3e983" - integrity sha512-uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA== +"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": + version "2.1.9-patch.3" + resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" + integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== dependencies: - ci-info "^2.0.0" - debug "^4.1.1" - glob "^7.1.6" - graphlib "^2.1.8" - jszip "^3.2.2" - needle "^2.3.3" - progress "^2.0.3" - snyk-config "^4.0.0-rc.2" - source-map-support "^0.5.7" - temp-dir "^2.0.0" - tmp "^0.2.1" - tslib "^1.9.3" - xml-js "^1.6.11" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" -"@snyk/java-call-graph-builder@1.18.0": - version "1.18.0" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz#f93abeaf347083b9d534a4f94b1468fd97d111a0" - integrity sha512-6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ== +"@snyk/inquirer@^7.3.3-patch": + version "7.3.3-patch" + resolved "https://registry.yarnpkg.com/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz#ef84d531724c53b755e8dd454e1a3c2ccdcfc0bf" + integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.defaults "^4.2.0" + lodash.filter "^4.6.0" + lodash.find "^4.6.0" + lodash.findindex "^4.6.0" + lodash.flatten "^4.4.0" + lodash.isboolean "^3.0.3" + lodash.isfunction "^3.0.9" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.last "^3.0.0" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.set "^4.3.2" + lodash.sum "^4.0.2" + lodash.uniq "^4.5.0" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + +"@snyk/java-call-graph-builder@1.19.1": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz#1d579d782df3bb5f9d5171cc35180596cd90aa8b" + integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== + dependencies: + "@snyk/graphlib" "2.1.9-patch.3" ci-info "^2.0.0" debug "^4.1.1" glob "^7.1.6" - graphlib "^2.1.8" jszip "^3.2.2" needle "^2.3.3" progress "^2.0.3" @@ -1621,14 +1704,14 @@ dependencies: event-loop-spinner "^2.0.0" -"@snyk/snyk-cocoapods-plugin@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.1.tgz#af4e749ee1420c1596345fefae3c5eb48b84ecb0" - integrity sha512-A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg== +"@snyk/snyk-cocoapods-plugin@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz#cd724fcd637cb3af76187bf7254819b6079489f6" + integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== dependencies: - "@snyk/cli-interface" "^2.9.2" - "@snyk/cocoapods-lockfile-parser" "3.5.2" - "@snyk/dep-graph" "^1.19.4" + "@snyk/cli-interface" "^2.11.0" + "@snyk/cocoapods-lockfile-parser" "3.6.2" + "@snyk/dep-graph" "^1.23.1" source-map-support "^0.5.7" tslib "^2.0.0" @@ -1656,6 +1739,11 @@ dependencies: defer-to-connect "^2.0.0" +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@types/cacheable-request@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" @@ -1671,10 +1759,25 @@ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf" integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw== +"@types/component-emitter@^1.2.10": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" + integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== + +"@types/cookie@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" + integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== + +"@types/cors@^2.8.8": + version "2.8.10" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" + integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== + "@types/d3-array@*": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee" - integrity sha512-Q0ubcGHAmCRPh90/hoYB4eKWhxYKUxphwSeQrlz2tiabQ8S9zqhaE2CZJtCaLH2cjqKcjr52WPvmOA7ha0O4ZA== + version "2.9.0" + resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.9.0.tgz#fb6c3d7d7640259e68771cd90cc5db5ac1a1a012" + integrity sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ== "@types/d3-array@1.2": version "1.2.8" @@ -1907,10 +2010,31 @@ dependencies: electron "*" +"@types/eslint-scope@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" + integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.2.6" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" + integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.46": + version "0.0.46" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" + integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== + "@types/fs-extra@^9.0.1": - version "9.0.6" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab" - integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig== + version "9.0.7" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" + integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== dependencies: "@types/node" "*" @@ -1927,7 +2051,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graphlib@^2", "@types/graphlib@^2.1.7": +"@types/graphlib@^2": version "2.1.7" resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== @@ -1966,10 +2090,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@*", "@types/jasmine@~3.6.0": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.2.tgz#02f64450016f7de70f145d698be311136d7c6374" - integrity sha512-AzfesNFLvOs6Q1mHzIsVJXSeUnqVh4ZHG8ngygKJfbkcSLwzrBVm/LKa+mR8KrOfnWtUL47112gde1MC0IXqpQ== +"@types/jasmine@*", "@types/jasmine@~3.6.3": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050" + integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA== "@types/jasminewd2@^2.0.8": version "2.0.8" @@ -1991,10 +2115,10 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1" integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" - integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== "@types/keyv@*": version "3.1.1" @@ -2018,22 +2142,17 @@ resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.5.tgz#e95569aa6273dbe0ed1814f86287547cc06e93c9" integrity sha512-OwVhKFim9Y/MprzCe4I6a59p31pMy8+LrtP6qS7J0kaOxYmW6VVJPBw5NYm+g7nSbgPUz22FvqU1F1hC5YGTfg== -"@types/node@*": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== - -"@types/node@14.14.10": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== +"@types/node@*", "@types/node@14.14.28", "@types/node@^14.14.10": + version "14.14.28" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b" + integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g== "@types/node@^12.0.12": - version "12.19.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.13.tgz#888e2b34159fb91496589484ec169618212b51b7" - integrity sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w== + version "12.20.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472" + integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g== -"@types/node@^6.14.4", "@types/node@^6.14.7": +"@types/node@^6.14.7": version "6.14.13" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== @@ -2058,10 +2177,10 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" - integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== +"@types/react-dom@^17.0.1": + version "17.0.1" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.1.tgz#d92d77d020bfb083e07cc8e0ac9f933599a4d56a" + integrity sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q== dependencies: "@types/react" "*" @@ -2072,18 +2191,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.35", "@types/react@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" - integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^16.9.11": - version "16.14.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c" - integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ== +"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.2": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2100,11 +2211,6 @@ resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b" integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw== -"@types/semver@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" - integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -2130,12 +2236,20 @@ integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== "@types/yargs@^15.0.0", "@types/yargs@^15.0.5": - version "15.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" - integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== + version "15.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" + integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" +"@webassemblyjs/ast@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" + integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2145,16 +2259,31 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" +"@webassemblyjs/floating-point-hex-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" + integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== + "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== +"@webassemblyjs/helper-api-error@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" + integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== + "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== +"@webassemblyjs/helper-buffer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" + integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2179,11 +2308,35 @@ dependencies: "@webassemblyjs/ast" "1.9.0" +"@webassemblyjs/helper-numbers@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" + integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" + integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== + "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== +"@webassemblyjs/helper-wasm-section@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" + integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2194,6 +2347,13 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" +"@webassemblyjs/ieee754@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" + integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2201,6 +2361,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/leb128@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" + integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2208,11 +2375,30 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" + integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== + "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== +"@webassemblyjs/wasm-edit@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" + integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/helper-wasm-section" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-opt" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wast-printer" "1.11.0" + "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2227,6 +2413,17 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/wasm-gen@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" + integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2238,6 +2435,16 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" +"@webassemblyjs/wasm-opt@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" + integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2248,6 +2455,18 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" +"@webassemblyjs/wasm-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" + integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2272,6 +2491,14 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" + integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -2296,14 +2523,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -JSONStream@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -2327,6 +2546,11 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^8.0.4: + version "8.0.5" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" + integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== + adjust-sourcemap-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e" @@ -2340,11 +2564,6 @@ adm-zip@^0.4.9: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== -after@0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2366,11 +2585,13 @@ agent-base@~4.2.1: dependencies: es6-promisify "^5.0.0" -agentkeepalive@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" - integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== +agentkeepalive@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" + integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== dependencies: + debug "^4.1.0" + depd "^1.1.2" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -2439,10 +2660,10 @@ angular-persistence@^1.0.1: resolved "https://registry.yarnpkg.com/angular-persistence/-/angular-persistence-1.0.1.tgz#79ffe7317f1f7aed88e69f07705f0ac32ccdb9da" integrity sha1-ef/nMX8feu2I5p8HcF8KwyzNudo= -angular-resizable-element@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.4.tgz#fe5fbae0cbde4c5ff28bad4d33a493c8f141ecf1" - integrity sha512-jA3j8qcWXKR+rdXxerAjpKhUsoUlEBQP3CmutHcHRAKTkQjZTd1LcZOZOnfIdOToyXsIKXYscbHpbPoCeew2Yw== +angular-resizable-element@^3.3.5: + version "3.3.5" + resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.5.tgz#e0c86655e53280306c5a6e0ed1d1f60b323b0497" + integrity sha512-PT7p3CGva1BmcTt8LA80yOblHqynZHPQYQ1KMMLgllCn3UZx/+0eCRtSXKwnWT5IYHBg9qI3tmd92SFExa1UMg== dependencies: tslib "^1.9.0" @@ -2507,6 +2728,11 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" @@ -2595,7 +2821,7 @@ app-root-path@^3.0.0: resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== -aproba@^1.1.1: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== @@ -2605,6 +2831,14 @@ archy@^1.0.0: resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -2682,11 +2916,6 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -arraybuffer.slice@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" - integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -2791,17 +3020,16 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@9.8.6: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== +autoprefixer@10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1" + integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw== dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" + browserslist "^4.16.1" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" + fraction.js "^4.0.13" normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" postcss-value-parser "^4.1.0" aws-sign2@~0.7.0: @@ -2821,15 +3049,14 @@ axobject-query@2.0.2: dependencies: ast-types-flow "0.0.7" -babel-loader@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" - integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== +babel-loader@8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" + integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== dependencies: - find-cache-dir "^2.1.0" + find-cache-dir "^3.3.1" loader-utils "^1.4.0" - mkdirp "^0.5.3" - pify "^4.0.1" + make-dir "^3.1.0" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -2839,11 +3066,6 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -backo2@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2859,7 +3081,7 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0: +base64id@2.0.0, base64id@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -2912,19 +3134,14 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== dependencies: buffer "^5.5.0" inherits "^2.0.4" readable-stream "^3.4.0" -blob@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" - integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - blocking-proxy@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2" @@ -2939,12 +3156,12 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: +bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.11.9" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== @@ -2992,10 +3209,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -bootstrap@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" - integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== +bootstrap@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" + integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== boxen@^4.2.0: version "4.2.0" @@ -3042,7 +3259,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -3115,16 +3332,16 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.9.1: - version "4.16.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" - integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1: + version "4.16.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" + integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== dependencies: - caniuse-lite "^1.0.30001173" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" - electron-to-chromium "^1.3.634" + electron-to-chromium "^1.3.649" escalade "^3.1.1" - node-releases "^1.1.69" + node-releases "^1.1.70" browserstack@^1.5.1: version "1.6.1" @@ -3246,7 +3463,7 @@ cacache@15.0.5, cacache@^15.0.5: tar "^6.0.2" unique-filename "^1.1.1" -cacache@^12.0.0, cacache@^12.0.2: +cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== @@ -3313,7 +3530,7 @@ cacheable-request@^7.0.1: normalize-url "^4.1.0" responselike "^2.0.0" -call-bind@^1.0.0: +call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -3350,7 +3567,7 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3365,10 +3582,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: - version "1.0.30001174" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001174.tgz#0f2aca2153fd88ceb07a2bb982fc2acb787623c4" - integrity sha512-tqClL/4ThQq6cfFXH3oJL4rifFBeM6gTkphjao5kgwMaW9yn0tKgQLAEfKzDwj6HQWCB/aWo8kTFlSvIN8geEA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001181: + version "1.0.30001187" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438" + integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA== canonical-path@1.0.0: version "1.0.0" @@ -3380,7 +3597,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3427,9 +3644,9 @@ child-process@^1.0.2: integrity sha1-mJdNx+0e5MYin44wX6cxOmiFp/I= "chokidar@>=2.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1, chokidar@^3.4.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65" - integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q== + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -3460,7 +3677,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1, chownr@^1.1.2: +chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3495,10 +3712,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-dependency-plugin@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93" - integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw== +circular-dependency-plugin@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" + integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== class-utils@^0.3.5: version "0.3.6" @@ -3537,7 +3754,7 @@ cli-spinner@0.2.10: resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47" integrity sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q== -cli-spinners@^2.2.0, cli-spinners@^2.4.0: +cli-spinners@^2.2.0, cli-spinners@^2.4.0, cli-spinners@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047" integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ== @@ -3609,6 +3826,11 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + codelyzer@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.1.tgz#c0e9668e847255b37c759e68fb2700b11e277d0f" @@ -3714,26 +3936,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-bind@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" - integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= - -component-emitter@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -component-inherit@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" - integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= - compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -3816,6 +4023,11 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3860,6 +4072,13 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +copy-anything@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" + integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== + dependencies: + is-what "^3.12.0" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -3877,10 +4096,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5" - integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q== +copy-webpack-plugin@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb" + integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA== dependencies: cacache "^15.0.5" fast-glob "^3.2.4" @@ -3894,29 +4113,32 @@ copy-webpack-plugin@6.2.1: serialize-javascript "^5.0.1" webpack-sources "^1.4.3" -core-js-compat@^3.6.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" - integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== +core-js-compat@^3.8.0: + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" + integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.1" semver "7.0.0" -core-js@3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== - -core-js@^3.6.5, core-js@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" - integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== +core-js@3.8.3, core-js@^3.6.5, core-js@^3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" + integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cors@~2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -3969,6 +4191,22 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +critters@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.6.tgz#b71384113d8b5f5c82f3aeba80c122437f195d8c" + integrity sha512-NUB3Om7tkf+XWi9+2kJ2A3l4/tHORDI1UT+nHxUqay2B/tJvMpiXcklDDLBH3fPn9Pe23uu0we/08Ukjy4cLCQ== + dependencies: + chalk "^4.1.0" + css "^3.0.0" + parse5 "^6.0.1" + parse5-htmlparser2-tree-adapter "^6.0.1" + pretty-bytes "^5.3.0" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4015,22 +4253,22 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" - integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== +css-loader@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f" + integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw== dependencies: - camelcase "^6.0.0" + camelcase "^6.2.0" cssesc "^3.0.0" - icss-utils "^4.1.1" + icss-utils "^5.0.0" loader-utils "^2.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.3" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" + postcss "^8.1.4" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^2.7.1" + schema-utils "^3.0.0" semver "^7.3.2" css-parse@~2.0.0: @@ -4094,6 +4332,15 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + cssauron@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" @@ -4571,34 +4818,20 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0: +debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0, debug@~4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -4744,7 +4977,12 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -depd@~1.1.2: +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -4853,12 +5091,12 @@ docker-modem@2.1.3: split-ca "^1.0.1" ssh2 "^0.8.7" -dockerfile-ast@0.0.30: - version "0.0.30" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz#74cbcd65e389852d752c5687117255ea622583ad" - integrity sha512-QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg== +dockerfile-ast@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz#29d611517b6fa207430ac99e9f59db1636a25b1f" + integrity sha512-qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ== dependencies: - vscode-languageserver-types "^3.15.1" + vscode-languageserver-types "^3.16.0" dom-helpers@^5.0.1, dom-helpers@^5.1.2, dom-helpers@^5.2.0: version "5.2.0" @@ -4972,9 +5210,9 @@ eev@^0.1.5: integrity sha512-U7+up/+0JaC+ffyrMicGDzb+j2Q04Fy22tKK1Xh6hHFWdVtXwoBF8M2DwFofwsJzJcs3W3NPDvmxcMak5/iQaA== ejs@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" - integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" @@ -5012,24 +5250,15 @@ electron-publish@22.9.1: lazy-val "^1.0.4" mime "^2.4.6" -electron-to-chromium@^1.3.634: - version "1.3.636" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.636.tgz#6980bd90813a9fb744e43f5e848f16cea4930058" - integrity sha512-Adcvng33sd3gTjNIDNXGD1G4H6qCImIy2euUJAQHtLNplEKU5WEz5KRJxupRNIIT8sD5oFZLTKBWAf12Bsz24A== +electron-to-chromium@^1.3.649: + version "1.3.664" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz#8fb039e2fa8ef3ab2568308464a28425d4f6e2a3" + integrity sha512-yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg== -electron@*: - version "11.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.1.tgz#188f036f8282798398dca9513e9bb3b10213e3aa" - integrity sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA== - dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" - extract-zip "^1.0.3" - -electron@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7" - integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q== +electron@*, electron@^11.2.3: + version "11.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" + integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -5043,17 +5272,17 @@ elfy@^1.0.0: endian-reader "^0.3.0" elliptic@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" - integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" + bn.js "^4.11.9" + brorand "^1.1.0" hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" email-validator@^2.0.4: version "2.0.4" @@ -5085,7 +5314,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.11: +encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5104,53 +5333,33 @@ endian-reader@^0.3.0: resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= -engine.io-client@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" - integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== +engine.io-parser@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" + integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== dependencies: - component-emitter "~1.3.0" - component-inherit "0.0.3" - debug "~3.1.0" - engine.io-parser "~2.2.0" - has-cors "1.1.0" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - ws "~7.4.2" - xmlhttprequest-ssl "~1.5.4" - yeast "0.1.2" - -engine.io-parser@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" - integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== - dependencies: - after "0.8.2" - arraybuffer.slice "~0.0.7" base64-arraybuffer "0.1.4" - blob "0.0.5" - has-binary2 "~1.0.2" -engine.io@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" - integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== +engine.io@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" + integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== dependencies: accepts "~1.3.4" base64id "2.0.0" cookie "~0.4.1" - debug "~4.1.0" - engine.io-parser "~2.2.0" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~4.0.0" ws "~7.4.2" -enhanced-resolve@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" - integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== +enhanced-resolve@5.7.0, enhanced-resolve@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" + integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== dependencies: graceful-fs "^4.2.4" - tapable "^2.0.0" + tapable "^2.2.0" enhanced-resolve@^4.3.0: version "4.5.0" @@ -5167,9 +5376,9 @@ ent@~2.2.0: integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= entities@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== env-paths@^2.2.0: version "2.2.0" @@ -5181,6 +5390,11 @@ err-code@^1.0.0: resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5195,7 +5409,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -5213,22 +5427,29 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: string.prototype.trimstart "^1.0.1" es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + version "1.18.0-next.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" + integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^1.0.2" has "^1.0.3" has-symbols "^1.0.1" is-callable "^1.2.2" - is-negative-zero "^2.0.0" + is-negative-zero "^2.0.1" is-regex "^1.1.1" - object-inspect "^1.8.0" + object-inspect "^1.9.0" object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.3" + string.prototype.trimstart "^1.0.3" + +es-module-lexer@^0.3.26: + version "0.3.26" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.3.26.tgz#7b507044e97d5b03b01d4392c74ffeb9c177a83b" + integrity sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA== es-to-primitive@^1.2.1: version "1.2.1" @@ -5327,6 +5548,14 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + esprima@3.x.x: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -5337,7 +5566,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrecurse@^4.1.0: +esrecurse@^4.1.0, esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5376,7 +5605,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0: +events@^3.0.0, events@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -5539,9 +5768,9 @@ fast-deep-equal@^3.1.1: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1, fast-glob@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" - integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5566,20 +5795,13 @@ fastparse@^1.1.2: integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" - integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e" + integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA== dependencies: reusify "^1.0.4" -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.1: +faye-websocket@^0.11.3: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -5593,7 +5815,7 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: +figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== @@ -5605,15 +5827,7 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa" - integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -file-loader@^6.2.0: +file-loader@6.2.0, file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== @@ -5632,9 +5846,9 @@ file-uri-to-path@1, file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== dependencies: minimatch "^3.0.4" @@ -5715,9 +5929,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" - integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== for-in@^1.0.2: version "1.0.2" @@ -5743,6 +5957,11 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fraction.js@^4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" + integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -5787,23 +6006,16 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5833,15 +6045,10 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== - fsevents@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" - integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== ftp@~0.3.10: version "0.3.10" @@ -5856,10 +6063,19 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -genfun@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" - integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + 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" gensync@^1.0.0-beta.1: version "1.0.0-beta.2" @@ -5872,9 +6088,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" - integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -5933,6 +6149,11 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -6056,17 +6277,10 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graphlib@2.1.8, graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== gunzip-maybe@^1.4.2: version "1.4.2" @@ -6105,18 +6319,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" -has-binary2@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" - integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== - dependencies: - isarray "2.0.1" - -has-cors@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6132,6 +6334,11 @@ has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6197,7 +6404,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -6212,9 +6419,9 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hosted-git-info@^3.0.4, hosted-git-info@^3.0.5, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" + integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" @@ -6258,12 +6465,7 @@ html-to-image@^0.1.1: resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-0.1.3.tgz#9661a54c30ed9c4b269f4612416b1c7e887de3a7" integrity sha512-8JTGEAAdJGL/nlp3wb/WI8fLMx2dHKOFZMdsvdon23D45ZdtsXDeRm39Wddf04ludQe3OPmvjMJ9nPjI/7hPlg== -http-cache-semantics@^3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" - integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== - -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -6318,6 +6520,15 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -6359,7 +6570,15 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3: +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +https-proxy-agent@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== @@ -6375,14 +6594,6 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6404,12 +6615,10 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" +icss-utils@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" @@ -6421,7 +6630,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: +ignore-walk@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== @@ -6487,11 +6696,6 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= - infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -6520,22 +6724,22 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.6.tgz#f1c46a2a93a253e7b3905115e74d527cd23061a1" - integrity sha512-IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg== - ini@1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: +ini@2.0.0, ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@7.3.3, inquirer@^7.3.3: +inquirer@7.3.3: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== @@ -6645,9 +6849,9 @@ is-buffer@^1.1.5: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^2.0.0: version "2.0.0" @@ -6668,7 +6872,7 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.0.0, is-core-module@^2.1.0: +is-core-module@^2.1.0, is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== @@ -6744,6 +6948,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -6786,7 +6997,12 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-negative-zero@^2.0.0: +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + +is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== @@ -6864,10 +7080,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" + integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== dependencies: + call-bind "^1.0.2" has-symbols "^1.0.1" is-resolvable@^1.0.0: @@ -6899,6 +7116,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-what@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55" + integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw== + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -6931,11 +7153,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isarray@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= - isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -7031,10 +7248,10 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-spec-reporter@~5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95" - integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g== +jasmine-spec-reporter@~6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz#3b9c85689676a351f343ba8dd6d3957f11a4bf1d" + integrity sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ== dependencies: colors "1.4.0" @@ -7067,16 +7284,7 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-worker@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" - integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^26.5.0: +jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7128,7 +7336,7 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -7153,7 +7361,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.2: +json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -7166,16 +7374,16 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" -jsonc-parser@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342" - integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg== +jsonc-parser@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== jsonfile@^4.0.0: version "4.0.0" @@ -7193,7 +7401,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: +jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= @@ -7219,9 +7427,9 @@ jszip@3.4.0: set-immediate-shim "~1.0.1" jszip@^3.1.3, jszip@^3.2.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6" - integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA== + version "3.6.0" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9" + integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ== dependencies: lie "~3.3.0" pako "~1.0.2" @@ -7272,10 +7480,10 @@ karma-source-map-support@1.4.0: dependencies: source-map-support "^0.5.5" -karma@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4" - integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ== +karma@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.1.tgz#a7539618cca0f2cbb26d5497120ec31fe340c2a1" + integrity sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg== dependencies: body-parser "^1.19.0" braces "^3.0.2" @@ -7295,11 +7503,11 @@ karma@^5.2.3: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^2.3.0" + socket.io "^3.1.0" source-map "^0.6.1" tmp "0.2.1" - ua-parser-js "0.7.22" - yargs "^15.3.1" + ua-parser-js "^0.7.23" + yargs "^16.1.1" keyv@^3.0.0: version "3.1.0" @@ -7361,20 +7569,22 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -less-loader@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" - integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== +less-loader@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" + integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" -less@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" - integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== +less@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" + integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== dependencies: + copy-anything "^2.0.1" + parse-node-version "^1.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -7382,7 +7592,7 @@ less@3.12.2: image-size "~0.5.0" make-dir "^2.1.0" mime "^1.4.1" - native-request "^1.0.5" + needle "^2.5.2" source-map "~0.6.0" levn@~0.3.0: @@ -7409,10 +7619,10 @@ license-checker@^25.0.1: spdx-satisfies "^4.0.0" treeify "^1.1.0" -license-webpack-plugin@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.1.tgz#08eddb2f776c7c64c02f308a00e017d6e824d0b6" - integrity sha512-yhqTmlYIEpZWA122lf6E0G8+rkn0AzoQ1OpzUKKs/lXUqG1plmGnwmkuuPlfggzJR5y6DLOdot/Tv00CC51CeQ== +license-webpack-plugin@2.3.11: + version "2.3.11" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8" + integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw== dependencies: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" @@ -7434,6 +7644,11 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" @@ -7491,6 +7706,11 @@ lodash.assignin@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -7501,6 +7721,36 @@ lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= +lodash.constant@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash.constant/-/lodash.constant-3.0.0.tgz#bfe05cce7e515b3128925d6362138420bd624910" + integrity sha1-v+Bczn5RWzEokl1jYhOEIL1iSRA= + +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.endswith@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" + integrity sha1-/tWawXOO0+I27dcGTsRWRIs3vAk= + +lodash.filter@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= + +lodash.find@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" + integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= + +lodash.findindex@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" + integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY= + lodash.findkey@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.findkey/-/lodash.findkey-4.6.0.tgz#83058e903b51cbb759d09ccf546dea3ea39c4718" @@ -7516,16 +7766,41 @@ lodash.flatten@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +lodash.flattendeep@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + +lodash.foreach@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.groupby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" + integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E= + +lodash.has@^4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" + integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= + lodash.invert@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.invert/-/lodash.invert-4.3.0.tgz#8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee" integrity sha1-j/4g1LYW9WvqjxqgxuvYDc90Ku4= +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" @@ -7536,6 +7811,51 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= + +lodash.isobject@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" + integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + +lodash.isundefined@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" + integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g= + +lodash.keys@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" + integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU= + +lodash.last@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c" + integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw= + +lodash.map@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= + lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -7546,22 +7866,72 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.omit@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" + integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= + +lodash.orderby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" + integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= + +lodash.reduce@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= + lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= +lodash.size@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.size/-/lodash.size-4.2.0.tgz#71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86" + integrity sha1-cf517T6r2yvLc6GwtPUcOS7ie4Y= + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + +lodash.sum@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/lodash.sum/-/lodash.sum-4.0.2.tgz#ad90e397965d803d4f1ff7aa5b2d0197f3b4637b" + integrity sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s= + lodash.topairs@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" integrity sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ= +lodash.transform@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" + integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= + +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: +lodash.upperfirst@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= + +lodash.values@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" + integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= + +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -7660,7 +8030,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2: +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -7672,22 +8042,26 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" - integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag== +make-fetch-happen@^8.0.9: + version "8.0.14" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222" + integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ== dependencies: - agentkeepalive "^3.4.1" - cacache "^12.0.0" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" + agentkeepalive "^4.1.3" + cacache "^15.0.5" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + promise-retry "^2.0.1" + socks-proxy-agent "^5.0.0" + ssri "^8.0.0" map-cache@^0.2.2: version "0.2.2" @@ -7815,12 +8189,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.45.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.45.0: version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +"mime-db@>= 1.43.0 < 2": + version "1.46.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" + integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== + +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== @@ -7833,9 +8212,9 @@ mime@1.6.0, mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4, mime@^2.4.5, mime@^2.4.6: - version "2.4.7" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" - integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" + integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== mimic-fn@^2.1.0: version "2.1.0" @@ -7852,10 +8231,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -mini-css-extract-plugin@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" - integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== +mini-css-extract-plugin@1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3" + integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -7866,7 +8245,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: +minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= @@ -7890,6 +8269,17 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" +minipass-fetch@^1.3.0, minipass-fetch@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a" + integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -7897,36 +8287,36 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2: +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" -minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" + minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - -minizlib@^2.1.1: +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -7958,7 +8348,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -8030,6 +8420,11 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nanoid@^3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8047,11 +8442,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-request@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== - needle@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -8061,7 +8451,7 @@ needle@2.5.0: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^2.3.3, needle@^2.5.0: +needle@^2.3.3, needle@^2.5.0, needle@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== @@ -8130,15 +8520,6 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch-npm@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4" - integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg== - dependencies: - encoding "^0.1.11" - json-parse-better-errors "^1.0.0" - safe-buffer "^5.1.1" - node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -8149,6 +8530,22 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-gyp@^7.1.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" + integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.3" + nopt "^5.0.0" + npmlog "^4.1.2" + request "^2.88.2" + rimraf "^3.0.2" + semver "^7.3.2" + tar "^6.0.2" + which "^2.0.2" + node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" @@ -8178,10 +8575,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.69: - version "1.1.69" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" - integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== +node-releases@^1.1.70: + version "1.1.70" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" + integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== nopt@^4.0.1: version "4.0.3" @@ -8191,7 +8588,14 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -8233,7 +8637,7 @@ notosans-fontface@1.2.2: resolved "https://registry.yarnpkg.com/notosans-fontface/-/notosans-fontface-1.2.2.tgz#533432651673a5ae64d1203abede3334749aaadc" integrity sha512-QDA7eFfUQrORmx8MhQc0Bs/IY+AajwxCycIgUt0pi4QLYEC6X/v9n6edQs33f1ctrSKcnZVWVIu2iWPexKFF2g== -npm-bundled@^1.0.1: +npm-bundled@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== @@ -8260,7 +8664,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-package-arg@8.1.0, npm-package-arg@^8.0.0: +npm-package-arg@8.1.0, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.0.tgz#b5f6319418c3246a1c38e1a8fbaa06231bc5308f" integrity sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig== @@ -8269,26 +8673,17 @@ npm-package-arg@8.1.0, npm-package-arg@^8.0.0: semver "^7.0.0" validate-npm-package-name "^3.0.0" -npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" - integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg== +npm-packlist@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.4.tgz#40e96b2b43787d0546a574542d01e066640d09da" + integrity sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw== dependencies: - hosted-git-info "^2.7.1" - osenv "^0.1.5" - semver "^5.6.0" - validate-npm-package-name "^3.0.0" - -npm-packlist@^1.1.12: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" + glob "^7.1.6" + ignore-walk "^3.0.3" + npm-bundled "^1.1.1" npm-normalize-package-bin "^1.0.1" -npm-pick-manifest@6.1.0: +npm-pick-manifest@6.1.0, npm-pick-manifest@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz#2befed87b0fce956790f62d32afb56d7539c022a" integrity sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw== @@ -8297,27 +8692,19 @@ npm-pick-manifest@6.1.0: npm-package-arg "^8.0.0" semver "^7.0.0" -npm-pick-manifest@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7" - integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw== +npm-registry-fetch@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661" + integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA== dependencies: - figgy-pudding "^3.5.1" - npm-package-arg "^6.0.0" - semver "^5.4.1" - -npm-registry-fetch@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7" - integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ== - dependencies: - JSONStream "^1.3.4" - bluebird "^3.5.1" - figgy-pudding "^3.4.1" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - npm-package-arg "^6.1.0" - safe-buffer "^5.2.0" + "@npmcli/ci-detect" "^1.0.0" + lru-cache "^6.0.0" + make-fetch-happen "^8.0.9" + minipass "^3.1.3" + minipass-fetch "^1.3.0" + minipass-json-stream "^1.0.1" + minizlib "^2.0.0" + npm-package-arg "^8.0.0" npm-run-path@^2.0.0: version "2.0.2" @@ -8326,6 +8713,16 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -8333,17 +8730,17 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8362,7 +8759,7 @@ object-hash@^2.0.3: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== -object-inspect@^1.8.0: +object-inspect@^1.8.0, object-inspect@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== @@ -8387,7 +8784,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.1: +object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -8454,18 +8851,18 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" - integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== +open@7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" + integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" open@^7.0.3: - version "7.3.1" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" - integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.1.tgz#4ccedc11ca348d398378ffb39c71357df55fe6f7" + integrity sha512-Pxv+fKRsd/Ozflgn2Gjev1HZveJJeKR6hKKmdaImJMuEZ6htAvCTbcMABJo+qevlAelTLCrEK3YTKZ9fVTcSPw== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -8517,17 +8914,17 @@ ora@5.0.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" - integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w== +ora@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" + integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g== dependencies: + bl "^4.0.3" chalk "^4.1.0" cli-cursor "^3.1.0" - cli-spinners "^2.4.0" + cli-spinners "^2.5.0" is-interactive "^1.0.0" log-symbols "^4.0.0" - mute-stream "0.0.8" strip-ansi "^6.0.0" wcwidth "^1.0.1" @@ -8561,7 +8958,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@^0.1.4, osenv@^0.1.5: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -8591,7 +8988,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -8671,41 +9068,30 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" -pacote@9.5.12: - version "9.5.12" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66" - integrity sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ== +pacote@11.2.4: + version "11.2.4" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.2.4.tgz#dc7ca740a573ed86a3bf863511d22c1d413ec82f" + integrity sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ== dependencies: - bluebird "^3.5.3" - cacache "^12.0.2" - chownr "^1.1.2" - figgy-pudding "^3.5.1" - get-stream "^4.1.0" - glob "^7.1.3" + "@npmcli/git" "^2.0.1" + "@npmcli/installed-package-contents" "^1.0.5" + "@npmcli/promise-spawn" "^1.2.0" + "@npmcli/run-script" "^1.3.0" + cacache "^15.0.5" + chownr "^2.0.0" + fs-minipass "^2.1.0" infer-owner "^1.0.4" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - minimatch "^3.0.4" - minipass "^2.3.5" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.4.0" - npm-normalize-package-bin "^1.0.0" - npm-package-arg "^6.1.0" - npm-packlist "^1.1.12" - npm-pick-manifest "^3.0.0" - npm-registry-fetch "^4.0.0" - osenv "^0.1.5" - promise-inflight "^1.0.1" + minipass "^3.1.3" + mkdirp "^1.0.3" + npm-package-arg "^8.0.1" + npm-packlist "^2.1.4" + npm-pick-manifest "^6.0.0" + npm-registry-fetch "^9.0.0" promise-retry "^1.1.1" - protoduck "^5.0.1" - rimraf "^2.6.2" - safe-buffer "^5.1.2" - semver "^5.6.0" - ssri "^6.0.1" - tar "^4.4.10" - unique-filename "^1.1.1" - which "^1.3.1" + read-package-json-fast "^1.1.3" + rimraf "^3.0.2" + ssri "^8.0.0" + tar "^6.1.0" pako@~0.2.0: version "0.2.9" @@ -8753,9 +9139,9 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -8769,6 +9155,11 @@ parse-link-header@^1.0.1: dependencies: xtend "~4.0.1" +parse-node-version@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + parse5-html-rewriting-stream@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" @@ -8777,6 +9168,13 @@ parse5-html-rewriting-stream@6.0.1: parse5 "^6.0.1" parse5-sax-parser "^6.0.1" +parse5-htmlparser2-tree-adapter@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + parse5-sax-parser@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" @@ -8794,16 +9192,6 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseqs@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" - integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== - -parseuri@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" - integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== - parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -9022,26 +9410,25 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" -postcss-import@12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" - integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== +postcss-import@14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296" + integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg== dependencies: - postcss "^7.0.1" - postcss-value-parser "^3.2.3" + postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-loader@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" - integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== +postcss-loader@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4" + integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.2" + semver "^7.3.4" postcss-merge-longhand@^4.0.11: version "4.0.11" @@ -9105,38 +9492,33 @@ postcss-minify-selectors@^4.0.2: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" + icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - -postcss-modules-values@^3.0.0: +postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -9257,7 +9639,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== @@ -9286,12 +9668,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -9305,16 +9687,16 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@7.0.32: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== +postcss@8.2.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04" + integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg== dependencies: - chalk "^2.4.2" + colorette "^1.2.1" + nanoid "^3.1.20" source-map "^0.6.1" - supports-color "^6.1.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -9323,6 +9705,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^8.1.4: + version "8.2.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" + integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg== + dependencies: + colorette "^1.2.1" + nanoid "^3.1.20" + source-map "^0.6.1" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9338,6 +9729,11 @@ prettier@^2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +pretty-bytes@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" + integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== + pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -9375,6 +9771,11 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +promise-queue@^2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" + integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= + promise-retry@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" @@ -9383,6 +9784,14 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + "promise@>=3.2 <8": version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -9412,13 +9821,6 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protoduck@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" - integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg== - dependencies: - genfun "^5.0.0" - protractor@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03" @@ -9494,6 +9896,11 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" +puka@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/puka/-/puka-1.0.1.tgz#a2df782b7eb4cf9564e4c93a5da422de0dfacc02" + integrity sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g== + pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -9581,6 +9988,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-microtask@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" + integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== + quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -9756,6 +10168,22 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" +read-package-json-fast@^1.1.3: + version "1.2.2" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz#fba77b0b0d66b1ab344e214cb0876577e749c423" + integrity sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + +read-package-json-fast@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz#c767f6c634873ffb6bb73788191b65559734f555" + integrity sha512-bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + read-package-json@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a" @@ -9766,7 +10194,7 @@ read-package-json@^2.0.0: normalize-package-data "^2.0.0" npm-normalize-package-bin "^1.0.0" -"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -9867,12 +10295,12 @@ regex-parser@^2.2.11: integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== regexp.prototype.flags@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" regexpu-core@^4.7.1: version "4.7.1" @@ -9906,9 +10334,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.6" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" - integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== + version "0.6.7" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" + integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== dependencies: jsesc "~0.5.0" @@ -10020,15 +10448,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" - integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== - dependencies: - is-core-module "^2.0.0" - path-parse "^1.0.6" - -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: +resolve@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -10036,6 +10456,14 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: is-core-module "^2.1.0" path-parse "^1.0.6" +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -10092,9 +10520,9 @@ rework@1.0.1: css "^2.0.0" rfdc@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" - integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== + version "1.2.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949" + integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA== rgb-regex@^1.0.1: version "1.0.1" @@ -10113,7 +10541,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10140,12 +10568,12 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup@2.32.1: - version "2.32.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c" - integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== +rollup@2.38.4: + version "2.38.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" + integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" run-async@^2.4.0: version "2.4.1" @@ -10153,9 +10581,11 @@ run-async@^2.4.0: integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-parallel@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" - integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" @@ -10228,17 +10658,17 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: +sanitize-filename@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@10.0.5: - version "10.0.5" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" - integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== +sass-loader@10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" + integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10246,17 +10676,17 @@ sass-loader@10.0.5: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2" - integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig== +sass@1.32.6: + version "1.32.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" + integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== dependencies: chokidar ">=2.0.0 <4.0.0" sass@^1.29.0: - version "1.32.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" - integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== + version "1.32.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8" + integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -10303,7 +10733,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: +schema-utils@^2.6.5, schema-utils@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10348,7 +10778,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: tmp "0.0.30" xml2js "^0.4.17" -selfsigned@^1.10.7: +selfsigned@^1.10.8: version "1.10.8" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== @@ -10391,23 +10821,18 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: +semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10471,7 +10896,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -10621,10 +11046,10 @@ snyk-cpp-plugin@2.2.1: hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz#e3a2666e5f3d847712c1c52ccce65438c29fb199" - integrity sha512-KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw== +snyk-docker-plugin@4.17.2: + version "4.17.2" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz#e22c7633311a1b17b89d125d0af638e1fa5c5167" + integrity sha512-fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" @@ -10632,13 +11057,13 @@ snyk-docker-plugin@4.13.1: chalk "^2.4.2" debug "^4.1.1" docker-modem "2.1.3" - dockerfile-ast "0.0.30" + dockerfile-ast "0.1.0" elfy "^1.0.0" event-loop-spinner "^2.0.0" gunzip-maybe "^1.4.2" mkdirp "^1.0.4" semver "^6.1.0" - snyk-nodejs-lockfile-parser "1.30.1" + snyk-nodejs-lockfile-parser "1.30.2" tar-stream "^2.1.0" tmp "^0.2.1" tslib "^1" @@ -10652,33 +11077,33 @@ snyk-go-parser@1.4.1: toml "^3.0.0" tslib "^1.10.0" -snyk-go-plugin@1.16.4: - version "1.16.4" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.4.tgz#2a42c9989a7353acb407dbc7284ec56de7f5f0b0" - integrity sha512-7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q== +snyk-go-plugin@1.16.5: + version "1.16.5" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.5.tgz#3f30ee6151648d1278cbcc68362c0222b17b1d6b" + integrity sha512-m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA== dependencies: - "@snyk/dep-graph" "^1.21.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/graphlib" "2.1.9-patch.3" debug "^4.1.1" - graphlib "2.1.8" snyk-go-parser "1.4.1" tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz#4d22704c38875e23a96469ac27d0d43ae746fc70" - integrity sha512-OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ== +snyk-gradle-plugin@3.12.5: + version "3.12.5" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.5.tgz#7e5ed9179ad7972663867f0b443144765d6e4329" + integrity sha512-Z4qEzzPuRO1BxfL0vgfv4pzJ58ox6dksf8i18Vi1+yqDKmYEHmcMBYe33faFPJFZYf1PP7RerADpPssFJiYyLg== dependencies: - "@snyk/cli-interface" "2.9.1" - "@snyk/dep-graph" "^1.19.4" - "@snyk/java-call-graph-builder" "1.18.0" + "@snyk/cli-interface" "2.11.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/java-call-graph-builder" "1.19.1" "@types/debug" "^4.1.4" chalk "^3.0.0" debug "^4.1.1" tmp "0.2.1" tslib "^2.0.0" -snyk-module@3.1.0: +snyk-module@3.1.0, snyk-module@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== @@ -10686,14 +11111,6 @@ snyk-module@3.1.0: debug "^4.1.1" hosted-git-info "^3.0.4" -snyk-module@^1.6.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804" - integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA== - dependencies: - debug "^3.1.0" - hosted-git-info "^2.7.1" - snyk-module@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-2.1.0.tgz#80d9e9b64f202ae753ed3b33b372ca6f5ec323da" @@ -10704,28 +11121,29 @@ snyk-module@^2.0.2: debug "^3.1.0" hosted-git-info "^2.7.1" -snyk-mvn-plugin@2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.0.tgz#9d7c89e5ad14f6b63d0be5548c2c20124905b257" - integrity sha512-2NDWrMWi9K32i9CdWUy2Pce8D9myR0dxPDJJpamVt/DD3fDxH4ia701i2HdDgOjMq8PI6yIgI+vRaAW3X2GrbA== +snyk-mvn-plugin@2.25.3: + version "2.25.3" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" + integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== dependencies: - "@snyk/cli-interface" "2.9.1" - "@snyk/java-call-graph-builder" "1.17.0" + "@snyk/cli-interface" "2.11.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/java-call-graph-builder" "1.19.1" debug "^4.1.1" glob "^7.1.6" needle "^2.5.0" tmp "^0.1.0" tslib "1.11.1" -snyk-nodejs-lockfile-parser@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.1.tgz#5d54180ae818ddbe8c2b55329528c4d68e390235" - integrity sha512-QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg== +snyk-nodejs-lockfile-parser@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz#8dbb64c42382aeaf4488c36e48c1e48eb75a1584" + integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== dependencies: + "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" event-loop-spinner "^2.0.0" got "11.4.0" - graphlib "2.1.8" lodash.clonedeep "^4.5.0" lodash.flatmap "^4.5.0" lodash.isempty "^4.4.0" @@ -10737,15 +11155,14 @@ snyk-nodejs-lockfile-parser@1.30.1: uuid "^8.3.0" yaml "^1.9.2" -snyk-nuget-plugin@1.19.4: - version "1.19.4" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz#cd1163a29f8002d54a965eab9e256345c97d4174" - integrity sha512-6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw== +snyk-nuget-plugin@1.21.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" + integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== dependencies: debug "^4.1.1" dotnet-deps-parser "5.0.0" jszip "3.4.0" - lodash "^4.17.20" snyk-paket-parser "1.6.0" tslib "^1.11.2" xml2js "^0.4.17" @@ -10766,13 +11183,13 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" -snyk-poetry-lockfile-parser@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz#3f062953802916f6ae1767ec13dd1892fff0541e" - integrity sha512-G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA== +snyk-poetry-lockfile-parser@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz#bd0ebc9b1dd3bde33e27e5b64bea22e25e7aee5d" + integrity sha512-HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA== dependencies: "@snyk/cli-interface" "^2.9.2" - "@snyk/dep-graph" "^1.19.5" + "@snyk/dep-graph" "^1.23.0" debug "^4.2.0" toml "^3.0.0" tslib "^2.0.0" @@ -10792,24 +11209,22 @@ snyk-policy@1.14.1: snyk-try-require "^1.3.1" then-fs "^2.0.0" -snyk-python-plugin@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz#91febcd260094a9d900bc54bf200aa0c2632613a" - integrity sha512-JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g== +snyk-python-plugin@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz#03b70c12c0adfd5104839e0d9d9ba7083271e905" + integrity sha512-d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w== dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.1" + snyk-poetry-lockfile-parser "^1.1.5" tmp "0.0.33" -snyk-resolve-deps@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d" - integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ== +snyk-resolve-deps@4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz#11e7051110dadd8756819594bb30e6b88777a8b4" + integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== dependencies: - "@types/node" "^6.14.4" - "@types/semver" "^5.5.0" ansicolors "^0.3.2" - debug "^3.2.5" + debug "^4.1.1" lodash.assign "^4.2.0" lodash.assignin "^4.2.0" lodash.clone "^4.5.0" @@ -10818,7 +11233,7 @@ snyk-resolve-deps@4.4.0: lodash.set "^4.3.2" lru-cache "^4.0.0" semver "^5.5.1" - snyk-module "^1.6.0" + snyk-module "^3.1.0" snyk-resolve "^1.0.0" snyk-tree "^1.0.0" snyk-try-require "^1.1.1" @@ -10868,15 +11283,18 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.437.3: - version "1.437.3" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.437.3.tgz#a3cfbfb568bf60b19be31a337899ebe71365bd70" - integrity sha512-DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g== +snyk@^1.455.0: + version "1.455.0" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.455.0.tgz#a4ac3d82d8946b0137cbbb96513721fe50dc97ee" + integrity sha512-SDdmPxgQ1yB2wZ5KJ0YAq3a4i7HJFJhoVfCvzs458Jr5vvBN6W8PAwLQnniqQIPtyX/H70QW6PkkYu4rO8CkpA== dependencies: + "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "1.21.0" + "@snyk/dep-graph" "1.23.1" "@snyk/gemfile" "1.2.0" - "@snyk/snyk-cocoapods-plugin" "2.5.1" + "@snyk/graphlib" "^2.1.9-patch.3" + "@snyk/inquirer" "^7.3.3-patch" + "@snyk/snyk-cocoapods-plugin" "2.5.2" abbrev "^1.1.1" ansi-escapes "3.2.0" chalk "^2.4.2" @@ -10884,30 +11302,45 @@ snyk@^1.437.3: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" - graphlib "^2.1.8" - inquirer "^7.3.3" - lodash "^4.17.20" + lodash.assign "^4.2.0" + lodash.camelcase "^4.3.0" + lodash.clonedeep "^4.5.0" + lodash.endswith "^4.2.1" + lodash.flatten "^4.4.0" + lodash.flattendeep "^4.4.0" + lodash.get "^4.4.2" + lodash.groupby "^4.6.0" + lodash.isempty "^4.4.0" + lodash.isobject "^3.0.2" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.orderby "^4.6.0" + lodash.sortby "^4.7.0" + lodash.uniq "^4.5.0" + lodash.upperfirst "^4.3.1" + lodash.values "^4.3.0" micromatch "4.0.2" needle "2.5.0" open "^7.0.3" os-name "^3.0.0" + promise-queue "^2.2.5" proxy-agent "^3.1.1" proxy-from-env "^1.0.0" semver "^6.0.0" snyk-config "4.0.0-rc.2" snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.13.1" - snyk-go-plugin "1.16.4" - snyk-gradle-plugin "3.11.0" + snyk-docker-plugin "4.17.2" + snyk-go-plugin "1.16.5" + snyk-gradle-plugin "3.12.5" snyk-module "3.1.0" - snyk-mvn-plugin "2.25.0" - snyk-nodejs-lockfile-parser "1.30.1" - snyk-nuget-plugin "1.19.4" + snyk-mvn-plugin "2.25.3" + snyk-nodejs-lockfile-parser "1.30.2" + snyk-nuget-plugin "1.21.0" snyk-php-plugin "1.9.2" snyk-policy "1.14.1" - snyk-python-plugin "1.19.1" + snyk-python-plugin "1.19.4" snyk-resolve "1.0.1" - snyk-resolve-deps "4.4.0" + snyk-resolve-deps "4.7.2" snyk-sbt-plugin "2.11.0" snyk-tree "^1.0.0" snyk-try-require "1.3.1" @@ -10918,80 +11351,57 @@ snyk@^1.437.3: uuid "^3.3.2" wrap-ansi "^5.1.0" -socket.io-adapter@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" - integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== +socket.io-adapter@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" + integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== -socket.io-client@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" - integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== +socket.io-parser@~4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" + integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== dependencies: - backo2 "1.0.2" - component-bind "1.0.0" + "@types/component-emitter" "^1.2.10" component-emitter "~1.3.0" - debug "~3.1.0" - engine.io-client "~3.5.0" - has-binary2 "~1.0.2" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - socket.io-parser "~3.3.0" - to-array "0.1.4" + debug "~4.3.1" -socket.io-parser@~3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" - integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== +socket.io@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba" + integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA== dependencies: - component-emitter "~1.3.0" - debug "~3.1.0" - isarray "2.0.1" + "@types/cookie" "^0.4.0" + "@types/cors" "^2.8.8" + "@types/node" "^14.14.10" + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.1" + engine.io "~4.1.0" + socket.io-adapter "~2.1.0" + socket.io-parser "~4.0.3" -socket.io-parser@~3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" - integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== +sockjs-client@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add" + integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q== dependencies: - component-emitter "1.2.1" - debug "~4.1.0" - isarray "2.0.1" - -socket.io@^2.3.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" - integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== - dependencies: - debug "~4.1.0" - engine.io "~3.5.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.4.0" - socket.io-parser "~3.4.0" - -sockjs-client@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" - integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== - dependencies: - debug "^3.2.5" + debug "^3.2.6" eventsource "^1.0.7" - faye-websocket "~0.11.1" - inherits "^2.0.3" - json3 "^3.3.2" - url-parse "^1.4.3" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.4.7" -sockjs@0.3.20: - version "0.3.20" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" - integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== dependencies: - faye-websocket "^0.10.0" + faye-websocket "^0.11.3" uuid "^3.4.0" - websocket-driver "0.6.5" + websocket-driver "^0.7.4" -socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1: +socks-proxy-agent@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== @@ -10999,6 +11409,23 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1: agent-base "~4.2.1" socks "~2.3.2" +socks-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" + integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== + dependencies: + agent-base "6" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.5.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.5.1.tgz#7720640b6b5ec9a07d556419203baa3f0596df5f" + integrity sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" @@ -11012,10 +11439,10 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" - integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== +source-map-loader@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" + integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" @@ -11035,6 +11462,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@0.5.19, source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.5, source-map-support@^0.5.7, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11051,9 +11486,9 @@ source-map-support@~0.4.0: source-map "^0.5.6" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -11152,12 +11587,12 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5" - integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ== +speed-measure-webpack-plugin@1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f" + integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw== dependencies: - chalk "^2.0.1" + chalk "^4.1.0" split-ca@^1.0.1: version "1.0.1" @@ -11212,7 +11647,7 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.0, ssri@^6.0.1: +ssri@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== @@ -11220,9 +11655,9 @@ ssri@^6.0.0, ssri@^6.0.1: figgy-pudding "^3.5.1" ssri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" - integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: minipass "^3.1.1" @@ -11295,6 +11730,23 @@ streamsearch@~0.1.2: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -11313,7 +11765,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimend@^1.0.1: +string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== @@ -11321,7 +11773,7 @@ string.prototype.trimend@^1.0.1: call-bind "^1.0.0" define-properties "^1.1.3" -string.prototype.trimstart@^1.0.1: +string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== @@ -11355,6 +11807,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -11396,10 +11855,10 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylus-loader@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" - integrity sha512-apDYJEM5ZpOAWbWInWcsbtI8gHNr/XYVcSY/tWqOUPt7M5tqhtwXVsAkgyiVjhuvw2Yrjq474a9H+g4d047Ebw== +stylus-loader@4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757" + integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ== dependencies: fast-glob "^3.2.4" klona "^2.0.4" @@ -11478,17 +11937,17 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a" - integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA== +symbol-observable@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-3.0.0.tgz#eea8f6478c651018e059044268375c408c15c533" + integrity sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q== tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0: +tapable@^2.1.1, tapable@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== @@ -11504,20 +11963,7 @@ tar-stream@^2.1.0, tar-stream@^2.1.2: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4.4.10: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - 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" - -tar@^6.0.2: +tar@^6.0.2, tar@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== @@ -11590,10 +12036,22 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@5.3.7: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.7.tgz#798a4ae2e7ff67050c3e99fcc4e00725827d97e2" - integrity sha512-lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w== +terser-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" + integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q== + dependencies: + jest-worker "^26.6.2" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + terser "^5.5.1" + +terser@5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -11608,10 +12066,10 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.4: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== +terser@^5.3.4, terser@^5.5.1: + version "5.6.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" + integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -11637,7 +12095,7 @@ through2@^2.0.0, through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6: +through@X.X.X, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -11692,11 +12150,6 @@ tmp@^0.1.0: dependencies: rimraf "^2.6.3" -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= - to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -11786,12 +12239,13 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== +ts-node@~9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" + integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" @@ -11807,21 +12261,16 @@ tslib@1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@2.1.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tslib@^1, tslib@^1.10.0, tslib@^1.11.2, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -11930,9 +12379,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.2.0.tgz#3edd448793f517d8b9dd108b486a043f5befd91f" + integrity sha512-M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -11956,28 +12405,33 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== -typescript@4.0.5, typescript@~4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" - integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== - -typescript@>=2.8.3: +typescript@4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -ua-parser-js@0.7.22: - version "0.7.22" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" - integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== +typescript@>=2.8.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" + integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA== + +typescript@~4.0.2: + version "4.0.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.7.tgz#7168032c43d2a2671c95c07812f69523c79590af" + integrity sha512-yi7M4y74SWvYbnazbn8/bmJmX4Zlej39ZOqwG/8dut/MYoSQ119GY9ZFbbGsD4PFZYWxqik/XsP3vk3+W5H3og== + +ua-parser-js@^0.7.23: + version "0.7.24" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" + integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== uncontrollable@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556" - integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q== + version "7.2.1" + resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738" + integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ== dependencies: "@babel/runtime" "^7.6.3" - "@types/react" "^16.9.11" + "@types/react" ">=16.9.11" invariant "^2.2.4" react-lifecycles-compat "^3.0.4" @@ -12059,11 +12513,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -12130,7 +12579,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3: +url-parse@^1.4.3, url-parse@^1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -12156,6 +12605,11 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= +utf8@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" + integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -12195,21 +12649,16 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" - integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== +uuid@8.3.2, uuid@^8.2.0, uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.2.0, uuid@^8.3.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -12225,7 +12674,7 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -vary@~1.1.2: +vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -12254,7 +12703,7 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -vscode-languageserver-types@^3.15.1: +vscode-languageserver-types@^3.16.0: version "3.16.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== @@ -12284,6 +12733,14 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" +watchpack@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7" + integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -12345,10 +12802,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" - integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== +webpack-dev-server@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" + integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -12370,11 +12827,11 @@ webpack-dev-server@3.11.0: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.8" semver "^6.3.0" serve-index "^1.9.1" - sockjs "0.3.20" - sockjs-client "1.4.0" + sockjs "^0.3.21" + sockjs-client "^1.5.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -12392,18 +12849,18 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9" - integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA== +webpack-merge@5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" + integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f" - integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw== +webpack-sources@2.2.0, webpack-sources@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -12416,10 +12873,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack-subresource-integrity@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz#6f44ea99987266b70c4ec42ac51064d33e982277" - integrity sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q== +webpack-subresource-integrity@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" + integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== dependencies: webpack-sources "^1.3.0" @@ -12452,14 +12909,36 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -websocket-driver@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= +webpack@5.22.0: + version "5.22.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.22.0.tgz#8505158bc52dcbbdb01ac94796a8aed61badf11a" + integrity sha512-xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ== dependencies: - websocket-extensions ">=0.1.1" + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.46" + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/wasm-edit" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + acorn "^8.0.4" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.7.0" + es-module-lexer "^0.3.26" + eslint-scope "^5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.0.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.1" + watchpack "^2.0.0" + webpack-sources "^2.1.1" -websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -12483,13 +12962,27 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.1, which@^1.2.9, which@^1.3.1: +which@^1.2.1, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" +which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -12578,9 +13071,9 @@ ws@^6.2.1: async-limiter "~1.0.0" ws@~7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== + version "7.4.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" + integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== xdg-basedir@^4.0.0: version "4.0.0" @@ -12607,11 +13100,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlhttprequest-ssl@~1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" - integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= - xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -12627,15 +13115,15 @@ xterm-addon-attach@^0.6.0: resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.6.0.tgz#220c23addd62ab88c9914e2d4c06f7407e44680e" integrity sha512-Mo8r3HTjI/EZfczVCwRU6jh438B4WLXxdFO86OB7bx0jGhwh2GdF4ifx/rP+OB+Cb2vmLhhVIZ00/7x3YSP3dg== -xterm-addon-fit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193" - integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w== +xterm-addon-fit@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" + integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm@^4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0.tgz#7a4c097a433d565339b5533b468bbc60c6c87969" - integrity sha512-wGfqufmioctKr8VkbRuZbVDfjlXWGZZ1PWHy1yqqpGT3Nm6yaJx8lxDbSEBANtgaiVPTcKSp97sxOy5IlpqYfw== +xterm@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb" + integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ== y18n@^4.0.0: version "4.0.1" @@ -12652,7 +13140,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -12684,9 +13172,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.5" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.5.tgz#5d37729146d3f894f39fc94b6796f5b239513186" + integrity sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg== yargs@^13.3.2: version "13.3.2" @@ -12750,11 +13238,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 0bbaca64394494b0b98f261e7cf2d2ed55a91a83 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 22:21:32 +0100 Subject: [PATCH 16/76] Revert "Update package.json" This reverts commit e4ad03e1c66a2a63e5d6e4932c8e3fabdf109ebb. --- package.json | 66 +- yarn.lock | 4113 ++++++++++++++++++++++---------------------------- 2 files changed, 1848 insertions(+), 2331 deletions(-) diff --git a/package.json b/package.json index 57d6c148..91a6a0fb 100644 --- a/package.json +++ b/package.json @@ -40,35 +40,35 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.2.0", - "@angular/cdk": "^11.2.0", - "@angular/common": "^11.2.0", - "@angular/compiler": "^11.2.0", - "@angular/core": "^11.2.0", - "@angular/forms": "^11.2.0", + "@angular/animations": "^11.0.8", + "@angular/cdk": "^11.0.3", + "@angular/common": "^11.0.8", + "@angular/compiler": "^11.0.8", + "@angular/core": "^11.0.8", + "@angular/forms": "^11.0.8", "@angular/http": "^7.2.16", - "@angular/material": "^11.2.0", - "@angular/platform-browser": "^11.2.0", - "@angular/platform-browser-dynamic": "^11.2.0", - "@angular/router": "^11.2.0", - "@sentry/browser": "^6.1.0", + "@angular/material": "^11.0.3", + "@angular/platform-browser": "^11.0.8", + "@angular/platform-browser-dynamic": "^11.0.8", + "@angular/router": "^11.0.8", + "@sentry/browser": "^5.29.2", "@types/jest": "^26.0.20", "@types/mocha": "^8.2.0", - "@types/react": "^17.0.2", - "@types/react-dom": "^17.0.1", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", - "angular-resizable-element": "^3.3.5", + "angular-resizable-element": "^3.3.4", "angular2-draggable": "^2.3.2", "angular2-hotkeys": "^2.2.0", "angular2-indexeddb": "^1.2.3", - "bootstrap": "^4.6.0", + "bootstrap": "^4.5.3", "command-exists": "^1.2.9", - "core-js": "^3.8.3", + "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", "eev": "^0.1.5", "file-saver": "^2.0.5", - "ini": "^2.0.0", + "ini": "^1.3.8", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", "ng2-file-upload": "^1.3.0", @@ -85,36 +85,36 @@ "save-html-as-image": "^1.3.4", "save-svg-as-png": "^1.4.14", "schematics-scss-migrate": "^1.2.10", - "snyk": "^1.455.0", + "snyk": "^1.437.3", "spark-md5": "^3.0.1", "svg-crowbar": "^0.6.5", "tree-kill": "^1.2.1", "tslib": "^2.1.0", "typeface-roboto": "^1.1.13", - "xterm": "^4.10.0", + "xterm": "^4.9.0", "xterm-addon-attach": "^0.6.0", - "xterm-addon-fit": "^0.5.0", + "xterm-addon-fit": "^0.4.0", "yargs": "^16.2.0", "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1102.0", - "@angular/cli": "^11.2.0", - "@angular/compiler-cli": "^11.2.0", - "@angular/language-service": "^11.2.0", - "@sentry/cli": "^1.62.0", - "@sentry/electron": "^2.2.0", - "@types/jasmine": "~3.6.3", + "@angular-devkit/build-angular": "^0.1100.6", + "@angular/cli": "^11.0.6", + "@angular/compiler-cli": "^11.0.8", + "@angular/language-service": "^11.0.8", + "@sentry/cli": "^1.61.0", + "@sentry/electron": "^2.1.0", + "@types/jasmine": "~3.6.0", "@types/jasminewd2": "^2.0.8", - "@types/node": "14.14.28", + "@types/node": "14.14.10", "codelyzer": "^6.0.0", - "electron": "^11.2.3", + "electron": "^11.2.0", "electron-builder": "22.9.1", "file-loader": "^6.2.0", "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~6.0.0", + "jasmine-spec-reporter": "~5.0.0", "jquery": "^3.5.1", - "karma": "^6.1.1", + "karma": "^5.2.3", "karma-chrome-launcher": "~3.1.0", "karma-cli": "^2.0.0", "karma-coverage-istanbul-reporter": "~3.0.2", @@ -127,11 +127,11 @@ "replace": "^1.2.0", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.1.1", + "ts-node": "~9.0.0", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.0.2", - "webpack": "5.22.0", + "webpack": "4.44.2", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/yarn.lock b/yarn.lock index b121fcd8..ff9dbd21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,116 +7,113 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== -"@angular-devkit/architect@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.0.tgz#0d4bee477d59318e8f3511fa6936bdcfa303df55" - integrity sha512-d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g== +"@angular-devkit/architect@0.1100.6": + version "0.1100.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.6.tgz#ce90ffb78d1d945cafc339d4cfc63b3582cb8e6a" + integrity sha512-4O+cg3AimI2bNAxxdu5NrqSf4Oa8r8xL0+G2Ycd3jLoFv0h0ecJiNKEG5F6IpTprb4aexZD6pcxBJCqQ8MmzWQ== dependencies: - "@angular-devkit/core" "11.2.0" + "@angular-devkit/core" "11.0.6" rxjs "6.6.3" -"@angular-devkit/build-angular@^0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1102.0.tgz#7996429000d4a707c8169b801f153819f04a2c24" - integrity sha512-9Yl6qBOR1o0ThyLhrWJ6Rhr3qLRe+RP3sbfUt4QA+8wsIXN7WakEXJALlq7TDeG66OaWyyjbtC2q3EPdNeBC/g== +"@angular-devkit/build-angular@^0.1100.6": + version "0.1100.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.6.tgz#4aa7635ab8fc1c6435b2b93954c08f2a7d7a8dd9" + integrity sha512-HcqsWiSIUxExGg3HRQScLOmF+ckVkCKolfpPcNOCCpBYxH/i8n4wDGLBP5Rtxky+0Qz+3nnAaFIpNb9p9aUmbg== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/build-optimizer" "0.1102.0" - "@angular-devkit/build-webpack" "0.1102.0" - "@angular-devkit/core" "11.2.0" - "@babel/core" "7.12.10" - "@babel/generator" "7.12.11" - "@babel/plugin-transform-async-to-generator" "7.12.1" - "@babel/plugin-transform-runtime" "7.12.10" - "@babel/preset-env" "7.12.11" - "@babel/runtime" "7.12.5" - "@babel/template" "7.12.7" + "@angular-devkit/architect" "0.1100.6" + "@angular-devkit/build-optimizer" "0.1100.6" + "@angular-devkit/build-webpack" "0.1100.6" + "@angular-devkit/core" "11.0.6" + "@babel/core" "7.12.3" + "@babel/generator" "7.12.1" + "@babel/plugin-transform-runtime" "7.12.1" + "@babel/preset-env" "7.12.1" + "@babel/runtime" "7.12.1" + "@babel/template" "7.10.4" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "11.2.0" + "@ngtools/webpack" "11.0.6" ansi-colors "4.1.1" - autoprefixer "10.2.4" - babel-loader "8.2.2" + autoprefixer "9.8.6" + babel-loader "8.1.0" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.2" - copy-webpack-plugin "6.3.2" - core-js "3.8.3" - critters "0.0.6" - css-loader "5.0.1" + circular-dependency-plugin "5.2.0" + copy-webpack-plugin "6.2.1" + core-js "3.6.5" + css-loader "4.3.0" cssnano "4.1.10" - file-loader "6.2.0" + file-loader "6.1.1" find-cache-dir "3.3.1" glob "7.1.6" - https-proxy-agent "5.0.0" inquirer "7.3.3" - jest-worker "26.6.2" + jest-worker "26.5.0" karma-source-map-support "1.4.0" - less "4.1.1" - less-loader "7.3.0" - license-webpack-plugin "2.3.11" + less "3.12.2" + less-loader "7.0.2" + license-webpack-plugin "2.3.1" loader-utils "2.0.0" - mini-css-extract-plugin "1.3.5" + mini-css-extract-plugin "1.2.1" minimatch "3.0.4" - open "7.4.0" - ora "5.3.0" + open "7.3.0" + ora "5.1.0" parse5-html-rewriting-stream "6.0.1" pnp-webpack-plugin "1.6.4" - postcss "8.2.4" - postcss-import "14.0.0" - postcss-loader "4.2.0" + postcss "7.0.32" + postcss-import "12.0.1" + postcss-loader "4.0.4" raw-loader "4.0.2" regenerator-runtime "0.13.7" resolve-url-loader "3.1.2" rimraf "3.0.2" - rollup "2.38.4" + rollup "2.32.1" rxjs "6.6.3" - sass "1.32.6" - sass-loader "10.1.1" - semver "7.3.4" + sass "1.27.0" + sass-loader "10.0.5" + semver "7.3.2" source-map "0.7.3" - source-map-loader "1.1.3" + source-map-loader "1.1.2" source-map-support "0.5.19" - speed-measure-webpack-plugin "1.4.2" + speed-measure-webpack-plugin "1.3.3" style-loader "2.0.0" stylus "0.54.8" - stylus-loader "4.3.3" - terser "5.5.1" + stylus-loader "4.3.1" + terser "5.3.7" terser-webpack-plugin "4.2.3" text-table "0.2.0" tree-kill "1.2.2" webpack "4.44.2" webpack-dev-middleware "3.7.2" - webpack-dev-server "3.11.2" - webpack-merge "5.7.3" - webpack-sources "2.2.0" - webpack-subresource-integrity "1.5.2" + webpack-dev-server "3.11.0" + webpack-merge "5.2.0" + webpack-sources "2.0.1" + webpack-subresource-integrity "1.5.1" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.0.tgz#22e84487e915d3a3590fc8ef3b0025ce7f846301" - integrity sha512-0Xb7xR0iUrbo/BnKJPTsy5IuodfFUWbvXUu9qeKc+oHzwxObX4Y32X0yyRpIJc5UK7Ce43HkopRQ/tHdoJp2fQ== +"@angular-devkit/build-optimizer@0.1100.6": + version "0.1100.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.6.tgz#4d6712ae75eeae71d74fd161a0a18c08402dc527" + integrity sha512-Qkq7n6510N+nXmfZqpqpI0I6Td+b+06RRNmS7KftSNJntU1z5QYh4FggwlthZ5P0QUT92cnBQsnT8OgYqGnwbg== dependencies: loader-utils "2.0.0" source-map "0.7.3" - tslib "2.1.0" - typescript "4.1.3" - webpack-sources "2.2.0" + tslib "2.0.3" + typescript "4.0.5" + webpack-sources "2.0.1" -"@angular-devkit/build-webpack@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1102.0.tgz#c198d47a755c2ede6eb575b8addd271709f5207b" - integrity sha512-bfd6WlxcbWJ01HNNcFt4sBBaY+Bz2J/zFA6BSORvC5LpqawYCYeUbDJTY9Wb7gtp+aPEiNHI0HeUvoNkubsYfg== +"@angular-devkit/build-webpack@0.1100.6": + version "0.1100.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.6.tgz#301caf71bebed6e841cb15fb3af5147c3b2d9c97" + integrity sha512-kK0FlpYJHP25o1yzIGHQqIvO5kp+p6V5OwGpD2GGRZLlJqd3WdjY5DxnyZoX3/IofO6KsTnmm76fzTRqc62z/Q== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/core" "11.2.0" + "@angular-devkit/architect" "0.1100.6" + "@angular-devkit/core" "11.0.6" rxjs "6.6.3" -"@angular-devkit/core@10.2.2", "@angular-devkit/core@^10.1.0": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.2.tgz#107b46618661845122e8b1b29eee18a392298986" - integrity sha512-kfSyk0J6vb+BgJsLazxpe4i01JtMpTrps95azqqNrZnUSuctwXRUJF3UkU64JhN13kb2E/QLdrGRibbXzu1J0w== +"@angular-devkit/core@10.2.1", "@angular-devkit/core@^10.1.0": + version "10.2.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.1.tgz#3ae38be4ca56c745788481b3577173ac2007e9e0" + integrity sha512-dzlF9Gl7KNt9sPYT2HYq6ySZYwKzkyYR5mrBj3DZOD0OQsoc21LvLkWAHNSL2iYGdHJQS1oJDNs8iRYxYIOY3w== dependencies: ajv "6.12.4" fast-json-stable-stringify "2.1.0" @@ -124,10 +121,10 @@ rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/core@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.0.tgz#a9198a391723e865fc6b369752c176cd5ed1d452" - integrity sha512-qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q== +"@angular-devkit/core@11.0.6": + version "11.0.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.6.tgz#b3ea815ecdea5f77dae58f3f410b268453d7eb8b" + integrity sha512-nhvU5hH01r9qcexAqvIFU233treWWeW3ncs9UFYjD9Hys9sDSvqC3+bvGvl9vCG5FsyY7oDsjaVAipyUc+SFAg== dependencies: ajv "6.12.6" fast-json-stable-stringify "2.1.0" @@ -135,10 +132,10 @@ rxjs "6.6.3" source-map "0.7.3" -"@angular-devkit/core@9.1.14": - version "9.1.14" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.14.tgz#d698d8322f4b231170c549bb52af4be475a9620d" - integrity sha512-xwGCDR8Wcn1/IPw0Sjabr9YNi/7T7I+dHKIWs3m7SYf4ebkqkIkQUdIlhzgB8KzXJboDUV9w8TNsVjHqgLyN2Q== +"@angular-devkit/core@9.1.13": + version "9.1.13" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.13.tgz#47135a25c04ceb62579f0a50d4ad015c7741235a" + integrity sha512-bwehVRsva9OWfh/yuEh9VU+0Gr1T7DHJLe8tpZk/VsIkGOD0IszEPZOIEK23bg32yiff9bh6qJEPMA7ZBYEQHg== dependencies: ajv "6.12.3" fast-json-stable-stringify "2.1.0" @@ -146,88 +143,86 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/schematics@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.2.0.tgz#82192578ff2a9fb01a9d8c56237f4fc98946e757" - integrity sha512-sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w== +"@angular-devkit/schematics@11.0.6": + version "11.0.6" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.0.6.tgz#06631190cb22609462597cd6659080fc3313582a" + integrity sha512-hCyu/SSSiC6dKl/NxdWctknIrBqKR6pRe7DMArWowrZX6P9oi36LpKEFnKutE8+tXjsOqQj8XMBq9L64sXZWqg== dependencies: - "@angular-devkit/core" "11.2.0" - ora "5.3.0" + "@angular-devkit/core" "11.0.6" + ora "5.1.0" rxjs "6.6.3" -"@angular-devkit/schematics@9.1.14": - version "9.1.14" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.14.tgz#38df5c0e3badc13f10d0a1f432fc5188edab6604" - integrity sha512-LlSRkoxeJIaptJEoSIds060qv8wcLvI9XZPhUnWHY+FddC/X3OO+Tag9U6CaJ5tfBRnKTS7GtBwQgI0Gip6rhA== +"@angular-devkit/schematics@9.1.13": + version "9.1.13" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.13.tgz#cdbd4b9067b1c610f99bb64d494071e8a7ee1b2c" + integrity sha512-DZBmfYE6xIfC6PDMvQpR8B31TtLWOmSeTQPnmSm9gj6OZpyqFqoGWOz/0l05FH6zC8HLthAAFJSEnPYyhzWDvg== dependencies: - "@angular-devkit/core" "9.1.14" + "@angular-devkit/core" "9.1.13" ora "4.0.3" rxjs "6.5.4" "@angular-devkit/schematics@^10.1.0": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.2.tgz#a037976e89768ad82d2cfa35b2a80939e34f6f32" - integrity sha512-HnNll8mxPQqcWrG/YcF8XXNvYq7Ixq2H/EJgbRUQDh9WHcS+5F2hD+WirnV2+co1H4+BZhMRc22bmec+o1aSGw== + version "10.2.1" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.1.tgz#1d1aaf3875c9ed5eb3ad97af993af39fe9ed10a9" + integrity sha512-0oMhB1eM7hg5Xf4U7r193zrNTGyxfzl2okBsLJPuVmkb3KCBGQOyHYmU5HjDNadPc5iCFc+Xo2+DSDvXGuLmaA== dependencies: - "@angular-devkit/core" "10.2.2" + "@angular-devkit/core" "10.2.1" ora "5.0.0" rxjs "6.6.2" -"@angular/animations@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387" - integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg== +"@angular/animations@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.8.tgz#abb3a016bc9164176d1edfcbd2783cc3ba6f9ca3" + integrity sha512-LlKR5bO7WsykZGcPDnL7c4q2/eq2fqywD+KMw5FemGLI8mN1mnq30br9/8TgaFwY0Do1OTOUh1JSrn1ybQgTwA== dependencies: tslib "^2.0.0" -"@angular/cdk@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.0.tgz#4f0d8e9865d29ee1b2ab3ce7be9a7af0a87b0ef4" - integrity sha512-25k1giKAJ7DPzJBZfAVZmw/VfR4pZUaZnhgVAMwIdGPl5SaXJEW3e2znGlhzwkuQsiBgrSKfMgJmwKSyUbe2tg== +"@angular/cdk@^11.0.3": + version "11.0.3" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.0.3.tgz#f5a119e28b4ba21a6f013dfd4de41b16083bd25a" + integrity sha512-hgbJXvZURKBnZawwxUrsZE/3a+HCJh2UhoLIng3cn5Q+WIW/4a37knDl8B9DYKBWrCqeINXNcUHVSKkWc/gjCA== dependencies: tslib "^2.0.0" optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.0.tgz#f611f0851f6f92008f0f5aaaade947751b27687f" - integrity sha512-waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q== +"@angular/cli@^11.0.6": + version "11.0.6" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.0.6.tgz#8d65d3ad3841aabe23ff38a41fa6c4f38dd12f66" + integrity sha512-bwrXXyU23HjUlFl0CNCU+XMGa/enooqpMLcTAA15StVpKFHyaA4c57il/aqu+1IuB+zR6rGDzhAABuvRcHd+mQ== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" - "@schematics/angular" "11.2.0" - "@schematics/update" "0.1102.0" + "@angular-devkit/architect" "0.1100.6" + "@angular-devkit/core" "11.0.6" + "@angular-devkit/schematics" "11.0.6" + "@schematics/angular" "11.0.6" + "@schematics/update" "0.1100.6" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" - debug "4.3.1" - ini "2.0.0" + debug "4.2.0" + ini "1.3.6" inquirer "7.3.3" - jsonc-parser "3.0.0" npm-package-arg "8.1.0" npm-pick-manifest "6.1.0" - open "7.4.0" - ora "5.3.0" - pacote "11.2.4" - resolve "1.19.0" + open "7.3.0" + pacote "9.5.12" + resolve "1.18.1" rimraf "3.0.2" - semver "7.3.4" - symbol-observable "3.0.0" + semver "7.3.2" + symbol-observable "2.0.3" universal-analytics "0.4.23" - uuid "8.3.2" + uuid "8.3.1" -"@angular/common@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f" - integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg== +"@angular/common@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.0.8.tgz#f3fd177af584a4e59b2a9bc1a90fa45dcb3dd672" + integrity sha512-Or7uSetk29wcKOsDVyJl/2JUC34e/gDNI3HNlpFh98miT8G4tqFKSmuLGRPPanIKqyQQQmquV93VNPOMA+rdYA== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.0.tgz#850bee57566c00b28a0842bce775b8c4597a4185" - integrity sha512-FJ8OHWBQftmncDGV43ASFeCu3cW1W2P5fvub9fiBFEeTIkB/HXrMOMCQg/1XSdfA5kwFzj2NedMp573X9kq6ng== +"@angular/compiler-cli@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.0.8.tgz#4284fc6e9cc7bee5314738cd32ce8bbdba20237c" + integrity sha512-xblOhSgshNzAxNmLdBjdLHMc3Zoc12w5Bz70nrqtAfK9DY6kQx6aAxpbhOr/F5Jl5XFNbvIviOOkG9aqM1Iuuw== dependencies: "@babel/core" "^7.8.6" "@babel/types" "^7.8.6" @@ -250,10 +245,10 @@ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/compiler@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2" - integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ== +"@angular/compiler@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.8.tgz#da59389d805034a261b839d703bca3134b6157c4" + integrity sha512-v7NjxLvyJl2cxH7roVTMLnaFCLA9gStgndxJcsXtD+hI7hCOFvrzxwpm3J822KYEkwWhB1PMthJwrZ6OWtkp/A== dependencies: tslib "^2.0.0" @@ -262,17 +257,17 @@ resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e" integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w== -"@angular/core@>=4.3.1", "@angular/core@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467" - integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g== +"@angular/core@>=4.3.1", "@angular/core@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.0.8.tgz#cc4ffc5506b393bf851fd7b94760d2a66efeb47c" + integrity sha512-NRKCgOtPFKcJpjjSV0NKuoNaD6ZQ3RqXBm9JURbnjVLaTwtCJlQ9H3N/e+HZNw8Ha2TDFJoiYX+RY071cyTMHQ== dependencies: tslib "^2.0.0" -"@angular/forms@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed" - integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA== +"@angular/forms@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.0.8.tgz#f0d68407b50174e4c8b6d3b134fafed792db5320" + integrity sha512-soTg9Zc3G08J/+LRq5FxFvVsKoDQb4F29nEVpbH7oK2hof9Qqois9lH8bJy5dHbNh1qNXYmlWjUd7CQ9p+bbUg== dependencies: tslib "^2.0.0" @@ -283,52 +278,74 @@ dependencies: tslib "^1.9.0" -"@angular/language-service@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.0.tgz#a233129970ccb05dab87093ae9410474a6e92128" - integrity sha512-0n7yrBiwpN6qUEDBoMHxEzxRN+w4tIe+42Ra68UQ5leBx5mSA6P6Ipi+nPwy8RXjqNEHgR0D//30Zp18O8UhCA== +"@angular/language-service@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.0.8.tgz#2354589115c7f851c016c7d3a68952f37040b80c" + integrity sha512-5iKvCzb0YWCrEvCUCGsmwQxfUQjnAOdeaNHieLmfkpAutojtIrK59rNmyQqA2RBpo2OZMANz0/aOde1N2rHI0w== -"@angular/material@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.0.tgz#a5843f2964366daebab9edf2b0a3d6dcad451f5d" - integrity sha512-duTQdHtzdZ3KWn90JcN+eI0oNwr7E7JGEOp7tZ9XOtqty0h158SJUCYSuDxhFOqyAgaY41enNPHdB2c4Xz0iBQ== +"@angular/material@^11.0.3": + version "11.0.3" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.0.3.tgz#dd848f1804b07c9654b095d5b1accb13083e91e5" + integrity sha512-YTHmtKGwjAEFAOOmuivcwnINMPHxvM7iZQpTgZqDKNiqiv53cwry2Ctb54suRNT+D794z59D0/r+YocGkzFv3w== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7" - integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ== +"@angular/platform-browser-dynamic@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.0.8.tgz#f7714f40e0cb3044f7dfd362371d39c9c4501b19" + integrity sha512-rirFL6R0R9wXTYfzZzsF7Zchq48439QQHAQ3Pi0nTDtyn3seHIEWMW1FcwjuPIt/ea5F+kRB4L8fxGK8G1/taA== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403" - integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow== +"@angular/platform-browser@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.0.8.tgz#aa3863512ad63373d9c6d13ecb64cc1357de959e" + integrity sha512-07nbExdtf2fRJh3XEicbCj1fK0/tWmIW/TaWJ9hv1xeQLjPDcplTF0MaPSlow36qyO+q83rsd3hxyFfBTqgOyw== dependencies: tslib "^2.0.0" -"@angular/router@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.0.tgz#00dca75d6dce5a88259fea88866caa51ebf1d1a7" - integrity sha512-Gw08D6W4SGEIgm5zKdGs1yCW7FnwYjF8cycWczrpU8fmZh+WLbIjPAy/blI/nByCDU9BGyZ7cWGOiQJHEnzWmg== +"@angular/router@^11.0.8": + version "11.0.8" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.0.8.tgz#771b4a235eb696d4411e867f13701532b0d95c67" + integrity sha512-vinpCct3r+6wFtGdYNa/l5PCpJqQSB/D9Z+zZBdmDUy9s32dggHG4msmVrYbFH/j7cKDAycqHGVFyj0hKGDQiQ== dependencies: tslib "^2.0.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.10.4" -"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.12.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" - integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" + integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== -"@babel/core@7.12.10": +"@babel/core@7.12.3": + version "7.12.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" + integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.1" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helpers" "^7.12.1" + "@babel/parser" "^7.12.3" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/core@^7.7.5", "@babel/core@^7.8.6": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -349,28 +366,16 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.7.5", "@babel/core@^7.8.6": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" - integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== +"@babel/generator@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" + integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg== dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.15" - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helpers" "^7.12.13" - "@babel/parser" "^7.12.16" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - semver "^5.4.1" + "@babel/types" "^7.12.1" + jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@7.12.11": +"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== @@ -379,155 +384,155 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.12.13", "@babel/generator@^7.12.15": - version "7.12.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" - integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== +"@babel/helper-annotate-as-pure@^7.10.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" + integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== dependencies: - "@babel/types" "^7.12.13" - jsesc "^2.5.1" - source-map "^0.5.0" + "@babel/types" "^7.12.10" -"@babel/helper-annotate-as-pure@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" - integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" + integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== dependencies: - "@babel/types" "^7.12.13" + "@babel/helper-explode-assignable-expression" "^7.10.4" + "@babel/types" "^7.10.4" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" - integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== +"@babel/helper-compilation-targets@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" + integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== dependencies: - "@babel/helper-explode-assignable-expression" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-compilation-targets@^7.12.5": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz#6905238b4a5e02ba2d032c1a49dd1820fe8ce61b" - integrity sha512-dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg== - dependencies: - "@babel/compat-data" "^7.12.13" - "@babel/helper-validator-option" "^7.12.16" + "@babel/compat-data" "^7.12.5" + "@babel/helper-validator-option" "^7.12.1" browserslist "^4.14.5" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.12.13": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz#955d5099fd093e5afb05542190f8022105082c61" - integrity sha512-KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow== +"@babel/helper-create-class-features-plugin@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" + integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.12.16" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.10.4" -"@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz#3b31d13f39f930fad975e151163b7df7d4ffe9d3" - integrity sha512-jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg== +"@babel/helper-create-regexp-features-plugin@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" + integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.10.4" regexpu-core "^4.7.1" -"@babel/helper-explode-assignable-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a" - integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw== +"@babel/helper-define-map@^7.10.4": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" + integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-hoist-variables@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd" - integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.16": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" - integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.12.5": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" - integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/helper-simple-access" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/helper-function-name" "^7.10.4" + "@babel/types" "^7.10.5" lodash "^4.17.19" -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== +"@babel/helper-explode-assignable-expression@^7.10.4": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" + integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.12.1" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" - integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== - -"@babel/helper-remap-async-to-generator@^7.12.1", "@babel/helper-remap-async-to-generator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" - integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA== +"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" + integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-wrap-function" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/helper-get-function-arity" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/types" "^7.12.11" -"@babel/helper-replace-supers@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" - integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== +"@babel/helper-get-function-arity@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/types" "^7.12.10" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-hoist-variables@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" + integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.10.4" + +"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== + dependencies: + "@babel/types" "^7.12.7" + +"@babel/helper-module-imports@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" + integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== + dependencies: + "@babel/types" "^7.12.5" + +"@babel/helper-module-transforms@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" + integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/helper-validator-identifier" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + lodash "^4.17.19" + +"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== + dependencies: + "@babel/types" "^7.12.10" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + +"@babel/helper-remap-async-to-generator@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" + integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-wrap-function" "^7.10.4" + "@babel/types" "^7.12.1" + +"@babel/helper-replace-supers@^7.12.1": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" + integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.12.7" + "@babel/helper-optimise-call-expression" "^7.12.10" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.11" + +"@babel/helper-simple-access@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" + integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== + dependencies: + "@babel/types" "^7.12.1" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1": version "7.12.1" @@ -536,162 +541,162 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== +"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" + integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.12.11" -"@babel/helper-validator-identifier@^7.12.11": +"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.12.16": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz#f73cbd3bbba51915216c5dea908e9b206bb10051" - integrity sha512-uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ== +"@babel/helper-validator-option@^7.12.1": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" + integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== -"@babel/helper-wrap-function@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff" - integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw== +"@babel/helper-wrap-function@^7.10.4": + version "7.12.3" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" + integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/helper-function-name" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.4" + "@babel/types" "^7.10.4" -"@babel/helpers@^7.12.13", "@babel/helpers@^7.12.5": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" - integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== +"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" + integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" -"@babel/highlight@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.10.4" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.12.7": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" - integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== +"@babel/parser@^7.10.4", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" + integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== "@babel/plugin-proposal-async-generator-functions@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5" - integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA== + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" + integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-remap-async-to-generator" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-remap-async-to-generator" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-proposal-class-properties@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8" - integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" + integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-dynamic-import@^7.12.1": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz#b9f33b252e3406d492a15a799c9d45a9a9613473" - integrity sha512-yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" + integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" + integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-proposal-json-strings@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d" - integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" + integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" "@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350" - integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" + integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde" - integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" + integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@^7.12.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== +"@babel/plugin-proposal-numeric-separator@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" + integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011" - integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" + integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.13" + "@babel/plugin-transform-parameters" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5" - integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" + integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.7": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz#600c7531f754186b0f2096e495a92da7d88aa139" - integrity sha512-O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg== +"@babel/plugin-proposal-optional-chaining@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" + integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71" - integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" + integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" - integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" + integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" @@ -701,11 +706,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" + integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" @@ -771,20 +776,20 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-arrow-functions@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe" - integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" + integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-async-to-generator@7.12.1": +"@babel/plugin-transform-async-to-generator@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== @@ -793,266 +798,259 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.12.1" -"@babel/plugin-transform-async-to-generator@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" - integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-remap-async-to-generator" "^7.12.13" - "@babel/plugin-transform-block-scoped-functions@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" + integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-block-scoping@^7.12.11": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" - integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== +"@babel/plugin-transform-block-scoping@^7.12.1": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" + integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-classes@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6" - integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" + integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-define-map" "^7.10.4" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.10.4" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d" - integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" + integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-destructuring@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb" - integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" + integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" - integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" + integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-duplicate-keys@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" - integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" + integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-exponentiation-operator@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" - integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" + integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-for-of@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6" - integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" + integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-function-name@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" - integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" + integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-literals@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" - integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" + integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-member-expression-literals@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" + integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-modules-amd@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56" - integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" + integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== dependencies: - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50" - integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" + integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== dependencies: - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-simple-access" "^7.12.1" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5" - integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" + integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== dependencies: - "@babel/helper-hoist-variables" "^7.12.13" - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-hoist-variables" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-validator-identifier" "^7.10.4" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-umd@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37" - integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" + integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== dependencies: - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" - integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" + integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.12.1" "@babel/plugin-transform-new-target@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" - integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" + integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-object-super@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" + integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-replace-supers" "^7.12.1" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853" - integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA== +"@babel/plugin-transform-parameters@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" + integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-property-literals@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" + integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-regenerator@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" + integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" - integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" + integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-runtime@7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" - integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== - dependencies: - "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-transform-runtime@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" + integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" semver "^5.5.1" "@babel/plugin-transform-shorthand-properties@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" - integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" + integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-spread@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949" - integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" + integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" - integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== +"@babel/plugin-transform-sticky-regex@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" + integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-template-literals@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865" - integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" + integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-typeof-symbol@^7.12.10": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" - integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== +"@babel/plugin-transform-typeof-symbol@^7.12.1": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" + integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" - integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" + integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-unicode-regex@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" - integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" + integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/preset-env@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" - integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== - dependencies: - "@babel/compat-data" "^7.12.7" - "@babel/helper-compilation-targets" "^7.12.5" - "@babel/helper-module-imports" "^7.12.5" + "@babel/helper-create-regexp-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.11" + +"@babel/preset-env@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" + integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== + dependencies: + "@babel/compat-data" "^7.12.1" + "@babel/helper-compilation-targets" "^7.12.1" + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-validator-option" "^7.12.1" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1060,10 +1058,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.7" + "@babel/plugin-proposal-numeric-separator" "^7.12.1" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-optional-chaining" "^7.12.1" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1081,7 +1079,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.11" + "@babel/plugin-transform-block-scoping" "^7.12.1" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1105,14 +1103,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.7" + "@babel/plugin-transform-sticky-regex" "^7.12.1" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.10" + "@babel/plugin-transform-typeof-symbol" "^7.12.1" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.11" - core-js-compat "^3.8.0" + "@babel/types" "^7.12.1" + core-js-compat "^3.6.2" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1126,21 +1124,30 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@7.12.5": +"@babel/runtime@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" + integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== + dependencies: + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" - integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== +"@babel/template@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" + integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== dependencies: - regenerator-runtime "^0.13.4" + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" -"@babel/template@7.12.7": +"@babel/template@^7.10.4", "@babel/template@^7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== @@ -1149,34 +1156,25 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/template@^7.12.13", "@babel/template@^7.12.7": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== +"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" + integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.12.10", "@babel/traverse@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" - integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/code-frame" "^7.12.11" + "@babel/generator" "^7.12.11" + "@babel/helper-function-name" "^7.12.11" + "@babel/helper-split-export-declaration" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/types" "^7.12.12" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" - integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== +"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": + version "7.12.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" + integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -1191,25 +1189,25 @@ ajv-keywords "^3.4.1" "@electron/get@^1.0.1": - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== + version "1.12.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3" + integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" - semver "^6.2.0" + sanitize-filename "^1.6.2" sumchecker "^3.0.1" optionalDependencies: global-agent "^2.0.2" global-tunnel-ng "^2.7.1" "@istanbuljs/schema@^0.1.2": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" - integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== "@jest/types@^26.6.2": version "26.6.2" @@ -1238,14 +1236,14 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== -"@ngtools/webpack@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.2.0.tgz#720c3a50aae5aced2fe049f7efc3434320bbe539" - integrity sha512-2KYaA/fIw863jydXDolWp4kUNLODVIKs2834vW+oztocnYFe/z4dTz6rArKFUCixMCu12ieXrjAetzGA564bsg== +"@ngtools/webpack@11.0.6": + version "11.0.6" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.6.tgz#1a1d7775022e7e6263f8d9ee2872d995163b3fc0" + integrity sha512-vf5YNEpXWRa0fKC/BRq5sVVj2WnEqW8jn14YQRHwVt5ppUeyu8IKUF69p6W1MwZMgMqMaw/vPQ8LI5cFbyf3uw== dependencies: - "@angular-devkit/core" "11.2.0" - enhanced-resolve "5.7.0" - webpack-sources "2.2.0" + "@angular-devkit/core" "11.0.6" + enhanced-resolve "5.3.1" + webpack-sources "2.0.1" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1268,79 +1266,18 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" -"@npmcli/ci-detect@^1.0.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a" - integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q== - -"@npmcli/git@^2.0.1": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.6.tgz#47b97e96b2eede3f38379262fa3bdfa6eae57bf2" - integrity sha512-a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg== - dependencies: - "@npmcli/promise-spawn" "^1.1.0" - lru-cache "^6.0.0" - mkdirp "^1.0.3" - npm-pick-manifest "^6.0.0" - promise-inflight "^1.0.1" - promise-retry "^2.0.1" - semver "^7.3.2" - unique-filename "^1.1.1" - which "^2.0.2" - -"@npmcli/installed-package-contents@^1.0.5": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" - integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== - dependencies: - npm-bundled "^1.1.1" - npm-normalize-package-bin "^1.0.1" - "@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" + integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== dependencies: mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@npmcli/node-gyp@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede" - integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg== - -"@npmcli/promise-spawn@^1.1.0", "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5" - integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg== - dependencies: - infer-owner "^1.0.4" - -"@npmcli/run-script@^1.3.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.3.tgz#07f440ed492400bb1114369bc37315eeaaae2bb3" - integrity sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ== - dependencies: - "@npmcli/node-gyp" "^1.0.2" - "@npmcli/promise-spawn" "^1.3.2" - infer-owner "^1.0.4" - node-gyp "^7.1.0" - puka "^1.0.1" - read-package-json-fast "^2.0.1" "@octetstream/promisify@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== -"@open-policy-agent/opa-wasm@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz#481b766093f70b00efefbee1e4192f375fd34ca2" - integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== - dependencies: - sprintf-js "^1.1.2" - utf8 "^3.0.0" - "@popperjs/core@^2.5.3": version "2.6.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f" @@ -1359,35 +1296,35 @@ lodash "^4.17.20" lodash-es "^4.17.20" -"@schematics/angular@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.2.0.tgz#da903e0fc09e834cf53452a30ea7d2eb78608ebc" - integrity sha512-PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw== +"@schematics/angular@11.0.6": + version "11.0.6" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.0.6.tgz#5e52f8396e66138df0d6062130399fab830ee79e" + integrity sha512-XUcpOrlcp55PBHrgpIVx69lnhDY6ro35BSRmqNmjXik56qcOkfvdki8vvyW9EsWvu9/sfBSsVDdparlbVois7w== dependencies: - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" - jsonc-parser "3.0.0" + "@angular-devkit/core" "11.0.6" + "@angular-devkit/schematics" "11.0.6" + jsonc-parser "2.3.1" "@schematics/angular@^9.1.0": - version "9.1.14" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.14.tgz#bb80d082b00d4614aa416052b57799f52f62667b" - integrity sha512-FoPX+D/+Mg/pofTobRGG28Gf84kbXql+LrLRVrVZ2V9sPvdWSD1b0U/y6pYtbEYLBg5OQ0vC6d2BfOJLOxFAvA== + version "9.1.13" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.13.tgz#e4be3f8b71ef8b27f0d1f0b1325f9806f56cb683" + integrity sha512-coHvhu2jXVCN3P5Ux5ArDousMWDq4W6eInJPBpAI6yidRW1ViPVF58Bas/+Txcbhubv2cZViBXGq0OAGdJIvTQ== dependencies: - "@angular-devkit/core" "9.1.14" - "@angular-devkit/schematics" "9.1.14" + "@angular-devkit/core" "9.1.13" + "@angular-devkit/schematics" "9.1.13" -"@schematics/update@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1102.0.tgz#6aa5e25cd18ab9e99d8cd06752583d1ed21a6a65" - integrity sha512-2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g== +"@schematics/update@0.1100.6": + version "0.1100.6" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1100.6.tgz#8e76276a3daecfd698b39e7643bc21f3abb3a4d0" + integrity sha512-+B8n+k+zZ3VYOhjNBsLqzjp8O9ZdUWgdpf9L8XAA7mh/oPwufXpExyEc66uAS07imvUMmjz6i8E2eNWV/IjBJg== dependencies: - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" + "@angular-devkit/core" "11.0.6" + "@angular-devkit/schematics" "11.0.6" "@yarnpkg/lockfile" "1.1.0" - ini "2.0.0" + ini "1.3.6" npm-package-arg "^8.0.0" - pacote "11.2.4" - semver "7.3.4" + pacote "9.5.12" + semver "7.3.2" semver-intersect "1.4.0" "@sentry/browser@5.27.6": @@ -1400,20 +1337,20 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/browser@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.1.0.tgz#0e18a07b44bebed729bcf842af33203e388e2053" - integrity sha512-t3y2TLXDWgvfknyH8eKj/9mghJfSEqItFyp74zPu1Src6kOPjkd4Sa7o4+bdkNgA8dIIOrDAhRUbB2sq4sWMCA== +"@sentry/browser@^5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.29.2.tgz#51adb4005511b1a4a70e4571880fc6653d651f91" + integrity sha512-uxZ7y7rp85tJll+RZtXRhXPbnFnOaxZqJEv05vJlXBtBNLQtlczV5iCtU9mZRLVHDtmZ5VVKUV8IKXntEqqDpQ== dependencies: - "@sentry/core" "6.1.0" - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/core" "5.29.2" + "@sentry/types" "5.29.2" + "@sentry/utils" "5.29.2" tslib "^1.9.3" -"@sentry/cli@^1.62.0": - version "1.62.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.62.0.tgz#2e2d8cacb5ec494f86c188ef95b41745605be028" - integrity sha512-MCkx+zjetdIWhAVaFuEuoD4MOAFlb3/GLR5B5uFZ1AcegcsggasLo/3rb2gq6jYIic/pubtRjH4ltmOL/s3cag== +"@sentry/cli@^1.61.0": + version "1.61.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.61.0.tgz#98be4cce2d61df91a8cb42afb740b46eba029925" + integrity sha512-pHEhqP1bB4sdO7N5ow/IkRBrPbKT9HZRinq4PhTVIvmG+NW4VVuVZ6k4tlbp+JXmzMcUc/iXynVkTL7zJIlTQw== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" @@ -1432,21 +1369,21 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/core@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.1.0.tgz#7dd4584dcaf2188a78b94b766068342e6ee65229" - integrity sha512-57mXkp3NoyxRycXrL+Ec6bYS6UYJZp9tYX0lUp5Ry2M0FxDZ3Q4drkjr8MIQOhBaQXP2ukSX4QTVLGMPm60zMw== +"@sentry/core@5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.29.2.tgz#9e05fe197234161d57aabaf52fab336a7c520d81" + integrity sha512-7WYkoxB5IdlNEbwOwqSU64erUKH4laavPsM0/yQ+jojM76ErxlgEF0u//p5WaLPRzh3iDSt6BH+9TL45oNZeZw== dependencies: - "@sentry/hub" "6.1.0" - "@sentry/minimal" "6.1.0" - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/hub" "5.29.2" + "@sentry/minimal" "5.29.2" + "@sentry/types" "5.29.2" + "@sentry/utils" "5.29.2" tslib "^1.9.3" -"@sentry/electron@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.2.0.tgz#e59d9cea4e5c3b003e2fc6fc9ecf1bfc1af15eb6" - integrity sha512-wNUIsRxb86zK1tV77MZaSLWHM2CxgC1QLJCWxr+Tkash6tESfMY2XlC4+7XQKHfASU3QHt5l4R55/rhrr7ChJA== +"@sentry/electron@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.1.0.tgz#82985f473590a99a5a19f879a4948617d185b3bb" + integrity sha512-ZOJmtAWNc2reJqgVPxuKGenXcl88gj7hqDk1dHo+kW4J+D28/pfbGEFr4aLvaUq5G8ZFGsxT0cZObAExIFv3Nw== dependencies: "@sentry/browser" "5.27.6" "@sentry/core" "5.27.6" @@ -1465,13 +1402,13 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/hub@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.1.0.tgz#fb22734c91c9d68564737996bf28b7e032e3d8ee" - integrity sha512-JnBSCgNg3VHiMojUl5tCHU8iWPVuE+qqENIzG9A722oJms1kKWBvWl+yQzhWBNdgk5qeAY3F5UzKWJZkbJ6xow== +"@sentry/hub@5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.29.2.tgz#208f10fe6674695575ad74182a1151f71d6df00a" + integrity sha512-LaAIo2hwUk9ykeh9RF0cwLy6IRw+DjEee8l1HfEaDFUM6TPGlNNGObMJNXb9/95jzWp7jWwOpQjoIE3jepdQJQ== dependencies: - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/types" "5.29.2" + "@sentry/utils" "5.29.2" tslib "^1.9.3" "@sentry/minimal@5.27.6": @@ -1483,13 +1420,13 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/minimal@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.1.0.tgz#b3abf76d93b95477a3c1029db810818bdc56845f" - integrity sha512-g6sfNKenL7wnsr/tibp8nFiMv/XRH0s0Pt4p151npmNI+SmjuUz3GGYEXk8ChCyaKldYKilkNOFdVXJxUf5gZw== +"@sentry/minimal@5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.29.2.tgz#420bebac8d03d30980fdb05c72d7b253d8aa541b" + integrity sha512-0aINSm8fGA1KyM7PavOBe1GDZDxrvnKt+oFnU0L+bTcw8Lr+of+v6Kwd97rkLRNOLw621xP076dL/7LSIzMuhw== dependencies: - "@sentry/hub" "6.1.0" - "@sentry/types" "6.1.0" + "@sentry/hub" "5.29.2" + "@sentry/types" "5.29.2" tslib "^1.9.3" "@sentry/node@5.27.6": @@ -1523,10 +1460,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.6.tgz#b5054eafcb8ac11d4bc4787c7bc7fc113cad8b80" integrity sha512-XOW9W8DrMk++4Hk7gWi9o5VR0o/GrqGfTKyFsHSIjqt2hL6kiMPvKeb2Hhmp7Iq37N2bDmRdWpM5m+68S2Jk6w== -"@sentry/types@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.1.0.tgz#5f9379229423ca1325acf6709e95687180f67132" - integrity sha512-kIaN52Fw5K+2mKRaHE2YluJ+F/qMGSUzZXIFDNdC6OUMXQ4TM8gZTrITXs8CLDm7cK8iCqFCtzKOjKK6KyOKAg== +"@sentry/types@5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.29.2.tgz#ac87383df1222c2d9b9f8f9ed7a6b86ea41a098a" + integrity sha512-dM9wgt8wy4WRty75QkqQgrw9FV9F+BOMfmc0iaX13Qos7i6Qs2Q0dxtJ83SoR4YGtW8URaHzlDtWlGs5egBiMA== "@sentry/utils@5.27.6": version "5.27.6" @@ -1536,12 +1473,12 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/utils@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.1.0.tgz#52e3d7050983e685d3a48f9d2efa1e6eb4ae3e6d" - integrity sha512-6JAplzUOS6bEwfX0PDRZBbYRvn9EN22kZfcL0qGHtM9L0QQ5ybjbbVwOpbXgRkiZx++dQbzLFtelxnDhsbFG+Q== +"@sentry/utils@5.29.2": + version "5.29.2" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.29.2.tgz#99a5cdda2ea19d34a41932f138d470adcb3ee673" + integrity sha512-nEwQIDjtFkeE4k6yIk4Ka5XjGRklNLThWLs2xfXlL7uwrYOH2B9UBBOOIRUraBm/g/Xrra3xsam/kRxuiwtXZQ== dependencies: - "@sentry/types" "6.1.0" + "@sentry/types" "5.29.2" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1554,21 +1491,31 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== -"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": +"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": version "2.11.0" resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" -"@snyk/cocoapods-lockfile-parser@3.6.2": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz#803ae9466f408c48ba7c5a8ec51b9dbac6f633b3" - integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== +"@snyk/cli-interface@2.9.1": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.9.1.tgz#e0466d183e7d4a13112ba098b1702a0d628dd380" + integrity sha512-2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA== dependencies: - "@snyk/dep-graph" "^1.23.1" + "@snyk/dep-graph" "1.19.4" + "@types/graphlib" "^2.1.7" + tslib "^1.9.3" + +"@snyk/cocoapods-lockfile-parser@3.5.2": + version "3.5.2" + resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.2.tgz#7f441ecf2fb9c0b488db7e392447d2c520b60cef" + integrity sha512-fIiUNCmhDp7lVKTs/nHCnLK1roMkG15HhuQhtZXxiFW3EZ5H9IqMdtrxqjXuzVWt7X2h7lbF5OMBzD07NODtug== + dependencies: + "@snyk/dep-graph" "1.19.4" "@types/js-yaml" "^3.12.1" js-yaml "^3.13.1" + source-map-support "^0.5.7" tslib "^1.10.0" "@snyk/composer-lockfile-parser@^1.4.1": @@ -1581,27 +1528,36 @@ lodash.invert "^4.3.0" lodash.isempty "^4.4.0" -"@snyk/dep-graph@1.23.1", "@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1": - version "1.23.1" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.23.1.tgz#c884811669983febb6685f9107b322b3c0603f42" - integrity sha512-bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ== +"@snyk/dep-graph@1.19.4": + version "1.19.4" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.4.tgz#d156c482bfdfba7505f1cf3e8a80b86dd9f45383" + integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== dependencies: - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.has "^4.5.2" - lodash.isempty "^4.4.0" + graphlib "^2.1.8" + lodash.isequal "^4.5.0" + object-hash "^2.0.3" + semver "^6.0.0" + source-map-support "^0.5.19" + tslib "^1.13.0" + +"@snyk/dep-graph@1.21.0": + version "1.21.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.21.0.tgz#02bc39598c7415d6d78d2ea6fd46f44514f9039c" + integrity sha512-+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw== + dependencies: + graphlib "^2.1.8" + lodash.isequal "^4.5.0" + object-hash "^2.0.3" + semver "^6.0.0" + tslib "^1.13.0" + +"@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.19.4", "@snyk/dep-graph@^1.19.5", "@snyk/dep-graph@^1.21.0": + version "1.22.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.22.0.tgz#3c9090b3a52596a0758d007e5ae8fda88864601d" + integrity sha512-KBRCZieE3XD4sd7yi0kBODElZF2que9jEgPnxNBwKcECHNH+DKv0rUIHchpMMrY2jK/cmbbq8Dmv/rmFLVT7CQ== + dependencies: + graphlib "^2.1.8" lodash.isequal "^4.5.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.keys "^4.2.0" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" object-hash "^2.0.3" semver "^6.0.0" tslib "^1.13.0" @@ -1620,73 +1576,34 @@ resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== -"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": - version "2.1.9-patch.3" - resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" - integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== +"@snyk/java-call-graph-builder@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.17.0.tgz#b183a6bc21e3b05756c7bcb4b953fa9a78a3e983" + integrity sha512-uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA== dependencies: - lodash.clone "^4.5.0" - lodash.constant "^3.0.0" - lodash.filter "^4.6.0" - lodash.foreach "^4.5.0" - lodash.has "^4.5.2" - lodash.isempty "^4.4.0" - lodash.isfunction "^3.0.9" - lodash.isundefined "^3.0.1" - lodash.keys "^4.2.0" - lodash.map "^4.6.0" - lodash.reduce "^4.6.0" - lodash.size "^4.2.0" - lodash.transform "^4.6.0" - lodash.union "^4.6.0" - lodash.values "^4.3.0" - -"@snyk/inquirer@^7.3.3-patch": - version "7.3.3-patch" - resolved "https://registry.yarnpkg.com/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz#ef84d531724c53b755e8dd454e1a3c2ccdcfc0bf" - integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash.assign "^4.2.0" - lodash.assignin "^4.2.0" - lodash.clone "^4.5.0" - lodash.defaults "^4.2.0" - lodash.filter "^4.6.0" - lodash.find "^4.6.0" - lodash.findindex "^4.6.0" - lodash.flatten "^4.4.0" - lodash.isboolean "^3.0.3" - lodash.isfunction "^3.0.9" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.last "^3.0.0" - lodash.map "^4.6.0" - lodash.omit "^4.5.0" - lodash.set "^4.3.2" - lodash.sum "^4.0.2" - lodash.uniq "^4.5.0" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -"@snyk/java-call-graph-builder@1.19.1": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz#1d579d782df3bb5f9d5171cc35180596cd90aa8b" - integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== - dependencies: - "@snyk/graphlib" "2.1.9-patch.3" ci-info "^2.0.0" debug "^4.1.1" glob "^7.1.6" + graphlib "^2.1.8" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" + +"@snyk/java-call-graph-builder@1.18.0": + version "1.18.0" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz#f93abeaf347083b9d534a4f94b1468fd97d111a0" + integrity sha512-6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ== + dependencies: + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + graphlib "^2.1.8" jszip "^3.2.2" needle "^2.3.3" progress "^2.0.3" @@ -1704,14 +1621,14 @@ dependencies: event-loop-spinner "^2.0.0" -"@snyk/snyk-cocoapods-plugin@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz#cd724fcd637cb3af76187bf7254819b6079489f6" - integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== +"@snyk/snyk-cocoapods-plugin@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.1.tgz#af4e749ee1420c1596345fefae3c5eb48b84ecb0" + integrity sha512-A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg== dependencies: - "@snyk/cli-interface" "^2.11.0" - "@snyk/cocoapods-lockfile-parser" "3.6.2" - "@snyk/dep-graph" "^1.23.1" + "@snyk/cli-interface" "^2.9.2" + "@snyk/cocoapods-lockfile-parser" "3.5.2" + "@snyk/dep-graph" "^1.19.4" source-map-support "^0.5.7" tslib "^2.0.0" @@ -1739,11 +1656,6 @@ dependencies: defer-to-connect "^2.0.0" -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - "@types/cacheable-request@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" @@ -1759,25 +1671,10 @@ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf" integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw== -"@types/component-emitter@^1.2.10": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" - integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== - -"@types/cookie@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" - integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== - -"@types/cors@^2.8.8": - version "2.8.10" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" - integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== - "@types/d3-array@*": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.9.0.tgz#fb6c3d7d7640259e68771cd90cc5db5ac1a1a012" - integrity sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ== + version "2.8.0" + resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee" + integrity sha512-Q0ubcGHAmCRPh90/hoYB4eKWhxYKUxphwSeQrlz2tiabQ8S9zqhaE2CZJtCaLH2cjqKcjr52WPvmOA7ha0O4ZA== "@types/d3-array@1.2": version "1.2.8" @@ -2010,31 +1907,10 @@ dependencies: electron "*" -"@types/eslint-scope@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" - integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== - "@types/fs-extra@^9.0.1": - version "9.0.7" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" - integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== + version "9.0.6" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab" + integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig== dependencies: "@types/node" "*" @@ -2051,7 +1927,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graphlib@^2": +"@types/graphlib@^2", "@types/graphlib@^2.1.7": version "2.1.7" resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== @@ -2090,10 +1966,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@*", "@types/jasmine@~3.6.3": - version "3.6.3" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050" - integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA== +"@types/jasmine@*", "@types/jasmine@~3.6.0": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.2.tgz#02f64450016f7de70f145d698be311136d7c6374" + integrity sha512-AzfesNFLvOs6Q1mHzIsVJXSeUnqVh4ZHG8ngygKJfbkcSLwzrBVm/LKa+mR8KrOfnWtUL47112gde1MC0IXqpQ== "@types/jasminewd2@^2.0.8": version "2.0.8" @@ -2115,10 +1991,10 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1" integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ== -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== "@types/keyv@*": version "3.1.1" @@ -2142,17 +2018,22 @@ resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.5.tgz#e95569aa6273dbe0ed1814f86287547cc06e93c9" integrity sha512-OwVhKFim9Y/MprzCe4I6a59p31pMy8+LrtP6qS7J0kaOxYmW6VVJPBw5NYm+g7nSbgPUz22FvqU1F1hC5YGTfg== -"@types/node@*", "@types/node@14.14.28", "@types/node@^14.14.10": - version "14.14.28" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b" - integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g== +"@types/node@*": + version "14.14.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" + integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== + +"@types/node@14.14.10": + version "14.14.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" + integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== "@types/node@^12.0.12": - version "12.20.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472" - integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g== + version "12.19.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.13.tgz#888e2b34159fb91496589484ec169618212b51b7" + integrity sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w== -"@types/node@^6.14.7": +"@types/node@^6.14.4", "@types/node@^6.14.7": version "6.14.13" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== @@ -2177,10 +2058,10 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^17.0.1": - version "17.0.1" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.1.tgz#d92d77d020bfb083e07cc8e0ac9f933599a4d56a" - integrity sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q== +"@types/react-dom@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" + integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== dependencies: "@types/react" "*" @@ -2191,10 +2072,18 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.2": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== +"@types/react@*", "@types/react@>=16.9.35", "@types/react@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" + integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + +"@types/react@^16.9.11": + version "16.14.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c" + integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2211,6 +2100,11 @@ resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b" integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw== +"@types/semver@^5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" + integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== + "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -2236,20 +2130,12 @@ integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== "@types/yargs@^15.0.0", "@types/yargs@^15.0.5": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== + version "15.0.12" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" + integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== dependencies: "@types/yargs-parser" "*" -"@webassemblyjs/ast@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" - integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2259,31 +2145,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" -"@webassemblyjs/floating-point-hex-parser@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" - integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== - "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== -"@webassemblyjs/helper-api-error@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" - integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== - "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== -"@webassemblyjs/helper-buffer@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" - integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== - "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2308,35 +2179,11 @@ dependencies: "@webassemblyjs/ast" "1.9.0" -"@webassemblyjs/helper-numbers@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" - integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.0" - "@webassemblyjs/helper-api-error" "1.11.0" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" - integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== - "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== -"@webassemblyjs/helper-wasm-section@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" - integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2347,13 +2194,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" -"@webassemblyjs/ieee754@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" - integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2361,13 +2201,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" - integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== - dependencies: - "@xtuc/long" "4.2.2" - "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2375,30 +2208,11 @@ dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" - integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== - "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== -"@webassemblyjs/wasm-edit@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" - integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/helper-wasm-section" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/wasm-opt" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - "@webassemblyjs/wast-printer" "1.11.0" - "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2413,17 +2227,6 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" -"@webassemblyjs/wasm-gen@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" - integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/ieee754" "1.11.0" - "@webassemblyjs/leb128" "1.11.0" - "@webassemblyjs/utf8" "1.11.0" - "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2435,16 +2238,6 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" -"@webassemblyjs/wasm-opt@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" - integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2455,18 +2248,6 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" -"@webassemblyjs/wasm-parser@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" - integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-api-error" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/ieee754" "1.11.0" - "@webassemblyjs/leb128" "1.11.0" - "@webassemblyjs/utf8" "1.11.0" - "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2491,14 +2272,6 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" - integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@xtuc/long" "4.2.2" - "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -2523,6 +2296,14 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +JSONStream@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -2546,11 +2327,6 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^8.0.4: - version "8.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" - integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== - adjust-sourcemap-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e" @@ -2564,6 +2340,11 @@ adm-zip@^0.4.9: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== +after@0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2585,13 +2366,11 @@ agent-base@~4.2.1: dependencies: es6-promisify "^5.0.0" -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== +agentkeepalive@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" + integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== dependencies: - debug "^4.1.0" - depd "^1.1.2" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -2660,10 +2439,10 @@ angular-persistence@^1.0.1: resolved "https://registry.yarnpkg.com/angular-persistence/-/angular-persistence-1.0.1.tgz#79ffe7317f1f7aed88e69f07705f0ac32ccdb9da" integrity sha1-ef/nMX8feu2I5p8HcF8KwyzNudo= -angular-resizable-element@^3.3.5: - version "3.3.5" - resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.5.tgz#e0c86655e53280306c5a6e0ed1d1f60b323b0497" - integrity sha512-PT7p3CGva1BmcTt8LA80yOblHqynZHPQYQ1KMMLgllCn3UZx/+0eCRtSXKwnWT5IYHBg9qI3tmd92SFExa1UMg== +angular-resizable-element@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.4.tgz#fe5fbae0cbde4c5ff28bad4d33a493c8f141ecf1" + integrity sha512-jA3j8qcWXKR+rdXxerAjpKhUsoUlEBQP3CmutHcHRAKTkQjZTd1LcZOZOnfIdOToyXsIKXYscbHpbPoCeew2Yw== dependencies: tslib "^1.9.0" @@ -2728,11 +2507,6 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" @@ -2821,7 +2595,7 @@ app-root-path@^3.0.0: resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== -aproba@^1.0.3, aproba@^1.1.1: +aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== @@ -2831,14 +2605,6 @@ archy@^1.0.0: resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -2916,6 +2682,11 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +arraybuffer.slice@~0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" + integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== + arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -3020,16 +2791,17 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@10.2.4: - version "10.2.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1" - integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw== +autoprefixer@9.8.6: + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== dependencies: - browserslist "^4.16.1" - caniuse-lite "^1.0.30001181" + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" colorette "^1.2.1" - fraction.js "^4.0.13" normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.32" postcss-value-parser "^4.1.0" aws-sign2@~0.7.0: @@ -3049,14 +2821,15 @@ axobject-query@2.0.2: dependencies: ast-types-flow "0.0.7" -babel-loader@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" - integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== +babel-loader@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== dependencies: - find-cache-dir "^3.3.1" + find-cache-dir "^2.1.0" loader-utils "^1.4.0" - make-dir "^3.1.0" + mkdirp "^0.5.3" + pify "^4.0.1" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -3066,6 +2839,11 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" +backo2@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -3081,7 +2859,7 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0, base64id@~2.0.0: +base64id@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -3134,14 +2912,19 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== dependencies: buffer "^5.5.0" inherits "^2.0.4" readable-stream "^3.4.0" +blob@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" + integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + blocking-proxy@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2" @@ -3156,12 +2939,12 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.5: +bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: version "4.11.9" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== @@ -3209,10 +2992,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -bootstrap@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" - integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== +bootstrap@^4.5.3: + version "4.5.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" + integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== boxen@^4.2.0: version "4.2.0" @@ -3259,7 +3042,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1, brorand@^1.1.0: +brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -3332,16 +3115,16 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.9.1: + version "4.16.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" + integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== dependencies: - caniuse-lite "^1.0.30001181" + caniuse-lite "^1.0.30001173" colorette "^1.2.1" - electron-to-chromium "^1.3.649" + electron-to-chromium "^1.3.634" escalade "^3.1.1" - node-releases "^1.1.70" + node-releases "^1.1.69" browserstack@^1.5.1: version "1.6.1" @@ -3463,7 +3246,7 @@ cacache@15.0.5, cacache@^15.0.5: tar "^6.0.2" unique-filename "^1.1.1" -cacache@^12.0.2: +cacache@^12.0.0, cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== @@ -3530,7 +3313,7 @@ cacheable-request@^7.0.1: normalize-url "^4.1.0" responselike "^2.0.0" -call-bind@^1.0.0, call-bind@^1.0.2: +call-bind@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -3567,7 +3350,7 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.2.0: +camelcase@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3582,10 +3365,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001181: - version "1.0.30001187" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438" - integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: + version "1.0.30001174" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001174.tgz#0f2aca2153fd88ceb07a2bb982fc2acb787623c4" + integrity sha512-tqClL/4ThQq6cfFXH3oJL4rifFBeM6gTkphjao5kgwMaW9yn0tKgQLAEfKzDwj6HQWCB/aWo8kTFlSvIN8geEA== canonical-path@1.0.0: version "1.0.0" @@ -3597,7 +3380,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3644,9 +3427,9 @@ child-process@^1.0.2: integrity sha1-mJdNx+0e5MYin44wX6cxOmiFp/I= "chokidar@>=2.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1, chokidar@^3.4.2: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65" + integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -3677,7 +3460,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1: +chownr@^1.1.1, chownr@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3712,10 +3495,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-dependency-plugin@5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" - integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== +circular-dependency-plugin@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93" + integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw== class-utils@^0.3.5: version "0.3.6" @@ -3754,7 +3537,7 @@ cli-spinner@0.2.10: resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47" integrity sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q== -cli-spinners@^2.2.0, cli-spinners@^2.4.0, cli-spinners@^2.5.0: +cli-spinners@^2.2.0, cli-spinners@^2.4.0: version "2.5.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047" integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ== @@ -3826,11 +3609,6 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - codelyzer@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.1.tgz#c0e9668e847255b37c759e68fb2700b11e277d0f" @@ -3936,11 +3714,26 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +component-bind@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" + integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= + +component-emitter@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== +component-inherit@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" + integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= + compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -4023,11 +3816,6 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -4072,13 +3860,6 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -copy-anything@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" - integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== - dependencies: - is-what "^3.12.0" - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -4096,10 +3877,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.3.2: - version "6.3.2" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb" - integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA== +copy-webpack-plugin@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5" + integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q== dependencies: cacache "^15.0.5" fast-glob "^3.2.4" @@ -4113,32 +3894,29 @@ copy-webpack-plugin@6.3.2: serialize-javascript "^5.0.1" webpack-sources "^1.4.3" -core-js-compat@^3.8.0: - version "3.8.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" - integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog== +core-js-compat@^3.6.2: + version "3.8.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" + integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== dependencies: - browserslist "^4.16.1" + browserslist "^4.16.0" semver "7.0.0" -core-js@3.8.3, core-js@^3.6.5, core-js@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" - integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== +core-js@3.6.5: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" + integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== + +core-js@^3.6.5, core-js@^3.8.2: + version "3.8.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" + integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -4191,22 +3969,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -critters@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.6.tgz#b71384113d8b5f5c82f3aeba80c122437f195d8c" - integrity sha512-NUB3Om7tkf+XWi9+2kJ2A3l4/tHORDI1UT+nHxUqay2B/tJvMpiXcklDDLBH3fPn9Pe23uu0we/08Ukjy4cLCQ== - dependencies: - chalk "^4.1.0" - css "^3.0.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - pretty-bytes "^5.3.0" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4253,22 +4015,22 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f" - integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw== +css-loader@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" + integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== dependencies: - camelcase "^6.2.0" + camelcase "^6.0.0" cssesc "^3.0.0" - icss-utils "^5.0.0" + icss-utils "^4.1.1" loader-utils "^2.0.0" - postcss "^8.1.4" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" + postcss "^7.0.32" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.3" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" + schema-utils "^2.7.1" semver "^7.3.2" css-parse@~2.0.0: @@ -4332,15 +4094,6 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" -css@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" - integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== - dependencies: - inherits "^2.0.4" - source-map "^0.6.1" - source-map-resolve "^0.6.0" - cssauron@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" @@ -4818,20 +4571,34 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0, debug@~4.3.1: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: +debug@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + +debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +debug@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -4977,12 +4744,7 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -depd@^1.1.2, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -5091,12 +4853,12 @@ docker-modem@2.1.3: split-ca "^1.0.1" ssh2 "^0.8.7" -dockerfile-ast@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz#29d611517b6fa207430ac99e9f59db1636a25b1f" - integrity sha512-qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ== +dockerfile-ast@0.0.30: + version "0.0.30" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz#74cbcd65e389852d752c5687117255ea622583ad" + integrity sha512-QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg== dependencies: - vscode-languageserver-types "^3.16.0" + vscode-languageserver-types "^3.15.1" dom-helpers@^5.0.1, dom-helpers@^5.1.2, dom-helpers@^5.2.0: version "5.2.0" @@ -5210,9 +4972,9 @@ eev@^0.1.5: integrity sha512-U7+up/+0JaC+ffyrMicGDzb+j2Q04Fy22tKK1Xh6hHFWdVtXwoBF8M2DwFofwsJzJcs3W3NPDvmxcMak5/iQaA== ejs@^3.1.5: - version "3.1.6" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" + integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== dependencies: jake "^10.6.1" @@ -5250,15 +5012,24 @@ electron-publish@22.9.1: lazy-val "^1.0.4" mime "^2.4.6" -electron-to-chromium@^1.3.649: - version "1.3.664" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz#8fb039e2fa8ef3ab2568308464a28425d4f6e2a3" - integrity sha512-yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg== +electron-to-chromium@^1.3.634: + version "1.3.636" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.636.tgz#6980bd90813a9fb744e43f5e848f16cea4930058" + integrity sha512-Adcvng33sd3gTjNIDNXGD1G4H6qCImIy2euUJAQHtLNplEKU5WEz5KRJxupRNIIT8sD5oFZLTKBWAf12Bsz24A== -electron@*, electron@^11.2.3: - version "11.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" - integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== +electron@*: + version "11.1.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.1.tgz#188f036f8282798398dca9513e9bb3b10213e3aa" + integrity sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA== + dependencies: + "@electron/get" "^1.0.1" + "@types/node" "^12.0.12" + extract-zip "^1.0.3" + +electron@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7" + integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -5272,17 +5043,17 @@ elfy@^1.0.0: endian-reader "^0.3.0" elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" + bn.js "^4.4.0" + brorand "^1.0.1" hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" + hmac-drbg "^1.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.0" email-validator@^2.0.4: version "2.0.4" @@ -5314,7 +5085,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.12: +encoding@^0.1.11: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5333,33 +5104,53 @@ endian-reader@^0.3.0: resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= -engine.io-parser@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" - integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== +engine.io-client@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" + integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== dependencies: - base64-arraybuffer "0.1.4" + component-emitter "~1.3.0" + component-inherit "0.0.3" + debug "~3.1.0" + engine.io-parser "~2.2.0" + has-cors "1.1.0" + indexof "0.0.1" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~7.4.2" + xmlhttprequest-ssl "~1.5.4" + yeast "0.1.2" -engine.io@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" - integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== +engine.io-parser@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" + integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== + dependencies: + after "0.8.2" + arraybuffer.slice "~0.0.7" + base64-arraybuffer "0.1.4" + blob "0.0.5" + has-binary2 "~1.0.2" + +engine.io@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" + integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== dependencies: accepts "~1.3.4" base64id "2.0.0" cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~4.0.0" + debug "~4.1.0" + engine.io-parser "~2.2.0" ws "~7.4.2" -enhanced-resolve@5.7.0, enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== +enhanced-resolve@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" + integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== dependencies: graceful-fs "^4.2.4" - tapable "^2.2.0" + tapable "^2.0.0" enhanced-resolve@^4.3.0: version "4.5.0" @@ -5376,9 +5167,9 @@ ent@~2.2.0: integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== env-paths@^2.2.0: version "2.2.0" @@ -5390,11 +5181,6 @@ err-code@^1.0.0: resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5409,7 +5195,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -5427,29 +5213,22 @@ es-abstract@^1.17.2: string.prototype.trimstart "^1.0.1" es-abstract@^1.18.0-next.1: - version "1.18.0-next.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" - integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== dependencies: - call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" - get-intrinsic "^1.0.2" has "^1.0.3" has-symbols "^1.0.1" is-callable "^1.2.2" - is-negative-zero "^2.0.1" + is-negative-zero "^2.0.0" is-regex "^1.1.1" - object-inspect "^1.9.0" + object-inspect "^1.8.0" object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.3" - string.prototype.trimstart "^1.0.3" - -es-module-lexer@^0.3.26: - version "0.3.26" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.3.26.tgz#7b507044e97d5b03b01d4392c74ffeb9c177a83b" - integrity sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA== + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -5548,14 +5327,6 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - esprima@3.x.x: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -5566,7 +5337,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5605,7 +5376,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.2.0: +events@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -5768,9 +5539,9 @@ fast-deep-equal@^3.1.1: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1, fast-glob@^3.2.4: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + version "3.2.4" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" + integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5795,13 +5566,20 @@ fastparse@^1.1.2: integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e" - integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA== + version "1.10.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" + integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: +faye-websocket@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" + integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= + dependencies: + websocket-driver ">=0.5.1" + +faye-websocket@~0.11.1: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -5815,7 +5593,7 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -figgy-pudding@^3.5.1: +figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== @@ -5827,7 +5605,15 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.2.0, file-loader@^6.2.0: +file-loader@6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa" + integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== @@ -5846,9 +5632,9 @@ file-uri-to-path@1, file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + version "1.0.1" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" + integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== dependencies: minimatch "^3.0.4" @@ -5929,9 +5715,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.13.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" - integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^1.0.2: version "1.0.2" @@ -5957,11 +5743,6 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -fraction.js@^4.0.13: - version "4.0.13" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" - integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA== - fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -6006,16 +5787,23 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + version "9.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" + integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^2.0.0" + universalify "^1.0.0" -fs-minipass@^2.0.0, fs-minipass@^2.1.0: +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + +fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -6045,10 +5833,15 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" +fsevents@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + fsevents@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" + integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== ftp@~0.3.10: version "0.3.10" @@ -6063,19 +5856,10 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - 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" +genfun@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" + integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== gensync@^1.0.0-beta.1: version "1.0.0-beta.2" @@ -6088,9 +5872,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" + integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -6149,11 +5933,6 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -6277,10 +6056,17 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +graphlib@2.1.8, graphlib@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" + integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== + dependencies: + lodash "^4.17.15" gunzip-maybe@^1.4.2: version "1.4.2" @@ -6319,6 +6105,18 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-binary2@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" + integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== + dependencies: + isarray "2.0.1" + +has-cors@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6334,11 +6132,6 @@ has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6404,7 +6197,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hmac-drbg@^1.0.1: +hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -6419,9 +6212,9 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hosted-git-info@^3.0.4, hosted-git-info@^3.0.5, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" + integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== dependencies: lru-cache "^6.0.0" @@ -6465,7 +6258,12 @@ html-to-image@^0.1.1: resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-0.1.3.tgz#9661a54c30ed9c4b269f4612416b1c7e887de3a7" integrity sha512-8JTGEAAdJGL/nlp3wb/WI8fLMx2dHKOFZMdsvdon23D45ZdtsXDeRm39Wddf04ludQe3OPmvjMJ9nPjI/7hPlg== -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: +http-cache-semantics@^3.8.1: + version "3.8.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + +http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -6520,15 +6318,6 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -6570,15 +6359,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -https-proxy-agent@^2.2.1: +https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== @@ -6594,6 +6375,14 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6615,10 +6404,12 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" @@ -6630,7 +6421,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.3: +ignore-walk@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== @@ -6696,6 +6487,11 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= +indexof@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= + infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -6724,22 +6520,22 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= +ini@1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.6.tgz#f1c46a2a93a253e7b3905115e74d527cd23061a1" + integrity sha512-IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg== + ini@1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@2.0.0, ini@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@7.3.3: +inquirer@7.3.3, inquirer@^7.3.3: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== @@ -6849,9 +6645,9 @@ is-buffer@^1.1.5: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== is-ci@^2.0.0: version "2.0.0" @@ -6872,7 +6668,7 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.1.0, is-core-module@^2.2.0: +is-core-module@^2.0.0, is-core-module@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== @@ -6948,13 +6744,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -6997,12 +6786,7 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= - -is-negative-zero@^2.0.1: +is-negative-zero@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== @@ -7080,11 +6864,10 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== dependencies: - call-bind "^1.0.2" has-symbols "^1.0.1" is-resolvable@^1.0.0: @@ -7116,11 +6899,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-what@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55" - integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw== - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -7153,6 +6931,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isarray@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" + integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= + isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -7248,10 +7031,10 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-spec-reporter@~6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz#3b9c85689676a351f343ba8dd6d3957f11a4bf1d" - integrity sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ== +jasmine-spec-reporter@~5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95" + integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g== dependencies: colors "1.4.0" @@ -7284,7 +7067,16 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2: +jest-worker@26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" + integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest-worker@^26.5.0: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7336,7 +7128,7 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -7361,7 +7153,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.3: +json3@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -7374,16 +7166,16 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== dependencies: minimist "^1.2.5" -jsonc-parser@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" - integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== +jsonc-parser@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342" + integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg== jsonfile@^4.0.0: version "4.0.0" @@ -7401,7 +7193,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.3.1: +jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= @@ -7427,9 +7219,9 @@ jszip@3.4.0: set-immediate-shim "~1.0.1" jszip@^3.1.3, jszip@^3.2.2: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9" - integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6" + integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA== dependencies: lie "~3.3.0" pako "~1.0.2" @@ -7480,10 +7272,10 @@ karma-source-map-support@1.4.0: dependencies: source-map-support "^0.5.5" -karma@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.1.tgz#a7539618cca0f2cbb26d5497120ec31fe340c2a1" - integrity sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg== +karma@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4" + integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ== dependencies: body-parser "^1.19.0" braces "^3.0.2" @@ -7503,11 +7295,11 @@ karma@^6.1.1: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^3.1.0" + socket.io "^2.3.0" source-map "^0.6.1" tmp "0.2.1" - ua-parser-js "^0.7.23" - yargs "^16.1.1" + ua-parser-js "0.7.22" + yargs "^15.3.1" keyv@^3.0.0: version "3.1.0" @@ -7569,22 +7361,20 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -less-loader@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" - integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== +less-loader@7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" + integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" -less@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" - integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== +less@3.12.2: + version "3.12.2" + resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" + integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -7592,7 +7382,7 @@ less@4.1.1: image-size "~0.5.0" make-dir "^2.1.0" mime "^1.4.1" - needle "^2.5.2" + native-request "^1.0.5" source-map "~0.6.0" levn@~0.3.0: @@ -7619,10 +7409,10 @@ license-checker@^25.0.1: spdx-satisfies "^4.0.0" treeify "^1.1.0" -license-webpack-plugin@2.3.11: - version "2.3.11" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8" - integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw== +license-webpack-plugin@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.1.tgz#08eddb2f776c7c64c02f308a00e017d6e824d0b6" + integrity sha512-yhqTmlYIEpZWA122lf6E0G8+rkn0AzoQ1OpzUKKs/lXUqG1plmGnwmkuuPlfggzJR5y6DLOdot/Tv00CC51CeQ== dependencies: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" @@ -7644,11 +7434,6 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== - loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" @@ -7706,11 +7491,6 @@ lodash.assignin@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -7721,36 +7501,6 @@ lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash.constant@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.constant/-/lodash.constant-3.0.0.tgz#bfe05cce7e515b3128925d6362138420bd624910" - integrity sha1-v+Bczn5RWzEokl1jYhOEIL1iSRA= - -lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.endswith@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" - integrity sha1-/tWawXOO0+I27dcGTsRWRIs3vAk= - -lodash.filter@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= - -lodash.find@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" - integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= - -lodash.findindex@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" - integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY= - lodash.findkey@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.findkey/-/lodash.findkey-4.6.0.tgz#83058e903b51cbb759d09ccf546dea3ea39c4718" @@ -7766,41 +7516,16 @@ lodash.flatten@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= -lodash.flattendeep@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= - -lodash.foreach@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= - lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= -lodash.groupby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" - integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E= - -lodash.has@^4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" - integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= - lodash.invert@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.invert/-/lodash.invert-4.3.0.tgz#8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee" integrity sha1-j/4g1LYW9WvqjxqgxuvYDc90Ku4= -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= - lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" @@ -7811,51 +7536,6 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.isfunction@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" - integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= - -lodash.isobject@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" - integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - -lodash.isundefined@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g= - -lodash.keys@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" - integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU= - -lodash.last@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c" - integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw= - -lodash.map@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -7866,72 +7546,22 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.omit@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" - integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= - -lodash.orderby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" - integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= - -lodash.reduce@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= - lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= -lodash.size@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.size/-/lodash.size-4.2.0.tgz#71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86" - integrity sha1-cf517T6r2yvLc6GwtPUcOS7ie4Y= - -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash.sum@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/lodash.sum/-/lodash.sum-4.0.2.tgz#ad90e397965d803d4f1ff7aa5b2d0197f3b4637b" - integrity sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s= - lodash.topairs@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" integrity sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ= -lodash.transform@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" - integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= - -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash.upperfirst@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" - integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= - -lodash.values@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" - integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= - -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -8030,7 +7660,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -8042,26 +7672,22 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^8.0.9: - version "8.0.14" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222" - integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ== +make-fetch-happen@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" + integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag== dependencies: - agentkeepalive "^4.1.3" - cacache "^15.0.5" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - promise-retry "^2.0.1" - socks-proxy-agent "^5.0.0" - ssri "^8.0.0" + agentkeepalive "^3.4.1" + cacache "^12.0.0" + http-cache-semantics "^3.8.1" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.3" + lru-cache "^5.1.1" + mississippi "^3.0.0" + node-fetch-npm "^2.0.2" + promise-retry "^1.1.1" + socks-proxy-agent "^4.0.0" + ssri "^6.0.0" map-cache@^0.2.2: version "0.2.2" @@ -8189,17 +7815,12 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.45.0: +mime-db@1.45.0, "mime-db@>= 1.43.0 < 2": version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== -"mime-db@>= 1.43.0 < 2": - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== - -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== @@ -8212,9 +7833,9 @@ mime@1.6.0, mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4, mime@^2.4.5, mime@^2.4.6: - version "2.5.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" - integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== + version "2.4.7" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" + integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== mimic-fn@^2.1.0: version "2.1.0" @@ -8231,10 +7852,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -mini-css-extract-plugin@1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3" - integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ== +mini-css-extract-plugin@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" + integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -8245,7 +7866,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimalistic-crypto-utils@^1.0.1: +minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= @@ -8269,17 +7890,6 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" -minipass-fetch@^1.3.0, minipass-fetch@^1.3.2: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a" - integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ== - dependencies: - minipass "^3.1.0" - minipass-sized "^1.0.3" - minizlib "^2.0.0" - optionalDependencies: - encoding "^0.1.12" - minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -8287,36 +7897,36 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-json-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" - integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== - dependencies: - jsonparse "^1.3.1" - minipass "^3.0.0" - -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.2: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== +minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== dependencies: - minipass "^3.0.0" + safe-buffer "^5.1.2" + yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: +minipass@^3.0.0, minipass@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + +minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -8348,7 +7958,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -8420,11 +8030,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8442,6 +8047,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +native-request@^1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" + integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== + needle@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -8451,7 +8061,7 @@ needle@2.5.0: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^2.3.3, needle@^2.5.0, needle@^2.5.2: +needle@^2.3.3, needle@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== @@ -8520,6 +8130,15 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-fetch-npm@^2.0.2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4" + integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg== + dependencies: + encoding "^0.1.11" + json-parse-better-errors "^1.0.0" + safe-buffer "^5.1.1" + node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -8530,22 +8149,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-gyp@^7.1.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" @@ -8575,10 +8178,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.70: - version "1.1.70" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" - integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== +node-releases@^1.1.69: + version "1.1.69" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" + integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== nopt@^4.0.1: version "4.0.3" @@ -8588,14 +8191,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: +normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -8637,7 +8233,7 @@ notosans-fontface@1.2.2: resolved "https://registry.yarnpkg.com/notosans-fontface/-/notosans-fontface-1.2.2.tgz#533432651673a5ae64d1203abede3334749aaadc" integrity sha512-QDA7eFfUQrORmx8MhQc0Bs/IY+AajwxCycIgUt0pi4QLYEC6X/v9n6edQs33f1ctrSKcnZVWVIu2iWPexKFF2g== -npm-bundled@^1.1.1: +npm-bundled@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== @@ -8664,7 +8260,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-package-arg@8.1.0, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: +npm-package-arg@8.1.0, npm-package-arg@^8.0.0: version "8.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.0.tgz#b5f6319418c3246a1c38e1a8fbaa06231bc5308f" integrity sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig== @@ -8673,17 +8269,26 @@ npm-package-arg@8.1.0, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: semver "^7.0.0" validate-npm-package-name "^3.0.0" -npm-packlist@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.4.tgz#40e96b2b43787d0546a574542d01e066640d09da" - integrity sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw== +npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: + version "6.1.1" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" + integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg== dependencies: - glob "^7.1.6" - ignore-walk "^3.0.3" - npm-bundled "^1.1.1" + hosted-git-info "^2.7.1" + osenv "^0.1.5" + semver "^5.6.0" + validate-npm-package-name "^3.0.0" + +npm-packlist@^1.1.12: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" npm-normalize-package-bin "^1.0.1" -npm-pick-manifest@6.1.0, npm-pick-manifest@^6.0.0: +npm-pick-manifest@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz#2befed87b0fce956790f62d32afb56d7539c022a" integrity sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw== @@ -8692,19 +8297,27 @@ npm-pick-manifest@6.1.0, npm-pick-manifest@^6.0.0: npm-package-arg "^8.0.0" semver "^7.0.0" -npm-registry-fetch@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661" - integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA== +npm-pick-manifest@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7" + integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw== dependencies: - "@npmcli/ci-detect" "^1.0.0" - lru-cache "^6.0.0" - make-fetch-happen "^8.0.9" - minipass "^3.1.3" - minipass-fetch "^1.3.0" - minipass-json-stream "^1.0.1" - minizlib "^2.0.0" - npm-package-arg "^8.0.0" + figgy-pudding "^3.5.1" + npm-package-arg "^6.0.0" + semver "^5.4.1" + +npm-registry-fetch@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7" + integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ== + dependencies: + JSONStream "^1.3.4" + bluebird "^3.5.1" + figgy-pudding "^3.4.1" + lru-cache "^5.1.1" + make-fetch-happen "^5.0.0" + npm-package-arg "^6.1.0" + safe-buffer "^5.2.0" npm-run-path@^2.0.0: version "2.0.2" @@ -8713,16 +8326,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -8730,17 +8333,17 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8759,7 +8362,7 @@ object-hash@^2.0.3: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== -object-inspect@^1.8.0, object-inspect@^1.9.0: +object-inspect@^1.8.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== @@ -8784,7 +8387,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: +object.assign@^4.1.0, object.assign@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -8851,18 +8454,18 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" - integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA== +open@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" + integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" open@^7.0.3: - version "7.4.1" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.1.tgz#4ccedc11ca348d398378ffb39c71357df55fe6f7" - integrity sha512-Pxv+fKRsd/Ozflgn2Gjev1HZveJJeKR6hKKmdaImJMuEZ6htAvCTbcMABJo+qevlAelTLCrEK3YTKZ9fVTcSPw== + version "7.3.1" + resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" + integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -8914,17 +8517,17 @@ ora@5.0.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" - integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g== +ora@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" + integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w== dependencies: - bl "^4.0.3" chalk "^4.1.0" cli-cursor "^3.1.0" - cli-spinners "^2.5.0" + cli-spinners "^2.4.0" is-interactive "^1.0.0" log-symbols "^4.0.0" + mute-stream "0.0.8" strip-ansi "^6.0.0" wcwidth "^1.0.1" @@ -8958,7 +8561,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@^0.1.4: +osenv@^0.1.4, osenv@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -8988,7 +8591,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -9068,30 +8671,41 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" -pacote@11.2.4: - version "11.2.4" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.2.4.tgz#dc7ca740a573ed86a3bf863511d22c1d413ec82f" - integrity sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ== +pacote@9.5.12: + version "9.5.12" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66" + integrity sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ== dependencies: - "@npmcli/git" "^2.0.1" - "@npmcli/installed-package-contents" "^1.0.5" - "@npmcli/promise-spawn" "^1.2.0" - "@npmcli/run-script" "^1.3.0" - cacache "^15.0.5" - chownr "^2.0.0" - fs-minipass "^2.1.0" + bluebird "^3.5.3" + cacache "^12.0.2" + chownr "^1.1.2" + figgy-pudding "^3.5.1" + get-stream "^4.1.0" + glob "^7.1.3" infer-owner "^1.0.4" - minipass "^3.1.3" - mkdirp "^1.0.3" - npm-package-arg "^8.0.1" - npm-packlist "^2.1.4" - npm-pick-manifest "^6.0.0" - npm-registry-fetch "^9.0.0" + lru-cache "^5.1.1" + make-fetch-happen "^5.0.0" + minimatch "^3.0.4" + minipass "^2.3.5" + mississippi "^3.0.0" + mkdirp "^0.5.1" + normalize-package-data "^2.4.0" + npm-normalize-package-bin "^1.0.0" + npm-package-arg "^6.1.0" + npm-packlist "^1.1.12" + npm-pick-manifest "^3.0.0" + npm-registry-fetch "^4.0.0" + osenv "^0.1.5" + promise-inflight "^1.0.1" promise-retry "^1.1.1" - read-package-json-fast "^1.1.3" - rimraf "^3.0.2" - ssri "^8.0.0" - tar "^6.1.0" + protoduck "^5.0.1" + rimraf "^2.6.2" + safe-buffer "^5.1.2" + semver "^5.6.0" + ssri "^6.0.1" + tar "^4.4.10" + unique-filename "^1.1.1" + which "^1.3.1" pako@~0.2.0: version "0.2.9" @@ -9139,9 +8753,9 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -9155,11 +8769,6 @@ parse-link-header@^1.0.1: dependencies: xtend "~4.0.1" -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - parse5-html-rewriting-stream@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" @@ -9168,13 +8777,6 @@ parse5-html-rewriting-stream@6.0.1: parse5 "^6.0.1" parse5-sax-parser "^6.0.1" -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== - dependencies: - parse5 "^6.0.1" - parse5-sax-parser@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" @@ -9192,6 +8794,16 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parseqs@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" + integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== + +parseuri@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" + integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -9410,25 +9022,26 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" -postcss-import@14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296" - integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg== +postcss-import@12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== dependencies: - postcss-value-parser "^4.0.0" + postcss "^7.0.1" + postcss-value-parser "^3.2.3" read-cache "^1.0.0" resolve "^1.1.7" -postcss-loader@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4" - integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA== +postcss-loader@4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" + integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.4" + semver "^7.3.2" postcss-merge-longhand@^4.0.11: version "4.0.11" @@ -9492,33 +9105,38 @@ postcss-minify-selectors@^4.0.2: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== dependencies: - icss-utils "^5.0.0" + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== dependencies: - postcss-selector-parser "^6.0.4" + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== dependencies: - icss-utils "^5.0.0" + icss-utils "^4.0.0" + postcss "^7.0.6" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -9639,7 +9257,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: version "6.0.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== @@ -9668,12 +9286,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -9687,16 +9305,16 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@8.2.4: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04" - integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg== +postcss@7.0.32: + version "7.0.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" + chalk "^2.4.2" source-map "^0.6.1" + supports-color "^6.1.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -9705,15 +9323,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.1.4: - version "8.2.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" - integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg== - dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" - source-map "^0.6.1" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9729,11 +9338,6 @@ prettier@^2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== -pretty-bytes@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" - integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== - pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -9771,11 +9375,6 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= -promise-queue@^2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" - integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= - promise-retry@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" @@ -9784,14 +9383,6 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - "promise@>=3.2 <8": version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -9821,6 +9412,13 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= +protoduck@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" + integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg== + dependencies: + genfun "^5.0.0" + protractor@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03" @@ -9896,11 +9494,6 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -puka@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/puka/-/puka-1.0.1.tgz#a2df782b7eb4cf9564e4c93a5da422de0dfacc02" - integrity sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g== - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -9988,11 +9581,6 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== -queue-microtask@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" - integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== - quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -10168,22 +9756,6 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" -read-package-json-fast@^1.1.3: - version "1.2.2" - resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz#fba77b0b0d66b1ab344e214cb0876577e749c423" - integrity sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ== - dependencies: - json-parse-even-better-errors "^2.3.0" - npm-normalize-package-bin "^1.0.1" - -read-package-json-fast@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz#c767f6c634873ffb6bb73788191b65559734f555" - integrity sha512-bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug== - dependencies: - json-parse-even-better-errors "^2.3.0" - npm-normalize-package-bin "^1.0.1" - read-package-json@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a" @@ -10194,7 +9766,7 @@ read-package-json@^2.0.0: normalize-package-data "^2.0.0" npm-normalize-package-bin "^1.0.0" -"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -10295,12 +9867,12 @@ regex-parser@^2.2.11: integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== regexp.prototype.flags@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== dependencies: - call-bind "^1.0.2" define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" regexpu-core@^4.7.1: version "4.7.1" @@ -10334,9 +9906,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.7" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" - integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== + version "0.6.6" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" + integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== dependencies: jsesc "~0.5.0" @@ -10448,7 +10020,15 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.19.0: +resolve@1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" + integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== + dependencies: + is-core-module "^2.0.0" + path-parse "^1.0.6" + +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -10456,14 +10036,6 @@ resolve@1.19.0: is-core-module "^2.1.0" path-parse "^1.0.6" -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -10520,9 +10092,9 @@ rework@1.0.1: css "^2.0.0" rfdc@^1.1.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949" - integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA== + version "1.1.4" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" + integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== rgb-regex@^1.0.1: version "1.0.1" @@ -10541,7 +10113,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10568,12 +10140,12 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup@2.38.4: - version "2.38.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" - integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== +rollup@2.32.1: + version "2.32.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c" + integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.1.2" run-async@^2.4.0: version "2.4.1" @@ -10581,11 +10153,9 @@ run-async@^2.4.0: integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" + version "1.1.10" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" + integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" @@ -10658,17 +10228,17 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@^1.6.3: +sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@10.1.1: - version "10.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" - integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== +sass-loader@10.0.5: + version "10.0.5" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" + integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10676,17 +10246,17 @@ sass-loader@10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.32.6: - version "1.32.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" - integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== +sass@1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2" + integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig== dependencies: chokidar ">=2.0.0 <4.0.0" sass@^1.29.0: - version "1.32.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8" - integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A== + version "1.32.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" + integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -10733,7 +10303,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0: +schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10778,7 +10348,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: tmp "0.0.30" xml2js "^0.4.17" -selfsigned@^1.10.8: +selfsigned@^1.10.7: version "1.10.8" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== @@ -10821,18 +10391,23 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - dependencies: - lru-cache "^6.0.0" +semver@7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10896,7 +10471,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0, set-blocking@~2.0.0: +set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -11046,10 +10621,10 @@ snyk-cpp-plugin@2.2.1: hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@4.17.2: - version "4.17.2" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz#e22c7633311a1b17b89d125d0af638e1fa5c5167" - integrity sha512-fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ== +snyk-docker-plugin@4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz#e3a2666e5f3d847712c1c52ccce65438c29fb199" + integrity sha512-KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" @@ -11057,13 +10632,13 @@ snyk-docker-plugin@4.17.2: chalk "^2.4.2" debug "^4.1.1" docker-modem "2.1.3" - dockerfile-ast "0.1.0" + dockerfile-ast "0.0.30" elfy "^1.0.0" event-loop-spinner "^2.0.0" gunzip-maybe "^1.4.2" mkdirp "^1.0.4" semver "^6.1.0" - snyk-nodejs-lockfile-parser "1.30.2" + snyk-nodejs-lockfile-parser "1.30.1" tar-stream "^2.1.0" tmp "^0.2.1" tslib "^1" @@ -11077,33 +10652,33 @@ snyk-go-parser@1.4.1: toml "^3.0.0" tslib "^1.10.0" -snyk-go-plugin@1.16.5: - version "1.16.5" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.5.tgz#3f30ee6151648d1278cbcc68362c0222b17b1d6b" - integrity sha512-m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA== +snyk-go-plugin@1.16.4: + version "1.16.4" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.4.tgz#2a42c9989a7353acb407dbc7284ec56de7f5f0b0" + integrity sha512-7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q== dependencies: - "@snyk/dep-graph" "^1.23.1" - "@snyk/graphlib" "2.1.9-patch.3" + "@snyk/dep-graph" "^1.21.0" debug "^4.1.1" + graphlib "2.1.8" snyk-go-parser "1.4.1" tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.12.5: - version "3.12.5" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.5.tgz#7e5ed9179ad7972663867f0b443144765d6e4329" - integrity sha512-Z4qEzzPuRO1BxfL0vgfv4pzJ58ox6dksf8i18Vi1+yqDKmYEHmcMBYe33faFPJFZYf1PP7RerADpPssFJiYyLg== +snyk-gradle-plugin@3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz#4d22704c38875e23a96469ac27d0d43ae746fc70" + integrity sha512-OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ== dependencies: - "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "^1.23.1" - "@snyk/java-call-graph-builder" "1.19.1" + "@snyk/cli-interface" "2.9.1" + "@snyk/dep-graph" "^1.19.4" + "@snyk/java-call-graph-builder" "1.18.0" "@types/debug" "^4.1.4" chalk "^3.0.0" debug "^4.1.1" tmp "0.2.1" tslib "^2.0.0" -snyk-module@3.1.0, snyk-module@^3.1.0: +snyk-module@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== @@ -11111,6 +10686,14 @@ snyk-module@3.1.0, snyk-module@^3.1.0: debug "^4.1.1" hosted-git-info "^3.0.4" +snyk-module@^1.6.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804" + integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA== + dependencies: + debug "^3.1.0" + hosted-git-info "^2.7.1" + snyk-module@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-2.1.0.tgz#80d9e9b64f202ae753ed3b33b372ca6f5ec323da" @@ -11121,29 +10704,28 @@ snyk-module@^2.0.2: debug "^3.1.0" hosted-git-info "^2.7.1" -snyk-mvn-plugin@2.25.3: - version "2.25.3" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" - integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== +snyk-mvn-plugin@2.25.0: + version "2.25.0" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.0.tgz#9d7c89e5ad14f6b63d0be5548c2c20124905b257" + integrity sha512-2NDWrMWi9K32i9CdWUy2Pce8D9myR0dxPDJJpamVt/DD3fDxH4ia701i2HdDgOjMq8PI6yIgI+vRaAW3X2GrbA== dependencies: - "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "^1.23.1" - "@snyk/java-call-graph-builder" "1.19.1" + "@snyk/cli-interface" "2.9.1" + "@snyk/java-call-graph-builder" "1.17.0" debug "^4.1.1" glob "^7.1.6" needle "^2.5.0" tmp "^0.1.0" tslib "1.11.1" -snyk-nodejs-lockfile-parser@1.30.2: - version "1.30.2" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz#8dbb64c42382aeaf4488c36e48c1e48eb75a1584" - integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== +snyk-nodejs-lockfile-parser@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.1.tgz#5d54180ae818ddbe8c2b55329528c4d68e390235" + integrity sha512-QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg== dependencies: - "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" event-loop-spinner "^2.0.0" got "11.4.0" + graphlib "2.1.8" lodash.clonedeep "^4.5.0" lodash.flatmap "^4.5.0" lodash.isempty "^4.4.0" @@ -11155,14 +10737,15 @@ snyk-nodejs-lockfile-parser@1.30.2: uuid "^8.3.0" yaml "^1.9.2" -snyk-nuget-plugin@1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" - integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== +snyk-nuget-plugin@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz#cd1163a29f8002d54a965eab9e256345c97d4174" + integrity sha512-6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw== dependencies: debug "^4.1.1" dotnet-deps-parser "5.0.0" jszip "3.4.0" + lodash "^4.17.20" snyk-paket-parser "1.6.0" tslib "^1.11.2" xml2js "^0.4.17" @@ -11183,13 +10766,13 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" -snyk-poetry-lockfile-parser@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz#bd0ebc9b1dd3bde33e27e5b64bea22e25e7aee5d" - integrity sha512-HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA== +snyk-poetry-lockfile-parser@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz#3f062953802916f6ae1767ec13dd1892fff0541e" + integrity sha512-G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA== dependencies: "@snyk/cli-interface" "^2.9.2" - "@snyk/dep-graph" "^1.23.0" + "@snyk/dep-graph" "^1.19.5" debug "^4.2.0" toml "^3.0.0" tslib "^2.0.0" @@ -11209,22 +10792,24 @@ snyk-policy@1.14.1: snyk-try-require "^1.3.1" then-fs "^2.0.0" -snyk-python-plugin@1.19.4: - version "1.19.4" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz#03b70c12c0adfd5104839e0d9d9ba7083271e905" - integrity sha512-d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w== +snyk-python-plugin@1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz#91febcd260094a9d900bc54bf200aa0c2632613a" + integrity sha512-JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g== dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.5" + snyk-poetry-lockfile-parser "^1.1.1" tmp "0.0.33" -snyk-resolve-deps@4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz#11e7051110dadd8756819594bb30e6b88777a8b4" - integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== +snyk-resolve-deps@4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d" + integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ== dependencies: + "@types/node" "^6.14.4" + "@types/semver" "^5.5.0" ansicolors "^0.3.2" - debug "^4.1.1" + debug "^3.2.5" lodash.assign "^4.2.0" lodash.assignin "^4.2.0" lodash.clone "^4.5.0" @@ -11233,7 +10818,7 @@ snyk-resolve-deps@4.7.2: lodash.set "^4.3.2" lru-cache "^4.0.0" semver "^5.5.1" - snyk-module "^3.1.0" + snyk-module "^1.6.0" snyk-resolve "^1.0.0" snyk-tree "^1.0.0" snyk-try-require "^1.1.1" @@ -11283,18 +10868,15 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.455.0: - version "1.455.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.455.0.tgz#a4ac3d82d8946b0137cbbb96513721fe50dc97ee" - integrity sha512-SDdmPxgQ1yB2wZ5KJ0YAq3a4i7HJFJhoVfCvzs458Jr5vvBN6W8PAwLQnniqQIPtyX/H70QW6PkkYu4rO8CkpA== +snyk@^1.437.3: + version "1.437.3" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.437.3.tgz#a3cfbfb568bf60b19be31a337899ebe71365bd70" + integrity sha512-DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g== dependencies: - "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "1.23.1" + "@snyk/dep-graph" "1.21.0" "@snyk/gemfile" "1.2.0" - "@snyk/graphlib" "^2.1.9-patch.3" - "@snyk/inquirer" "^7.3.3-patch" - "@snyk/snyk-cocoapods-plugin" "2.5.2" + "@snyk/snyk-cocoapods-plugin" "2.5.1" abbrev "^1.1.1" ansi-escapes "3.2.0" chalk "^2.4.2" @@ -11302,45 +10884,30 @@ snyk@^1.455.0: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" - lodash.assign "^4.2.0" - lodash.camelcase "^4.3.0" - lodash.clonedeep "^4.5.0" - lodash.endswith "^4.2.1" - lodash.flatten "^4.4.0" - lodash.flattendeep "^4.4.0" - lodash.get "^4.4.2" - lodash.groupby "^4.6.0" - lodash.isempty "^4.4.0" - lodash.isobject "^3.0.2" - lodash.map "^4.6.0" - lodash.omit "^4.5.0" - lodash.orderby "^4.6.0" - lodash.sortby "^4.7.0" - lodash.uniq "^4.5.0" - lodash.upperfirst "^4.3.1" - lodash.values "^4.3.0" + graphlib "^2.1.8" + inquirer "^7.3.3" + lodash "^4.17.20" micromatch "4.0.2" needle "2.5.0" open "^7.0.3" os-name "^3.0.0" - promise-queue "^2.2.5" proxy-agent "^3.1.1" proxy-from-env "^1.0.0" semver "^6.0.0" snyk-config "4.0.0-rc.2" snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.17.2" - snyk-go-plugin "1.16.5" - snyk-gradle-plugin "3.12.5" + snyk-docker-plugin "4.13.1" + snyk-go-plugin "1.16.4" + snyk-gradle-plugin "3.11.0" snyk-module "3.1.0" - snyk-mvn-plugin "2.25.3" - snyk-nodejs-lockfile-parser "1.30.2" - snyk-nuget-plugin "1.21.0" + snyk-mvn-plugin "2.25.0" + snyk-nodejs-lockfile-parser "1.30.1" + snyk-nuget-plugin "1.19.4" snyk-php-plugin "1.9.2" snyk-policy "1.14.1" - snyk-python-plugin "1.19.4" + snyk-python-plugin "1.19.1" snyk-resolve "1.0.1" - snyk-resolve-deps "4.7.2" + snyk-resolve-deps "4.4.0" snyk-sbt-plugin "2.11.0" snyk-tree "^1.0.0" snyk-try-require "1.3.1" @@ -11351,57 +10918,80 @@ snyk@^1.455.0: uuid "^3.3.2" wrap-ansi "^5.1.0" -socket.io-adapter@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" - integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== +socket.io-adapter@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" + integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-parser@~4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" - integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== +socket.io-client@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" + integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== dependencies: - "@types/component-emitter" "^1.2.10" + backo2 "1.0.2" + component-bind "1.0.0" component-emitter "~1.3.0" - debug "~4.3.1" + debug "~3.1.0" + engine.io-client "~3.5.0" + has-binary2 "~1.0.2" + indexof "0.0.1" + parseqs "0.0.6" + parseuri "0.0.6" + socket.io-parser "~3.3.0" + to-array "0.1.4" -socket.io@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba" - integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA== +socket.io-parser@~3.3.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" + integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== dependencies: - "@types/cookie" "^0.4.0" - "@types/cors" "^2.8.8" - "@types/node" "^14.14.10" - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.1" - engine.io "~4.1.0" - socket.io-adapter "~2.1.0" - socket.io-parser "~4.0.3" + component-emitter "~1.3.0" + debug "~3.1.0" + isarray "2.0.1" -sockjs-client@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add" - integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q== +socket.io-parser@~3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" + integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== dependencies: - debug "^3.2.6" + component-emitter "1.2.1" + debug "~4.1.0" + isarray "2.0.1" + +socket.io@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" + integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== + dependencies: + debug "~4.1.0" + engine.io "~3.5.0" + has-binary2 "~1.0.2" + socket.io-adapter "~1.1.0" + socket.io-client "2.4.0" + socket.io-parser "~3.4.0" + +sockjs-client@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" + integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== + dependencies: + debug "^3.2.5" eventsource "^1.0.7" - faye-websocket "^0.11.3" - inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.4.7" + faye-websocket "~0.11.1" + inherits "^2.0.3" + json3 "^3.3.2" + url-parse "^1.4.3" -sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== +sockjs@0.3.20: + version "0.3.20" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" + integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== dependencies: - faye-websocket "^0.11.3" + faye-websocket "^0.10.0" uuid "^3.4.0" - websocket-driver "^0.7.4" + websocket-driver "0.6.5" -socks-proxy-agent@^4.0.1: +socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== @@ -11409,23 +10999,6 @@ socks-proxy-agent@^4.0.1: agent-base "~4.2.1" socks "~2.3.2" -socks-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" - integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== - dependencies: - agent-base "6" - debug "4" - socks "^2.3.3" - -socks@^2.3.3: - version "2.5.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.5.1.tgz#7720640b6b5ec9a07d556419203baa3f0596df5f" - integrity sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ== - dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" - socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" @@ -11439,10 +11012,10 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" - integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== +source-map-loader@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" + integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" @@ -11462,14 +11035,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - source-map-support@0.5.19, source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.5, source-map-support@^0.5.7, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11486,9 +11051,9 @@ source-map-support@~0.4.0: source-map "^0.5.6" source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -11587,12 +11152,12 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f" - integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw== +speed-measure-webpack-plugin@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5" + integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ== dependencies: - chalk "^4.1.0" + chalk "^2.0.1" split-ca@^1.0.1: version "1.0.1" @@ -11647,7 +11212,7 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.1: +ssri@^6.0.0, ssri@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== @@ -11655,9 +11220,9 @@ ssri@^6.0.1: figgy-pudding "^3.5.1" ssri@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== + version "8.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" + integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== dependencies: minipass "^3.1.1" @@ -11730,23 +11295,6 @@ streamsearch@~0.1.2: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -11765,7 +11313,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: +string.prototype.trimend@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== @@ -11773,7 +11321,7 @@ string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: call-bind "^1.0.0" define-properties "^1.1.3" -string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: +string.prototype.trimstart@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== @@ -11807,13 +11355,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -11855,10 +11396,10 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylus-loader@4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757" - integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ== +stylus-loader@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" + integrity sha512-apDYJEM5ZpOAWbWInWcsbtI8gHNr/XYVcSY/tWqOUPt7M5tqhtwXVsAkgyiVjhuvw2Yrjq474a9H+g4d047Ebw== dependencies: fast-glob "^3.2.4" klona "^2.0.4" @@ -11937,17 +11478,17 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-3.0.0.tgz#eea8f6478c651018e059044268375c408c15c533" - integrity sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q== +symbol-observable@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a" + integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA== tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.1.1, tapable@^2.2.0: +tapable@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== @@ -11963,7 +11504,20 @@ tar-stream@^2.1.0, tar-stream@^2.1.2: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.0.2, tar@^6.1.0: +tar@^4.4.10: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + 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" + +tar@^6.0.2: version "6.1.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== @@ -12036,22 +11590,10 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser-webpack-plugin@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" - integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q== - dependencies: - jest-worker "^26.6.2" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" - source-map "^0.6.1" - terser "^5.5.1" - -terser@5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== +terser@5.3.7: + version "5.3.7" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.7.tgz#798a4ae2e7ff67050c3e99fcc4e00725827d97e2" + integrity sha512-lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -12066,10 +11608,10 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.4, terser@^5.5.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" - integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== +terser@^5.3.4: + version "5.5.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -12095,7 +11637,7 @@ through2@^2.0.0, through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -through@X.X.X, through@^2.3.6: +"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -12150,6 +11692,11 @@ tmp@^0.1.0: dependencies: rimraf "^2.6.3" +to-array@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -12239,13 +11786,12 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" - integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== +ts-node@~9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== dependencies: arg "^4.1.0" - create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" @@ -12261,16 +11807,21 @@ tslib@1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@2.1.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" + integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== tslib@^1, tslib@^1.10.0, tslib@^1.11.2, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -12379,9 +11930,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.2.0.tgz#3edd448793f517d8b9dd108b486a043f5befd91f" - integrity sha512-M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" + integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -12405,33 +11956,28 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== -typescript@4.1.3: +typescript@4.0.5, typescript@~4.0.2: + version "4.0.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" + integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== + +typescript@>=2.8.3: version "4.1.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -typescript@>=2.8.3: - version "4.1.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" - integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA== - -typescript@~4.0.2: - version "4.0.7" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.7.tgz#7168032c43d2a2671c95c07812f69523c79590af" - integrity sha512-yi7M4y74SWvYbnazbn8/bmJmX4Zlej39ZOqwG/8dut/MYoSQ119GY9ZFbbGsD4PFZYWxqik/XsP3vk3+W5H3og== - -ua-parser-js@^0.7.23: - version "0.7.24" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" - integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== +ua-parser-js@0.7.22: + version "0.7.22" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" + integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== uncontrollable@^7.0.0: - version "7.2.1" - resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738" - integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ== + version "7.1.1" + resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556" + integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q== dependencies: "@babel/runtime" "^7.6.3" - "@types/react" ">=16.9.11" + "@types/react" "^16.9.11" invariant "^2.2.4" react-lifecycles-compat "^3.0.4" @@ -12513,6 +12059,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -12579,7 +12130,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.4.7: +url-parse@^1.4.3: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -12605,11 +12156,6 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= -utf8@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" - integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== - util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -12649,16 +12195,21 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@8.3.2, uuid@^8.2.0, uuid@^8.3.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" + integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.2.0, uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -12674,7 +12225,7 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -vary@^1, vary@~1.1.2: +vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -12703,7 +12254,7 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -vscode-languageserver-types@^3.16.0: +vscode-languageserver-types@^3.15.1: version "3.16.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== @@ -12733,14 +12284,6 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" -watchpack@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7" - integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -12802,10 +12345,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" - integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== +webpack-dev-server@3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" + integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -12827,11 +12370,11 @@ webpack-dev-server@3.11.2: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.8" + selfsigned "^1.10.7" semver "^6.3.0" serve-index "^1.9.1" - sockjs "^0.3.21" - sockjs-client "^1.5.0" + sockjs "0.3.20" + sockjs-client "1.4.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -12849,18 +12392,18 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" - integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== +webpack-merge@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9" + integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@2.2.0, webpack-sources@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" - integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== +webpack-sources@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f" + integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -12873,10 +12416,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack-subresource-integrity@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" - integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== +webpack-subresource-integrity@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz#6f44ea99987266b70c4ec42ac51064d33e982277" + integrity sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q== dependencies: webpack-sources "^1.3.0" @@ -12909,36 +12452,14 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@5.22.0: - version "5.22.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.22.0.tgz#8505158bc52dcbbdb01ac94796a8aed61badf11a" - integrity sha512-xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ== +websocket-driver@0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" + integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= dependencies: - "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.46" - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/wasm-edit" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.7.0" - es-module-lexer "^0.3.26" - eslint-scope "^5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.4" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.0.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.1" - watchpack "^2.0.0" - webpack-sources "^2.1.1" + websocket-extensions ">=0.1.1" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: +websocket-driver@>=0.5.1: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -12962,27 +12483,13 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.1, which@^1.2.9: +which@^1.2.1, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" -which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -13071,9 +12578,9 @@ ws@^6.2.1: async-limiter "~1.0.0" ws@~7.4.2: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== + version "7.4.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" + integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== xdg-basedir@^4.0.0: version "4.0.0" @@ -13100,6 +12607,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlhttprequest-ssl@~1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" + integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= + xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -13115,15 +12627,15 @@ xterm-addon-attach@^0.6.0: resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.6.0.tgz#220c23addd62ab88c9914e2d4c06f7407e44680e" integrity sha512-Mo8r3HTjI/EZfczVCwRU6jh438B4WLXxdFO86OB7bx0jGhwh2GdF4ifx/rP+OB+Cb2vmLhhVIZ00/7x3YSP3dg== -xterm-addon-fit@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" - integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== +xterm-addon-fit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193" + integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w== -xterm@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb" - integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ== +xterm@^4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0.tgz#7a4c097a433d565339b5533b468bbc60c6c87969" + integrity sha512-wGfqufmioctKr8VkbRuZbVDfjlXWGZZ1PWHy1yqqpGT3Nm6yaJx8lxDbSEBANtgaiVPTcKSp97sxOy5IlpqYfw== y18n@^4.0.0: version "4.0.1" @@ -13140,7 +12652,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -13172,9 +12684,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2: - version "20.2.5" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.5.tgz#5d37729146d3f894f39fc94b6796f5b239513186" - integrity sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg== + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== yargs@^13.3.2: version "13.3.2" @@ -13238,6 +12750,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 015a1a93503bffb39dff27efc3bfe66c6c3e0154 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 22:29:42 +0100 Subject: [PATCH 17/76] Revert "Revert "Update package.json"" This reverts commit 0bbaca64394494b0b98f261e7cf2d2ed55a91a83. --- package.json | 66 +- yarn.lock | 4101 ++++++++++++++++++++++++++++---------------------- 2 files changed, 2325 insertions(+), 1842 deletions(-) diff --git a/package.json b/package.json index 91a6a0fb..57d6c148 100644 --- a/package.json +++ b/package.json @@ -40,35 +40,35 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.0.8", - "@angular/cdk": "^11.0.3", - "@angular/common": "^11.0.8", - "@angular/compiler": "^11.0.8", - "@angular/core": "^11.0.8", - "@angular/forms": "^11.0.8", + "@angular/animations": "^11.2.0", + "@angular/cdk": "^11.2.0", + "@angular/common": "^11.2.0", + "@angular/compiler": "^11.2.0", + "@angular/core": "^11.2.0", + "@angular/forms": "^11.2.0", "@angular/http": "^7.2.16", - "@angular/material": "^11.0.3", - "@angular/platform-browser": "^11.0.8", - "@angular/platform-browser-dynamic": "^11.0.8", - "@angular/router": "^11.0.8", - "@sentry/browser": "^5.29.2", + "@angular/material": "^11.2.0", + "@angular/platform-browser": "^11.2.0", + "@angular/platform-browser-dynamic": "^11.2.0", + "@angular/router": "^11.2.0", + "@sentry/browser": "^6.1.0", "@types/jest": "^26.0.20", "@types/mocha": "^8.2.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^17.0.2", + "@types/react-dom": "^17.0.1", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", - "angular-resizable-element": "^3.3.4", + "angular-resizable-element": "^3.3.5", "angular2-draggable": "^2.3.2", "angular2-hotkeys": "^2.2.0", "angular2-indexeddb": "^1.2.3", - "bootstrap": "^4.5.3", + "bootstrap": "^4.6.0", "command-exists": "^1.2.9", - "core-js": "^3.8.2", + "core-js": "^3.8.3", "d3-ng2-service": "^2.1.0", "eev": "^0.1.5", "file-saver": "^2.0.5", - "ini": "^1.3.8", + "ini": "^2.0.0", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", "ng2-file-upload": "^1.3.0", @@ -85,36 +85,36 @@ "save-html-as-image": "^1.3.4", "save-svg-as-png": "^1.4.14", "schematics-scss-migrate": "^1.2.10", - "snyk": "^1.437.3", + "snyk": "^1.455.0", "spark-md5": "^3.0.1", "svg-crowbar": "^0.6.5", "tree-kill": "^1.2.1", "tslib": "^2.1.0", "typeface-roboto": "^1.1.13", - "xterm": "^4.9.0", + "xterm": "^4.10.0", "xterm-addon-attach": "^0.6.0", - "xterm-addon-fit": "^0.4.0", + "xterm-addon-fit": "^0.5.0", "yargs": "^16.2.0", "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1100.6", - "@angular/cli": "^11.0.6", - "@angular/compiler-cli": "^11.0.8", - "@angular/language-service": "^11.0.8", - "@sentry/cli": "^1.61.0", - "@sentry/electron": "^2.1.0", - "@types/jasmine": "~3.6.0", + "@angular-devkit/build-angular": "^0.1102.0", + "@angular/cli": "^11.2.0", + "@angular/compiler-cli": "^11.2.0", + "@angular/language-service": "^11.2.0", + "@sentry/cli": "^1.62.0", + "@sentry/electron": "^2.2.0", + "@types/jasmine": "~3.6.3", "@types/jasminewd2": "^2.0.8", - "@types/node": "14.14.10", + "@types/node": "14.14.28", "codelyzer": "^6.0.0", - "electron": "^11.2.0", + "electron": "^11.2.3", "electron-builder": "22.9.1", "file-loader": "^6.2.0", "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~5.0.0", + "jasmine-spec-reporter": "~6.0.0", "jquery": "^3.5.1", - "karma": "^5.2.3", + "karma": "^6.1.1", "karma-chrome-launcher": "~3.1.0", "karma-cli": "^2.0.0", "karma-coverage-istanbul-reporter": "~3.0.2", @@ -127,11 +127,11 @@ "replace": "^1.2.0", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.0.0", + "ts-node": "~9.1.1", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.0.2", - "webpack": "4.44.2", + "webpack": "5.22.0", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/yarn.lock b/yarn.lock index ff9dbd21..b121fcd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,113 +7,116 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== -"@angular-devkit/architect@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.6.tgz#ce90ffb78d1d945cafc339d4cfc63b3582cb8e6a" - integrity sha512-4O+cg3AimI2bNAxxdu5NrqSf4Oa8r8xL0+G2Ycd3jLoFv0h0ecJiNKEG5F6IpTprb4aexZD6pcxBJCqQ8MmzWQ== +"@angular-devkit/architect@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.0.tgz#0d4bee477d59318e8f3511fa6936bdcfa303df55" + integrity sha512-d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g== dependencies: - "@angular-devkit/core" "11.0.6" + "@angular-devkit/core" "11.2.0" rxjs "6.6.3" -"@angular-devkit/build-angular@^0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.6.tgz#4aa7635ab8fc1c6435b2b93954c08f2a7d7a8dd9" - integrity sha512-HcqsWiSIUxExGg3HRQScLOmF+ckVkCKolfpPcNOCCpBYxH/i8n4wDGLBP5Rtxky+0Qz+3nnAaFIpNb9p9aUmbg== +"@angular-devkit/build-angular@^0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1102.0.tgz#7996429000d4a707c8169b801f153819f04a2c24" + integrity sha512-9Yl6qBOR1o0ThyLhrWJ6Rhr3qLRe+RP3sbfUt4QA+8wsIXN7WakEXJALlq7TDeG66OaWyyjbtC2q3EPdNeBC/g== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/build-optimizer" "0.1100.6" - "@angular-devkit/build-webpack" "0.1100.6" - "@angular-devkit/core" "11.0.6" - "@babel/core" "7.12.3" - "@babel/generator" "7.12.1" - "@babel/plugin-transform-runtime" "7.12.1" - "@babel/preset-env" "7.12.1" - "@babel/runtime" "7.12.1" - "@babel/template" "7.10.4" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/build-optimizer" "0.1102.0" + "@angular-devkit/build-webpack" "0.1102.0" + "@angular-devkit/core" "11.2.0" + "@babel/core" "7.12.10" + "@babel/generator" "7.12.11" + "@babel/plugin-transform-async-to-generator" "7.12.1" + "@babel/plugin-transform-runtime" "7.12.10" + "@babel/preset-env" "7.12.11" + "@babel/runtime" "7.12.5" + "@babel/template" "7.12.7" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "11.0.6" + "@ngtools/webpack" "11.2.0" ansi-colors "4.1.1" - autoprefixer "9.8.6" - babel-loader "8.1.0" + autoprefixer "10.2.4" + babel-loader "8.2.2" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.0" - copy-webpack-plugin "6.2.1" - core-js "3.6.5" - css-loader "4.3.0" + circular-dependency-plugin "5.2.2" + copy-webpack-plugin "6.3.2" + core-js "3.8.3" + critters "0.0.6" + css-loader "5.0.1" cssnano "4.1.10" - file-loader "6.1.1" + file-loader "6.2.0" find-cache-dir "3.3.1" glob "7.1.6" + https-proxy-agent "5.0.0" inquirer "7.3.3" - jest-worker "26.5.0" + jest-worker "26.6.2" karma-source-map-support "1.4.0" - less "3.12.2" - less-loader "7.0.2" - license-webpack-plugin "2.3.1" + less "4.1.1" + less-loader "7.3.0" + license-webpack-plugin "2.3.11" loader-utils "2.0.0" - mini-css-extract-plugin "1.2.1" + mini-css-extract-plugin "1.3.5" minimatch "3.0.4" - open "7.3.0" - ora "5.1.0" + open "7.4.0" + ora "5.3.0" parse5-html-rewriting-stream "6.0.1" pnp-webpack-plugin "1.6.4" - postcss "7.0.32" - postcss-import "12.0.1" - postcss-loader "4.0.4" + postcss "8.2.4" + postcss-import "14.0.0" + postcss-loader "4.2.0" raw-loader "4.0.2" regenerator-runtime "0.13.7" resolve-url-loader "3.1.2" rimraf "3.0.2" - rollup "2.32.1" + rollup "2.38.4" rxjs "6.6.3" - sass "1.27.0" - sass-loader "10.0.5" - semver "7.3.2" + sass "1.32.6" + sass-loader "10.1.1" + semver "7.3.4" source-map "0.7.3" - source-map-loader "1.1.2" + source-map-loader "1.1.3" source-map-support "0.5.19" - speed-measure-webpack-plugin "1.3.3" + speed-measure-webpack-plugin "1.4.2" style-loader "2.0.0" stylus "0.54.8" - stylus-loader "4.3.1" - terser "5.3.7" + stylus-loader "4.3.3" + terser "5.5.1" terser-webpack-plugin "4.2.3" text-table "0.2.0" tree-kill "1.2.2" webpack "4.44.2" webpack-dev-middleware "3.7.2" - webpack-dev-server "3.11.0" - webpack-merge "5.2.0" - webpack-sources "2.0.1" - webpack-subresource-integrity "1.5.1" + webpack-dev-server "3.11.2" + webpack-merge "5.7.3" + webpack-sources "2.2.0" + webpack-subresource-integrity "1.5.2" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.6.tgz#4d6712ae75eeae71d74fd161a0a18c08402dc527" - integrity sha512-Qkq7n6510N+nXmfZqpqpI0I6Td+b+06RRNmS7KftSNJntU1z5QYh4FggwlthZ5P0QUT92cnBQsnT8OgYqGnwbg== +"@angular-devkit/build-optimizer@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.0.tgz#22e84487e915d3a3590fc8ef3b0025ce7f846301" + integrity sha512-0Xb7xR0iUrbo/BnKJPTsy5IuodfFUWbvXUu9qeKc+oHzwxObX4Y32X0yyRpIJc5UK7Ce43HkopRQ/tHdoJp2fQ== dependencies: loader-utils "2.0.0" source-map "0.7.3" - tslib "2.0.3" - typescript "4.0.5" - webpack-sources "2.0.1" + tslib "2.1.0" + typescript "4.1.3" + webpack-sources "2.2.0" -"@angular-devkit/build-webpack@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.6.tgz#301caf71bebed6e841cb15fb3af5147c3b2d9c97" - integrity sha512-kK0FlpYJHP25o1yzIGHQqIvO5kp+p6V5OwGpD2GGRZLlJqd3WdjY5DxnyZoX3/IofO6KsTnmm76fzTRqc62z/Q== +"@angular-devkit/build-webpack@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1102.0.tgz#c198d47a755c2ede6eb575b8addd271709f5207b" + integrity sha512-bfd6WlxcbWJ01HNNcFt4sBBaY+Bz2J/zFA6BSORvC5LpqawYCYeUbDJTY9Wb7gtp+aPEiNHI0HeUvoNkubsYfg== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/core" "11.0.6" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/core" "11.2.0" rxjs "6.6.3" -"@angular-devkit/core@10.2.1", "@angular-devkit/core@^10.1.0": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.1.tgz#3ae38be4ca56c745788481b3577173ac2007e9e0" - integrity sha512-dzlF9Gl7KNt9sPYT2HYq6ySZYwKzkyYR5mrBj3DZOD0OQsoc21LvLkWAHNSL2iYGdHJQS1oJDNs8iRYxYIOY3w== +"@angular-devkit/core@10.2.2", "@angular-devkit/core@^10.1.0": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-10.2.2.tgz#107b46618661845122e8b1b29eee18a392298986" + integrity sha512-kfSyk0J6vb+BgJsLazxpe4i01JtMpTrps95azqqNrZnUSuctwXRUJF3UkU64JhN13kb2E/QLdrGRibbXzu1J0w== dependencies: ajv "6.12.4" fast-json-stable-stringify "2.1.0" @@ -121,10 +124,10 @@ rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/core@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.6.tgz#b3ea815ecdea5f77dae58f3f410b268453d7eb8b" - integrity sha512-nhvU5hH01r9qcexAqvIFU233treWWeW3ncs9UFYjD9Hys9sDSvqC3+bvGvl9vCG5FsyY7oDsjaVAipyUc+SFAg== +"@angular-devkit/core@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.0.tgz#a9198a391723e865fc6b369752c176cd5ed1d452" + integrity sha512-qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q== dependencies: ajv "6.12.6" fast-json-stable-stringify "2.1.0" @@ -132,10 +135,10 @@ rxjs "6.6.3" source-map "0.7.3" -"@angular-devkit/core@9.1.13": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.13.tgz#47135a25c04ceb62579f0a50d4ad015c7741235a" - integrity sha512-bwehVRsva9OWfh/yuEh9VU+0Gr1T7DHJLe8tpZk/VsIkGOD0IszEPZOIEK23bg32yiff9bh6qJEPMA7ZBYEQHg== +"@angular-devkit/core@9.1.14": + version "9.1.14" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.1.14.tgz#d698d8322f4b231170c549bb52af4be475a9620d" + integrity sha512-xwGCDR8Wcn1/IPw0Sjabr9YNi/7T7I+dHKIWs3m7SYf4ebkqkIkQUdIlhzgB8KzXJboDUV9w8TNsVjHqgLyN2Q== dependencies: ajv "6.12.3" fast-json-stable-stringify "2.1.0" @@ -143,86 +146,88 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/schematics@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.0.6.tgz#06631190cb22609462597cd6659080fc3313582a" - integrity sha512-hCyu/SSSiC6dKl/NxdWctknIrBqKR6pRe7DMArWowrZX6P9oi36LpKEFnKutE8+tXjsOqQj8XMBq9L64sXZWqg== +"@angular-devkit/schematics@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.2.0.tgz#82192578ff2a9fb01a9d8c56237f4fc98946e757" + integrity sha512-sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w== dependencies: - "@angular-devkit/core" "11.0.6" - ora "5.1.0" + "@angular-devkit/core" "11.2.0" + ora "5.3.0" rxjs "6.6.3" -"@angular-devkit/schematics@9.1.13": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.13.tgz#cdbd4b9067b1c610f99bb64d494071e8a7ee1b2c" - integrity sha512-DZBmfYE6xIfC6PDMvQpR8B31TtLWOmSeTQPnmSm9gj6OZpyqFqoGWOz/0l05FH6zC8HLthAAFJSEnPYyhzWDvg== +"@angular-devkit/schematics@9.1.14": + version "9.1.14" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.1.14.tgz#38df5c0e3badc13f10d0a1f432fc5188edab6604" + integrity sha512-LlSRkoxeJIaptJEoSIds060qv8wcLvI9XZPhUnWHY+FddC/X3OO+Tag9U6CaJ5tfBRnKTS7GtBwQgI0Gip6rhA== dependencies: - "@angular-devkit/core" "9.1.13" + "@angular-devkit/core" "9.1.14" ora "4.0.3" rxjs "6.5.4" "@angular-devkit/schematics@^10.1.0": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.1.tgz#1d1aaf3875c9ed5eb3ad97af993af39fe9ed10a9" - integrity sha512-0oMhB1eM7hg5Xf4U7r193zrNTGyxfzl2okBsLJPuVmkb3KCBGQOyHYmU5HjDNadPc5iCFc+Xo2+DSDvXGuLmaA== + version "10.2.2" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-10.2.2.tgz#a037976e89768ad82d2cfa35b2a80939e34f6f32" + integrity sha512-HnNll8mxPQqcWrG/YcF8XXNvYq7Ixq2H/EJgbRUQDh9WHcS+5F2hD+WirnV2+co1H4+BZhMRc22bmec+o1aSGw== dependencies: - "@angular-devkit/core" "10.2.1" + "@angular-devkit/core" "10.2.2" ora "5.0.0" rxjs "6.6.2" -"@angular/animations@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.0.8.tgz#abb3a016bc9164176d1edfcbd2783cc3ba6f9ca3" - integrity sha512-LlKR5bO7WsykZGcPDnL7c4q2/eq2fqywD+KMw5FemGLI8mN1mnq30br9/8TgaFwY0Do1OTOUh1JSrn1ybQgTwA== +"@angular/animations@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387" + integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg== dependencies: tslib "^2.0.0" -"@angular/cdk@^11.0.3": - version "11.0.3" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.0.3.tgz#f5a119e28b4ba21a6f013dfd4de41b16083bd25a" - integrity sha512-hgbJXvZURKBnZawwxUrsZE/3a+HCJh2UhoLIng3cn5Q+WIW/4a37knDl8B9DYKBWrCqeINXNcUHVSKkWc/gjCA== +"@angular/cdk@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.0.tgz#4f0d8e9865d29ee1b2ab3ce7be9a7af0a87b0ef4" + integrity sha512-25k1giKAJ7DPzJBZfAVZmw/VfR4pZUaZnhgVAMwIdGPl5SaXJEW3e2znGlhzwkuQsiBgrSKfMgJmwKSyUbe2tg== dependencies: tslib "^2.0.0" optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.0.6.tgz#8d65d3ad3841aabe23ff38a41fa6c4f38dd12f66" - integrity sha512-bwrXXyU23HjUlFl0CNCU+XMGa/enooqpMLcTAA15StVpKFHyaA4c57il/aqu+1IuB+zR6rGDzhAABuvRcHd+mQ== +"@angular/cli@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.0.tgz#f611f0851f6f92008f0f5aaaade947751b27687f" + integrity sha512-waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q== dependencies: - "@angular-devkit/architect" "0.1100.6" - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" - "@schematics/angular" "11.0.6" - "@schematics/update" "0.1100.6" + "@angular-devkit/architect" "0.1102.0" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" + "@schematics/angular" "11.2.0" + "@schematics/update" "0.1102.0" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" - debug "4.2.0" - ini "1.3.6" + debug "4.3.1" + ini "2.0.0" inquirer "7.3.3" + jsonc-parser "3.0.0" npm-package-arg "8.1.0" npm-pick-manifest "6.1.0" - open "7.3.0" - pacote "9.5.12" - resolve "1.18.1" + open "7.4.0" + ora "5.3.0" + pacote "11.2.4" + resolve "1.19.0" rimraf "3.0.2" - semver "7.3.2" - symbol-observable "2.0.3" + semver "7.3.4" + symbol-observable "3.0.0" universal-analytics "0.4.23" - uuid "8.3.1" + uuid "8.3.2" -"@angular/common@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.0.8.tgz#f3fd177af584a4e59b2a9bc1a90fa45dcb3dd672" - integrity sha512-Or7uSetk29wcKOsDVyJl/2JUC34e/gDNI3HNlpFh98miT8G4tqFKSmuLGRPPanIKqyQQQmquV93VNPOMA+rdYA== +"@angular/common@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f" + integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.0.8.tgz#4284fc6e9cc7bee5314738cd32ce8bbdba20237c" - integrity sha512-xblOhSgshNzAxNmLdBjdLHMc3Zoc12w5Bz70nrqtAfK9DY6kQx6aAxpbhOr/F5Jl5XFNbvIviOOkG9aqM1Iuuw== +"@angular/compiler-cli@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.0.tgz#850bee57566c00b28a0842bce775b8c4597a4185" + integrity sha512-FJ8OHWBQftmncDGV43ASFeCu3cW1W2P5fvub9fiBFEeTIkB/HXrMOMCQg/1XSdfA5kwFzj2NedMp573X9kq6ng== dependencies: "@babel/core" "^7.8.6" "@babel/types" "^7.8.6" @@ -245,10 +250,10 @@ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/compiler@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.8.tgz#da59389d805034a261b839d703bca3134b6157c4" - integrity sha512-v7NjxLvyJl2cxH7roVTMLnaFCLA9gStgndxJcsXtD+hI7hCOFvrzxwpm3J822KYEkwWhB1PMthJwrZ6OWtkp/A== +"@angular/compiler@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2" + integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ== dependencies: tslib "^2.0.0" @@ -257,17 +262,17 @@ resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e" integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w== -"@angular/core@>=4.3.1", "@angular/core@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.0.8.tgz#cc4ffc5506b393bf851fd7b94760d2a66efeb47c" - integrity sha512-NRKCgOtPFKcJpjjSV0NKuoNaD6ZQ3RqXBm9JURbnjVLaTwtCJlQ9H3N/e+HZNw8Ha2TDFJoiYX+RY071cyTMHQ== +"@angular/core@>=4.3.1", "@angular/core@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467" + integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g== dependencies: tslib "^2.0.0" -"@angular/forms@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.0.8.tgz#f0d68407b50174e4c8b6d3b134fafed792db5320" - integrity sha512-soTg9Zc3G08J/+LRq5FxFvVsKoDQb4F29nEVpbH7oK2hof9Qqois9lH8bJy5dHbNh1qNXYmlWjUd7CQ9p+bbUg== +"@angular/forms@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed" + integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA== dependencies: tslib "^2.0.0" @@ -278,74 +283,52 @@ dependencies: tslib "^1.9.0" -"@angular/language-service@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.0.8.tgz#2354589115c7f851c016c7d3a68952f37040b80c" - integrity sha512-5iKvCzb0YWCrEvCUCGsmwQxfUQjnAOdeaNHieLmfkpAutojtIrK59rNmyQqA2RBpo2OZMANz0/aOde1N2rHI0w== +"@angular/language-service@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.0.tgz#a233129970ccb05dab87093ae9410474a6e92128" + integrity sha512-0n7yrBiwpN6qUEDBoMHxEzxRN+w4tIe+42Ra68UQ5leBx5mSA6P6Ipi+nPwy8RXjqNEHgR0D//30Zp18O8UhCA== -"@angular/material@^11.0.3": - version "11.0.3" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.0.3.tgz#dd848f1804b07c9654b095d5b1accb13083e91e5" - integrity sha512-YTHmtKGwjAEFAOOmuivcwnINMPHxvM7iZQpTgZqDKNiqiv53cwry2Ctb54suRNT+D794z59D0/r+YocGkzFv3w== +"@angular/material@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.0.tgz#a5843f2964366daebab9edf2b0a3d6dcad451f5d" + integrity sha512-duTQdHtzdZ3KWn90JcN+eI0oNwr7E7JGEOp7tZ9XOtqty0h158SJUCYSuDxhFOqyAgaY41enNPHdB2c4Xz0iBQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.0.8.tgz#f7714f40e0cb3044f7dfd362371d39c9c4501b19" - integrity sha512-rirFL6R0R9wXTYfzZzsF7Zchq48439QQHAQ3Pi0nTDtyn3seHIEWMW1FcwjuPIt/ea5F+kRB4L8fxGK8G1/taA== +"@angular/platform-browser-dynamic@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7" + integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.0.8.tgz#aa3863512ad63373d9c6d13ecb64cc1357de959e" - integrity sha512-07nbExdtf2fRJh3XEicbCj1fK0/tWmIW/TaWJ9hv1xeQLjPDcplTF0MaPSlow36qyO+q83rsd3hxyFfBTqgOyw== +"@angular/platform-browser@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403" + integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow== dependencies: tslib "^2.0.0" -"@angular/router@^11.0.8": - version "11.0.8" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.0.8.tgz#771b4a235eb696d4411e867f13701532b0d95c67" - integrity sha512-vinpCct3r+6wFtGdYNa/l5PCpJqQSB/D9Z+zZBdmDUy9s32dggHG4msmVrYbFH/j7cKDAycqHGVFyj0hKGDQiQ== +"@angular/router@^11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.0.tgz#00dca75d6dce5a88259fea88866caa51ebf1d1a7" + integrity sha512-Gw08D6W4SGEIgm5zKdGs1yCW7FnwYjF8cycWczrpU8fmZh+WLbIjPAy/blI/nByCDU9BGyZ7cWGOiQJHEnzWmg== dependencies: tslib "^2.0.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== dependencies: - "@babel/highlight" "^7.10.4" + "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41" - integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw== +"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" + integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== -"@babel/core@7.12.3": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5", "@babel/core@^7.8.6": +"@babel/core@7.12.10": version "7.12.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== @@ -366,16 +349,28 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" - integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg== +"@babel/core@^7.7.5", "@babel/core@^7.8.6": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" + integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== dependencies: - "@babel/types" "^7.12.1" - jsesc "^2.5.1" + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.15" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helpers" "^7.12.13" + "@babel/parser" "^7.12.16" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.10", "@babel/generator@^7.12.11": +"@babel/generator@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== @@ -384,155 +379,155 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.10.4": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d" - integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ== +"@babel/generator@^7.12.10", "@babel/generator@^7.12.13", "@babel/generator@^7.12.15": + version "7.12.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" + integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== dependencies: - "@babel/types" "^7.12.10" + "@babel/types" "^7.12.13" + jsesc "^2.5.1" + source-map "^0.5.0" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3" - integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg== +"@babel/helper-annotate-as-pure@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" + integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== dependencies: - "@babel/helper-explode-assignable-expression" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831" - integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" + integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== dependencies: - "@babel/compat-data" "^7.12.5" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-explode-assignable-expression" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-compilation-targets@^7.12.5": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz#6905238b4a5e02ba2d032c1a49dd1820fe8ce61b" + integrity sha512-dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg== + dependencies: + "@babel/compat-data" "^7.12.13" + "@babel/helper-validator-option" "^7.12.16" browserslist "^4.14.5" semver "^5.5.0" -"@babel/helper-create-class-features-plugin@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e" - integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w== +"@babel/helper-create-class-features-plugin@^7.12.13": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz#955d5099fd093e5afb05542190f8022105082c61" + integrity sha512-KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-member-expression-to-functions" "^7.12.1" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-member-expression-to-functions" "^7.12.16" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" -"@babel/helper-create-regexp-features-plugin@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f" - integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ== +"@babel/helper-create-regexp-features-plugin@^7.12.13": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz#3b31d13f39f930fad975e151163b7df7d4ffe9d3" + integrity sha512-jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" regexpu-core "^4.7.1" -"@babel/helper-define-map@^7.10.4": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30" - integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ== +"@babel/helper-explode-assignable-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a" + integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/types" "^7.10.5" + "@babel/types" "^7.12.13" + +"@babel/helper-function-name@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" + integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== + dependencies: + "@babel/helper-get-function-arity" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/helper-get-function-arity@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" + integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-hoist-variables@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz#13aba58b7480b502362316ea02f52cca0e9796cd" + integrity sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-member-expression-to-functions@^7.12.13", "@babel/helper-member-expression-to-functions@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" + integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.12.5": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" + integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== + dependencies: + "@babel/types" "^7.12.13" + +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" + integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== + dependencies: + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" lodash "^4.17.19" -"@babel/helper-explode-assignable-expression@^7.10.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633" - integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA== +"@babel/helper-optimise-call-expression@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" + integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" -"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz#1fd7738aee5dcf53c3ecff24f1da9c511ec47b42" - integrity sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" + integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== + +"@babel/helper-remap-async-to-generator@^7.12.1", "@babel/helper-remap-async-to-generator@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" + integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA== dependencies: - "@babel/helper-get-function-arity" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/types" "^7.12.11" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-get-function-arity@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" - integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== +"@babel/helper-replace-supers@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" + integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== dependencies: - "@babel/types" "^7.12.10" + "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helper-hoist-variables@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e" - integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA== +"@babel/helper-simple-access@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" + integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== dependencies: - "@babel/types" "^7.10.4" - -"@babel/helper-member-expression-to-functions@^7.12.1", "@babel/helper-member-expression-to-functions@^7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" - integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== - dependencies: - "@babel/types" "^7.12.7" - -"@babel/helper-module-imports@^7.12.1": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" - integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== - dependencies: - "@babel/types" "^7.12.5" - -"@babel/helper-module-transforms@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" - integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-simple-access" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/helper-validator-identifier" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.10.4", "@babel/helper-optimise-call-expression@^7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" - integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== - dependencies: - "@babel/types" "^7.12.10" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" - integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== - -"@babel/helper-remap-async-to-generator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd" - integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-wrap-function" "^7.10.4" - "@babel/types" "^7.12.1" - -"@babel/helper-replace-supers@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz#ea511658fc66c7908f923106dd88e08d1997d60d" - integrity sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.7" - "@babel/helper-optimise-call-expression" "^7.12.10" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.11" - -"@babel/helper-simple-access@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" - integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== - dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1": version "7.12.1" @@ -541,162 +536,162 @@ dependencies: "@babel/types" "^7.12.1" -"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz#1b4cc424458643c47d37022223da33d76ea4603a" - integrity sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g== +"@babel/helper-split-export-declaration@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" + integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11": +"@babel/helper-validator-identifier@^7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f" - integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw== +"@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz#f73cbd3bbba51915216c5dea908e9b206bb10051" + integrity sha512-uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ== -"@babel/helper-wrap-function@^7.10.4": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9" - integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow== +"@babel/helper-wrap-function@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz#e3ea8cb3ee0a16911f9c1b50d9e99fe8fe30f9ff" + integrity sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" - integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== +"@babel/helpers@^7.12.13", "@babel/helpers@^7.12.5": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" + integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== dependencies: - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.5" - "@babel/types" "^7.12.5" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.12.13" + "@babel/types" "^7.12.13" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/highlight@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" + integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.4", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79" - integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg== +"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.12.7": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" + integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== "@babel/plugin-proposal-async-generator-functions@^7.12.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566" - integrity sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz#d1c6d841802ffb88c64a2413e311f7345b9e66b5" + integrity sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" "@babel/plugin-syntax-async-generators" "^7.8.0" "@babel/plugin-proposal-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de" - integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz#3d2ce350367058033c93c098e348161d6dc0d8c8" + integrity sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-proposal-dynamic-import@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc" - integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ== + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz#b9f33b252e3406d492a15a799c9d45a9a9613473" + integrity sha512-yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-dynamic-import" "^7.8.0" "@babel/plugin-proposal-export-namespace-from@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4" - integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" + integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-proposal-json-strings@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c" - integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz#ced7888a2db92a3d520a2e35eb421fdb7fcc9b5d" + integrity sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-json-strings" "^7.8.0" "@babel/plugin-proposal-logical-assignment-operators@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751" - integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz#575b5d9a08d8299eeb4db6430da6e16e5cf14350" + integrity sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c" - integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz#24867307285cee4e1031170efd8a7ac807deefde" + integrity sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b" - integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ== +"@babel/plugin-proposal-numeric-separator@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" + integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069" - integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz#f93f3116381ff94bc676fdcb29d71045cd1ec011" + integrity sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.13" "@babel/plugin-proposal-optional-catch-binding@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942" - integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz#4640520afe57728af14b4d1574ba844f263bcae5" + integrity sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" - integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== +"@babel/plugin-proposal-optional-chaining@^7.12.7": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz#600c7531f754186b0f2096e495a92da7d88aa139" + integrity sha512-O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" "@babel/plugin-proposal-private-methods@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389" - integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz#ea78a12554d784ecf7fc55950b752d469d9c4a71" + integrity sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-class-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072" - integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" + integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-async-generators@^7.8.0": version "7.8.4" @@ -706,11 +701,11 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" - integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-dynamic-import@^7.8.0": version "7.8.3" @@ -776,20 +771,20 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" - integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" + integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-arrow-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3" - integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz#eda5670b282952100c229f8a3bd49e0f6a72e9fe" + integrity sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-async-to-generator@^7.12.1": +"@babel/plugin-transform-async-to-generator@7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== @@ -798,259 +793,266 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/helper-remap-async-to-generator" "^7.12.1" -"@babel/plugin-transform-block-scoped-functions@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9" - integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA== +"@babel/plugin-transform-async-to-generator@^7.12.1": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" + integrity sha512-psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-imports" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-remap-async-to-generator" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.1": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz#d93a567a152c22aea3b1929bb118d1d0a175cdca" - integrity sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ== +"@babel/plugin-transform-block-scoped-functions@^7.12.1": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" + integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-transform-block-scoping@^7.12.11": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" + integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-classes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6" - integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz#9728edc1838b5d62fc93ad830bd523b1fcb0e1f6" + integrity sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-define-map" "^7.10.4" - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-optimise-call-expression" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" - "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-optimise-call-expression" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852" - integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz#6a210647a3d67f21f699cfd2a01333803b27339d" + integrity sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-destructuring@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847" - integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz#fc56c5176940c5b41735c677124d1d20cecc9aeb" + integrity sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975" - integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" + integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-duplicate-keys@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228" - integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" + integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-exponentiation-operator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0" - integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" + integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-for-of@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa" - integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz#561ff6d74d9e1c8879cb12dbaf4a14cd29d15cf6" + integrity sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-function-name@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667" - integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" + integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== dependencies: - "@babel/helper-function-name" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57" - integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" + integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-member-expression-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad" - integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" + integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-modules-amd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9" - integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz#43db16249b274ee2e551e2422090aa1c47692d56" + integrity sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-commonjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648" - integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz#5043b870a784a8421fa1fd9136a24f294da13e50" + integrity sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-simple-access" "^7.12.13" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086" - integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz#351937f392c7f07493fc79b2118201d50404a3c5" + integrity sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA== dependencies: - "@babel/helper-hoist-variables" "^7.10.4" - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-hoist-variables" "^7.12.13" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-validator-identifier" "^7.12.11" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-umd@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902" - integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz#26c66f161d3456674e344b4b1255de4d530cfb37" + integrity sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w== dependencies: - "@babel/helper-module-transforms" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-module-transforms" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753" - integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" + integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/plugin-transform-new-target@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0" - integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" + integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-object-super@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e" - integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" + integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-replace-supers" "^7.12.13" -"@babel/plugin-transform-parameters@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d" - integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz#461e76dfb63c2dfd327b8a008a9e802818ce9853" + integrity sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-property-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd" - integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" + integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-regenerator@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753" - integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" + integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8" - integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" + integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" - integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== +"@babel/plugin-transform-runtime@7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" + integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== dependencies: - "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - resolve "^1.8.1" semver "^5.5.1" "@babel/plugin-transform-shorthand-properties@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3" - integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" + integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-spread@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e" - integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz#ca0d5645abbd560719c354451b849f14df4a7949" + integrity sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.1": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad" - integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg== +"@babel/plugin-transform-sticky-regex@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" + integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-template-literals@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" - integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz#655037b07ebbddaf3b7752f55d15c2fd6f5aa865" + integrity sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-typeof-symbol@^7.12.1": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b" - integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA== +"@babel/plugin-transform-typeof-symbol@^7.12.10": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" + integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-unicode-escapes@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709" - integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" + integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-transform-unicode-regex@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb" - integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg== + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" + integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" - integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== +"@babel/preset-env@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-compilation-targets" "^7.12.1" - "@babel/helper-module-imports" "^7.12.1" + "@babel/compat-data" "^7.12.7" + "@babel/helper-compilation-targets" "^7.12.5" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1058,10 +1060,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.7" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1079,7 +1081,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1103,14 +1105,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.1" - core-js-compat "^3.6.2" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1124,30 +1126,21 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" - integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@7.12.5": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== +"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" + integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.12.7": +"@babel/template@7.12.7": version "7.12.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== @@ -1156,25 +1149,34 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376" - integrity sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w== +"@babel/template@^7.12.13", "@babel/template@^7.12.7": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" + integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== dependencies: - "@babel/code-frame" "^7.12.11" - "@babel/generator" "^7.12.11" - "@babel/helper-function-name" "^7.12.11" - "@babel/helper-split-export-declaration" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/types" "^7.12.12" + "@babel/code-frame" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" + +"@babel/traverse@^7.12.10", "@babel/traverse@^7.12.13": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" + integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.12.13" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.12.13" + "@babel/types" "^7.12.13" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": - version "7.12.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299" - integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ== +"@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" + integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -1189,25 +1191,25 @@ ajv-keywords "^3.4.1" "@electron/get@^1.0.1": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3" - integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg== + version "1.12.4" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" + integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== dependencies: debug "^4.1.1" env-paths "^2.2.0" fs-extra "^8.1.0" got "^9.6.0" progress "^2.0.3" - sanitize-filename "^1.6.2" + semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: global-agent "^2.0.2" global-tunnel-ng "^2.7.1" "@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== "@jest/types@^26.6.2": version "26.6.2" @@ -1236,14 +1238,14 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== -"@ngtools/webpack@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.6.tgz#1a1d7775022e7e6263f8d9ee2872d995163b3fc0" - integrity sha512-vf5YNEpXWRa0fKC/BRq5sVVj2WnEqW8jn14YQRHwVt5ppUeyu8IKUF69p6W1MwZMgMqMaw/vPQ8LI5cFbyf3uw== +"@ngtools/webpack@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.2.0.tgz#720c3a50aae5aced2fe049f7efc3434320bbe539" + integrity sha512-2KYaA/fIw863jydXDolWp4kUNLODVIKs2834vW+oztocnYFe/z4dTz6rArKFUCixMCu12ieXrjAetzGA564bsg== dependencies: - "@angular-devkit/core" "11.0.6" - enhanced-resolve "5.3.1" - webpack-sources "2.0.1" + "@angular-devkit/core" "11.2.0" + enhanced-resolve "5.7.0" + webpack-sources "2.2.0" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1266,18 +1268,79 @@ "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" +"@npmcli/ci-detect@^1.0.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a" + integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q== + +"@npmcli/git@^2.0.1": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.6.tgz#47b97e96b2eede3f38379262fa3bdfa6eae57bf2" + integrity sha512-a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg== + dependencies: + "@npmcli/promise-spawn" "^1.1.0" + lru-cache "^6.0.0" + mkdirp "^1.0.3" + npm-pick-manifest "^6.0.0" + promise-inflight "^1.0.1" + promise-retry "^2.0.1" + semver "^7.3.2" + unique-filename "^1.1.1" + which "^2.0.2" + +"@npmcli/installed-package-contents@^1.0.5": + version "1.0.7" + resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa" + integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw== + dependencies: + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + "@npmcli/move-file@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" - integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" + integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== dependencies: mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@npmcli/node-gyp@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede" + integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg== + +"@npmcli/promise-spawn@^1.1.0", "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5" + integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg== + dependencies: + infer-owner "^1.0.4" + +"@npmcli/run-script@^1.3.0": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.3.tgz#07f440ed492400bb1114369bc37315eeaaae2bb3" + integrity sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ== + dependencies: + "@npmcli/node-gyp" "^1.0.2" + "@npmcli/promise-spawn" "^1.3.2" + infer-owner "^1.0.4" + node-gyp "^7.1.0" + puka "^1.0.1" + read-package-json-fast "^2.0.1" "@octetstream/promisify@2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@octetstream/promisify/-/promisify-2.0.2.tgz#29ac3bd7aefba646db670227f895d812c1a19615" integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== +"@open-policy-agent/opa-wasm@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz#481b766093f70b00efefbee1e4192f375fd34ca2" + integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== + dependencies: + sprintf-js "^1.1.2" + utf8 "^3.0.0" + "@popperjs/core@^2.5.3": version "2.6.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f" @@ -1296,35 +1359,35 @@ lodash "^4.17.20" lodash-es "^4.17.20" -"@schematics/angular@11.0.6": - version "11.0.6" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.0.6.tgz#5e52f8396e66138df0d6062130399fab830ee79e" - integrity sha512-XUcpOrlcp55PBHrgpIVx69lnhDY6ro35BSRmqNmjXik56qcOkfvdki8vvyW9EsWvu9/sfBSsVDdparlbVois7w== +"@schematics/angular@11.2.0": + version "11.2.0" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.2.0.tgz#da903e0fc09e834cf53452a30ea7d2eb78608ebc" + integrity sha512-PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw== dependencies: - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" - jsonc-parser "2.3.1" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" + jsonc-parser "3.0.0" "@schematics/angular@^9.1.0": - version "9.1.13" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.13.tgz#e4be3f8b71ef8b27f0d1f0b1325f9806f56cb683" - integrity sha512-coHvhu2jXVCN3P5Ux5ArDousMWDq4W6eInJPBpAI6yidRW1ViPVF58Bas/+Txcbhubv2cZViBXGq0OAGdJIvTQ== + version "9.1.14" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.1.14.tgz#bb80d082b00d4614aa416052b57799f52f62667b" + integrity sha512-FoPX+D/+Mg/pofTobRGG28Gf84kbXql+LrLRVrVZ2V9sPvdWSD1b0U/y6pYtbEYLBg5OQ0vC6d2BfOJLOxFAvA== dependencies: - "@angular-devkit/core" "9.1.13" - "@angular-devkit/schematics" "9.1.13" + "@angular-devkit/core" "9.1.14" + "@angular-devkit/schematics" "9.1.14" -"@schematics/update@0.1100.6": - version "0.1100.6" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1100.6.tgz#8e76276a3daecfd698b39e7643bc21f3abb3a4d0" - integrity sha512-+B8n+k+zZ3VYOhjNBsLqzjp8O9ZdUWgdpf9L8XAA7mh/oPwufXpExyEc66uAS07imvUMmjz6i8E2eNWV/IjBJg== +"@schematics/update@0.1102.0": + version "0.1102.0" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1102.0.tgz#6aa5e25cd18ab9e99d8cd06752583d1ed21a6a65" + integrity sha512-2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g== dependencies: - "@angular-devkit/core" "11.0.6" - "@angular-devkit/schematics" "11.0.6" + "@angular-devkit/core" "11.2.0" + "@angular-devkit/schematics" "11.2.0" "@yarnpkg/lockfile" "1.1.0" - ini "1.3.6" + ini "2.0.0" npm-package-arg "^8.0.0" - pacote "9.5.12" - semver "7.3.2" + pacote "11.2.4" + semver "7.3.4" semver-intersect "1.4.0" "@sentry/browser@5.27.6": @@ -1337,20 +1400,20 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/browser@^5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.29.2.tgz#51adb4005511b1a4a70e4571880fc6653d651f91" - integrity sha512-uxZ7y7rp85tJll+RZtXRhXPbnFnOaxZqJEv05vJlXBtBNLQtlczV5iCtU9mZRLVHDtmZ5VVKUV8IKXntEqqDpQ== +"@sentry/browser@^6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.1.0.tgz#0e18a07b44bebed729bcf842af33203e388e2053" + integrity sha512-t3y2TLXDWgvfknyH8eKj/9mghJfSEqItFyp74zPu1Src6kOPjkd4Sa7o4+bdkNgA8dIIOrDAhRUbB2sq4sWMCA== dependencies: - "@sentry/core" "5.29.2" - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/core" "6.1.0" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" -"@sentry/cli@^1.61.0": - version "1.61.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.61.0.tgz#98be4cce2d61df91a8cb42afb740b46eba029925" - integrity sha512-pHEhqP1bB4sdO7N5ow/IkRBrPbKT9HZRinq4PhTVIvmG+NW4VVuVZ6k4tlbp+JXmzMcUc/iXynVkTL7zJIlTQw== +"@sentry/cli@^1.62.0": + version "1.62.0" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.62.0.tgz#2e2d8cacb5ec494f86c188ef95b41745605be028" + integrity sha512-MCkx+zjetdIWhAVaFuEuoD4MOAFlb3/GLR5B5uFZ1AcegcsggasLo/3rb2gq6jYIic/pubtRjH4ltmOL/s3cag== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" @@ -1369,21 +1432,21 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/core@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.29.2.tgz#9e05fe197234161d57aabaf52fab336a7c520d81" - integrity sha512-7WYkoxB5IdlNEbwOwqSU64erUKH4laavPsM0/yQ+jojM76ErxlgEF0u//p5WaLPRzh3iDSt6BH+9TL45oNZeZw== +"@sentry/core@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.1.0.tgz#7dd4584dcaf2188a78b94b766068342e6ee65229" + integrity sha512-57mXkp3NoyxRycXrL+Ec6bYS6UYJZp9tYX0lUp5Ry2M0FxDZ3Q4drkjr8MIQOhBaQXP2ukSX4QTVLGMPm60zMw== dependencies: - "@sentry/hub" "5.29.2" - "@sentry/minimal" "5.29.2" - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/hub" "6.1.0" + "@sentry/minimal" "6.1.0" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" -"@sentry/electron@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.1.0.tgz#82985f473590a99a5a19f879a4948617d185b3bb" - integrity sha512-ZOJmtAWNc2reJqgVPxuKGenXcl88gj7hqDk1dHo+kW4J+D28/pfbGEFr4aLvaUq5G8ZFGsxT0cZObAExIFv3Nw== +"@sentry/electron@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.2.0.tgz#e59d9cea4e5c3b003e2fc6fc9ecf1bfc1af15eb6" + integrity sha512-wNUIsRxb86zK1tV77MZaSLWHM2CxgC1QLJCWxr+Tkash6tESfMY2XlC4+7XQKHfASU3QHt5l4R55/rhrr7ChJA== dependencies: "@sentry/browser" "5.27.6" "@sentry/core" "5.27.6" @@ -1402,13 +1465,13 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/hub@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.29.2.tgz#208f10fe6674695575ad74182a1151f71d6df00a" - integrity sha512-LaAIo2hwUk9ykeh9RF0cwLy6IRw+DjEee8l1HfEaDFUM6TPGlNNGObMJNXb9/95jzWp7jWwOpQjoIE3jepdQJQ== +"@sentry/hub@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.1.0.tgz#fb22734c91c9d68564737996bf28b7e032e3d8ee" + integrity sha512-JnBSCgNg3VHiMojUl5tCHU8iWPVuE+qqENIzG9A722oJms1kKWBvWl+yQzhWBNdgk5qeAY3F5UzKWJZkbJ6xow== dependencies: - "@sentry/types" "5.29.2" - "@sentry/utils" "5.29.2" + "@sentry/types" "6.1.0" + "@sentry/utils" "6.1.0" tslib "^1.9.3" "@sentry/minimal@5.27.6": @@ -1420,13 +1483,13 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/minimal@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.29.2.tgz#420bebac8d03d30980fdb05c72d7b253d8aa541b" - integrity sha512-0aINSm8fGA1KyM7PavOBe1GDZDxrvnKt+oFnU0L+bTcw8Lr+of+v6Kwd97rkLRNOLw621xP076dL/7LSIzMuhw== +"@sentry/minimal@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.1.0.tgz#b3abf76d93b95477a3c1029db810818bdc56845f" + integrity sha512-g6sfNKenL7wnsr/tibp8nFiMv/XRH0s0Pt4p151npmNI+SmjuUz3GGYEXk8ChCyaKldYKilkNOFdVXJxUf5gZw== dependencies: - "@sentry/hub" "5.29.2" - "@sentry/types" "5.29.2" + "@sentry/hub" "6.1.0" + "@sentry/types" "6.1.0" tslib "^1.9.3" "@sentry/node@5.27.6": @@ -1460,10 +1523,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.6.tgz#b5054eafcb8ac11d4bc4787c7bc7fc113cad8b80" integrity sha512-XOW9W8DrMk++4Hk7gWi9o5VR0o/GrqGfTKyFsHSIjqt2hL6kiMPvKeb2Hhmp7Iq37N2bDmRdWpM5m+68S2Jk6w== -"@sentry/types@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.29.2.tgz#ac87383df1222c2d9b9f8f9ed7a6b86ea41a098a" - integrity sha512-dM9wgt8wy4WRty75QkqQgrw9FV9F+BOMfmc0iaX13Qos7i6Qs2Q0dxtJ83SoR4YGtW8URaHzlDtWlGs5egBiMA== +"@sentry/types@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.1.0.tgz#5f9379229423ca1325acf6709e95687180f67132" + integrity sha512-kIaN52Fw5K+2mKRaHE2YluJ+F/qMGSUzZXIFDNdC6OUMXQ4TM8gZTrITXs8CLDm7cK8iCqFCtzKOjKK6KyOKAg== "@sentry/utils@5.27.6": version "5.27.6" @@ -1473,12 +1536,12 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/utils@5.29.2": - version "5.29.2" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.29.2.tgz#99a5cdda2ea19d34a41932f138d470adcb3ee673" - integrity sha512-nEwQIDjtFkeE4k6yIk4Ka5XjGRklNLThWLs2xfXlL7uwrYOH2B9UBBOOIRUraBm/g/Xrra3xsam/kRxuiwtXZQ== +"@sentry/utils@6.1.0": + version "6.1.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.1.0.tgz#52e3d7050983e685d3a48f9d2efa1e6eb4ae3e6d" + integrity sha512-6JAplzUOS6bEwfX0PDRZBbYRvn9EN22kZfcL0qGHtM9L0QQ5ybjbbVwOpbXgRkiZx++dQbzLFtelxnDhsbFG+Q== dependencies: - "@sentry/types" "5.29.2" + "@sentry/types" "6.1.0" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1491,31 +1554,21 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== -"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": +"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": version "2.11.0" resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" -"@snyk/cli-interface@2.9.1": - version "2.9.1" - resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.9.1.tgz#e0466d183e7d4a13112ba098b1702a0d628dd380" - integrity sha512-2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA== +"@snyk/cocoapods-lockfile-parser@3.6.2": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz#803ae9466f408c48ba7c5a8ec51b9dbac6f633b3" + integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== dependencies: - "@snyk/dep-graph" "1.19.4" - "@types/graphlib" "^2.1.7" - tslib "^1.9.3" - -"@snyk/cocoapods-lockfile-parser@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.2.tgz#7f441ecf2fb9c0b488db7e392447d2c520b60cef" - integrity sha512-fIiUNCmhDp7lVKTs/nHCnLK1roMkG15HhuQhtZXxiFW3EZ5H9IqMdtrxqjXuzVWt7X2h7lbF5OMBzD07NODtug== - dependencies: - "@snyk/dep-graph" "1.19.4" + "@snyk/dep-graph" "^1.23.1" "@types/js-yaml" "^3.12.1" js-yaml "^3.13.1" - source-map-support "^0.5.7" tslib "^1.10.0" "@snyk/composer-lockfile-parser@^1.4.1": @@ -1528,36 +1581,27 @@ lodash.invert "^4.3.0" lodash.isempty "^4.4.0" -"@snyk/dep-graph@1.19.4": - version "1.19.4" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.19.4.tgz#d156c482bfdfba7505f1cf3e8a80b86dd9f45383" - integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== +"@snyk/dep-graph@1.23.1", "@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1": + version "1.23.1" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.23.1.tgz#c884811669983febb6685f9107b322b3c0603f42" + integrity sha512-bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ== dependencies: - graphlib "^2.1.8" - lodash.isequal "^4.5.0" - object-hash "^2.0.3" - semver "^6.0.0" - source-map-support "^0.5.19" - tslib "^1.13.0" - -"@snyk/dep-graph@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.21.0.tgz#02bc39598c7415d6d78d2ea6fd46f44514f9039c" - integrity sha512-+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw== - dependencies: - graphlib "^2.1.8" - lodash.isequal "^4.5.0" - object-hash "^2.0.3" - semver "^6.0.0" - tslib "^1.13.0" - -"@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.19.4", "@snyk/dep-graph@^1.19.5", "@snyk/dep-graph@^1.21.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.22.0.tgz#3c9090b3a52596a0758d007e5ae8fda88864601d" - integrity sha512-KBRCZieE3XD4sd7yi0kBODElZF2que9jEgPnxNBwKcECHNH+DKv0rUIHchpMMrY2jK/cmbbq8Dmv/rmFLVT7CQ== - dependencies: - graphlib "^2.1.8" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" lodash.isequal "^4.5.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" object-hash "^2.0.3" semver "^6.0.0" tslib "^1.13.0" @@ -1576,34 +1620,73 @@ resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== -"@snyk/java-call-graph-builder@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.17.0.tgz#b183a6bc21e3b05756c7bcb4b953fa9a78a3e983" - integrity sha512-uO1b6UtT6QGz7F5ZgNdOSyMXBvykUhOcuHBRc//xUnBWsyJwdlAFp/d646zIeaBCe87Fcn5hXuWUGjj+N8rBzA== +"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": + version "2.1.9-patch.3" + resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" + integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== dependencies: - ci-info "^2.0.0" - debug "^4.1.1" - glob "^7.1.6" - graphlib "^2.1.8" - jszip "^3.2.2" - needle "^2.3.3" - progress "^2.0.3" - snyk-config "^4.0.0-rc.2" - source-map-support "^0.5.7" - temp-dir "^2.0.0" - tmp "^0.2.1" - tslib "^1.9.3" - xml-js "^1.6.11" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" -"@snyk/java-call-graph-builder@1.18.0": - version "1.18.0" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.18.0.tgz#f93abeaf347083b9d534a4f94b1468fd97d111a0" - integrity sha512-6Mt+Rs2N4HdHICCjxWRwtGXUrSktCsSGnn7HlL6wi+4JXjPWa+rDCzaF6furqRR3aphZAclgved0haFwwmqBxQ== +"@snyk/inquirer@^7.3.3-patch": + version "7.3.3-patch" + resolved "https://registry.yarnpkg.com/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz#ef84d531724c53b755e8dd454e1a3c2ccdcfc0bf" + integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== dependencies: + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.defaults "^4.2.0" + lodash.filter "^4.6.0" + lodash.find "^4.6.0" + lodash.findindex "^4.6.0" + lodash.flatten "^4.4.0" + lodash.isboolean "^3.0.3" + lodash.isfunction "^3.0.9" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.last "^3.0.0" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.set "^4.3.2" + lodash.sum "^4.0.2" + lodash.uniq "^4.5.0" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" + +"@snyk/java-call-graph-builder@1.19.1": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz#1d579d782df3bb5f9d5171cc35180596cd90aa8b" + integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== + dependencies: + "@snyk/graphlib" "2.1.9-patch.3" ci-info "^2.0.0" debug "^4.1.1" glob "^7.1.6" - graphlib "^2.1.8" jszip "^3.2.2" needle "^2.3.3" progress "^2.0.3" @@ -1621,14 +1704,14 @@ dependencies: event-loop-spinner "^2.0.0" -"@snyk/snyk-cocoapods-plugin@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.1.tgz#af4e749ee1420c1596345fefae3c5eb48b84ecb0" - integrity sha512-A+1xHD+SpmXQa0p+dWmiApFZtz/y37qAW9aWmFx2B1j7fwRBf9Qr89/6RbJOznf1a4nEitjzE3fa98yNZk/MNg== +"@snyk/snyk-cocoapods-plugin@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz#cd724fcd637cb3af76187bf7254819b6079489f6" + integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== dependencies: - "@snyk/cli-interface" "^2.9.2" - "@snyk/cocoapods-lockfile-parser" "3.5.2" - "@snyk/dep-graph" "^1.19.4" + "@snyk/cli-interface" "^2.11.0" + "@snyk/cocoapods-lockfile-parser" "3.6.2" + "@snyk/dep-graph" "^1.23.1" source-map-support "^0.5.7" tslib "^2.0.0" @@ -1656,6 +1739,11 @@ dependencies: defer-to-connect "^2.0.0" +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@types/cacheable-request@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" @@ -1671,10 +1759,25 @@ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf" integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw== +"@types/component-emitter@^1.2.10": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" + integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== + +"@types/cookie@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" + integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== + +"@types/cors@^2.8.8": + version "2.8.10" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" + integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== + "@types/d3-array@*": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.8.0.tgz#4b70ccb0c6d2ef28dac1e7e653b3ecd1f4b1d1ee" - integrity sha512-Q0ubcGHAmCRPh90/hoYB4eKWhxYKUxphwSeQrlz2tiabQ8S9zqhaE2CZJtCaLH2cjqKcjr52WPvmOA7ha0O4ZA== + version "2.9.0" + resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.9.0.tgz#fb6c3d7d7640259e68771cd90cc5db5ac1a1a012" + integrity sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ== "@types/d3-array@1.2": version "1.2.8" @@ -1907,10 +2010,31 @@ dependencies: electron "*" +"@types/eslint-scope@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" + integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.2.6" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" + integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.46": + version "0.0.46" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" + integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== + "@types/fs-extra@^9.0.1": - version "9.0.6" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab" - integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig== + version "9.0.7" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" + integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== dependencies: "@types/node" "*" @@ -1927,7 +2051,7 @@ "@types/minimatch" "*" "@types/node" "*" -"@types/graphlib@^2", "@types/graphlib@^2.1.7": +"@types/graphlib@^2": version "2.1.7" resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== @@ -1966,10 +2090,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@*", "@types/jasmine@~3.6.0": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.2.tgz#02f64450016f7de70f145d698be311136d7c6374" - integrity sha512-AzfesNFLvOs6Q1mHzIsVJXSeUnqVh4ZHG8ngygKJfbkcSLwzrBVm/LKa+mR8KrOfnWtUL47112gde1MC0IXqpQ== +"@types/jasmine@*", "@types/jasmine@~3.6.3": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050" + integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA== "@types/jasminewd2@^2.0.8": version "2.0.8" @@ -1991,10 +2115,10 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1" integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" - integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" + integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== "@types/keyv@*": version "3.1.1" @@ -2018,22 +2142,17 @@ resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.5.tgz#e95569aa6273dbe0ed1814f86287547cc06e93c9" integrity sha512-OwVhKFim9Y/MprzCe4I6a59p31pMy8+LrtP6qS7J0kaOxYmW6VVJPBw5NYm+g7nSbgPUz22FvqU1F1hC5YGTfg== -"@types/node@*": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== - -"@types/node@14.14.10": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== +"@types/node@*", "@types/node@14.14.28", "@types/node@^14.14.10": + version "14.14.28" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b" + integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g== "@types/node@^12.0.12": - version "12.19.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.13.tgz#888e2b34159fb91496589484ec169618212b51b7" - integrity sha512-qdixo2f0U7z6m0UJUugTJqVF94GNDkdgQhfBtMs8t5898JE7G/D2kJYw4rc1nzjIPLVAsDkY2MdABnLAP5lM1w== + version "12.20.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472" + integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g== -"@types/node@^6.14.4", "@types/node@^6.14.7": +"@types/node@^6.14.7": version "6.14.13" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== @@ -2058,10 +2177,10 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.0.tgz#b3b691eb956c4b3401777ee67b900cb28415d95a" - integrity sha512-lUqY7OlkF/RbNtD5nIq7ot8NquXrdFrjSOR6+w9a9RFQevGi1oZO1dcJbXMeONAPKtZ2UrZOEJ5UOCVsxbLk/g== +"@types/react-dom@^17.0.1": + version "17.0.1" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.1.tgz#d92d77d020bfb083e07cc8e0ac9f933599a4d56a" + integrity sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q== dependencies: "@types/react" "*" @@ -2072,18 +2191,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.35", "@types/react@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.0.tgz#5af3eb7fad2807092f0046a1302b7823e27919b8" - integrity sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^16.9.11": - version "16.14.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.2.tgz#85dcc0947d0645349923c04ccef6018a1ab7538c" - integrity sha512-BzzcAlyDxXl2nANlabtT4thtvbbnhee8hMmH/CcJrISDBVcJS1iOsP1f0OAgSdGE0MsY9tqcrb9YoZcOFv9dbQ== +"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.2": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2100,11 +2211,6 @@ resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b" integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw== -"@types/semver@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" - integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -2130,12 +2236,20 @@ integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== "@types/yargs@^15.0.0", "@types/yargs@^15.0.5": - version "15.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74" - integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw== + version "15.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" + integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" +"@webassemblyjs/ast@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" + integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2145,16 +2259,31 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" +"@webassemblyjs/floating-point-hex-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" + integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== + "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== +"@webassemblyjs/helper-api-error@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" + integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== + "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== +"@webassemblyjs/helper-buffer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" + integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2179,11 +2308,35 @@ dependencies: "@webassemblyjs/ast" "1.9.0" +"@webassemblyjs/helper-numbers@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" + integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" + integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== + "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== +"@webassemblyjs/helper-wasm-section@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" + integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2194,6 +2347,13 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" +"@webassemblyjs/ieee754@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" + integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2201,6 +2361,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/leb128@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" + integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2208,11 +2375,30 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" + integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== + "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== +"@webassemblyjs/wasm-edit@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" + integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/helper-wasm-section" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-opt" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wast-printer" "1.11.0" + "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2227,6 +2413,17 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/wasm-gen@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" + integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2238,6 +2435,16 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" +"@webassemblyjs/wasm-opt@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" + integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2248,6 +2455,18 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" +"@webassemblyjs/wasm-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" + integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2272,6 +2491,14 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" + integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -2296,14 +2523,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -JSONStream@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -2327,6 +2546,11 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^8.0.4: + version "8.0.5" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" + integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== + adjust-sourcemap-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e" @@ -2340,11 +2564,6 @@ adm-zip@^0.4.9: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== -after@0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2366,11 +2585,13 @@ agent-base@~4.2.1: dependencies: es6-promisify "^5.0.0" -agentkeepalive@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" - integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== +agentkeepalive@^4.1.3: + version "4.1.4" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" + integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== dependencies: + debug "^4.1.0" + depd "^1.1.2" humanize-ms "^1.2.1" aggregate-error@^3.0.0: @@ -2439,10 +2660,10 @@ angular-persistence@^1.0.1: resolved "https://registry.yarnpkg.com/angular-persistence/-/angular-persistence-1.0.1.tgz#79ffe7317f1f7aed88e69f07705f0ac32ccdb9da" integrity sha1-ef/nMX8feu2I5p8HcF8KwyzNudo= -angular-resizable-element@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.4.tgz#fe5fbae0cbde4c5ff28bad4d33a493c8f141ecf1" - integrity sha512-jA3j8qcWXKR+rdXxerAjpKhUsoUlEBQP3CmutHcHRAKTkQjZTd1LcZOZOnfIdOToyXsIKXYscbHpbPoCeew2Yw== +angular-resizable-element@^3.3.5: + version "3.3.5" + resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.5.tgz#e0c86655e53280306c5a6e0ed1d1f60b323b0497" + integrity sha512-PT7p3CGva1BmcTt8LA80yOblHqynZHPQYQ1KMMLgllCn3UZx/+0eCRtSXKwnWT5IYHBg9qI3tmd92SFExa1UMg== dependencies: tslib "^1.9.0" @@ -2507,6 +2728,11 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" @@ -2595,7 +2821,7 @@ app-root-path@^3.0.0: resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== -aproba@^1.1.1: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== @@ -2605,6 +2831,14 @@ archy@^1.0.0: resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -2682,11 +2916,6 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -arraybuffer.slice@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" - integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -2791,17 +3020,16 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@9.8.6: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== +autoprefixer@10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1" + integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw== dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" + browserslist "^4.16.1" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" + fraction.js "^4.0.13" normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" postcss-value-parser "^4.1.0" aws-sign2@~0.7.0: @@ -2821,15 +3049,14 @@ axobject-query@2.0.2: dependencies: ast-types-flow "0.0.7" -babel-loader@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" - integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== +babel-loader@8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" + integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== dependencies: - find-cache-dir "^2.1.0" + find-cache-dir "^3.3.1" loader-utils "^1.4.0" - mkdirp "^0.5.3" - pify "^4.0.1" + make-dir "^3.1.0" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -2839,11 +3066,6 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -backo2@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -2859,7 +3081,7 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0: +base64id@2.0.0, base64id@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -2912,19 +3134,14 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" bl@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" - integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== dependencies: buffer "^5.5.0" inherits "^2.0.4" readable-stream "^3.4.0" -blob@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" - integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - blocking-proxy@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2" @@ -2939,12 +3156,12 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: +bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: version "4.11.9" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== @@ -2992,10 +3209,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -bootstrap@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" - integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== +bootstrap@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" + integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== boxen@^4.2.0: version "4.2.0" @@ -3042,7 +3259,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= @@ -3115,16 +3332,16 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.9.1: - version "4.16.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz#bf757a2da376b3447b800a16f0f1c96358138766" - integrity sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA== +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1: + version "4.16.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" + integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== dependencies: - caniuse-lite "^1.0.30001173" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" - electron-to-chromium "^1.3.634" + electron-to-chromium "^1.3.649" escalade "^3.1.1" - node-releases "^1.1.69" + node-releases "^1.1.70" browserstack@^1.5.1: version "1.6.1" @@ -3246,7 +3463,7 @@ cacache@15.0.5, cacache@^15.0.5: tar "^6.0.2" unique-filename "^1.1.1" -cacache@^12.0.0, cacache@^12.0.2: +cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== @@ -3313,7 +3530,7 @@ cacheable-request@^7.0.1: normalize-url "^4.1.0" responselike "^2.0.0" -call-bind@^1.0.0: +call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -3350,7 +3567,7 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3365,10 +3582,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001173: - version "1.0.30001174" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001174.tgz#0f2aca2153fd88ceb07a2bb982fc2acb787623c4" - integrity sha512-tqClL/4ThQq6cfFXH3oJL4rifFBeM6gTkphjao5kgwMaW9yn0tKgQLAEfKzDwj6HQWCB/aWo8kTFlSvIN8geEA== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001181: + version "1.0.30001187" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438" + integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA== canonical-path@1.0.0: version "1.0.0" @@ -3380,7 +3597,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3427,9 +3644,9 @@ child-process@^1.0.2: integrity sha1-mJdNx+0e5MYin44wX6cxOmiFp/I= "chokidar@>=2.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1, chokidar@^3.4.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.0.tgz#458a4816a415e9d3b3caa4faec2b96a6935a9e65" - integrity sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q== + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -3460,7 +3677,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1, chownr@^1.1.2: +chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -3495,10 +3712,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-dependency-plugin@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93" - integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw== +circular-dependency-plugin@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" + integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== class-utils@^0.3.5: version "0.3.6" @@ -3537,7 +3754,7 @@ cli-spinner@0.2.10: resolved "https://registry.yarnpkg.com/cli-spinner/-/cli-spinner-0.2.10.tgz#f7d617a36f5c47a7bc6353c697fc9338ff782a47" integrity sha512-U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q== -cli-spinners@^2.2.0, cli-spinners@^2.4.0: +cli-spinners@^2.2.0, cli-spinners@^2.4.0, cli-spinners@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047" integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ== @@ -3609,6 +3826,11 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + codelyzer@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.1.tgz#c0e9668e847255b37c759e68fb2700b11e277d0f" @@ -3714,26 +3936,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-bind@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" - integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= - -component-emitter@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -component-inherit@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" - integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= - compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -3816,6 +4023,11 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3860,6 +4072,13 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +copy-anything@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" + integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== + dependencies: + is-what "^3.12.0" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -3877,10 +4096,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5" - integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q== +copy-webpack-plugin@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb" + integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA== dependencies: cacache "^15.0.5" fast-glob "^3.2.4" @@ -3894,29 +4113,32 @@ copy-webpack-plugin@6.2.1: serialize-javascript "^5.0.1" webpack-sources "^1.4.3" -core-js-compat@^3.6.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.2.tgz#3717f51f6c3d2ebba8cbf27619b57160029d1d4c" - integrity sha512-LO8uL9lOIyRRrQmZxHZFl1RV+ZbcsAkFWTktn5SmH40WgLtSNYN4m4W2v9ONT147PxBY/XrRhrWq8TlvObyUjQ== +core-js-compat@^3.8.0: + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" + integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog== dependencies: - browserslist "^4.16.0" + browserslist "^4.16.1" semver "7.0.0" -core-js@3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== - -core-js@^3.6.5, core-js@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044" - integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A== +core-js@3.8.3, core-js@^3.6.5, core-js@^3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" + integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cors@~2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -3969,6 +4191,22 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +critters@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.6.tgz#b71384113d8b5f5c82f3aeba80c122437f195d8c" + integrity sha512-NUB3Om7tkf+XWi9+2kJ2A3l4/tHORDI1UT+nHxUqay2B/tJvMpiXcklDDLBH3fPn9Pe23uu0we/08Ukjy4cLCQ== + dependencies: + chalk "^4.1.0" + css "^3.0.0" + parse5 "^6.0.1" + parse5-htmlparser2-tree-adapter "^6.0.1" + pretty-bytes "^5.3.0" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4015,22 +4253,22 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" - integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== +css-loader@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f" + integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw== dependencies: - camelcase "^6.0.0" + camelcase "^6.2.0" cssesc "^3.0.0" - icss-utils "^4.1.1" + icss-utils "^5.0.0" loader-utils "^2.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.3" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" + postcss "^8.1.4" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^2.7.1" + schema-utils "^3.0.0" semver "^7.3.2" css-parse@~2.0.0: @@ -4094,6 +4332,15 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + cssauron@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" @@ -4571,34 +4818,20 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0: +debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0, debug@~4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== - dependencies: - ms "2.1.2" - -debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -4744,7 +4977,12 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -depd@~1.1.2: +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -4853,12 +5091,12 @@ docker-modem@2.1.3: split-ca "^1.0.1" ssh2 "^0.8.7" -dockerfile-ast@0.0.30: - version "0.0.30" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz#74cbcd65e389852d752c5687117255ea622583ad" - integrity sha512-QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg== +dockerfile-ast@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz#29d611517b6fa207430ac99e9f59db1636a25b1f" + integrity sha512-qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ== dependencies: - vscode-languageserver-types "^3.15.1" + vscode-languageserver-types "^3.16.0" dom-helpers@^5.0.1, dom-helpers@^5.1.2, dom-helpers@^5.2.0: version "5.2.0" @@ -4972,9 +5210,9 @@ eev@^0.1.5: integrity sha512-U7+up/+0JaC+ffyrMicGDzb+j2Q04Fy22tKK1Xh6hHFWdVtXwoBF8M2DwFofwsJzJcs3W3NPDvmxcMak5/iQaA== ejs@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" - integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" @@ -5012,24 +5250,15 @@ electron-publish@22.9.1: lazy-val "^1.0.4" mime "^2.4.6" -electron-to-chromium@^1.3.634: - version "1.3.636" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.636.tgz#6980bd90813a9fb744e43f5e848f16cea4930058" - integrity sha512-Adcvng33sd3gTjNIDNXGD1G4H6qCImIy2euUJAQHtLNplEKU5WEz5KRJxupRNIIT8sD5oFZLTKBWAf12Bsz24A== +electron-to-chromium@^1.3.649: + version "1.3.664" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz#8fb039e2fa8ef3ab2568308464a28425d4f6e2a3" + integrity sha512-yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg== -electron@*: - version "11.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.1.tgz#188f036f8282798398dca9513e9bb3b10213e3aa" - integrity sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA== - dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" - extract-zip "^1.0.3" - -electron@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7" - integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q== +electron@*, electron@^11.2.3: + version "11.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" + integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" @@ -5043,17 +5272,17 @@ elfy@^1.0.0: endian-reader "^0.3.0" elliptic@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" - integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" + bn.js "^4.11.9" + brorand "^1.1.0" hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" email-validator@^2.0.4: version "2.0.4" @@ -5085,7 +5314,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.11: +encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5104,53 +5333,33 @@ endian-reader@^0.3.0: resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= -engine.io-client@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" - integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== +engine.io-parser@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" + integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== dependencies: - component-emitter "~1.3.0" - component-inherit "0.0.3" - debug "~3.1.0" - engine.io-parser "~2.2.0" - has-cors "1.1.0" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - ws "~7.4.2" - xmlhttprequest-ssl "~1.5.4" - yeast "0.1.2" - -engine.io-parser@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" - integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== - dependencies: - after "0.8.2" - arraybuffer.slice "~0.0.7" base64-arraybuffer "0.1.4" - blob "0.0.5" - has-binary2 "~1.0.2" -engine.io@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" - integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== +engine.io@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" + integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== dependencies: accepts "~1.3.4" base64id "2.0.0" cookie "~0.4.1" - debug "~4.1.0" - engine.io-parser "~2.2.0" + cors "~2.8.5" + debug "~4.3.1" + engine.io-parser "~4.0.0" ws "~7.4.2" -enhanced-resolve@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" - integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== +enhanced-resolve@5.7.0, enhanced-resolve@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" + integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== dependencies: graceful-fs "^4.2.4" - tapable "^2.0.0" + tapable "^2.2.0" enhanced-resolve@^4.3.0: version "4.5.0" @@ -5167,9 +5376,9 @@ ent@~2.2.0: integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= entities@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== env-paths@^2.2.0: version "2.2.0" @@ -5181,6 +5390,11 @@ err-code@^1.0.0: resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5195,7 +5409,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: +es-abstract@^1.17.2: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== @@ -5213,22 +5427,29 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: string.prototype.trimstart "^1.0.1" es-abstract@^1.18.0-next.1: - version "1.18.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" - integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + version "1.18.0-next.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" + integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^1.0.2" has "^1.0.3" has-symbols "^1.0.1" is-callable "^1.2.2" - is-negative-zero "^2.0.0" + is-negative-zero "^2.0.1" is-regex "^1.1.1" - object-inspect "^1.8.0" + object-inspect "^1.9.0" object-keys "^1.1.1" - object.assign "^4.1.1" - string.prototype.trimend "^1.0.1" - string.prototype.trimstart "^1.0.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.3" + string.prototype.trimstart "^1.0.3" + +es-module-lexer@^0.3.26: + version "0.3.26" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.3.26.tgz#7b507044e97d5b03b01d4392c74ffeb9c177a83b" + integrity sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA== es-to-primitive@^1.2.1: version "1.2.1" @@ -5327,6 +5548,14 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + esprima@3.x.x: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -5337,7 +5566,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrecurse@^4.1.0: +esrecurse@^4.1.0, esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5376,7 +5605,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0: +events@^3.0.0, events@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -5539,9 +5768,9 @@ fast-deep-equal@^3.1.1: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1, fast-glob@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" - integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5566,20 +5795,13 @@ fastparse@^1.1.2: integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.0.tgz#74dbefccade964932cdf500473ef302719c652bb" - integrity sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e" + integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA== dependencies: reusify "^1.0.4" -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.1: +faye-websocket@^0.11.3: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -5593,7 +5815,7 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: +figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== @@ -5605,15 +5827,7 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa" - integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -file-loader@^6.2.0: +file-loader@6.2.0, file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== @@ -5632,9 +5846,9 @@ file-uri-to-path@1, file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" - integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== dependencies: minimatch "^3.0.4" @@ -5715,9 +5929,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" - integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== + version "1.13.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" + integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== for-in@^1.0.2: version "1.0.2" @@ -5743,6 +5957,11 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fraction.js@^4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" + integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -5787,23 +6006,16 @@ fs-extra@^8.1.0: universalify "^0.1.0" fs-extra@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" - integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: at-least-node "^1.0.0" graceful-fs "^4.2.0" jsonfile "^6.0.1" - universalify "^1.0.0" + universalify "^2.0.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5833,15 +6045,10 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== - fsevents@~2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f" - integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw== + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== ftp@~0.3.10: version "0.3.10" @@ -5856,10 +6063,19 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -genfun@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" - integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + 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" gensync@^1.0.0-beta.1: version "1.0.0-beta.2" @@ -5872,9 +6088,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.2.tgz#6820da226e50b24894e08859469dc68361545d49" - integrity sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -5933,6 +6149,11 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -6056,17 +6277,10 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -graphlib@2.1.8, graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== gunzip-maybe@^1.4.2: version "1.4.2" @@ -6105,18 +6319,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" -has-binary2@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" - integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== - dependencies: - isarray "2.0.1" - -has-cors@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6132,6 +6334,11 @@ has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6197,7 +6404,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -hmac-drbg@^1.0.0: +hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= @@ -6212,9 +6419,9 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hosted-git-info@^3.0.4, hosted-git-info@^3.0.5, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + version "3.0.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" + integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" @@ -6258,12 +6465,7 @@ html-to-image@^0.1.1: resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-0.1.3.tgz#9661a54c30ed9c4b269f4612416b1c7e887de3a7" integrity sha512-8JTGEAAdJGL/nlp3wb/WI8fLMx2dHKOFZMdsvdon23D45ZdtsXDeRm39Wddf04ludQe3OPmvjMJ9nPjI/7hPlg== -http-cache-semantics@^3.8.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" - integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== - -http-cache-semantics@^4.0.0: +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== @@ -6318,6 +6520,15 @@ http-proxy-agent@^2.1.0: agent-base "4" debug "3.1.0" +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -6359,7 +6570,15 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3: +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +https-proxy-agent@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== @@ -6375,14 +6594,6 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6404,12 +6615,10 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" +icss-utils@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" @@ -6421,7 +6630,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: +ignore-walk@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== @@ -6487,11 +6696,6 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= - infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -6520,22 +6724,22 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.6.tgz#f1c46a2a93a253e7b3905115e74d527cd23061a1" - integrity sha512-IZUoxEjNjubzrmvzZU4lKP7OnYmX72XRl3sqkfJhBKweKi5rnGi5+IUdlj/H1M+Ip5JQ1WzaDMOBRY90Ajc5jg== - ini@1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: +ini@2.0.0, ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@7.3.3, inquirer@^7.3.3: +inquirer@7.3.3: version "7.3.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== @@ -6645,9 +6849,9 @@ is-buffer@^1.1.5: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" - integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^2.0.0: version "2.0.0" @@ -6668,7 +6872,7 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.0.0, is-core-module@^2.1.0: +is-core-module@^2.1.0, is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== @@ -6744,6 +6948,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -6786,7 +6997,12 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-negative-zero@^2.0.0: +is-lambda@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" + integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + +is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== @@ -6864,10 +7080,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.0.4, is-regex@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" - integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" + integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== dependencies: + call-bind "^1.0.2" has-symbols "^1.0.1" is-resolvable@^1.0.0: @@ -6899,6 +7116,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-what@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55" + integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw== + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -6931,11 +7153,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isarray@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= - isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -7031,10 +7248,10 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-spec-reporter@~5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95" - integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g== +jasmine-spec-reporter@~6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz#3b9c85689676a351f343ba8dd6d3957f11a4bf1d" + integrity sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ== dependencies: colors "1.4.0" @@ -7067,16 +7284,7 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-worker@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" - integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^26.5.0: +jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7128,7 +7336,7 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -7153,7 +7361,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.2: +json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -7166,16 +7374,16 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" -jsonc-parser@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz#59549150b133f2efacca48fe9ce1ec0659af2342" - integrity sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg== +jsonc-parser@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== jsonfile@^4.0.0: version "4.0.0" @@ -7193,7 +7401,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: +jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= @@ -7219,9 +7427,9 @@ jszip@3.4.0: set-immediate-shim "~1.0.1" jszip@^3.1.3, jszip@^3.2.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6" - integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA== + version "3.6.0" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9" + integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ== dependencies: lie "~3.3.0" pako "~1.0.2" @@ -7272,10 +7480,10 @@ karma-source-map-support@1.4.0: dependencies: source-map-support "^0.5.5" -karma@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4" - integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ== +karma@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.1.tgz#a7539618cca0f2cbb26d5497120ec31fe340c2a1" + integrity sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg== dependencies: body-parser "^1.19.0" braces "^3.0.2" @@ -7295,11 +7503,11 @@ karma@^5.2.3: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^2.3.0" + socket.io "^3.1.0" source-map "^0.6.1" tmp "0.2.1" - ua-parser-js "0.7.22" - yargs "^15.3.1" + ua-parser-js "^0.7.23" + yargs "^16.1.1" keyv@^3.0.0: version "3.1.0" @@ -7361,20 +7569,22 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -less-loader@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" - integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== +less-loader@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" + integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" -less@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" - integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== +less@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" + integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== dependencies: + copy-anything "^2.0.1" + parse-node-version "^1.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -7382,7 +7592,7 @@ less@3.12.2: image-size "~0.5.0" make-dir "^2.1.0" mime "^1.4.1" - native-request "^1.0.5" + needle "^2.5.2" source-map "~0.6.0" levn@~0.3.0: @@ -7409,10 +7619,10 @@ license-checker@^25.0.1: spdx-satisfies "^4.0.0" treeify "^1.1.0" -license-webpack-plugin@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.1.tgz#08eddb2f776c7c64c02f308a00e017d6e824d0b6" - integrity sha512-yhqTmlYIEpZWA122lf6E0G8+rkn0AzoQ1OpzUKKs/lXUqG1plmGnwmkuuPlfggzJR5y6DLOdot/Tv00CC51CeQ== +license-webpack-plugin@2.3.11: + version "2.3.11" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8" + integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw== dependencies: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" @@ -7434,6 +7644,11 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" @@ -7491,6 +7706,11 @@ lodash.assignin@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -7501,6 +7721,36 @@ lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= +lodash.constant@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash.constant/-/lodash.constant-3.0.0.tgz#bfe05cce7e515b3128925d6362138420bd624910" + integrity sha1-v+Bczn5RWzEokl1jYhOEIL1iSRA= + +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.endswith@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09" + integrity sha1-/tWawXOO0+I27dcGTsRWRIs3vAk= + +lodash.filter@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= + +lodash.find@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1" + integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= + +lodash.findindex@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" + integrity sha1-oyRd7mH7m24GJLU1ElYku2nBEQY= + lodash.findkey@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.findkey/-/lodash.findkey-4.6.0.tgz#83058e903b51cbb759d09ccf546dea3ea39c4718" @@ -7516,16 +7766,41 @@ lodash.flatten@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +lodash.flattendeep@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + +lodash.foreach@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.groupby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1" + integrity sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E= + +lodash.has@^4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" + integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI= + lodash.invert@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.invert/-/lodash.invert-4.3.0.tgz#8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee" integrity sha1-j/4g1LYW9WvqjxqgxuvYDc90Ku4= +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= + lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" @@ -7536,6 +7811,51 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w= + +lodash.isobject@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" + integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + +lodash.isundefined@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" + integrity sha1-I+89lTVWUgOmbO/VuDD4SJEa+0g= + +lodash.keys@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" + integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU= + +lodash.last@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash.last/-/lodash.last-3.0.0.tgz#242f663112dd4c6e63728c60a3c909d1bdadbd4c" + integrity sha1-JC9mMRLdTG5jcoxgo8kJ0b2tvUw= + +lodash.map@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= + lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -7546,22 +7866,72 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.omit@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" + integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA= + +lodash.orderby@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" + integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= + +lodash.reduce@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= + lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= +lodash.size@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.size/-/lodash.size-4.2.0.tgz#71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86" + integrity sha1-cf517T6r2yvLc6GwtPUcOS7ie4Y= + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + +lodash.sum@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/lodash.sum/-/lodash.sum-4.0.2.tgz#ad90e397965d803d4f1ff7aa5b2d0197f3b4637b" + integrity sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s= + lodash.topairs@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64" integrity sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ= +lodash.transform@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.transform/-/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" + integrity sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A= + +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: +lodash.upperfirst@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= + +lodash.values@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" + integrity sha1-o6bCsOvsxcLLocF+bmIP6BtT00c= + +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -7660,7 +8030,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2: +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -7672,22 +8042,26 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd" - integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag== +make-fetch-happen@^8.0.9: + version "8.0.14" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222" + integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ== dependencies: - agentkeepalive "^3.4.1" - cacache "^12.0.0" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" + agentkeepalive "^4.1.3" + cacache "^15.0.5" + http-cache-semantics "^4.1.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^6.0.0" + minipass "^3.1.3" + minipass-collect "^1.0.2" + minipass-fetch "^1.3.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + promise-retry "^2.0.1" + socks-proxy-agent "^5.0.0" + ssri "^8.0.0" map-cache@^0.2.2: version "0.2.2" @@ -7815,12 +8189,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.45.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.45.0: version "1.45.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +"mime-db@>= 1.43.0 < 2": + version "1.46.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" + integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== + +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== @@ -7833,9 +8212,9 @@ mime@1.6.0, mime@^1.4.1: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4, mime@^2.4.5, mime@^2.4.6: - version "2.4.7" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74" - integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA== + version "2.5.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" + integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== mimic-fn@^2.1.0: version "2.1.0" @@ -7852,10 +8231,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -mini-css-extract-plugin@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" - integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== +mini-css-extract-plugin@1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3" + integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -7866,7 +8245,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: +minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= @@ -7890,6 +8269,17 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" +minipass-fetch@^1.3.0, minipass-fetch@^1.3.2: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a" + integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ== + dependencies: + minipass "^3.1.0" + minipass-sized "^1.0.3" + minizlib "^2.0.0" + optionalDependencies: + encoding "^0.1.12" + minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -7897,36 +8287,36 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2: +minipass-json-stream@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7" + integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg== + dependencies: + jsonparse "^1.3.1" + minipass "^3.0.0" + +minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== dependencies: minipass "^3.0.0" -minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== +minipass-sized@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" + integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" + minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== dependencies: yallist "^4.0.0" -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - -minizlib@^2.1.1: +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -7958,7 +8348,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -8030,6 +8420,11 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nanoid@^3.1.20: + version "3.1.20" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" + integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8047,11 +8442,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-request@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== - needle@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -8061,7 +8451,7 @@ needle@2.5.0: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^2.3.3, needle@^2.5.0: +needle@^2.3.3, needle@^2.5.0, needle@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== @@ -8130,15 +8520,6 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch-npm@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4" - integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg== - dependencies: - encoding "^0.1.11" - json-parse-better-errors "^1.0.0" - safe-buffer "^5.1.1" - node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -8149,6 +8530,22 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== +node-gyp@^7.1.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" + integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== + dependencies: + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.3" + nopt "^5.0.0" + npmlog "^4.1.2" + request "^2.88.2" + rimraf "^3.0.2" + semver "^7.3.2" + tar "^6.0.2" + which "^2.0.2" + node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" @@ -8178,10 +8575,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^1.1.69: - version "1.1.69" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.69.tgz#3149dbde53b781610cd8b486d62d86e26c3725f6" - integrity sha512-DGIjo79VDEyAnRlfSqYTsy+yoHd2IOjJiKUozD2MV2D85Vso6Bug56mb9tT/fY5Urt0iqk01H7x+llAruDR2zA== +node-releases@^1.1.70: + version "1.1.70" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" + integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== nopt@^4.0.1: version "4.0.3" @@ -8191,7 +8588,14 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + +normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -8233,7 +8637,7 @@ notosans-fontface@1.2.2: resolved "https://registry.yarnpkg.com/notosans-fontface/-/notosans-fontface-1.2.2.tgz#533432651673a5ae64d1203abede3334749aaadc" integrity sha512-QDA7eFfUQrORmx8MhQc0Bs/IY+AajwxCycIgUt0pi4QLYEC6X/v9n6edQs33f1ctrSKcnZVWVIu2iWPexKFF2g== -npm-bundled@^1.0.1: +npm-bundled@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== @@ -8260,7 +8664,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-package-arg@8.1.0, npm-package-arg@^8.0.0: +npm-package-arg@8.1.0, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.0.tgz#b5f6319418c3246a1c38e1a8fbaa06231bc5308f" integrity sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig== @@ -8269,26 +8673,17 @@ npm-package-arg@8.1.0, npm-package-arg@^8.0.0: semver "^7.0.0" validate-npm-package-name "^3.0.0" -npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" - integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg== +npm-packlist@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.4.tgz#40e96b2b43787d0546a574542d01e066640d09da" + integrity sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw== dependencies: - hosted-git-info "^2.7.1" - osenv "^0.1.5" - semver "^5.6.0" - validate-npm-package-name "^3.0.0" - -npm-packlist@^1.1.12: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" + glob "^7.1.6" + ignore-walk "^3.0.3" + npm-bundled "^1.1.1" npm-normalize-package-bin "^1.0.1" -npm-pick-manifest@6.1.0: +npm-pick-manifest@6.1.0, npm-pick-manifest@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz#2befed87b0fce956790f62d32afb56d7539c022a" integrity sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw== @@ -8297,27 +8692,19 @@ npm-pick-manifest@6.1.0: npm-package-arg "^8.0.0" semver "^7.0.0" -npm-pick-manifest@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7" - integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw== +npm-registry-fetch@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661" + integrity sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA== dependencies: - figgy-pudding "^3.5.1" - npm-package-arg "^6.0.0" - semver "^5.4.1" - -npm-registry-fetch@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7" - integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ== - dependencies: - JSONStream "^1.3.4" - bluebird "^3.5.1" - figgy-pudding "^3.4.1" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - npm-package-arg "^6.1.0" - safe-buffer "^5.2.0" + "@npmcli/ci-detect" "^1.0.0" + lru-cache "^6.0.0" + make-fetch-happen "^8.0.9" + minipass "^3.1.3" + minipass-fetch "^1.3.0" + minipass-json-stream "^1.0.1" + minizlib "^2.0.0" + npm-package-arg "^8.0.0" npm-run-path@^2.0.0: version "2.0.2" @@ -8326,6 +8713,16 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -8333,17 +8730,17 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8362,7 +8759,7 @@ object-hash@^2.0.3: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09" integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ== -object-inspect@^1.8.0: +object-inspect@^1.8.0, object-inspect@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== @@ -8387,7 +8784,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.1: +object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -8454,18 +8851,18 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" - integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== +open@7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" + integrity sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" open@^7.0.3: - version "7.3.1" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" - integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.1.tgz#4ccedc11ca348d398378ffb39c71357df55fe6f7" + integrity sha512-Pxv+fKRsd/Ozflgn2Gjev1HZveJJeKR6hKKmdaImJMuEZ6htAvCTbcMABJo+qevlAelTLCrEK3YTKZ9fVTcSPw== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -8517,17 +8914,17 @@ ora@5.0.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" - integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w== +ora@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" + integrity sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g== dependencies: + bl "^4.0.3" chalk "^4.1.0" cli-cursor "^3.1.0" - cli-spinners "^2.4.0" + cli-spinners "^2.5.0" is-interactive "^1.0.0" log-symbols "^4.0.0" - mute-stream "0.0.8" strip-ansi "^6.0.0" wcwidth "^1.0.1" @@ -8561,7 +8958,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@^0.1.4, osenv@^0.1.5: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== @@ -8591,7 +8988,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -8671,41 +9068,30 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" -pacote@9.5.12: - version "9.5.12" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66" - integrity sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ== +pacote@11.2.4: + version "11.2.4" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.2.4.tgz#dc7ca740a573ed86a3bf863511d22c1d413ec82f" + integrity sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ== dependencies: - bluebird "^3.5.3" - cacache "^12.0.2" - chownr "^1.1.2" - figgy-pudding "^3.5.1" - get-stream "^4.1.0" - glob "^7.1.3" + "@npmcli/git" "^2.0.1" + "@npmcli/installed-package-contents" "^1.0.5" + "@npmcli/promise-spawn" "^1.2.0" + "@npmcli/run-script" "^1.3.0" + cacache "^15.0.5" + chownr "^2.0.0" + fs-minipass "^2.1.0" infer-owner "^1.0.4" - lru-cache "^5.1.1" - make-fetch-happen "^5.0.0" - minimatch "^3.0.4" - minipass "^2.3.5" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.4.0" - npm-normalize-package-bin "^1.0.0" - npm-package-arg "^6.1.0" - npm-packlist "^1.1.12" - npm-pick-manifest "^3.0.0" - npm-registry-fetch "^4.0.0" - osenv "^0.1.5" - promise-inflight "^1.0.1" + minipass "^3.1.3" + mkdirp "^1.0.3" + npm-package-arg "^8.0.1" + npm-packlist "^2.1.4" + npm-pick-manifest "^6.0.0" + npm-registry-fetch "^9.0.0" promise-retry "^1.1.1" - protoduck "^5.0.1" - rimraf "^2.6.2" - safe-buffer "^5.1.2" - semver "^5.6.0" - ssri "^6.0.1" - tar "^4.4.10" - unique-filename "^1.1.1" - which "^1.3.1" + read-package-json-fast "^1.1.3" + rimraf "^3.0.2" + ssri "^8.0.0" + tar "^6.1.0" pako@~0.2.0: version "0.2.9" @@ -8753,9 +9139,9 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" - integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" @@ -8769,6 +9155,11 @@ parse-link-header@^1.0.1: dependencies: xtend "~4.0.1" +parse-node-version@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + parse5-html-rewriting-stream@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" @@ -8777,6 +9168,13 @@ parse5-html-rewriting-stream@6.0.1: parse5 "^6.0.1" parse5-sax-parser "^6.0.1" +parse5-htmlparser2-tree-adapter@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + parse5-sax-parser@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" @@ -8794,16 +9192,6 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== -parseqs@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" - integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== - -parseuri@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" - integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== - parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -9022,26 +9410,25 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" -postcss-import@12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" - integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== +postcss-import@14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296" + integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg== dependencies: - postcss "^7.0.1" - postcss-value-parser "^3.2.3" + postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-loader@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" - integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== +postcss-loader@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4" + integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.2" + semver "^7.3.4" postcss-merge-longhand@^4.0.11: version "4.0.11" @@ -9105,38 +9492,33 @@ postcss-minify-selectors@^4.0.2: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" + icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - -postcss-modules-values@^3.0.0: +postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -9257,7 +9639,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== @@ -9286,12 +9668,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -9305,16 +9687,16 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@7.0.32: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== +postcss@8.2.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04" + integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg== dependencies: - chalk "^2.4.2" + colorette "^1.2.1" + nanoid "^3.1.20" source-map "^0.6.1" - supports-color "^6.1.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -9323,6 +9705,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 source-map "^0.6.1" supports-color "^6.1.0" +postcss@^8.1.4: + version "8.2.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" + integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg== + dependencies: + colorette "^1.2.1" + nanoid "^3.1.20" + source-map "^0.6.1" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9338,6 +9729,11 @@ prettier@^2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +pretty-bytes@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" + integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== + pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -9375,6 +9771,11 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +promise-queue@^2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/promise-queue/-/promise-queue-2.2.5.tgz#2f6f5f7c0f6d08109e967659c79b88a9ed5e93b4" + integrity sha1-L29ffA9tCBCelnZZx5uIqe1ek7Q= + promise-retry@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" @@ -9383,6 +9784,14 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + "promise@>=3.2 <8": version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -9412,13 +9821,6 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protoduck@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" - integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg== - dependencies: - genfun "^5.0.0" - protractor@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03" @@ -9494,6 +9896,11 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" +puka@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/puka/-/puka-1.0.1.tgz#a2df782b7eb4cf9564e4c93a5da422de0dfacc02" + integrity sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g== + pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -9581,6 +9988,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-microtask@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" + integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== + quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -9756,6 +10168,22 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" +read-package-json-fast@^1.1.3: + version "1.2.2" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz#fba77b0b0d66b1ab344e214cb0876577e749c423" + integrity sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + +read-package-json-fast@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz#c767f6c634873ffb6bb73788191b65559734f555" + integrity sha512-bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug== + dependencies: + json-parse-even-better-errors "^2.3.0" + npm-normalize-package-bin "^1.0.1" + read-package-json@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a" @@ -9766,7 +10194,7 @@ read-package-json@^2.0.0: normalize-package-data "^2.0.0" npm-normalize-package-bin "^1.0.0" -"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -9867,12 +10295,12 @@ regex-parser@^2.2.11: integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== regexp.prototype.flags@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" regexpu-core@^4.7.1: version "4.7.1" @@ -9906,9 +10334,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.6" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.6.tgz#6d8c939d1a654f78859b08ddcc4aa777f3fa800a" - integrity sha512-jjyuCp+IEMIm3N1H1LLTJW1EISEJV9+5oHdEyrt43Pg9cDSb6rrLZei2cVWpl0xTjmmlpec/lEQGYgM7xfpGCQ== + version "0.6.7" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" + integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== dependencies: jsesc "~0.5.0" @@ -10020,15 +10448,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" - integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== - dependencies: - is-core-module "^2.0.0" - path-parse "^1.0.6" - -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: +resolve@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -10036,6 +10456,14 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: is-core-module "^2.1.0" path-parse "^1.0.6" +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -10092,9 +10520,9 @@ rework@1.0.1: css "^2.0.0" rfdc@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" - integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== + version "1.2.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949" + integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA== rgb-regex@^1.0.1: version "1.0.1" @@ -10113,7 +10541,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10140,12 +10568,12 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup@2.32.1: - version "2.32.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c" - integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== +rollup@2.38.4: + version "2.38.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" + integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" run-async@^2.4.0: version "2.4.1" @@ -10153,9 +10581,11 @@ run-async@^2.4.0: integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-parallel@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" - integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" @@ -10228,17 +10658,17 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: +sanitize-filename@^1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@10.0.5: - version "10.0.5" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" - integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== +sass-loader@10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" + integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10246,17 +10676,17 @@ sass-loader@10.0.5: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2" - integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig== +sass@1.32.6: + version "1.32.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" + integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== dependencies: chokidar ">=2.0.0 <4.0.0" sass@^1.29.0: - version "1.32.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" - integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== + version "1.32.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8" + integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -10303,7 +10733,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: +schema-utils@^2.6.5, schema-utils@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10348,7 +10778,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: tmp "0.0.30" xml2js "^0.4.17" -selfsigned@^1.10.7: +selfsigned@^1.10.8: version "1.10.8" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== @@ -10391,23 +10821,18 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: +semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== dependencies: lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10471,7 +10896,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -10621,10 +11046,10 @@ snyk-cpp-plugin@2.2.1: hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.13.1.tgz#e3a2666e5f3d847712c1c52ccce65438c29fb199" - integrity sha512-KS2G2cBdwKhyRta85uv3q/xUmFSC9lVCu8MUxgm7IDNn8ImjmCIkSp5SsI0qu5jYXJhZZnX6jjj5gzI0QP0WXw== +snyk-docker-plugin@4.17.2: + version "4.17.2" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz#e22c7633311a1b17b89d125d0af638e1fa5c5167" + integrity sha512-fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" @@ -10632,13 +11057,13 @@ snyk-docker-plugin@4.13.1: chalk "^2.4.2" debug "^4.1.1" docker-modem "2.1.3" - dockerfile-ast "0.0.30" + dockerfile-ast "0.1.0" elfy "^1.0.0" event-loop-spinner "^2.0.0" gunzip-maybe "^1.4.2" mkdirp "^1.0.4" semver "^6.1.0" - snyk-nodejs-lockfile-parser "1.30.1" + snyk-nodejs-lockfile-parser "1.30.2" tar-stream "^2.1.0" tmp "^0.2.1" tslib "^1" @@ -10652,33 +11077,33 @@ snyk-go-parser@1.4.1: toml "^3.0.0" tslib "^1.10.0" -snyk-go-plugin@1.16.4: - version "1.16.4" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.4.tgz#2a42c9989a7353acb407dbc7284ec56de7f5f0b0" - integrity sha512-7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q== +snyk-go-plugin@1.16.5: + version "1.16.5" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.5.tgz#3f30ee6151648d1278cbcc68362c0222b17b1d6b" + integrity sha512-m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA== dependencies: - "@snyk/dep-graph" "^1.21.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/graphlib" "2.1.9-patch.3" debug "^4.1.1" - graphlib "2.1.8" snyk-go-parser "1.4.1" tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.11.0.tgz#4d22704c38875e23a96469ac27d0d43ae746fc70" - integrity sha512-OXf1A+kcif+vslm/nsel3bDYWsGwum2PsZLETM28nG4JOgqBLYLWvCHPgH9r2aa0MKTq0nBpimvFkzDm/+2qQQ== +snyk-gradle-plugin@3.12.5: + version "3.12.5" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.5.tgz#7e5ed9179ad7972663867f0b443144765d6e4329" + integrity sha512-Z4qEzzPuRO1BxfL0vgfv4pzJ58ox6dksf8i18Vi1+yqDKmYEHmcMBYe33faFPJFZYf1PP7RerADpPssFJiYyLg== dependencies: - "@snyk/cli-interface" "2.9.1" - "@snyk/dep-graph" "^1.19.4" - "@snyk/java-call-graph-builder" "1.18.0" + "@snyk/cli-interface" "2.11.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/java-call-graph-builder" "1.19.1" "@types/debug" "^4.1.4" chalk "^3.0.0" debug "^4.1.1" tmp "0.2.1" tslib "^2.0.0" -snyk-module@3.1.0: +snyk-module@3.1.0, snyk-module@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== @@ -10686,14 +11111,6 @@ snyk-module@3.1.0: debug "^4.1.1" hosted-git-info "^3.0.4" -snyk-module@^1.6.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-1.9.1.tgz#b2a78f736600b0ab680f1703466ed7309c980804" - integrity sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA== - dependencies: - debug "^3.1.0" - hosted-git-info "^2.7.1" - snyk-module@^2.0.2: version "2.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-2.1.0.tgz#80d9e9b64f202ae753ed3b33b372ca6f5ec323da" @@ -10704,28 +11121,29 @@ snyk-module@^2.0.2: debug "^3.1.0" hosted-git-info "^2.7.1" -snyk-mvn-plugin@2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.0.tgz#9d7c89e5ad14f6b63d0be5548c2c20124905b257" - integrity sha512-2NDWrMWi9K32i9CdWUy2Pce8D9myR0dxPDJJpamVt/DD3fDxH4ia701i2HdDgOjMq8PI6yIgI+vRaAW3X2GrbA== +snyk-mvn-plugin@2.25.3: + version "2.25.3" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" + integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== dependencies: - "@snyk/cli-interface" "2.9.1" - "@snyk/java-call-graph-builder" "1.17.0" + "@snyk/cli-interface" "2.11.0" + "@snyk/dep-graph" "^1.23.1" + "@snyk/java-call-graph-builder" "1.19.1" debug "^4.1.1" glob "^7.1.6" needle "^2.5.0" tmp "^0.1.0" tslib "1.11.1" -snyk-nodejs-lockfile-parser@1.30.1: - version "1.30.1" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.1.tgz#5d54180ae818ddbe8c2b55329528c4d68e390235" - integrity sha512-QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg== +snyk-nodejs-lockfile-parser@1.30.2: + version "1.30.2" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz#8dbb64c42382aeaf4488c36e48c1e48eb75a1584" + integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== dependencies: + "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" event-loop-spinner "^2.0.0" got "11.4.0" - graphlib "2.1.8" lodash.clonedeep "^4.5.0" lodash.flatmap "^4.5.0" lodash.isempty "^4.4.0" @@ -10737,15 +11155,14 @@ snyk-nodejs-lockfile-parser@1.30.1: uuid "^8.3.0" yaml "^1.9.2" -snyk-nuget-plugin@1.19.4: - version "1.19.4" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz#cd1163a29f8002d54a965eab9e256345c97d4174" - integrity sha512-6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw== +snyk-nuget-plugin@1.21.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" + integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== dependencies: debug "^4.1.1" dotnet-deps-parser "5.0.0" jszip "3.4.0" - lodash "^4.17.20" snyk-paket-parser "1.6.0" tslib "^1.11.2" xml2js "^0.4.17" @@ -10766,13 +11183,13 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" -snyk-poetry-lockfile-parser@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz#3f062953802916f6ae1767ec13dd1892fff0541e" - integrity sha512-G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA== +snyk-poetry-lockfile-parser@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz#bd0ebc9b1dd3bde33e27e5b64bea22e25e7aee5d" + integrity sha512-HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA== dependencies: "@snyk/cli-interface" "^2.9.2" - "@snyk/dep-graph" "^1.19.5" + "@snyk/dep-graph" "^1.23.0" debug "^4.2.0" toml "^3.0.0" tslib "^2.0.0" @@ -10792,24 +11209,22 @@ snyk-policy@1.14.1: snyk-try-require "^1.3.1" then-fs "^2.0.0" -snyk-python-plugin@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz#91febcd260094a9d900bc54bf200aa0c2632613a" - integrity sha512-JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g== +snyk-python-plugin@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz#03b70c12c0adfd5104839e0d9d9ba7083271e905" + integrity sha512-d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w== dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.1" + snyk-poetry-lockfile-parser "^1.1.5" tmp "0.0.33" -snyk-resolve-deps@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.4.0.tgz#ef20fb578a4c920cc262fb73dd292ff21215f52d" - integrity sha512-aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ== +snyk-resolve-deps@4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz#11e7051110dadd8756819594bb30e6b88777a8b4" + integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== dependencies: - "@types/node" "^6.14.4" - "@types/semver" "^5.5.0" ansicolors "^0.3.2" - debug "^3.2.5" + debug "^4.1.1" lodash.assign "^4.2.0" lodash.assignin "^4.2.0" lodash.clone "^4.5.0" @@ -10818,7 +11233,7 @@ snyk-resolve-deps@4.4.0: lodash.set "^4.3.2" lru-cache "^4.0.0" semver "^5.5.1" - snyk-module "^1.6.0" + snyk-module "^3.1.0" snyk-resolve "^1.0.0" snyk-tree "^1.0.0" snyk-try-require "^1.1.1" @@ -10868,15 +11283,18 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.437.3: - version "1.437.3" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.437.3.tgz#a3cfbfb568bf60b19be31a337899ebe71365bd70" - integrity sha512-DFcYz8Q8LT/XNCNxaeEoGahazvkEhWS//JWJTfr6W1d5jMnORQauPxxj4RR3WGjKewSDl2eElwK1jhi5RNOP9g== +snyk@^1.455.0: + version "1.455.0" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.455.0.tgz#a4ac3d82d8946b0137cbbb96513721fe50dc97ee" + integrity sha512-SDdmPxgQ1yB2wZ5KJ0YAq3a4i7HJFJhoVfCvzs458Jr5vvBN6W8PAwLQnniqQIPtyX/H70QW6PkkYu4rO8CkpA== dependencies: + "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "1.21.0" + "@snyk/dep-graph" "1.23.1" "@snyk/gemfile" "1.2.0" - "@snyk/snyk-cocoapods-plugin" "2.5.1" + "@snyk/graphlib" "^2.1.9-patch.3" + "@snyk/inquirer" "^7.3.3-patch" + "@snyk/snyk-cocoapods-plugin" "2.5.2" abbrev "^1.1.1" ansi-escapes "3.2.0" chalk "^2.4.2" @@ -10884,30 +11302,45 @@ snyk@^1.437.3: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" - graphlib "^2.1.8" - inquirer "^7.3.3" - lodash "^4.17.20" + lodash.assign "^4.2.0" + lodash.camelcase "^4.3.0" + lodash.clonedeep "^4.5.0" + lodash.endswith "^4.2.1" + lodash.flatten "^4.4.0" + lodash.flattendeep "^4.4.0" + lodash.get "^4.4.2" + lodash.groupby "^4.6.0" + lodash.isempty "^4.4.0" + lodash.isobject "^3.0.2" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.orderby "^4.6.0" + lodash.sortby "^4.7.0" + lodash.uniq "^4.5.0" + lodash.upperfirst "^4.3.1" + lodash.values "^4.3.0" micromatch "4.0.2" needle "2.5.0" open "^7.0.3" os-name "^3.0.0" + promise-queue "^2.2.5" proxy-agent "^3.1.1" proxy-from-env "^1.0.0" semver "^6.0.0" snyk-config "4.0.0-rc.2" snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.13.1" - snyk-go-plugin "1.16.4" - snyk-gradle-plugin "3.11.0" + snyk-docker-plugin "4.17.2" + snyk-go-plugin "1.16.5" + snyk-gradle-plugin "3.12.5" snyk-module "3.1.0" - snyk-mvn-plugin "2.25.0" - snyk-nodejs-lockfile-parser "1.30.1" - snyk-nuget-plugin "1.19.4" + snyk-mvn-plugin "2.25.3" + snyk-nodejs-lockfile-parser "1.30.2" + snyk-nuget-plugin "1.21.0" snyk-php-plugin "1.9.2" snyk-policy "1.14.1" - snyk-python-plugin "1.19.1" + snyk-python-plugin "1.19.4" snyk-resolve "1.0.1" - snyk-resolve-deps "4.4.0" + snyk-resolve-deps "4.7.2" snyk-sbt-plugin "2.11.0" snyk-tree "^1.0.0" snyk-try-require "1.3.1" @@ -10918,80 +11351,57 @@ snyk@^1.437.3: uuid "^3.3.2" wrap-ansi "^5.1.0" -socket.io-adapter@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" - integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== +socket.io-adapter@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" + integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== -socket.io-client@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" - integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== +socket.io-parser@~4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" + integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== dependencies: - backo2 "1.0.2" - component-bind "1.0.0" + "@types/component-emitter" "^1.2.10" component-emitter "~1.3.0" - debug "~3.1.0" - engine.io-client "~3.5.0" - has-binary2 "~1.0.2" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - socket.io-parser "~3.3.0" - to-array "0.1.4" + debug "~4.3.1" -socket.io-parser@~3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" - integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== +socket.io@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba" + integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA== dependencies: - component-emitter "~1.3.0" - debug "~3.1.0" - isarray "2.0.1" + "@types/cookie" "^0.4.0" + "@types/cors" "^2.8.8" + "@types/node" "^14.14.10" + accepts "~1.3.4" + base64id "~2.0.0" + debug "~4.3.1" + engine.io "~4.1.0" + socket.io-adapter "~2.1.0" + socket.io-parser "~4.0.3" -socket.io-parser@~3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" - integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== +sockjs-client@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add" + integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q== dependencies: - component-emitter "1.2.1" - debug "~4.1.0" - isarray "2.0.1" - -socket.io@^2.3.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" - integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== - dependencies: - debug "~4.1.0" - engine.io "~3.5.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.4.0" - socket.io-parser "~3.4.0" - -sockjs-client@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" - integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== - dependencies: - debug "^3.2.5" + debug "^3.2.6" eventsource "^1.0.7" - faye-websocket "~0.11.1" - inherits "^2.0.3" - json3 "^3.3.2" - url-parse "^1.4.3" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.4.7" -sockjs@0.3.20: - version "0.3.20" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" - integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== dependencies: - faye-websocket "^0.10.0" + faye-websocket "^0.11.3" uuid "^3.4.0" - websocket-driver "0.6.5" + websocket-driver "^0.7.4" -socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1: +socks-proxy-agent@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== @@ -10999,6 +11409,23 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1: agent-base "~4.2.1" socks "~2.3.2" +socks-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60" + integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA== + dependencies: + agent-base "6" + debug "4" + socks "^2.3.3" + +socks@^2.3.3: + version "2.5.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.5.1.tgz#7720640b6b5ec9a07d556419203baa3f0596df5f" + integrity sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ== + dependencies: + ip "^1.1.5" + smart-buffer "^4.1.0" + socks@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" @@ -11012,10 +11439,10 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" - integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== +source-map-loader@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" + integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" @@ -11035,6 +11462,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@0.5.19, source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.5, source-map-support@^0.5.7, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11051,9 +11486,9 @@ source-map-support@~0.4.0: source-map "^0.5.6" source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" @@ -11152,12 +11587,12 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5" - integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ== +speed-measure-webpack-plugin@1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f" + integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw== dependencies: - chalk "^2.0.1" + chalk "^4.1.0" split-ca@^1.0.1: version "1.0.1" @@ -11212,7 +11647,7 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.0, ssri@^6.0.1: +ssri@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== @@ -11220,9 +11655,9 @@ ssri@^6.0.0, ssri@^6.0.1: figgy-pudding "^3.5.1" ssri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" - integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + version "8.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" + integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: minipass "^3.1.1" @@ -11295,6 +11730,23 @@ streamsearch@~0.1.2: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -11313,7 +11765,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimend@^1.0.1: +string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== @@ -11321,7 +11773,7 @@ string.prototype.trimend@^1.0.1: call-bind "^1.0.0" define-properties "^1.1.3" -string.prototype.trimstart@^1.0.1: +string.prototype.trimstart@^1.0.1, string.prototype.trimstart@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== @@ -11355,6 +11807,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -11396,10 +11855,10 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylus-loader@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" - integrity sha512-apDYJEM5ZpOAWbWInWcsbtI8gHNr/XYVcSY/tWqOUPt7M5tqhtwXVsAkgyiVjhuvw2Yrjq474a9H+g4d047Ebw== +stylus-loader@4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757" + integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ== dependencies: fast-glob "^3.2.4" klona "^2.0.4" @@ -11478,17 +11937,17 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a" - integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA== +symbol-observable@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-3.0.0.tgz#eea8f6478c651018e059044268375c408c15c533" + integrity sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q== tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0: +tapable@^2.1.1, tapable@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== @@ -11504,20 +11963,7 @@ tar-stream@^2.1.0, tar-stream@^2.1.2: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4.4.10: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - 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" - -tar@^6.0.2: +tar@^6.0.2, tar@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== @@ -11590,10 +12036,22 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@5.3.7: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.7.tgz#798a4ae2e7ff67050c3e99fcc4e00725827d97e2" - integrity sha512-lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w== +terser-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" + integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q== + dependencies: + jest-worker "^26.6.2" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + terser "^5.5.1" + +terser@5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -11608,10 +12066,10 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.4: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== +terser@^5.3.4, terser@^5.5.1: + version "5.6.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" + integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -11637,7 +12095,7 @@ through2@^2.0.0, through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6: +through@X.X.X, through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -11692,11 +12150,6 @@ tmp@^0.1.0: dependencies: rimraf "^2.6.3" -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= - to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -11786,12 +12239,13 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== +ts-node@~9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" + integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" @@ -11807,21 +12261,16 @@ tslib@1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@2.1.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tslib@^1, tslib@^1.10.0, tslib@^1.11.2, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -11930,9 +12379,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" - integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.2.0.tgz#3edd448793f517d8b9dd108b486a043f5befd91f" + integrity sha512-M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -11956,28 +12405,33 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== -typescript@4.0.5, typescript@~4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" - integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== - -typescript@>=2.8.3: +typescript@4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== -ua-parser-js@0.7.22: - version "0.7.22" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" - integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== +typescript@>=2.8.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" + integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA== + +typescript@~4.0.2: + version "4.0.7" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.7.tgz#7168032c43d2a2671c95c07812f69523c79590af" + integrity sha512-yi7M4y74SWvYbnazbn8/bmJmX4Zlej39ZOqwG/8dut/MYoSQ119GY9ZFbbGsD4PFZYWxqik/XsP3vk3+W5H3og== + +ua-parser-js@^0.7.23: + version "0.7.24" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" + integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== uncontrollable@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556" - integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q== + version "7.2.1" + resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738" + integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ== dependencies: "@babel/runtime" "^7.6.3" - "@types/react" "^16.9.11" + "@types/react" ">=16.9.11" invariant "^2.2.4" react-lifecycles-compat "^3.0.4" @@ -12059,11 +12513,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -12130,7 +12579,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3: +url-parse@^1.4.3, url-parse@^1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -12156,6 +12605,11 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= +utf8@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" + integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -12195,21 +12649,16 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" - integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== +uuid@8.3.2, uuid@^8.2.0, uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.2.0, uuid@^8.3.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -12225,7 +12674,7 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -vary@~1.1.2: +vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -12254,7 +12703,7 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -vscode-languageserver-types@^3.15.1: +vscode-languageserver-types@^3.16.0: version "3.16.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== @@ -12284,6 +12733,14 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" +watchpack@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7" + integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -12345,10 +12802,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" - integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== +webpack-dev-server@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" + integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -12370,11 +12827,11 @@ webpack-dev-server@3.11.0: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.8" semver "^6.3.0" serve-index "^1.9.1" - sockjs "0.3.20" - sockjs-client "1.4.0" + sockjs "^0.3.21" + sockjs-client "^1.5.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -12392,18 +12849,18 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9" - integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA== +webpack-merge@5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" + integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f" - integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw== +webpack-sources@2.2.0, webpack-sources@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -12416,10 +12873,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack-subresource-integrity@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz#6f44ea99987266b70c4ec42ac51064d33e982277" - integrity sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q== +webpack-subresource-integrity@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" + integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== dependencies: webpack-sources "^1.3.0" @@ -12452,14 +12909,36 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -websocket-driver@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= +webpack@5.22.0: + version "5.22.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.22.0.tgz#8505158bc52dcbbdb01ac94796a8aed61badf11a" + integrity sha512-xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ== dependencies: - websocket-extensions ">=0.1.1" + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.46" + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/wasm-edit" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + acorn "^8.0.4" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.7.0" + es-module-lexer "^0.3.26" + eslint-scope "^5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.0.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.1" + watchpack "^2.0.0" + webpack-sources "^2.1.1" -websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -12483,13 +12962,27 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.1, which@^1.2.9, which@^1.3.1: +which@^1.2.1, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" +which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -12578,9 +13071,9 @@ ws@^6.2.1: async-limiter "~1.0.0" ws@~7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" - integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== + version "7.4.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" + integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== xdg-basedir@^4.0.0: version "4.0.0" @@ -12607,11 +13100,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmlhttprequest-ssl@~1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" - integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= - xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -12627,15 +13115,15 @@ xterm-addon-attach@^0.6.0: resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.6.0.tgz#220c23addd62ab88c9914e2d4c06f7407e44680e" integrity sha512-Mo8r3HTjI/EZfczVCwRU6jh438B4WLXxdFO86OB7bx0jGhwh2GdF4ifx/rP+OB+Cb2vmLhhVIZ00/7x3YSP3dg== -xterm-addon-fit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193" - integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w== +xterm-addon-fit@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" + integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm@^4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0.tgz#7a4c097a433d565339b5533b468bbc60c6c87969" - integrity sha512-wGfqufmioctKr8VkbRuZbVDfjlXWGZZ1PWHy1yqqpGT3Nm6yaJx8lxDbSEBANtgaiVPTcKSp97sxOy5IlpqYfw== +xterm@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb" + integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ== y18n@^4.0.0: version "4.0.1" @@ -12652,7 +13140,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -12684,9 +13172,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.5" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.5.tgz#5d37729146d3f894f39fc94b6796f5b239513186" + integrity sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg== yargs@^13.3.2: version "13.3.2" @@ -12750,11 +13238,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From c4eecd3e8b517785baaa3d93a06f62e12bb8164f Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:43:39 +0100 Subject: [PATCH 18/76] Working version --- package.json | 71 +- src/app/app.module.ts | 3 + yarn.lock | 1667 ++++++++++++++++++++++------------------- 3 files changed, 917 insertions(+), 824 deletions(-) diff --git a/package.json b/package.json index 57d6c148..37896e16 100644 --- a/package.json +++ b/package.json @@ -40,35 +40,37 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.2.0", - "@angular/cdk": "^11.2.0", - "@angular/common": "^11.2.0", - "@angular/compiler": "^11.2.0", - "@angular/core": "^11.2.0", - "@angular/forms": "^11.2.0", + "@angular-react/core": "^3.0.0", + "@angular-react/fabric": "^3.0.0", + "@angular/animations": "^11.0.8", + "@angular/cdk": "^11.0.3", + "@angular/common": "^11.0.8", + "@angular/compiler": "^11.0.8", + "@angular/core": "^11.0.8", + "@angular/forms": "^11.0.8", "@angular/http": "^7.2.16", - "@angular/material": "^11.2.0", - "@angular/platform-browser": "^11.2.0", - "@angular/platform-browser-dynamic": "^11.2.0", - "@angular/router": "^11.2.0", - "@sentry/browser": "^6.1.0", + "@angular/material": "^11.0.3", + "@angular/platform-browser": "^11.0.8", + "@angular/platform-browser-dynamic": "^11.0.8", + "@angular/router": "^11.0.8", + "@sentry/browser": "^5.29.2", "@types/jest": "^26.0.20", "@types/mocha": "^8.2.0", - "@types/react": "^17.0.2", - "@types/react-dom": "^17.0.1", + "@types/react": "^17.0.0", + "@types/react-dom": "^17.0.0", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", - "angular-resizable-element": "^3.3.5", + "angular-resizable-element": "^3.3.4", "angular2-draggable": "^2.3.2", "angular2-hotkeys": "^2.2.0", "angular2-indexeddb": "^1.2.3", - "bootstrap": "^4.6.0", + "bootstrap": "^4.5.3", "command-exists": "^1.2.9", - "core-js": "^3.8.3", + "core-js": "^3.8.2", "d3-ng2-service": "^2.1.0", "eev": "^0.1.5", - "file-saver": "^2.0.5", - "ini": "^2.0.0", + "file-saver": "^2.0.2", + "ini": "^1.3.6", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", "ng2-file-upload": "^1.3.0", @@ -77,6 +79,7 @@ "ngx-electron": "^2.1.1", "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", + "office-ui-fabric-react": "^7.156.0", "react": "^17.0.1", "react-bootstrap": "^1.4.3", "react-dom": "^17.0.1", @@ -85,36 +88,36 @@ "save-html-as-image": "^1.3.4", "save-svg-as-png": "^1.4.14", "schematics-scss-migrate": "^1.2.10", - "snyk": "^1.455.0", + "snyk": "^1.437.3", "spark-md5": "^3.0.1", "svg-crowbar": "^0.6.5", "tree-kill": "^1.2.1", "tslib": "^2.1.0", "typeface-roboto": "^1.1.13", - "xterm": "^4.10.0", + "xterm": "^4.9.0", "xterm-addon-attach": "^0.6.0", - "xterm-addon-fit": "^0.5.0", + "xterm-addon-fit": "^0.4.0", "yargs": "^16.2.0", "zone.js": "^0.11.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1102.0", - "@angular/cli": "^11.2.0", - "@angular/compiler-cli": "^11.2.0", - "@angular/language-service": "^11.2.0", - "@sentry/cli": "^1.62.0", - "@sentry/electron": "^2.2.0", - "@types/jasmine": "~3.6.3", + "@angular-devkit/build-angular": "^0.1100.6", + "@angular/cli": "^11.0.6", + "@angular/compiler-cli": "^11.0.8", + "@angular/language-service": "^11.0.8", + "@sentry/cli": "^1.61.0", + "@sentry/electron": "^2.1.0", + "@types/jasmine": "~3.6.0", "@types/jasminewd2": "^2.0.8", - "@types/node": "14.14.28", + "@types/node": "14.14.10", "codelyzer": "^6.0.0", - "electron": "^11.2.3", + "electron": "^11.2.0", "electron-builder": "22.9.1", "file-loader": "^6.2.0", "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~6.0.0", + "jasmine-spec-reporter": "~5.0.0", "jquery": "^3.5.1", - "karma": "^6.1.1", + "karma": "^5.2.3", "karma-chrome-launcher": "~3.1.0", "karma-cli": "^2.0.0", "karma-coverage-istanbul-reporter": "~3.0.2", @@ -127,11 +130,11 @@ "replace": "^1.2.0", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.1.1", + "ts-node": "~9.0.0", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.0.2", - "webpack": "5.22.0", + "webpack": "4.44.2", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5cc09b67..af8366e4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -282,6 +282,8 @@ import { InformationDialogComponent } from './components/dialogs/information-dia import { TemplateNameDialogComponent } from './components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component'; import { UpdatesService } from './services/updates.service'; import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; +import { AngularReactBrowserModule } from '@angular-react/core'; +import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; @NgModule({ declarations: [ @@ -472,6 +474,7 @@ import { ReportIssueComponent } from './components/help/report-issue/report-issu ReportIssueComponent ], imports: [ + AngularReactBrowserModule, BrowserModule, HttpClientModule, AppRoutingModule, diff --git a/yarn.lock b/yarn.lock index b121fcd8..0d69febb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,14 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== +"@angular-devkit/architect@0.1100.7": + version "0.1100.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.7.tgz#6c39b886bbdb5d0e5a2d9921aa5816209041e105" + integrity sha512-b2zv2yiRbdhJ7hJfZsAvGYcqgh2DVtc7gRIPo1eDPvOAKrenmZ4zo/v0PRYScrTsPzqmoCokNA5nIwufwUEnuA== + dependencies: + "@angular-devkit/core" "11.0.7" + rxjs "6.6.3" + "@angular-devkit/architect@0.1102.0": version "0.1102.0" resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.0.tgz#0d4bee477d59318e8f3511fa6936bdcfa303df55" @@ -15,102 +23,99 @@ "@angular-devkit/core" "11.2.0" rxjs "6.6.3" -"@angular-devkit/build-angular@^0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1102.0.tgz#7996429000d4a707c8169b801f153819f04a2c24" - integrity sha512-9Yl6qBOR1o0ThyLhrWJ6Rhr3qLRe+RP3sbfUt4QA+8wsIXN7WakEXJALlq7TDeG66OaWyyjbtC2q3EPdNeBC/g== +"@angular-devkit/build-angular@^0.1100.6": + version "0.1100.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.7.tgz#e5577998e67e89137c2b7c9d232a58b2fdca91dc" + integrity sha512-erc+AtSU46ZIX7A5dmeZ0/G/SQIbqMAGbTKZbf11GePyhT0JAAnfMQtOHMb6AaX85n4yQTg1uMo9f5+8V3lfKA== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/build-optimizer" "0.1102.0" - "@angular-devkit/build-webpack" "0.1102.0" - "@angular-devkit/core" "11.2.0" - "@babel/core" "7.12.10" - "@babel/generator" "7.12.11" - "@babel/plugin-transform-async-to-generator" "7.12.1" - "@babel/plugin-transform-runtime" "7.12.10" - "@babel/preset-env" "7.12.11" - "@babel/runtime" "7.12.5" - "@babel/template" "7.12.7" + "@angular-devkit/architect" "0.1100.7" + "@angular-devkit/build-optimizer" "0.1100.7" + "@angular-devkit/build-webpack" "0.1100.7" + "@angular-devkit/core" "11.0.7" + "@babel/core" "7.12.3" + "@babel/generator" "7.12.1" + "@babel/plugin-transform-runtime" "7.12.1" + "@babel/preset-env" "7.12.1" + "@babel/runtime" "7.12.1" + "@babel/template" "7.10.4" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "11.2.0" + "@ngtools/webpack" "11.0.7" ansi-colors "4.1.1" - autoprefixer "10.2.4" - babel-loader "8.2.2" + autoprefixer "9.8.6" + babel-loader "8.1.0" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.2" - copy-webpack-plugin "6.3.2" - core-js "3.8.3" - critters "0.0.6" - css-loader "5.0.1" + circular-dependency-plugin "5.2.0" + copy-webpack-plugin "6.2.1" + core-js "3.6.5" + css-loader "4.3.0" cssnano "4.1.10" - file-loader "6.2.0" + file-loader "6.1.1" find-cache-dir "3.3.1" glob "7.1.6" - https-proxy-agent "5.0.0" inquirer "7.3.3" - jest-worker "26.6.2" + jest-worker "26.5.0" karma-source-map-support "1.4.0" - less "4.1.1" - less-loader "7.3.0" - license-webpack-plugin "2.3.11" + less "3.12.2" + less-loader "7.0.2" + license-webpack-plugin "2.3.1" loader-utils "2.0.0" - mini-css-extract-plugin "1.3.5" + mini-css-extract-plugin "1.2.1" minimatch "3.0.4" - open "7.4.0" - ora "5.3.0" + open "7.3.0" + ora "5.1.0" parse5-html-rewriting-stream "6.0.1" pnp-webpack-plugin "1.6.4" - postcss "8.2.4" - postcss-import "14.0.0" - postcss-loader "4.2.0" + postcss "7.0.32" + postcss-import "12.0.1" + postcss-loader "4.0.4" raw-loader "4.0.2" regenerator-runtime "0.13.7" resolve-url-loader "3.1.2" rimraf "3.0.2" - rollup "2.38.4" + rollup "2.32.1" rxjs "6.6.3" - sass "1.32.6" - sass-loader "10.1.1" - semver "7.3.4" + sass "1.27.0" + sass-loader "10.0.5" + semver "7.3.2" source-map "0.7.3" - source-map-loader "1.1.3" + source-map-loader "1.1.2" source-map-support "0.5.19" - speed-measure-webpack-plugin "1.4.2" + speed-measure-webpack-plugin "1.3.3" style-loader "2.0.0" stylus "0.54.8" - stylus-loader "4.3.3" - terser "5.5.1" + stylus-loader "4.3.1" + terser "5.3.7" terser-webpack-plugin "4.2.3" text-table "0.2.0" tree-kill "1.2.2" webpack "4.44.2" webpack-dev-middleware "3.7.2" - webpack-dev-server "3.11.2" - webpack-merge "5.7.3" - webpack-sources "2.2.0" - webpack-subresource-integrity "1.5.2" + webpack-dev-server "3.11.0" + webpack-merge "5.2.0" + webpack-sources "2.0.1" + webpack-subresource-integrity "1.5.1" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.0.tgz#22e84487e915d3a3590fc8ef3b0025ce7f846301" - integrity sha512-0Xb7xR0iUrbo/BnKJPTsy5IuodfFUWbvXUu9qeKc+oHzwxObX4Y32X0yyRpIJc5UK7Ce43HkopRQ/tHdoJp2fQ== +"@angular-devkit/build-optimizer@0.1100.7": + version "0.1100.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.7.tgz#fef39c8db5d178f223d43bd1c6e3a566e19c24c1" + integrity sha512-bHIIub0d1trVAmAX/EaNR6Zo4b7hkscewK394qYYp/w8VKQkLSAPMUbt2YTWN+erR9yyHnJ2y7tBabIui75Wdw== dependencies: loader-utils "2.0.0" source-map "0.7.3" - tslib "2.1.0" - typescript "4.1.3" - webpack-sources "2.2.0" + tslib "2.0.3" + typescript "4.0.5" + webpack-sources "2.0.1" -"@angular-devkit/build-webpack@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1102.0.tgz#c198d47a755c2ede6eb575b8addd271709f5207b" - integrity sha512-bfd6WlxcbWJ01HNNcFt4sBBaY+Bz2J/zFA6BSORvC5LpqawYCYeUbDJTY9Wb7gtp+aPEiNHI0HeUvoNkubsYfg== +"@angular-devkit/build-webpack@0.1100.7": + version "0.1100.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.7.tgz#d62df6bd70b495df7dc335f80ecd925e0f3b3e4d" + integrity sha512-/6Hudd1hs/GMHX4C/Qk7jueIMNg8NKFJWDEbvMPMgDzTqUIa680PTD6SNSCcY5Cz9mEpdpYCZo5N31JB7dlpOg== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/core" "11.2.0" + "@angular-devkit/architect" "0.1100.7" + "@angular-devkit/core" "11.0.7" rxjs "6.6.3" "@angular-devkit/core@10.2.2", "@angular-devkit/core@^10.1.0": @@ -124,6 +129,17 @@ rxjs "6.6.2" source-map "0.7.3" +"@angular-devkit/core@11.0.7": + version "11.0.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.7.tgz#05b82be7e11ddc2a7836c777297ee45eee20ff55" + integrity sha512-1GKnIT++YSUHpzzRx9QC0+8yOw4wy+ZpiJVDlroPSeK4FGrTCJqJKenkfRjVFRFOSrzTiJds+IU6kI4+bFbw9g== + dependencies: + ajv "6.12.6" + fast-json-stable-stringify "2.1.0" + magic-string "0.25.7" + rxjs "6.6.3" + source-map "0.7.3" + "@angular-devkit/core@11.2.0": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.0.tgz#a9198a391723e865fc6b369752c176cd5ed1d452" @@ -173,14 +189,31 @@ ora "5.0.0" rxjs "6.6.2" -"@angular/animations@^11.2.0": +"@angular-react/core@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@angular-react/core/-/core-3.0.0.tgz#7698360141fc3b2afa81ff5ef554b1f758d1e1e2" + integrity sha512-FsoklrmJ/Zqk4RoVbw5KgQBZ0Ta3ab4MM34Au3JcjWE9Xh7lBGdXw87QKkYDzkV2fE9bdkHYpVdgujTKX/qSLw== + dependencies: + classnames "^2.2.6" + css-to-style "^1.2.1" + stylenames "^1.1.6" + tslib "^1.9.0" + +"@angular-react/fabric@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@angular-react/fabric/-/fabric-3.0.0.tgz#08f1c71d1301c68635d084cb1c74c62968db56a1" + integrity sha512-zPol+Xwq8ErDrQVUD8ixz4VKjK4w0YC9EpkC/uWhz3BmY+InURL9ppmt/kUdJMXLDBe25EVlZws417HKzZR14Q== + dependencies: + tslib "^1.9.0" + +"@angular/animations@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.0.tgz#383438758c61d98f43c5ea1078d8388eb8784387" integrity sha512-orYrBPNAsF8VpvuOaXTtPltwK2nsje5R8sWJnRC2dh1RCRdyIqHwmRIU0Mi6qLMiEaLNrFPGEMyQ9gB+sC/vYg== dependencies: tslib "^2.0.0" -"@angular/cdk@^11.2.0": +"@angular/cdk@^11.0.3": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.0.tgz#4f0d8e9865d29ee1b2ab3ce7be9a7af0a87b0ef4" integrity sha512-25k1giKAJ7DPzJBZfAVZmw/VfR4pZUaZnhgVAMwIdGPl5SaXJEW3e2znGlhzwkuQsiBgrSKfMgJmwKSyUbe2tg== @@ -189,7 +222,7 @@ optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^11.2.0": +"@angular/cli@^11.0.6": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.0.tgz#f611f0851f6f92008f0f5aaaade947751b27687f" integrity sha512-waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q== @@ -217,14 +250,14 @@ universal-analytics "0.4.23" uuid "8.3.2" -"@angular/common@^11.2.0": +"@angular/common@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.0.tgz#90d602c0e33bb95a4d0c4c597f08255d78ed580f" integrity sha512-wsWI5F6Y2DNxne2D5uk8e9U/vn95UYZLMNBW+QXI9U/I9kDSXoa8yEvNcn1x0XfNXBMst5pi4iSF5M8mIck1eg== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^11.2.0": +"@angular/compiler-cli@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.0.tgz#850bee57566c00b28a0842bce775b8c4597a4185" integrity sha512-FJ8OHWBQftmncDGV43ASFeCu3cW1W2P5fvub9fiBFEeTIkB/HXrMOMCQg/1XSdfA5kwFzj2NedMp573X9kq6ng== @@ -250,7 +283,7 @@ resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/compiler@^11.2.0": +"@angular/compiler@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.0.tgz#130bee57dd1daa1326d37bef4b63c02aa7309cc2" integrity sha512-EW6LM/kUYhQkuFqGt03c/eRKZAYr0LLEdMOn//j1uIh+wSq9KLffBGpky6b63xdfWxsXi8OucXUOydTQBckNEQ== @@ -262,14 +295,14 @@ resolved "https://registry.yarnpkg.com/@angular/core/-/core-9.0.0.tgz#227dc53e1ac81824f998c6e76000b7efc522641e" integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w== -"@angular/core@>=4.3.1", "@angular/core@^11.2.0": +"@angular/core@>=4.3.1", "@angular/core@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467" integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g== dependencies: tslib "^2.0.0" -"@angular/forms@^11.2.0": +"@angular/forms@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.0.tgz#8ba7a98efdd464a4a6b901ba1f220162dd80c1ed" integrity sha512-FgIG9ou27FbmyFv0n6pF95cQEz412/+iyY9OSlDnezD/7yU4fwk4NNPgP6Z/b1k7ClLYxP/YKC00WVhi1i8HdA== @@ -283,33 +316,33 @@ dependencies: tslib "^1.9.0" -"@angular/language-service@^11.2.0": +"@angular/language-service@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.0.tgz#a233129970ccb05dab87093ae9410474a6e92128" integrity sha512-0n7yrBiwpN6qUEDBoMHxEzxRN+w4tIe+42Ra68UQ5leBx5mSA6P6Ipi+nPwy8RXjqNEHgR0D//30Zp18O8UhCA== -"@angular/material@^11.2.0": +"@angular/material@^11.0.3": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.0.tgz#a5843f2964366daebab9edf2b0a3d6dcad451f5d" integrity sha512-duTQdHtzdZ3KWn90JcN+eI0oNwr7E7JGEOp7tZ9XOtqty0h158SJUCYSuDxhFOqyAgaY41enNPHdB2c4Xz0iBQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^11.2.0": +"@angular/platform-browser-dynamic@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.0.tgz#647fe6d8dfa7651d38564240cbf75f97f11754b7" integrity sha512-bBCtgtL87mvDT0K3HNBS19UC0BzIJUTGnYKJS9IugyfTEqlldB4juMmh/3FPjk30kxxJ8IB/ydaN2uVhBAxPVQ== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^11.2.0": +"@angular/platform-browser@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.0.tgz#d1bbafd394ebfb600043060ec2d8543763041403" integrity sha512-xd3O4svQ95BN/KpzQUFkSWfvwiCURuLJhLlDkxzLA58ElA0qodHOjQmQz/1vRFh/nXQQoWg8z9ixbmcRGzWTow== dependencies: tslib "^2.0.0" -"@angular/router@^11.2.0": +"@angular/router@^11.0.8": version "11.2.0" resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.0.tgz#00dca75d6dce5a88259fea88866caa51ebf1d1a7" integrity sha512-Gw08D6W4SGEIgm5zKdGs1yCW7FnwYjF8cycWczrpU8fmZh+WLbIjPAy/blI/nByCDU9BGyZ7cWGOiQJHEnzWmg== @@ -323,29 +356,30 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.12.13", "@babel/compat-data@^7.12.7": +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== -"@babel/core@7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" - integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== +"@babel/core@7.12.3": + version "7.12.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" + integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.10" + "@babel/generator" "^7.12.1" "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.10" - "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.10" - "@babel/types" "^7.12.10" + "@babel/helpers" "^7.12.1" + "@babel/parser" "^7.12.3" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" + resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" @@ -370,16 +404,16 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" - integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== +"@babel/generator@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" + integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg== dependencies: - "@babel/types" "^7.12.11" + "@babel/types" "^7.12.1" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.12.10", "@babel/generator@^7.12.13", "@babel/generator@^7.12.15": +"@babel/generator@^7.12.1", "@babel/generator@^7.12.13", "@babel/generator@^7.12.15": version "7.12.15" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== @@ -403,7 +437,7 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.12.5": +"@babel/helper-compilation-targets@^7.12.1": version "7.12.16" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz#6905238b4a5e02ba2d032c1a49dd1820fe8ce61b" integrity sha512-dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg== @@ -469,7 +503,7 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.12.5": +"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== @@ -503,7 +537,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== -"@babel/helper-remap-async-to-generator@^7.12.1", "@babel/helper-remap-async-to-generator@^7.12.13": +"@babel/helper-remap-async-to-generator@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" integrity sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA== @@ -548,7 +582,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.12.16": +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.16": version "7.12.16" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz#f73cbd3bbba51915216c5dea908e9b206bb10051" integrity sha512-uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ== @@ -563,7 +597,7 @@ "@babel/traverse" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helpers@^7.12.13", "@babel/helpers@^7.12.5": +"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== @@ -581,7 +615,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.12.7": +"@babel/parser@^7.10.4", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.12.3": version "7.12.16" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== @@ -643,7 +677,7 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@^7.12.7": +"@babel/plugin-proposal-numeric-separator@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== @@ -668,7 +702,7 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.7": +"@babel/plugin-proposal-optional-chaining@^7.12.1": version "7.12.16" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz#600c7531f754186b0f2096e495a92da7d88aa139" integrity sha512-O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg== @@ -784,15 +818,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-async-to-generator@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" - integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== - dependencies: - "@babel/helper-module-imports" "^7.12.1" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-remap-async-to-generator" "^7.12.1" - "@babel/plugin-transform-async-to-generator@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" @@ -809,7 +834,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.11": +"@babel/plugin-transform-block-scoping@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== @@ -983,13 +1008,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-runtime@7.12.10": - version "7.12.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" - integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== +"@babel/plugin-transform-runtime@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" + integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== dependencies: - "@babel/helper-module-imports" "^7.12.5" + "@babel/helper-module-imports" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" semver "^5.5.1" "@babel/plugin-transform-shorthand-properties@^7.12.1": @@ -1007,7 +1033,7 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.7": +"@babel/plugin-transform-sticky-regex@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== @@ -1021,7 +1047,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-typeof-symbol@^7.12.10": +"@babel/plugin-transform-typeof-symbol@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== @@ -1043,16 +1069,16 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" - integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== +"@babel/preset-env@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" + integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== dependencies: - "@babel/compat-data" "^7.12.7" - "@babel/helper-compilation-targets" "^7.12.5" - "@babel/helper-module-imports" "^7.12.5" + "@babel/compat-data" "^7.12.1" + "@babel/helper-compilation-targets" "^7.12.1" + "@babel/helper-module-imports" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.11" + "@babel/helper-validator-option" "^7.12.1" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1060,10 +1086,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.7" + "@babel/plugin-proposal-numeric-separator" "^7.12.1" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-optional-chaining" "^7.12.1" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1081,7 +1107,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.11" + "@babel/plugin-transform-block-scoping" "^7.12.1" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1105,14 +1131,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.7" + "@babel/plugin-transform-sticky-regex" "^7.12.1" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.10" + "@babel/plugin-transform-typeof-symbol" "^7.12.1" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.11" - core-js-compat "^3.8.0" + "@babel/types" "^7.12.1" + core-js-compat "^3.6.2" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1126,10 +1152,10 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" - integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== +"@babel/runtime@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" + integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== dependencies: regenerator-runtime "^0.13.4" @@ -1140,16 +1166,16 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@7.12.7": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" - integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== +"@babel/template@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" + integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" + "@babel/parser" "^7.10.4" + "@babel/types" "^7.10.4" -"@babel/template@^7.12.13", "@babel/template@^7.12.7": +"@babel/template@^7.10.4", "@babel/template@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== @@ -1158,7 +1184,7 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.12.10", "@babel/traverse@^7.12.13": +"@babel/traverse@^7.12.1", "@babel/traverse@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== @@ -1173,7 +1199,7 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.4.4", "@babel/types@^7.8.6": +"@babel/types@^7.10.4", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.4.4", "@babel/types@^7.8.6": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== @@ -1206,6 +1232,59 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" +"@fluentui/date-time-utilities@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz#4c8570b3af8bc654963ecb034d0fd100010e7d6d" + integrity sha512-D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/dom-utilities@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz#b0bbab665fe726f245800bb9e7883b1ceb54248b" + integrity sha512-w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/keyboard-key@^0.2.12": + version "0.2.13" + resolved "https://registry.yarnpkg.com/@fluentui/keyboard-key/-/keyboard-key-0.2.13.tgz#e980b0192f6493a23a3534ff08e2b2db6c560611" + integrity sha512-HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ== + dependencies: + tslib "^1.10.0" + +"@fluentui/react-focus@^7.17.4": + version "7.17.4" + resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-7.17.4.tgz#8e0773be88b908e44ed3a633ce04ba9cc52b4af4" + integrity sha512-L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg== + dependencies: + "@fluentui/keyboard-key" "^0.2.12" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.18.0" + "@uifabric/utilities" "^7.33.4" + tslib "^1.10.0" + +"@fluentui/react-window-provider@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz#8ec71db8cfd57e11f00ed42c5c1377ef4dfe5f6b" + integrity sha512-5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@fluentui/theme@^1.7.3": + version "1.7.3" + resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-1.7.3.tgz#cf3b3e0782a6d3c7b0de38b06f4b883c9d981de5" + integrity sha512-S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g== + dependencies: + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.4" + tslib "^1.10.0" + "@istanbuljs/schema@^0.1.2": version "0.1.3" resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" @@ -1238,14 +1317,19 @@ resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" integrity sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ== -"@ngtools/webpack@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.2.0.tgz#720c3a50aae5aced2fe049f7efc3434320bbe539" - integrity sha512-2KYaA/fIw863jydXDolWp4kUNLODVIKs2834vW+oztocnYFe/z4dTz6rArKFUCixMCu12ieXrjAetzGA564bsg== +"@microsoft/load-themed-styles@^1.10.26": + version "1.10.147" + resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.147.tgz#20dafb4c681a91b2cc8cdd1e01ef9cf33b6660a7" + integrity sha512-fqkftQUoc2fjR9F+4uZkCt2hJhgZlkgM33k4qD4UdI75+SDOK9Zp5iU3dWzvwDWWVIXTOE+GKMFlmUtrlKZ+fg== + +"@ngtools/webpack@11.0.7": + version "11.0.7" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.7.tgz#3ec8cd967fdf1dfc79e6b1469369148bc3a93bd1" + integrity sha512-OWGiiDc7s4T53BBCY8tLkLUjgw44HrixW8Wh8e4thFH1eIUM0NHe087s/B5hDNu72W/GqK4IoBbhNQ2wiCR7qQ== dependencies: - "@angular-devkit/core" "11.2.0" - enhanced-resolve "5.7.0" - webpack-sources "2.2.0" + "@angular-devkit/core" "11.0.7" + enhanced-resolve "5.3.1" + webpack-sources "2.0.1" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1400,17 +1484,17 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/browser@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.1.0.tgz#0e18a07b44bebed729bcf842af33203e388e2053" - integrity sha512-t3y2TLXDWgvfknyH8eKj/9mghJfSEqItFyp74zPu1Src6kOPjkd4Sa7o4+bdkNgA8dIIOrDAhRUbB2sq4sWMCA== +"@sentry/browser@^5.29.2": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3" + integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw== dependencies: - "@sentry/core" "6.1.0" - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/core" "5.30.0" + "@sentry/types" "5.30.0" + "@sentry/utils" "5.30.0" tslib "^1.9.3" -"@sentry/cli@^1.62.0": +"@sentry/cli@^1.61.0": version "1.62.0" resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.62.0.tgz#2e2d8cacb5ec494f86c188ef95b41745605be028" integrity sha512-MCkx+zjetdIWhAVaFuEuoD4MOAFlb3/GLR5B5uFZ1AcegcsggasLo/3rb2gq6jYIic/pubtRjH4ltmOL/s3cag== @@ -1432,18 +1516,18 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/core@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.1.0.tgz#7dd4584dcaf2188a78b94b766068342e6ee65229" - integrity sha512-57mXkp3NoyxRycXrL+Ec6bYS6UYJZp9tYX0lUp5Ry2M0FxDZ3Q4drkjr8MIQOhBaQXP2ukSX4QTVLGMPm60zMw== +"@sentry/core@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3" + integrity sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg== dependencies: - "@sentry/hub" "6.1.0" - "@sentry/minimal" "6.1.0" - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/hub" "5.30.0" + "@sentry/minimal" "5.30.0" + "@sentry/types" "5.30.0" + "@sentry/utils" "5.30.0" tslib "^1.9.3" -"@sentry/electron@^2.2.0": +"@sentry/electron@^2.1.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.2.0.tgz#e59d9cea4e5c3b003e2fc6fc9ecf1bfc1af15eb6" integrity sha512-wNUIsRxb86zK1tV77MZaSLWHM2CxgC1QLJCWxr+Tkash6tESfMY2XlC4+7XQKHfASU3QHt5l4R55/rhrr7ChJA== @@ -1465,13 +1549,13 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/hub@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.1.0.tgz#fb22734c91c9d68564737996bf28b7e032e3d8ee" - integrity sha512-JnBSCgNg3VHiMojUl5tCHU8iWPVuE+qqENIzG9A722oJms1kKWBvWl+yQzhWBNdgk5qeAY3F5UzKWJZkbJ6xow== +"@sentry/hub@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz#2453be9b9cb903404366e198bd30c7ca74cdc100" + integrity sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ== dependencies: - "@sentry/types" "6.1.0" - "@sentry/utils" "6.1.0" + "@sentry/types" "5.30.0" + "@sentry/utils" "5.30.0" tslib "^1.9.3" "@sentry/minimal@5.27.6": @@ -1483,13 +1567,13 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/minimal@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.1.0.tgz#b3abf76d93b95477a3c1029db810818bdc56845f" - integrity sha512-g6sfNKenL7wnsr/tibp8nFiMv/XRH0s0Pt4p151npmNI+SmjuUz3GGYEXk8ChCyaKldYKilkNOFdVXJxUf5gZw== +"@sentry/minimal@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz#ce3d3a6a273428e0084adcb800bc12e72d34637b" + integrity sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw== dependencies: - "@sentry/hub" "6.1.0" - "@sentry/types" "6.1.0" + "@sentry/hub" "5.30.0" + "@sentry/types" "5.30.0" tslib "^1.9.3" "@sentry/node@5.27.6": @@ -1523,10 +1607,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.6.tgz#b5054eafcb8ac11d4bc4787c7bc7fc113cad8b80" integrity sha512-XOW9W8DrMk++4Hk7gWi9o5VR0o/GrqGfTKyFsHSIjqt2hL6kiMPvKeb2Hhmp7Iq37N2bDmRdWpM5m+68S2Jk6w== -"@sentry/types@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.1.0.tgz#5f9379229423ca1325acf6709e95687180f67132" - integrity sha512-kIaN52Fw5K+2mKRaHE2YluJ+F/qMGSUzZXIFDNdC6OUMXQ4TM8gZTrITXs8CLDm7cK8iCqFCtzKOjKK6KyOKAg== +"@sentry/types@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz#19709bbe12a1a0115bc790b8942917da5636f402" + integrity sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw== "@sentry/utils@5.27.6": version "5.27.6" @@ -1536,12 +1620,12 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/utils@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.1.0.tgz#52e3d7050983e685d3a48f9d2efa1e6eb4ae3e6d" - integrity sha512-6JAplzUOS6bEwfX0PDRZBbYRvn9EN22kZfcL0qGHtM9L0QQ5ybjbbVwOpbXgRkiZx++dQbzLFtelxnDhsbFG+Q== +"@sentry/utils@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz#9a5bd7ccff85ccfe7856d493bffa64cabc41e980" + integrity sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww== dependencies: - "@sentry/types" "6.1.0" + "@sentry/types" "5.30.0" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1759,21 +1843,6 @@ resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.11.tgz#2521cc86f69d15c5b90664e4829d84566052c1cf" integrity sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw== -"@types/component-emitter@^1.2.10": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea" - integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg== - -"@types/cookie@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108" - integrity sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg== - -"@types/cors@^2.8.8": - version "2.8.10" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" - integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== - "@types/d3-array@*": version "2.9.0" resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-2.9.0.tgz#fb6c3d7d7640259e68771cd90cc5db5ac1a1a012" @@ -2010,27 +2079,6 @@ dependencies: electron "*" -"@types/eslint-scope@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" - integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== - "@types/fs-extra@^9.0.1": version "9.0.7" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" @@ -2090,7 +2138,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@*", "@types/jasmine@~3.6.3": +"@types/jasmine@*", "@types/jasmine@~3.6.0": version "3.6.3" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050" integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA== @@ -2115,7 +2163,7 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1" integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ== -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.7" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== @@ -2142,11 +2190,16 @@ resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.5.tgz#e95569aa6273dbe0ed1814f86287547cc06e93c9" integrity sha512-OwVhKFim9Y/MprzCe4I6a59p31pMy8+LrtP6qS7J0kaOxYmW6VVJPBw5NYm+g7nSbgPUz22FvqU1F1hC5YGTfg== -"@types/node@*", "@types/node@14.14.28", "@types/node@^14.14.10": +"@types/node@*": version "14.14.28" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b" integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g== +"@types/node@14.14.10": + version "14.14.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" + integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== + "@types/node@^12.0.12": version "12.20.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472" @@ -2177,7 +2230,7 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^17.0.1": +"@types/react-dom@^17.0.0": version "17.0.1" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.1.tgz#d92d77d020bfb083e07cc8e0ac9f933599a4d56a" integrity sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q== @@ -2191,7 +2244,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.2": +"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.0": version "17.0.2" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== @@ -2242,13 +2295,73 @@ dependencies: "@types/yargs-parser" "*" -"@webassemblyjs/ast@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" - integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== +"@uifabric/foundation@^7.9.24": + version "7.9.24" + resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.9.24.tgz#a86211d1913d691e05efed9d95cefbe2209079ae" + integrity sha512-f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q== dependencies: - "@webassemblyjs/helper-numbers" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.18.0" + "@uifabric/utilities" "^7.33.4" + tslib "^1.10.0" + +"@uifabric/icons@^7.5.21": + version "7.5.21" + resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.5.21.tgz#a665ccd9dede47096f2591395d2e21384136e17c" + integrity sha512-ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ== + dependencies: + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.18.0" + tslib "^1.10.0" + +"@uifabric/merge-styles@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz#446b3da48ce9925d1649edd0fc232221974b00c9" + integrity sha512-yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A== + dependencies: + "@uifabric/set-version" "^7.0.23" + tslib "^1.10.0" + +"@uifabric/react-hooks@^7.13.11": + version "7.13.11" + resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz#62af56b53248a0a6dfd44208d6e6524902f016e6" + integrity sha512-9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w== + dependencies: + "@fluentui/react-window-provider" "^1.0.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.4" + tslib "^1.10.0" + +"@uifabric/set-version@^7.0.23": + version "7.0.23" + resolved "https://registry.yarnpkg.com/@uifabric/set-version/-/set-version-7.0.23.tgz#bfe10b6ba17a2518704cca856bdba8adbc11ffb0" + integrity sha512-9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA== + dependencies: + tslib "^1.10.0" + +"@uifabric/styling@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.18.0.tgz#3f12f2addef285aced24e2ad110c93aeeaf98d6a" + integrity sha512-PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg== + dependencies: + "@fluentui/theme" "^1.7.3" + "@microsoft/load-themed-styles" "^1.10.26" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + "@uifabric/utilities" "^7.33.4" + tslib "^1.10.0" + +"@uifabric/utilities@^7.33.4": + version "7.33.4" + resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.33.4.tgz#11ce778c420c1f72b1f29032530c39545affb53a" + integrity sha512-FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA== + dependencies: + "@fluentui/dom-utilities" "^1.1.1" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/set-version" "^7.0.23" + prop-types "^15.7.2" + tslib "^1.10.0" "@webassemblyjs/ast@1.9.0": version "1.9.0" @@ -2259,31 +2372,16 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" -"@webassemblyjs/floating-point-hex-parser@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" - integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== - "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== -"@webassemblyjs/helper-api-error@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" - integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== - "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== -"@webassemblyjs/helper-buffer@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" - integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== - "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2308,35 +2406,11 @@ dependencies: "@webassemblyjs/ast" "1.9.0" -"@webassemblyjs/helper-numbers@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" - integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.0" - "@webassemblyjs/helper-api-error" "1.11.0" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" - integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== - "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== -"@webassemblyjs/helper-wasm-section@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" - integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2347,13 +2421,6 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" -"@webassemblyjs/ieee754@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" - integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== - dependencies: - "@xtuc/ieee754" "^1.2.0" - "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2361,13 +2428,6 @@ dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" - integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== - dependencies: - "@xtuc/long" "4.2.2" - "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2375,30 +2435,11 @@ dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" - integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== - "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== -"@webassemblyjs/wasm-edit@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" - integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/helper-wasm-section" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/wasm-opt" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - "@webassemblyjs/wast-printer" "1.11.0" - "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2413,17 +2454,6 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" -"@webassemblyjs/wasm-gen@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" - integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/ieee754" "1.11.0" - "@webassemblyjs/leb128" "1.11.0" - "@webassemblyjs/utf8" "1.11.0" - "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2435,16 +2465,6 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" -"@webassemblyjs/wasm-opt@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" - integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-buffer" "1.11.0" - "@webassemblyjs/wasm-gen" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2455,18 +2475,6 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" -"@webassemblyjs/wasm-parser@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" - integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/helper-api-error" "1.11.0" - "@webassemblyjs/helper-wasm-bytecode" "1.11.0" - "@webassemblyjs/ieee754" "1.11.0" - "@webassemblyjs/leb128" "1.11.0" - "@webassemblyjs/utf8" "1.11.0" - "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2491,14 +2499,6 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" - integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== - dependencies: - "@webassemblyjs/ast" "1.11.0" - "@xtuc/long" "4.2.2" - "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -2546,11 +2546,6 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^8.0.4: - version "8.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7" - integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg== - adjust-sourcemap-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e" @@ -2564,6 +2559,11 @@ adm-zip@^0.4.9: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== +after@0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2660,7 +2660,7 @@ angular-persistence@^1.0.1: resolved "https://registry.yarnpkg.com/angular-persistence/-/angular-persistence-1.0.1.tgz#79ffe7317f1f7aed88e69f07705f0ac32ccdb9da" integrity sha1-ef/nMX8feu2I5p8HcF8KwyzNudo= -angular-resizable-element@^3.3.5: +angular-resizable-element@^3.3.4: version "3.3.5" resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.5.tgz#e0c86655e53280306c5a6e0ed1d1f60b323b0497" integrity sha512-PT7p3CGva1BmcTt8LA80yOblHqynZHPQYQ1KMMLgllCn3UZx/+0eCRtSXKwnWT5IYHBg9qI3tmd92SFExa1UMg== @@ -2916,6 +2916,11 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +arraybuffer.slice@~0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" + integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== + arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -3020,16 +3025,17 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@10.2.4: - version "10.2.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1" - integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw== +autoprefixer@9.8.6: + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== dependencies: - browserslist "^4.16.1" - caniuse-lite "^1.0.30001181" + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" colorette "^1.2.1" - fraction.js "^4.0.13" normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.32" postcss-value-parser "^4.1.0" aws-sign2@~0.7.0: @@ -3049,14 +3055,15 @@ axobject-query@2.0.2: dependencies: ast-types-flow "0.0.7" -babel-loader@8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" - integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== +babel-loader@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" + integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== dependencies: - find-cache-dir "^3.3.1" + find-cache-dir "^2.1.0" loader-utils "^1.4.0" - make-dir "^3.1.0" + mkdirp "^0.5.3" + pify "^4.0.1" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -3066,6 +3073,11 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" +backo2@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -3081,7 +3093,7 @@ base64-js@^1.0.2, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@2.0.0, base64id@~2.0.0: +base64id@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -3142,6 +3154,11 @@ bl@^4.0.3: inherits "^2.0.4" readable-stream "^3.4.0" +blob@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" + integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + blocking-proxy@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2" @@ -3209,7 +3226,7 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -bootstrap@^4.6.0: +bootstrap@^4.5.3: version "4.6.0" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== @@ -3332,7 +3349,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.9.1: version "4.16.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== @@ -3567,7 +3584,7 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.2.0: +camelcase@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3582,7 +3599,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001181: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: version "1.0.30001187" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438" integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA== @@ -3597,7 +3614,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3712,10 +3729,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-dependency-plugin@5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" - integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== +circular-dependency-plugin@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93" + integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw== class-utils@^0.3.5: version "0.3.6" @@ -3936,11 +3953,26 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +component-bind@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" + integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= + +component-emitter@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== +component-inherit@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" + integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= + compose-function@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/compose-function/-/compose-function-3.0.3.tgz#9ed675f13cc54501d30950a486ff6a7ba3ab185f" @@ -4072,13 +4104,6 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -copy-anything@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" - integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== - dependencies: - is-what "^3.12.0" - copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -4096,10 +4121,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.3.2: - version "6.3.2" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb" - integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA== +copy-webpack-plugin@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5" + integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q== dependencies: cacache "^15.0.5" fast-glob "^3.2.4" @@ -4113,7 +4138,7 @@ copy-webpack-plugin@6.3.2: serialize-javascript "^5.0.1" webpack-sources "^1.4.3" -core-js-compat@^3.8.0: +core-js-compat@^3.6.2: version "3.8.3" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.3.tgz#9123fb6b9cad30f0651332dc77deba48ef9b0b3f" integrity sha512-1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog== @@ -4121,7 +4146,12 @@ core-js-compat@^3.8.0: browserslist "^4.16.1" semver "7.0.0" -core-js@3.8.3, core-js@^3.6.5, core-js@^3.8.3: +core-js@3.6.5: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" + integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== + +core-js@^3.6.5, core-js@^3.8.2: version "3.8.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== @@ -4131,14 +4161,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -4191,22 +4213,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -critters@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.6.tgz#b71384113d8b5f5c82f3aeba80c122437f195d8c" - integrity sha512-NUB3Om7tkf+XWi9+2kJ2A3l4/tHORDI1UT+nHxUqay2B/tJvMpiXcklDDLBH3fPn9Pe23uu0we/08Ukjy4cLCQ== - dependencies: - chalk "^4.1.0" - css "^3.0.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - pretty-bytes "^5.3.0" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4253,22 +4259,22 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f" - integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw== +css-loader@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" + integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== dependencies: - camelcase "^6.2.0" + camelcase "^6.0.0" cssesc "^3.0.0" - icss-utils "^5.0.0" + icss-utils "^4.1.1" loader-utils "^2.0.0" - postcss "^8.1.4" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" + postcss "^7.0.32" + postcss-modules-extract-imports "^2.0.0" + postcss-modules-local-by-default "^3.0.3" + postcss-modules-scope "^2.2.0" + postcss-modules-values "^3.0.0" postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" + schema-utils "^2.7.1" semver "^7.3.2" css-parse@~2.0.0: @@ -4301,6 +4307,11 @@ css-selector-tokenizer@^0.7.1: cssesc "^3.0.0" fastparse "^1.1.2" +css-to-style@^1.2.1: + version "1.4.0" + resolved "https://registry.yarnpkg.com/css-to-style/-/css-to-style-1.4.0.tgz#2d91742041b77a700d387dfa7978e80f56abf32b" + integrity sha512-FxLJRS+zzAjICI/AwpXUQR+aXrDOksrMTPpoKVwcGP0ARCxY5K3eRfgPW+pJrFXG46SKuxWOufJheis8Bhc2kg== + css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" @@ -4332,15 +4343,6 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" -css@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" - integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== - dependencies: - inherits "^2.0.4" - source-map "^0.6.1" - source-map-resolve "^0.6.0" - cssauron@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" @@ -4818,20 +4820,27 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0, debug@~4.3.1: +debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +debug@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -5255,7 +5264,7 @@ electron-to-chromium@^1.3.649: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz#8fb039e2fa8ef3ab2568308464a28425d4f6e2a3" integrity sha512-yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg== -electron@*, electron@^11.2.3: +electron@*, electron@^11.2.0: version "11.2.3" resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== @@ -5333,33 +5342,53 @@ endian-reader@^0.3.0: resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= -engine.io-parser@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.2.tgz#e41d0b3fb66f7bf4a3671d2038a154024edb501e" - integrity sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg== +engine.io-client@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7" + integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA== dependencies: - base64-arraybuffer "0.1.4" + component-emitter "~1.3.0" + component-inherit "0.0.3" + debug "~3.1.0" + engine.io-parser "~2.2.0" + has-cors "1.1.0" + indexof "0.0.1" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~7.4.2" + xmlhttprequest-ssl "~1.5.4" + yeast "0.1.2" -engine.io@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" - integrity sha512-t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w== +engine.io-parser@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" + integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== + dependencies: + after "0.8.2" + arraybuffer.slice "~0.0.7" + base64-arraybuffer "0.1.4" + blob "0.0.5" + has-binary2 "~1.0.2" + +engine.io@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" + integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== dependencies: accepts "~1.3.4" base64id "2.0.0" cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~4.0.0" + debug "~4.1.0" + engine.io-parser "~2.2.0" ws "~7.4.2" -enhanced-resolve@5.7.0, enhanced-resolve@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" - integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== +enhanced-resolve@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" + integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== dependencies: graceful-fs "^4.2.4" - tapable "^2.2.0" + tapable "^2.0.0" enhanced-resolve@^4.3.0: version "4.5.0" @@ -5446,11 +5475,6 @@ es-abstract@^1.18.0-next.1: string.prototype.trimend "^1.0.3" string.prototype.trimstart "^1.0.3" -es-module-lexer@^0.3.26: - version "0.3.26" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.3.26.tgz#7b507044e97d5b03b01d4392c74ffeb9c177a83b" - integrity sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA== - es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -5495,7 +5519,7 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -5548,14 +5572,6 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - esprima@3.x.x: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -5566,7 +5582,7 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5605,7 +5621,7 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.2.0: +events@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== @@ -5801,7 +5817,14 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: +faye-websocket@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" + integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= + dependencies: + websocket-driver ">=0.5.1" + +faye-websocket@~0.11.1: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -5827,7 +5850,15 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.2.0, file-loader@^6.2.0: +file-loader@6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa" + integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + +file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== @@ -5835,7 +5866,7 @@ file-loader@6.2.0, file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.2, file-saver@^2.0.5: +file-saver@^2.0.2: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== @@ -5957,11 +5988,6 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -fraction.js@^4.0.13: - version "4.0.13" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" - integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA== - fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -6045,6 +6071,11 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" +fsevents@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + fsevents@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" @@ -6149,11 +6180,6 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -6319,6 +6345,18 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-binary2@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" + integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== + dependencies: + isarray "2.0.1" + +has-cors@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -6570,14 +6608,6 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - https-proxy-agent@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" @@ -6594,6 +6624,14 @@ https-proxy-agent@^3.0.0: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6615,10 +6653,12 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== +icss-utils@^4.0.0, icss-utils@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" + integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== + dependencies: + postcss "^7.0.14" ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" @@ -6696,6 +6736,11 @@ indexes-of@^1.0.1: resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= +indexof@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= + infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -6729,12 +6774,12 @@ ini@1.3.7: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@2.0.0, ini@^2.0.0: +ini@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -7116,11 +7161,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-what@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55" - integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw== - is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -7153,6 +7193,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isarray@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" + integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= + isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -7248,10 +7293,10 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-spec-reporter@~6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz#3b9c85689676a351f343ba8dd6d3957f11a4bf1d" - integrity sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ== +jasmine-spec-reporter@~5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95" + integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g== dependencies: colors "1.4.0" @@ -7284,7 +7329,16 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2: +jest-worker@26.5.0: + version "26.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" + integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest-worker@^26.5.0: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7361,7 +7415,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.3: +json3@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -7480,10 +7534,10 @@ karma-source-map-support@1.4.0: dependencies: source-map-support "^0.5.5" -karma@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.1.tgz#a7539618cca0f2cbb26d5497120ec31fe340c2a1" - integrity sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg== +karma@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-5.2.3.tgz#3264024219bad2728e92542e0058a2492d7a46e4" + integrity sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ== dependencies: body-parser "^1.19.0" braces "^3.0.2" @@ -7503,11 +7557,11 @@ karma@^6.1.1: qjobs "^1.2.0" range-parser "^1.2.1" rimraf "^3.0.2" - socket.io "^3.1.0" + socket.io "^2.3.0" source-map "^0.6.1" tmp "0.2.1" - ua-parser-js "^0.7.23" - yargs "^16.1.1" + ua-parser-js "0.7.22" + yargs "^15.3.1" keyv@^3.0.0: version "3.1.0" @@ -7569,22 +7623,20 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -less-loader@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" - integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== +less-loader@7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" + integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" -less@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" - integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== +less@3.12.2: + version "3.12.2" + resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" + integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -7592,7 +7644,7 @@ less@4.1.1: image-size "~0.5.0" make-dir "^2.1.0" mime "^1.4.1" - needle "^2.5.2" + native-request "^1.0.5" source-map "~0.6.0" levn@~0.3.0: @@ -7619,10 +7671,10 @@ license-checker@^25.0.1: spdx-satisfies "^4.0.0" treeify "^1.1.0" -license-webpack-plugin@2.3.11: - version "2.3.11" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8" - integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw== +license-webpack-plugin@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.1.tgz#08eddb2f776c7c64c02f308a00e017d6e824d0b6" + integrity sha512-yhqTmlYIEpZWA122lf6E0G8+rkn0AzoQ1OpzUKKs/lXUqG1plmGnwmkuuPlfggzJR5y6DLOdot/Tv00CC51CeQ== dependencies: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" @@ -7644,11 +7696,6 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== - loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" @@ -8030,7 +8077,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -8199,7 +8246,7 @@ mime-db@1.45.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== @@ -8231,10 +8278,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -mini-css-extract-plugin@1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3" - integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ== +mini-css-extract-plugin@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" + integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -8420,11 +8467,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8442,6 +8484,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +native-request@^1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" + integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== + needle@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" @@ -8451,7 +8498,7 @@ needle@2.5.0: iconv-lite "^0.4.4" sax "^1.2.4" -needle@^2.3.3, needle@^2.5.0, needle@^2.5.2: +needle@^2.3.3, needle@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== @@ -8730,6 +8777,11 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -8740,7 +8792,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8825,6 +8877,25 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +office-ui-fabric-react@^7.156.0: + version "7.160.1" + resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.160.1.tgz#cb5b84831dacaa2e9028785d22291736861ce9e2" + integrity sha512-yfwYBXZscIJgL8r/SRSiAhgLzp9QvbA7UtWsDxEleJH1YG2FG7fbUe/JkO/76WkUJjytilXGgAS9ZbL5NLdBXA== + dependencies: + "@fluentui/date-time-utilities" "^7.9.0" + "@fluentui/react-focus" "^7.17.4" + "@fluentui/react-window-provider" "^1.0.1" + "@microsoft/load-themed-styles" "^1.10.26" + "@uifabric/foundation" "^7.9.24" + "@uifabric/icons" "^7.5.21" + "@uifabric/merge-styles" "^7.19.1" + "@uifabric/react-hooks" "^7.13.11" + "@uifabric/set-version" "^7.0.23" + "@uifabric/styling" "^7.18.0" + "@uifabric/utilities" "^7.33.4" + prop-types "^15.7.2" + tslib "^1.10.0" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -8851,6 +8922,14 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" +open@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" + integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + open@7.4.0: version "7.4.0" resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" @@ -8914,6 +8993,20 @@ ora@5.0.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" +ora@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" + integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w== + dependencies: + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.4.0" + is-interactive "^1.0.0" + log-symbols "^4.0.0" + mute-stream "0.0.8" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + ora@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" @@ -8988,7 +9081,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -9155,11 +9248,6 @@ parse-link-header@^1.0.1: dependencies: xtend "~4.0.1" -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - parse5-html-rewriting-stream@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" @@ -9168,13 +9256,6 @@ parse5-html-rewriting-stream@6.0.1: parse5 "^6.0.1" parse5-sax-parser "^6.0.1" -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== - dependencies: - parse5 "^6.0.1" - parse5-sax-parser@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" @@ -9192,6 +9273,16 @@ parse5@^6.0.1: resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parseqs@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" + integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== + +parseuri@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" + integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -9410,25 +9501,26 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" -postcss-import@14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296" - integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg== +postcss-import@12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" + integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== dependencies: - postcss-value-parser "^4.0.0" + postcss "^7.0.1" + postcss-value-parser "^3.2.3" read-cache "^1.0.0" resolve "^1.1.7" -postcss-loader@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4" - integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA== +postcss-loader@4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" + integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.4" + semver "^7.3.2" postcss-merge-longhand@^4.0.11: version "4.0.11" @@ -9492,33 +9584,38 @@ postcss-minify-selectors@^4.0.2: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== +postcss-modules-extract-imports@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" + integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== dependencies: - icss-utils "^5.0.0" + postcss "^7.0.5" + +postcss-modules-local-by-default@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== + dependencies: + icss-utils "^4.1.1" + postcss "^7.0.32" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== dependencies: - postcss-selector-parser "^6.0.4" + postcss "^7.0.6" + postcss-selector-parser "^6.0.0" -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== +postcss-modules-values@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" + integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== dependencies: - icss-utils "^5.0.0" + icss-utils "^4.0.0" + postcss "^7.0.6" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -9639,7 +9736,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: version "6.0.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== @@ -9668,12 +9765,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -9687,16 +9784,16 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@8.2.4: - version "8.2.4" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04" - integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg== +postcss@7.0.32: + version "7.0.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" + chalk "^2.4.2" source-map "^0.6.1" + supports-color "^6.1.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -9705,15 +9802,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.1.4: - version "8.2.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" - integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg== - dependencies: - colorette "^1.2.1" - nanoid "^3.1.20" - source-map "^0.6.1" - prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -9729,11 +9817,6 @@ prettier@^2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== -pretty-bytes@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e" - integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA== - pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -10456,7 +10539,7 @@ resolve@1.19.0: is-core-module "^2.1.0" path-parse "^1.0.6" -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -10568,12 +10651,12 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup@2.38.4: - version "2.38.4" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" - integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== +rollup@2.32.1: + version "2.32.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c" + integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.1.2" run-async@^2.4.0: version "2.4.1" @@ -10665,10 +10748,10 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@10.1.1: - version "10.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" - integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== +sass-loader@10.0.5: + version "10.0.5" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" + integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10676,10 +10759,10 @@ sass-loader@10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.32.6: - version "1.32.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" - integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== +sass@1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2" + integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -10733,7 +10816,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0: +schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10778,7 +10861,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: tmp "0.0.30" xml2js "^0.4.17" -selfsigned@^1.10.8: +selfsigned@^1.10.7: version "1.10.8" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== @@ -10821,7 +10904,12 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4: +semver@7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + +semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== @@ -11283,7 +11371,7 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.455.0: +snyk@^1.437.3: version "1.455.0" resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.455.0.tgz#a4ac3d82d8946b0137cbbb96513721fe50dc97ee" integrity sha512-SDdmPxgQ1yB2wZ5KJ0YAq3a4i7HJFJhoVfCvzs458Jr5vvBN6W8PAwLQnniqQIPtyX/H70QW6PkkYu4rO8CkpA== @@ -11351,55 +11439,78 @@ snyk@^1.455.0: uuid "^3.3.2" wrap-ansi "^5.1.0" -socket.io-adapter@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" - integrity sha512-+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg== +socket.io-adapter@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" + integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-parser@~4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" - integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g== +socket.io-client@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" + integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== dependencies: - "@types/component-emitter" "^1.2.10" + backo2 "1.0.2" + component-bind "1.0.0" component-emitter "~1.3.0" - debug "~4.3.1" + debug "~3.1.0" + engine.io-client "~3.5.0" + has-binary2 "~1.0.2" + indexof "0.0.1" + parseqs "0.0.6" + parseuri "0.0.6" + socket.io-parser "~3.3.0" + to-array "0.1.4" -socket.io@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba" - integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA== +socket.io-parser@~3.3.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" + integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== dependencies: - "@types/cookie" "^0.4.0" - "@types/cors" "^2.8.8" - "@types/node" "^14.14.10" - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.1" - engine.io "~4.1.0" - socket.io-adapter "~2.1.0" - socket.io-parser "~4.0.3" + component-emitter "~1.3.0" + debug "~3.1.0" + isarray "2.0.1" -sockjs-client@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz#2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add" - integrity sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q== +socket.io-parser@~3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" + integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== dependencies: - debug "^3.2.6" + component-emitter "1.2.1" + debug "~4.1.0" + isarray "2.0.1" + +socket.io@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" + integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== + dependencies: + debug "~4.1.0" + engine.io "~3.5.0" + has-binary2 "~1.0.2" + socket.io-adapter "~1.1.0" + socket.io-client "2.4.0" + socket.io-parser "~3.4.0" + +sockjs-client@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" + integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== + dependencies: + debug "^3.2.5" eventsource "^1.0.7" - faye-websocket "^0.11.3" - inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.4.7" + faye-websocket "~0.11.1" + inherits "^2.0.3" + json3 "^3.3.2" + url-parse "^1.4.3" -sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== +sockjs@0.3.20: + version "0.3.20" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" + integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== dependencies: - faye-websocket "^0.11.3" + faye-websocket "^0.10.0" uuid "^3.4.0" - websocket-driver "^0.7.4" + websocket-driver "0.6.5" socks-proxy-agent@^4.0.1: version "4.0.2" @@ -11439,10 +11550,10 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" - integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== +source-map-loader@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" + integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" @@ -11462,14 +11573,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - source-map-support@0.5.19, source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.5, source-map-support@^0.5.7, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11587,12 +11690,12 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f" - integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw== +speed-measure-webpack-plugin@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5" + integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ== dependencies: - chalk "^4.1.0" + chalk "^2.0.1" split-ca@^1.0.1: version "1.0.1" @@ -11855,10 +11958,17 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylus-loader@4.3.3: - version "4.3.3" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757" - integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ== +stylenames@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/stylenames/-/stylenames-1.1.6.tgz#185641ea9261906a5c350ac6836f4ef67caf867f" + integrity sha1-GFZB6pJhkGpcNQrGg29O9nyvhn8= + dependencies: + es6-symbol "^3.1.0" + +stylus-loader@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" + integrity sha512-apDYJEM5ZpOAWbWInWcsbtI8gHNr/XYVcSY/tWqOUPt7M5tqhtwXVsAkgyiVjhuvw2Yrjq474a9H+g4d047Ebw== dependencies: fast-glob "^3.2.4" klona "^2.0.4" @@ -11947,7 +12057,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.1.1, tapable@^2.2.0: +tapable@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== @@ -12036,22 +12146,10 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser-webpack-plugin@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" - integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q== - dependencies: - jest-worker "^26.6.2" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" - source-map "^0.6.1" - terser "^5.5.1" - -terser@5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" - integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== +terser@5.3.7: + version "5.3.7" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.7.tgz#798a4ae2e7ff67050c3e99fcc4e00725827d97e2" + integrity sha512-lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -12066,7 +12164,7 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.3.4, terser@^5.5.1: +terser@^5.3.4: version "5.6.0" resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== @@ -12150,6 +12248,11 @@ tmp@^0.1.0: dependencies: rimraf "^2.6.3" +to-array@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -12239,13 +12342,12 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" - integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== +ts-node@~9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" + integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== dependencies: arg "^4.1.0" - create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" @@ -12261,16 +12363,21 @@ tslib@1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@2.1.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" + integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== tslib@^1, tslib@^1.10.0, tslib@^1.11.2, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + tslint-config-prettier@^1.18.0: version "1.18.0" resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" @@ -12405,10 +12512,10 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== -typescript@4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" - integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== +typescript@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" + integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== typescript@>=2.8.3: version "4.1.5" @@ -12420,10 +12527,10 @@ typescript@~4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.7.tgz#7168032c43d2a2671c95c07812f69523c79590af" integrity sha512-yi7M4y74SWvYbnazbn8/bmJmX4Zlej39ZOqwG/8dut/MYoSQ119GY9ZFbbGsD4PFZYWxqik/XsP3vk3+W5H3og== -ua-parser-js@^0.7.23: - version "0.7.24" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" - integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== +ua-parser-js@0.7.22: + version "0.7.22" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3" + integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q== uncontrollable@^7.0.0: version "7.2.1" @@ -12579,7 +12686,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3, url-parse@^1.4.7: +url-parse@^1.4.3: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== @@ -12674,7 +12781,7 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -vary@^1, vary@~1.1.2: +vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -12733,14 +12840,6 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" -watchpack@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7" - integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -12802,10 +12901,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" - integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== +webpack-dev-server@3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" + integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -12827,11 +12926,11 @@ webpack-dev-server@3.11.2: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.8" + selfsigned "^1.10.7" semver "^6.3.0" serve-index "^1.9.1" - sockjs "^0.3.21" - sockjs-client "^1.5.0" + sockjs "0.3.20" + sockjs-client "1.4.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -12849,18 +12948,18 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" - integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== +webpack-merge@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9" + integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@2.2.0, webpack-sources@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" - integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== +webpack-sources@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f" + integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -12873,10 +12972,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack-subresource-integrity@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" - integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== +webpack-subresource-integrity@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz#6f44ea99987266b70c4ec42ac51064d33e982277" + integrity sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q== dependencies: webpack-sources "^1.3.0" @@ -12909,36 +13008,14 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@5.22.0: - version "5.22.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.22.0.tgz#8505158bc52dcbbdb01ac94796a8aed61badf11a" - integrity sha512-xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ== +websocket-driver@0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" + integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= dependencies: - "@types/eslint-scope" "^3.7.0" - "@types/estree" "^0.0.46" - "@webassemblyjs/ast" "1.11.0" - "@webassemblyjs/wasm-edit" "1.11.0" - "@webassemblyjs/wasm-parser" "1.11.0" - acorn "^8.0.4" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.7.0" - es-module-lexer "^0.3.26" - eslint-scope "^5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.4" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.0.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.1" - watchpack "^2.0.0" - webpack-sources "^2.1.1" + websocket-extensions ">=0.1.1" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: +websocket-driver@>=0.5.1: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -13100,6 +13177,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlhttprequest-ssl@~1.5.4: + version "1.5.5" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" + integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= + xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" @@ -13115,12 +13197,12 @@ xterm-addon-attach@^0.6.0: resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.6.0.tgz#220c23addd62ab88c9914e2d4c06f7407e44680e" integrity sha512-Mo8r3HTjI/EZfczVCwRU6jh438B4WLXxdFO86OB7bx0jGhwh2GdF4ifx/rP+OB+Cb2vmLhhVIZ00/7x3YSP3dg== -xterm-addon-fit@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" - integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== +xterm-addon-fit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193" + integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w== -xterm@^4.10.0: +xterm@^4.9.0: version "4.10.0" resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb" integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ== @@ -13238,6 +13320,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yeast@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 7294e926a8988c7fe9fe822cde900604cb45f5fc Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:45:25 +0100 Subject: [PATCH 19/76] Update ReleaseNotes.txt --- src/ReleaseNotes.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ReleaseNotes.txt b/src/ReleaseNotes.txt index 61d31051..a89fddc5 100644 --- a/src/ReleaseNotes.txt +++ b/src/ReleaseNotes.txt @@ -1,5 +1,7 @@ GNS3 WebUI is web implementation of user interface for GNS3 software. +Current version: 2.2.18 + Current version: 2020.4.0-beta.1 Bug Fixes & enhancements From 73d3ab2534d1eb12f7519e8f4ee38bda4519b67e Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:47:09 +0100 Subject: [PATCH 20/76] Release 2.2.18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37896e16..96f9deee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gns3-web-ui", - "version": "2.2.18dev", + "version": "2.2.18", "author": { "name": "GNS3 Technology Inc.", "email": "developers@gns3.com" From baa344fbe5309adf5af22f9718f22dca297eca1c Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Tue, 16 Feb 2021 15:59:43 +0100 Subject: [PATCH 21/76] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96f9deee..0b3a60cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gns3-web-ui", - "version": "2.2.18", + "version": "2.2.19dev", "author": { "name": "GNS3 Technology Inc.", "email": "developers@gns3.com" From 46c4bc1d78e671cd09d4d5b04adfe971d58e6337 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 17 Feb 2021 04:03:02 +0100 Subject: [PATCH 22/76] Fix for theming --- angular.json | 11 +-- src/app/app.module.ts | 4 +- src/app/services/theme.service.ts | 47 ++++++----- src/theme-light.scss | 70 ---------------- src/theme.scss | 135 ++++++++++++++++++++++-------- 5 files changed, 128 insertions(+), 139 deletions(-) delete mode 100644 src/theme-light.scss diff --git a/angular.json b/angular.json index 6eebf3ab..3be730c1 100644 --- a/angular.json +++ b/angular.json @@ -47,16 +47,7 @@ "node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/notosans-fontface/css/notosans-fontface.min.css", "src/styles.scss", - { - "inject": true, - "input": "src/theme.scss", - "bundleName": "theme-default-dark" - }, - { - "inject": true, - "input": "src/theme-light.scss", - "bundleName": "theme-default" - } + "src/theme.scss" ], "scripts": [] }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index af8366e4..8aafeb5e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -284,6 +284,7 @@ import { UpdatesService } from './services/updates.service'; import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; import { AngularReactBrowserModule } from '@angular-react/core'; import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; +import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; @NgModule({ declarations: [ @@ -492,7 +493,8 @@ import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; DragDropModule, NgxChildProcessModule, MATERIAL_IMPORTS, - NgCircleProgressModule.forRoot() + NgCircleProgressModule.forRoot(), + OverlayModule ], providers: [ SettingsService, diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index e7869ba2..c2cb934a 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -1,6 +1,7 @@ import { Injectable, RendererFactory2, Renderer2, Inject, EventEmitter } from '@angular/core'; import { Observable, BehaviorSubject, combineLatest } from 'rxjs'; import { DOCUMENT } from '@angular/common'; +import { OverlayContainer} from '@angular/cdk/overlay'; @Injectable({ providedIn: 'root' }) export class ThemeService { @@ -17,18 +18,19 @@ export class ThemeService { constructor( rendererFactory: RendererFactory2, + private overlayContainer: OverlayContainer, @Inject(DOCUMENT) document: Document ) { - this.head = document.head; - this._renderer = rendererFactory.createRenderer(null, null); - this.theme$ = combineLatest(this._mainTheme$, this._darkMode$); - this.theme$.subscribe(async ([mainTheme, darkMode]) => { - const cssExt = '.css'; - const cssFilename = darkMode ? mainTheme + '-dark' + cssExt : mainTheme + cssExt; - await this.loadCss(cssFilename); - if (this.themeLinks.length == 2) - this._renderer.removeChild(this.head, this.themeLinks.shift()); - }) + // this.head = document.head; + // this._renderer = rendererFactory.createRenderer(null, null); + // this.theme$ = combineLatest(this._mainTheme$, this._darkMode$); + // this.theme$.subscribe(async ([mainTheme, darkMode]) => { + // const cssExt = '.css'; + // const cssFilename = darkMode ? mainTheme + '-dark' + cssExt : mainTheme + cssExt; + // await this.loadCss(cssFilename); + // if (this.themeLinks.length == 2) + // this._renderer.removeChild(this.head, this.themeLinks.shift()); + // }) } getActualTheme() { @@ -40,17 +42,20 @@ export class ThemeService { } setDarkMode(value: boolean) { - this._darkMode$.next(value); - localStorage.removeItem('theme'); - if (value) { - this.savedTheme = 'dark'; - this.themeChanged.emit(this.savedTheme); - localStorage.setItem('theme', 'dark'); - } else { - this.savedTheme = 'light'; - this.themeChanged.emit(this.savedTheme); - localStorage.setItem('theme', 'light'); - } + if (value) this.overlayContainer.getContainerElement().classList.add('dark-theme'); + if (!value) this.overlayContainer.getContainerElement().classList.add('light-theme'); + + // this._darkMode$.next(value); + // localStorage.removeItem('theme'); + // if (value) { + // this.savedTheme = 'dark'; + // this.themeChanged.emit(this.savedTheme); + // localStorage.setItem('theme', 'dark'); + // } else { + // this.savedTheme = 'light'; + // this.themeChanged.emit(this.savedTheme); + // localStorage.setItem('theme', 'light'); + // } } private async loadCss(filename: string) { diff --git a/src/theme-light.scss b/src/theme-light.scss deleted file mode 100644 index 29585d89..00000000 --- a/src/theme-light.scss +++ /dev/null @@ -1,70 +0,0 @@ -@import '~@angular/material/theming'; -@import '~material-design-icons/iconfont/material-icons.css'; -@import '~typeface-roboto/index.css'; - -// Include non-theme styles for core. -@include mat-core(); - -// Define a theme. -$primary: mat-palette($mat-cyan, 700, 500, 900); -$accent: mat-palette($mat-blue, A200, A100, A700); - -$theme: mat-light-theme($primary, $accent); - -$light-palette: mat-palette($mat-blue, 900, A100, A400); -$light-background: mat-light-theme($light-palette, $primary); - -$mat-light-theme-background: ( - status-bar: black, - app-bar: map_get($mat-blue, 900), - background: white, - hover: rgba(white, 0.04), - card: white, - dialog: white, - disabled-button: $white-12-opacity, - raised-button: white, - focused-button: $white-6-opacity, - selected-button: map_get($mat-blue, 900), - selected-disabled-button: map_get($mat-blue, 800), - disabled-button-toggle: black, - unselected-chip: map_get($mat-blue, 700), - disabled-list-option: black -); - -$theme: map-merge( - $theme, - ( - background: $mat-light-theme-background - ) -); - -@include mat-core-theme($theme); -@include mat-autocomplete-theme($theme); -@include mat-button-theme($theme); -@include mat-button-toggle-theme($theme); -@include mat-card-theme($theme); -@include mat-checkbox-theme($theme); -@include mat-chips-theme($theme); -@include mat-table-theme($theme); -@include mat-datepicker-theme($theme); -@include mat-dialog-theme($theme); -@include mat-expansion-panel-theme($theme); -@include mat-form-field-theme($theme); -@include mat-grid-list-theme($theme); -@include mat-icon-theme($theme); -@include mat-input-theme($theme); -@include mat-list-theme($theme); -@include mat-menu-theme($theme); -@include mat-paginator-theme($theme); -@include mat-progress-bar-theme($theme); -@include mat-progress-spinner-theme($theme); -@include mat-radio-theme($theme); -@include mat-select-theme($theme); -@include mat-sidenav-theme($theme); -@include mat-slide-toggle-theme($theme); -@include mat-slider-theme($theme); -@include mat-stepper-theme($theme); -@include mat-tabs-theme($theme); -@include mat-toolbar-theme($light-background); -@include mat-tooltip-theme($theme); -@include mat-snack-bar-theme($theme); diff --git a/src/theme.scss b/src/theme.scss index fcd9f957..9ff7e407 100644 --- a/src/theme.scss +++ b/src/theme.scss @@ -1,16 +1,13 @@ @import '~@angular/material/theming'; @import '~material-design-icons/iconfont/material-icons.css'; @import '~typeface-roboto/index.css'; - -// Include non-theme styles for core. @include mat-core(); -// Define a theme. $primary: mat-palette($mat-cyan, 700, 500, 900); $accent: mat-palette($mat-blue-grey, A200, A100, A700); -$theme: mat-dark-theme($primary, $accent); - +// Dark theme +$dark-theme: mat-dark-theme($primary, $accent); $dark-palette: mat-palette($mat-blue-grey, 900, A100, A400); $dark-background: mat-dark-theme($dark-palette, $primary); @@ -31,40 +28,104 @@ $mat-dark-theme-background: ( disabled-list-option: black ); -$theme: map-merge( - $theme, +$dark-theme: map-merge( + $dark-theme, ( background: $mat-dark-theme-background ) ); -@include mat-core-theme($theme); -@include mat-autocomplete-theme($theme); -@include mat-button-theme($theme); -@include mat-button-toggle-theme($theme); -@include mat-card-theme($theme); -@include mat-checkbox-theme($theme); -@include mat-chips-theme($theme); -@include mat-table-theme($theme); -@include mat-datepicker-theme($theme); -@include mat-dialog-theme($theme); -@include mat-expansion-panel-theme($theme); -@include mat-form-field-theme($theme); -@include mat-grid-list-theme($theme); -@include mat-icon-theme($theme); -@include mat-input-theme($theme); -@include mat-list-theme($theme); -@include mat-menu-theme($theme); -@include mat-paginator-theme($theme); -@include mat-progress-bar-theme($theme); -@include mat-progress-spinner-theme($theme); -@include mat-radio-theme($theme); -@include mat-select-theme($theme); -@include mat-sidenav-theme($theme); -@include mat-slide-toggle-theme($theme); -@include mat-slider-theme($theme); -@include mat-stepper-theme($theme); -@include mat-tabs-theme($theme); -@include mat-toolbar-theme($dark-background); -@include mat-tooltip-theme($theme); -@include mat-snack-bar-theme($theme); +.dark-theme { + @include mat-core-theme($dark-theme); + @include mat-autocomplete-theme($dark-theme); + @include mat-button-theme($dark-theme); + @include mat-button-toggle-theme($dark-theme); + @include mat-card-theme($dark-theme); + @include mat-checkbox-theme($dark-theme); + @include mat-chips-theme($dark-theme); + @include mat-table-theme($dark-theme); + @include mat-datepicker-theme($dark-theme); + @include mat-dialog-theme($dark-theme); + @include mat-expansion-panel-theme($dark-theme); + @include mat-form-field-theme($dark-theme); + @include mat-grid-list-theme($dark-theme); + @include mat-icon-theme($dark-theme); + @include mat-input-theme($dark-theme); + @include mat-list-theme($dark-theme); + @include mat-menu-theme($dark-theme); + @include mat-paginator-theme($dark-theme); + @include mat-progress-bar-theme($dark-theme); + @include mat-progress-spinner-theme($dark-theme); + @include mat-radio-theme($dark-theme); + @include mat-select-theme($dark-theme); + @include mat-sidenav-theme($dark-theme); + @include mat-slide-toggle-theme($dark-theme); + @include mat-slider-theme($dark-theme); + @include mat-stepper-theme($dark-theme); + @include mat-tabs-theme($dark-theme); + @include mat-toolbar-theme($dark-background); + @include mat-tooltip-theme($dark-theme); + @include mat-snack-bar-theme($dark-theme); +} + +// Light theme +$light-theme: mat-light-theme($primary, $accent); +$light-palette: mat-palette($mat-blue, 900, A100, A400); +$light-background: mat-light-theme($light-palette, $primary); + +$mat-light-theme-background: ( + status-bar: black, + app-bar: map_get($mat-blue, 900), + background: white, + hover: rgba(white, 0.04), + card: white, + dialog: white, + disabled-button: $white-12-opacity, + raised-button: white, + focused-button: $white-6-opacity, + selected-button: map_get($mat-blue, 900), + selected-disabled-button: map_get($mat-blue, 800), + disabled-button-toggle: black, + unselected-chip: map_get($mat-blue, 700), + disabled-list-option: black +); + +$light-theme: map-merge( + $light-theme, + ( + background: $mat-light-theme-background + ) +); + +.light-theme { + @include mat-core-theme($light-theme); + @include mat-autocomplete-theme($light-theme); + @include mat-button-theme($light-theme); + @include mat-button-toggle-theme($light-theme); + @include mat-card-theme($light-theme); + @include mat-checkbox-theme($light-theme); + @include mat-chips-theme($light-theme); + @include mat-table-theme($light-theme); + @include mat-datepicker-theme($light-theme); + @include mat-dialog-theme($light-theme); + @include mat-expansion-panel-theme($light-theme); + @include mat-form-field-theme($light-theme); + @include mat-grid-list-theme($light-theme); + @include mat-icon-theme($light-theme); + @include mat-input-theme($light-theme); + @include mat-list-theme($light-theme); + @include mat-menu-theme($light-theme); + @include mat-paginator-theme($light-theme); + @include mat-progress-bar-theme($light-theme); + @include mat-progress-spinner-theme($light-theme); + @include mat-radio-theme($light-theme); + @include mat-select-theme($light-theme); + @include mat-sidenav-theme($light-theme); + @include mat-slide-toggle-theme($light-theme); + @include mat-slider-theme($light-theme); + @include mat-stepper-theme($light-theme); + @include mat-tabs-theme($light-theme); + @include mat-toolbar-theme($light-background); + @include mat-tooltip-theme($light-theme); + @include mat-snack-bar-theme($light-theme); +} From 91844ee7702d2c02cda3091643e1a093362b8dc4 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 17 Feb 2021 16:28:00 +0100 Subject: [PATCH 23/76] Rewriting theme-service --- src/app/app.component.ts | 22 ++++-- .../notification-box.component.ts | 6 +- .../project-map/project-map.component.html | 2 +- .../project-map/project-map.component.scss | 4 ++ .../project-map/project-map.component.ts | 13 +++- src/app/services/theme.service.ts | 67 ++++--------------- 6 files changed, 49 insertions(+), 65 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 401e4efa..ae1eba45 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, HostBinding, OnInit } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { ElectronService } from 'ngx-electron'; @@ -6,6 +6,7 @@ import { SettingsService } from './services/settings.service'; import { ThemeService } from './services/theme.service'; import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router'; import { ProgressService } from './common/progress/progress.service'; +import { OverlayContainer} from '@angular/cdk/overlay'; @Component({ selector: 'app-root', @@ -14,6 +15,7 @@ import { ProgressService } from './common/progress/progress.service'; }) export class AppComponent implements OnInit { constructor( + private overlayContainer: OverlayContainer, iconReg: MatIconRegistry, sanitizer: DomSanitizer, private settingsService: SettingsService, @@ -30,18 +32,24 @@ export class AppComponent implements OnInit { }); } + @HostBinding('class') componentCssClass; + ngOnInit(): void { if (this.electronService.isElectronApp) { this.settingsService.subscribe(settings => { this.electronService.ipcRenderer.send('settings.changed', settings); }); } - let theme = localStorage.getItem('theme'); - if (theme === 'light') { - this.themeService.setDarkMode(false); - } else { - this.themeService.setDarkMode(true); - } + + this.applyTheme(this.themeService.savedTheme + '-theme'); + this.themeService.themeChanged.subscribe((event: string) => { + this.applyTheme(event); + }); + } + + applyTheme(theme: string) { + this.overlayContainer.getContainerElement().classList.add(theme); + this.componentCssClass = theme; } checkEvent(routerEvent) : void { diff --git a/src/app/components/notification-box/notification-box.component.ts b/src/app/components/notification-box/notification-box.component.ts index e2768f54..6814cf5c 100644 --- a/src/app/components/notification-box/notification-box.component.ts +++ b/src/app/components/notification-box/notification-box.component.ts @@ -46,7 +46,11 @@ export class NotificationBoxComponent implements OnInit, OnDestroy { // if (!this.location.path().includes('nodes') && !(adbutler == today)) this.startTimer(); if (!this.location.path().includes('nodes')) this.startTimer(); - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + + this.themeService.themeChanged.subscribe((value: string) => { + this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + }); } ngAfterViewInit() { diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html index 44d2b469..60a8942b 100644 --- a/src/app/components/project-map/project-map.component.html +++ b/src/app/components/project-map/project-map.component.html @@ -172,7 +172,7 @@
- +
-
- + +
+
+ + + + + +
+
+ +
+
+ +
- - -
- - - -
- - - - - - - - - - - - -
- -
-
- -
diff --git a/src/app/components/project-map/project-map.component.scss b/src/app/components/project-map/project-map.component.scss index a68421e6..7b22e384 100644 --- a/src/app/components/project-map/project-map.component.scss +++ b/src/app/components/project-map/project-map.component.scss @@ -9,20 +9,154 @@ app-map { width: auto; } -svg.map { - background-color: #f0f0f0; -} - g.node:hover { background-color: #0097a7; } -.project-toolbar { - width: 70px; - position: fixed; - top: 20px; - left: 20px; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); +.project-map { + background-color: #e8ecef; +} + +#project-titlebar { + position: fixed; + top: 0px; + left: 0px; + right: 0px; + height: 60px; + padding: 0px 20px; + background-color: #20313b; + display: flex; + justify-content: space-between; + align-items: center; + box-shadow: 3px 3px 10px rgba(0,0,0,0.2); + z-index: 2; + + .gns3-button { + position: relative; + top: -2px; + + mat-icon { + width: 30px !important; + height: 30px !important; + } + } + + .primary-controls { + border-right: 1px solid rgba(255,255,255,0.3); + padding-right: 15px; + margin-right: 15px; + } + + .menu-button-group { + display: flex; + align-items: center; + height: 24px; + } + + .menu-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + margin: 0px 8px; + border-radius: 18px; + background: none; + font-size: 20px; + } + + .add-menu-button mat-icon { + font-size: 28px !important; + } + + .selected { + background: rgba(0, 151, 167, 0.1); + + mat-icon { + color: #0097a7 !important; + } + } + + .project-titlebar-controls { + display: flex; + align-items: center; + } + + &.lightTheme { + background-color: #20313b !important; + + mat-icon { + color: #fff !important; + } + + .selected mat-icon { + color: #0097a7 !important; + } + } +} + +#project-toolbar { + position: fixed; + top: 60px; + left: 0px; + width: 50px; + margin: 20px; + background-color: rgba(15,18,20,0.90); + border-radius: 6px; + box-shadow: 1px 1px 10px rgba(0,0,0,0.2); + z-index: 2; + + mat-icon { + font-size: 20px; + } + + .menu-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + border-radius: 18px; + background: none; + margin: 2px 0px; + } + + .selection-button { + margin-bottom: 0px !important; + } + + .snapshot-button mat-icon { + font-size: 16px; + } + + .section { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + border-top: 1px solid rgba(255,255,255,0.3); + padding: 5px 0px; + + &:first-child { + border: none; + } + } + + &.lightTheme { + background-color: rgba(244, 248, 252, 0.95) !important; + + .menu-button { + opacity: 0.7; + } + + .section { + border-top: 1px solid rgba(0,0,0,0.1); + + &:first-child { + border: none; + } + } + } } img { @@ -31,7 +165,6 @@ img { } .lightTheme { - background: white!important; color: black!important; } @@ -42,7 +175,7 @@ img { #show-menu-wrapper { position: fixed; background: transparent; - top: 20px; + top: 0px; left: 92px; background: #263238; height: 72px; @@ -64,8 +197,9 @@ img { #menu-wrapper { position: fixed; background: transparent; - top: 20px; + top: 0px; left: 92px; + right: 0px; background: #263238; height: 72px; padding-top: 16px; @@ -111,30 +245,6 @@ mat-divider.divider { color: gray; } -.zoom-buttons { - position: fixed; - background: #263238; - bottom: 20px; - right: 20px; - display: grid; - color: white; - - .zoom-button { - outline: none; - height: 40px; - width: 40px; - background: transparent; - border: none; - color: white; - font-size: 1.25rem; - font-weight: bold; - - mat-icon { - margin-left: -6px; - } - } -} - @-moz-document url-prefix() { /** fixes gray background of drawing menu on Firefox **/ .mat-drawer-content { diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html index 80234777..df9c9668 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html @@ -1 +1,8 @@ - + diff --git a/src/app/components/template/template.component.html b/src/app/components/template/template.component.html index 1675c5e9..4c18af6a 100644 --- a/src/app/components/template/template.component.html +++ b/src/app/components/template/template.component.html @@ -1,15 +1,24 @@ - - - + - diff --git a/src/app/components/topology-summary/topology-summary.component.html b/src/app/components/topology-summary/topology-summary.component.html index 0a3ef674..601f2ca6 100644 --- a/src/app/components/topology-summary/topology-summary.component.html +++ b/src/app/components/topology-summary/topology-summary.component.html @@ -4,10 +4,10 @@ (document:mouseup)="toggleDragging(false)">
- - - close -
-
- -
- - - started - suspended - stopped - - - active capture(s) - active packet captures - - -
-
- - sort by name ascending - sort by name descending - -
- -
-
-
- - - - - - - - - - {{node.name}} -
-
- {{node.console_type}} {{node.console_host}}:{{node.console}} -
-
- none -
-
-
-
-
- -
-
-
- - - - - - - {{compute.name}} -
-
- {{compute.host}} -
-
- {{server.location}} -
-
-
+ + +
+
+ + + started + suspended + stopped + + + active capture(s) + active packet captures + + +
+
+ + sort by name ascending + sort by name descending + +
+ +
+
+
+ + + + + + + + + + {{node.name}} +
+
+ {{node.console_type}} {{node.console_host}}:{{node.console}} +
+
+ none +
+
+
+
+ + +
+
+
+
+ + + + + + + {{compute.name}} +
+
+ {{compute.host}} +
+
+ {{server.location}} +
+
+
+
+ +
diff --git a/src/app/components/topology-summary/topology-summary.component.scss b/src/app/components/topology-summary/topology-summary.component.scss index 663f0a60..865efd1d 100644 --- a/src/app/components/topology-summary/topology-summary.component.scss +++ b/src/app/components/topology-summary/topology-summary.component.scss @@ -7,19 +7,23 @@ .summaryWrapper { box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; - top: 20px; - right: 20px; + top: 60px; + right: 0px; height: 400px; - width: 300px; + width: 320px; background: #263238; color: white; overflow: hidden; font-size: 12px; + margin: 20px; + border-radius: 8px; } .lightTheme { - background: white!important; + background-color: rgba(244, 248, 252, 0.95); color: black; + margin: 20px; + border-radius: 8px; } .summaryHeaderMenu { @@ -28,10 +32,7 @@ .summaryHeader { width: 100%; - height: 34px; display: flex; - justify-content: space-between; - margin-right: 5px; } .summaryFilters { @@ -46,17 +47,17 @@ margin-right: 5px; } +.tabContent { + padding: 10px; +} + .summaryContent { - margin-left: 5px; - margin-right: 5px; overflow: auto; scrollbar-color: darkgrey #263238; scrollbar-width: thin; } .summaryContentServers { - margin-left: 5px; - margin-right: 5px; max-height: 350px; overflow: auto; scrollbar-color: darkgrey #263238; @@ -67,10 +68,12 @@ margin-left: 5px; margin-top: 4px; outline: none; + border-radius: 0px; } .marked { color: #0097a7; + border-bottom: 2px solid #0097a7; } .divider { diff --git a/src/app/components/topology-summary/topology-summary.component.ts b/src/app/components/topology-summary/topology-summary.component.ts index a0f088a2..f446bdd7 100644 --- a/src/app/components/topology-summary/topology-summary.component.ts +++ b/src/app/components/topology-summary/topology-summary.component.ts @@ -38,7 +38,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { captureFilterEnabled: boolean = false; packetFilterEnabled: boolean = false; computes: Compute[] = []; - + isTopologyVisible: boolean = true; isDraggingEnabled: boolean = false; isLightThemeEnabled: boolean = false; @@ -52,7 +52,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { ) {} ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; this.subscriptions.push( this.nodesDataSource.changes.subscribe((nodes: Node[]) => { this.nodes = nodes; @@ -77,7 +77,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { this.computes = computes; }); - this.style = { top: '20px', right: '20px', width: '300px', height: '400px'}; + this.style = { top: '60px', right: '0px', width: '320px', height: '400px'}; } toggleDragging(value: boolean) { @@ -138,7 +138,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { }; } - toogleTopologyVisibility(value: boolean) { + toggleTopologyVisibility(value: boolean) { this.isTopologyVisible = value; } @@ -161,7 +161,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { this.filteredNodes = this.filteredNodes.sort(this.compareAsc); } else { this.filteredNodes = this.filteredNodes.sort(this.compareDesc); - } + } } applyStatusFilter(filter: string) { @@ -190,15 +190,15 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { if (this.startedStatusFilterEnabled) { nodes = nodes.concat(this.nodes.filter(n => n.status === 'started')); } - + if (this.stoppedStatusFilterEnabled) { nodes = nodes.concat(this.nodes.filter(n => n.status === 'stopped')); } - + if (this.suspendedStatusFilterEnabled) { nodes = nodes.concat(this.nodes.filter(n => n.status === 'suspended')); } - + if (!this.startedStatusFilterEnabled && !this.stoppedStatusFilterEnabled && !this.suspendedStatusFilterEnabled) { nodes = nodes.concat(this.nodes); } @@ -215,7 +215,7 @@ export class TopologySummaryComponent implements OnInit, OnDestroy { this.filteredNodes = nodes.sort(this.compareAsc); } else { this.filteredNodes = nodes.sort(this.compareDesc); - } + } } checkCapturing(nodes: Node[]): Node[] { diff --git a/src/styles.scss b/src/styles.scss index ffa74624..b8aaec2b 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,3 +1,7 @@ +body { + background-color: #e8ecef; +} + img.logo-header { width: 50px; } From 249a98b340c3b7ec996e2f6ef0e1da9bb4148430 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 7 Apr 2021 10:29:58 -0400 Subject: [PATCH 51/76] style updates --- .../adbutler/adbutler.component.html | 2 +- .../adbutler/adbutler.component.scss | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/components/adbutler/adbutler.component.html b/src/app/components/adbutler/adbutler.component.html index 2e383bec..709874a7 100644 --- a/src/app/components/adbutler/adbutler.component.html +++ b/src/app/components/adbutler/adbutler.component.html @@ -6,6 +6,6 @@ - close
+ close
diff --git a/src/app/components/adbutler/adbutler.component.scss b/src/app/components/adbutler/adbutler.component.scss index 6fc078ce..43942aa0 100644 --- a/src/app/components/adbutler/adbutler.component.scss +++ b/src/app/components/adbutler/adbutler.component.scss @@ -19,6 +19,13 @@ padding-right: 16px; } +.close-button { + position: absolute; + top: 15px; + right: 15px; + color: #000 !important; +} + .lightTheme { background-color: #ddf9ff; } @@ -35,17 +42,16 @@ button { padding: 5px; color: white; font-weight: bold; + font-size: 11px; padding-right: 15px; padding-left: 15px; border-radius: 6px; + + a { + color: white; + } } a { color: #122124; } - -button { - a { - color: white; - } -} From 4f34076440f62ccaed143ea80e716e9457a1e8cd Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 8 Apr 2021 00:35:06 +0930 Subject: [PATCH 52/76] Trying to fix Electron build --- .appveyor.yml | 1 + scripts/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 792bc9b6..ba06cda4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,6 +20,7 @@ install: build_script: - cmd: set NODE_OPTIONS=--max-old-space-size=8092 - yarn buildforelectron + - "%PYTHON%\\python.exe -m pip install -U pip - "%PYTHON%\\python.exe -m pip install -r scripts\\requirements.txt" - "%PYTHON%\\python.exe scripts\\build.py download -a" - "%PYTHON%\\python.exe scripts\\build.py build_exe -b dist/exe.gns3server -s" diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 9bab4b5e..49339bb5 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -1,6 +1,6 @@ -setuptools==40.8.0 +setuptools==54.2.0 cx_Freeze==5.1.1 requests==2.25.1 packaging==20.9 appdirs==1.4.4 -psutil==5.6.7 +psutil==5.8.0 From 0d7e76eb6caf65182cbf4ea8c8e8d190fd5d120c Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 8 Apr 2021 00:38:37 +0930 Subject: [PATCH 53/76] Fix typo in .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index ba06cda4..3e291170 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,7 +20,7 @@ install: build_script: - cmd: set NODE_OPTIONS=--max-old-space-size=8092 - yarn buildforelectron - - "%PYTHON%\\python.exe -m pip install -U pip + - "%PYTHON%\\python.exe -m pip install -U pip" - "%PYTHON%\\python.exe -m pip install -r scripts\\requirements.txt" - "%PYTHON%\\python.exe scripts\\build.py download -a" - "%PYTHON%\\python.exe scripts\\build.py build_exe -b dist/exe.gns3server -s" From c90f37b0300361b811b53321142a16ae7548bd90 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 7 Apr 2021 22:43:19 +0200 Subject: [PATCH 54/76] Updating dependencies --- package.json | 120 +- yarn.lock | 3467 +++++++++++++++++++++++++++++++------------------- 2 files changed, 2252 insertions(+), 1335 deletions(-) diff --git a/package.json b/package.json index 5216a404..010b0e49 100644 --- a/package.json +++ b/package.json @@ -42,99 +42,99 @@ "dependencies": { "@angular-react/core": "^3.0.0", "@angular-react/fabric": "^3.0.0", - "@angular/animations": "^11.0.8", - "@angular/cdk": "^11.0.3", - "@angular/common": "^11.0.8", - "@angular/compiler": "^11.0.8", - "@angular/core": "^11.0.8", - "@angular/forms": "^11.0.8", + "@angular/animations": "^11.2.8", + "@angular/cdk": "^11.2.7", + "@angular/common": "^11.2.8", + "@angular/compiler": "^11.2.8", + "@angular/core": "^11.2.8", + "@angular/forms": "^11.2.8", "@angular/http": "^7.2.16", - "@angular/material": "^11.0.3", - "@angular/platform-browser": "^11.0.8", - "@angular/platform-browser-dynamic": "^11.0.8", - "@angular/router": "^11.0.8", - "@sentry/browser": "^5.29.2", - "@types/jest": "^26.0.20", - "@types/mocha": "^8.2.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@angular/material": "^11.2.7", + "@angular/platform-browser": "^11.2.8", + "@angular/platform-browser-dynamic": "^11.2.8", + "@angular/router": "^11.2.8", + "@sentry/browser": "^6.2.5", + "@types/jest": "^26.0.22", + "@types/mocha": "^8.2.2", + "@types/react": "^17.0.3", + "@types/react-dom": "^17.0.3", "angular-draggable-droppable": "^4.6.0", "angular-persistence": "^1.0.1", - "angular-resizable-element": "^3.3.4", + "angular-resizable-element": "^3.3.5", "angular2-draggable": "^2.3.2", "angular2-hotkeys": "^2.2.0", "angular2-indexeddb": "^1.2.3", - "bootstrap": "^4.5.3", + "bootstrap": "^4.6.0", "command-exists": "^1.2.9", - "core-js": "^3.8.2", - "d3-ng2-service": "^2.1.0", + "core-js": "^3.10.0", + "d3-ng2-service": "^2.2.0", "eev": "^0.1.5", - "file-saver": "^2.0.2", - "ini": "^1.3.6", + "file-saver": "^2.0.5", + "ini": "^2.0.0", "material-design-icons": "^3.0.1", "ng-circle-progress": "^1.6.0", - "ng2-file-upload": "^1.3.0", + "ng2-file-upload": "^1.4.0", "ngx-childprocess": "^0.0.6", - "ngx-device-detector": "^2.0.5", - "ngx-electron": "^2.1.1", + "ngx-device-detector": "^2.0.6", + "ngx-electron": "^2.2.0", "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", - "office-ui-fabric-react": "^7.156.0", - "react": "^17.0.1", - "react-bootstrap": "^1.4.3", - "react-dom": "^17.0.1", - "rxjs": "^6.6.3", - "rxjs-compat": "^6.6.3", - "save-html-as-image": "^1.3.4", - "save-svg-as-png": "^1.4.14", - "schematics-scss-migrate": "^1.2.10", - "snyk": "^1.437.3", + "office-ui-fabric-react": "^7.166.0", + "react": "^17.0.2", + "react-bootstrap": "^1.5.2", + "react-dom": "^17.0.2", + "rxjs": "^6.6.7", + "rxjs-compat": "^6.6.7", + "save-html-as-image": "^1.5.2", + "save-svg-as-png": "^1.4.17", + "schematics-scss-migrate": "^1.3.13", + "snyk": "^1.528.0", "spark-md5": "^3.0.1", "svg-crowbar": "^0.6.5", - "tree-kill": "^1.2.1", - "tslib": "^2.1.0", + "tree-kill": "^1.2.2", + "tslib": "^2.2.0", "typeface-roboto": "^1.1.13", - "xterm": "^4.9.0", + "xterm": "^4.11.0", "xterm-addon-attach": "^0.6.0", - "xterm-addon-fit": "^0.4.0", + "xterm-addon-fit": "^0.5.0", "yargs": "^16.2.0", - "zone.js": "^0.11.3" + "zone.js": "^0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.1100.6", - "@angular/cli": "^11.0.6", - "@angular/compiler-cli": "^11.0.8", - "@angular/language-service": "^11.0.8", - "@sentry/cli": "^1.61.0", - "@sentry/electron": "^2.1.0", - "@types/jasmine": "~3.6.0", + "@angular-devkit/build-angular": "^0.1102.7", + "@angular/cli": "^11.2.7", + "@angular/compiler-cli": "^11.2.8", + "@angular/language-service": "^11.2.8", + "@sentry/cli": "^1.63.2", + "@sentry/electron": "^2.4.0", + "@types/jasmine": "~3.6.9", "@types/jasminewd2": "^2.0.8", - "@types/node": "14.14.10", - "codelyzer": "^6.0.0", - "electron": "^11.2.0", - "electron-builder": "22.9.1", + "@types/node": "14.14.37", + "codelyzer": "^6.0.1", + "electron": "^12.0.2", + "electron-builder": "22.10.5", "file-loader": "^6.2.0", - "jasmine-core": "~3.6.0", - "jasmine-spec-reporter": "~5.0.0", - "jquery": "^3.5.1", - "karma": "^6.1.1", + "jasmine-core": "~3.7.1", + "jasmine-spec-reporter": "~6.0.0", + "jquery": "^3.6.0", + "karma": "^6.3.2", "karma-chrome-launcher": "~3.1.0", "karma-cli": "^2.0.0", - "karma-coverage-istanbul-reporter": "~3.0.2", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "^1.5.0", + "karma-coverage-istanbul-reporter": "~3.0.3", + "karma-jasmine": "~4.0.1", + "karma-jasmine-html-reporter": "^1.5.4", "license-checker": "^25.0.1", "popper.js": "^1.16.1", "prettier": "^2.2.1", "protractor": "^7.0.0", - "replace": "^1.2.0", + "replace": "^1.2.1", "rxjs-tslint": "^0.1.8", "ts-mockito": "^2.6.1", - "ts-node": "~9.0.0", + "ts-node": "~9.1.1", "tslint": "^6.1.3", "tslint-config-prettier": "^1.18.0", "typescript": "4.0.2", - "webpack": "4.44.2", + "webpack": "5.31.0", "yarn-upgrade-all": "^0.5.4" }, "greenkeeper": { diff --git a/yarn.lock b/yarn.lock index 346dae86..356f6d05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,115 +7,111 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== -"@angular-devkit/architect@0.1100.7": - version "0.1100.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1100.7.tgz#6c39b886bbdb5d0e5a2d9921aa5816209041e105" - integrity sha512-b2zv2yiRbdhJ7hJfZsAvGYcqgh2DVtc7gRIPo1eDPvOAKrenmZ4zo/v0PRYScrTsPzqmoCokNA5nIwufwUEnuA== +"@angular-devkit/architect@0.1102.7": + version "0.1102.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.7.tgz#27a155621194f15f85de01528301c44f967af127" + integrity sha512-55SduK1ZpoHDSNd5ACBFVUQ5dMNVLOznJDoec76acrDuY7EZ6bptfjcK329fBQME0Ne6Jvip7zzrmec+PBXS+g== dependencies: - "@angular-devkit/core" "11.0.7" + "@angular-devkit/core" "11.2.7" rxjs "6.6.3" -"@angular-devkit/architect@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1102.0.tgz#0d4bee477d59318e8f3511fa6936bdcfa303df55" - integrity sha512-d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g== +"@angular-devkit/build-angular@^0.1102.7": + version "0.1102.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1102.7.tgz#f260a9fe9135e8c4192a85466bd32383970460aa" + integrity sha512-SDAqqJmX7EP8KIGopZJRTpOWnAAicRbE43pe/D/6Q9nzqN0RA44SP9SIyTAMRYFpRWtgskWf2MOtf5Xt/s83yw== dependencies: - "@angular-devkit/core" "11.2.0" - rxjs "6.6.3" - -"@angular-devkit/build-angular@^0.1100.6": - version "0.1100.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.1100.7.tgz#e5577998e67e89137c2b7c9d232a58b2fdca91dc" - integrity sha512-erc+AtSU46ZIX7A5dmeZ0/G/SQIbqMAGbTKZbf11GePyhT0JAAnfMQtOHMb6AaX85n4yQTg1uMo9f5+8V3lfKA== - dependencies: - "@angular-devkit/architect" "0.1100.7" - "@angular-devkit/build-optimizer" "0.1100.7" - "@angular-devkit/build-webpack" "0.1100.7" - "@angular-devkit/core" "11.0.7" - "@babel/core" "7.12.3" - "@babel/generator" "7.12.1" - "@babel/plugin-transform-runtime" "7.12.1" - "@babel/preset-env" "7.12.1" - "@babel/runtime" "7.12.1" - "@babel/template" "7.10.4" + "@angular-devkit/architect" "0.1102.7" + "@angular-devkit/build-optimizer" "0.1102.7" + "@angular-devkit/build-webpack" "0.1102.7" + "@angular-devkit/core" "11.2.7" + "@babel/core" "7.12.10" + "@babel/generator" "7.12.11" + "@babel/plugin-transform-async-to-generator" "7.12.1" + "@babel/plugin-transform-runtime" "7.12.10" + "@babel/preset-env" "7.12.11" + "@babel/runtime" "7.12.5" + "@babel/template" "7.12.7" + "@discoveryjs/json-ext" "0.5.2" "@jsdevtools/coverage-istanbul-loader" "3.0.5" - "@ngtools/webpack" "11.0.7" + "@ngtools/webpack" "11.2.7" ansi-colors "4.1.1" - autoprefixer "9.8.6" - babel-loader "8.1.0" + autoprefixer "10.2.4" + babel-loader "8.2.2" browserslist "^4.9.1" cacache "15.0.5" caniuse-lite "^1.0.30001032" - circular-dependency-plugin "5.2.0" - copy-webpack-plugin "6.2.1" - core-js "3.6.5" - css-loader "4.3.0" + circular-dependency-plugin "5.2.2" + copy-webpack-plugin "6.3.2" + core-js "3.8.3" + critters "0.0.7" + css-loader "5.0.1" cssnano "4.1.10" - file-loader "6.1.1" + file-loader "6.2.0" find-cache-dir "3.3.1" glob "7.1.6" + https-proxy-agent "5.0.0" inquirer "7.3.3" - jest-worker "26.5.0" + jest-worker "26.6.2" karma-source-map-support "1.4.0" - less "3.12.2" - less-loader "7.0.2" - license-webpack-plugin "2.3.1" + less "4.1.1" + less-loader "7.3.0" + license-webpack-plugin "2.3.11" loader-utils "2.0.0" - mini-css-extract-plugin "1.2.1" + mini-css-extract-plugin "1.3.5" minimatch "3.0.4" - open "7.3.0" - ora "5.1.0" + open "7.4.0" + ora "5.3.0" parse5-html-rewriting-stream "6.0.1" pnp-webpack-plugin "1.6.4" - postcss "7.0.32" - postcss-import "12.0.1" - postcss-loader "4.0.4" + postcss "8.2.4" + postcss-import "14.0.0" + postcss-loader "4.2.0" raw-loader "4.0.2" regenerator-runtime "0.13.7" resolve-url-loader "3.1.2" rimraf "3.0.2" - rollup "2.32.1" + rollup "2.38.4" rxjs "6.6.3" - sass "1.27.0" - sass-loader "10.0.5" - semver "7.3.2" + sass "1.32.6" + sass-loader "10.1.1" + semver "7.3.4" source-map "0.7.3" - source-map-loader "1.1.2" + source-map-loader "1.1.3" source-map-support "0.5.19" - speed-measure-webpack-plugin "1.3.3" + speed-measure-webpack-plugin "1.4.2" style-loader "2.0.0" stylus "0.54.8" - stylus-loader "4.3.1" - terser "5.3.7" + stylus-loader "4.3.3" + terser "5.5.1" terser-webpack-plugin "4.2.3" text-table "0.2.0" tree-kill "1.2.2" webpack "4.44.2" webpack-dev-middleware "3.7.2" - webpack-dev-server "3.11.0" - webpack-merge "5.2.0" - webpack-sources "2.0.1" - webpack-subresource-integrity "1.5.1" + webpack-dev-server "3.11.2" + webpack-merge "5.7.3" + webpack-sources "2.2.0" + webpack-subresource-integrity "1.5.2" worker-plugin "5.0.0" -"@angular-devkit/build-optimizer@0.1100.7": - version "0.1100.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1100.7.tgz#fef39c8db5d178f223d43bd1c6e3a566e19c24c1" - integrity sha512-bHIIub0d1trVAmAX/EaNR6Zo4b7hkscewK394qYYp/w8VKQkLSAPMUbt2YTWN+erR9yyHnJ2y7tBabIui75Wdw== +"@angular-devkit/build-optimizer@0.1102.7": + version "0.1102.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.7.tgz#d2da35401b65cc92f7a80ab9ff36e8a327369256" + integrity sha512-OC+2TmkBon7KxeBurtYBmzecUsRMKP8JI0c39HnWePPoQU6yMnYmEeU/3zuIX5hOaxriQwPAx76R7u+9N1dF9w== dependencies: loader-utils "2.0.0" source-map "0.7.3" - tslib "2.0.3" - typescript "4.0.5" - webpack-sources "2.0.1" + tslib "2.1.0" + typescript "4.1.5" + webpack-sources "2.2.0" -"@angular-devkit/build-webpack@0.1100.7": - version "0.1100.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1100.7.tgz#d62df6bd70b495df7dc335f80ecd925e0f3b3e4d" - integrity sha512-/6Hudd1hs/GMHX4C/Qk7jueIMNg8NKFJWDEbvMPMgDzTqUIa680PTD6SNSCcY5Cz9mEpdpYCZo5N31JB7dlpOg== +"@angular-devkit/build-webpack@0.1102.7": + version "0.1102.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1102.7.tgz#87b85ccbda5b7b90d3cf2aa76227e359e4b44101" + integrity sha512-+Z0HCa5tuhN5az3+3zWNFsJEkU6FawPU4kp+pdqQXD8Bzwo7jlsDXfSB2UN50RmveqrZNJxszIvhIjFyVDKXVQ== dependencies: - "@angular-devkit/architect" "0.1100.7" - "@angular-devkit/core" "11.0.7" + "@angular-devkit/architect" "0.1102.7" + "@angular-devkit/core" "11.2.7" rxjs "6.6.3" "@angular-devkit/core@10.2.2", "@angular-devkit/core@^10.1.0": @@ -129,21 +125,10 @@ rxjs "6.6.2" source-map "0.7.3" -"@angular-devkit/core@11.0.7": - version "11.0.7" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.0.7.tgz#05b82be7e11ddc2a7836c777297ee45eee20ff55" - integrity sha512-1GKnIT++YSUHpzzRx9QC0+8yOw4wy+ZpiJVDlroPSeK4FGrTCJqJKenkfRjVFRFOSrzTiJds+IU6kI4+bFbw9g== - dependencies: - ajv "6.12.6" - fast-json-stable-stringify "2.1.0" - magic-string "0.25.7" - rxjs "6.6.3" - source-map "0.7.3" - -"@angular-devkit/core@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.0.tgz#a9198a391723e865fc6b369752c176cd5ed1d452" - integrity sha512-qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q== +"@angular-devkit/core@11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.7.tgz#65963736fae633f5b77af62b0637f422ff5c410b" + integrity sha512-oflo+LsUob5nF0PknivtRdkHH/iMbVNIPRnv/c52Nk7+FUlEx53pkLWBc2rdhTrEptBFMmrpNaa30P+TQrFNkQ== dependencies: ajv "6.12.6" fast-json-stable-stringify "2.1.0" @@ -162,12 +147,12 @@ rxjs "6.5.4" source-map "0.7.3" -"@angular-devkit/schematics@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.2.0.tgz#82192578ff2a9fb01a9d8c56237f4fc98946e757" - integrity sha512-sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w== +"@angular-devkit/schematics@11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-11.2.7.tgz#a78730a6d7d4242c69e1b87fef5d880a016b8748" + integrity sha512-cnORKnyVtsdVZ180ZZyrmCMeSH1IGK2apfgGGW3UaUZvTAtolQPrqT0RQUK8qLF/RC85xy9QYXApiAaLDUixIw== dependencies: - "@angular-devkit/core" "11.2.0" + "@angular-devkit/core" "11.2.7" ora "5.3.0" rxjs "6.6.3" @@ -206,32 +191,32 @@ dependencies: tslib "^1.9.0" -"@angular/animations@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.1.tgz#970d79add4c2a4abc0ed91e6cf5920c65dda2d99" - integrity sha512-U2gtMaiVfTNMn0FPpSDTgOgtYc45QUnQcc2Po40rCmgH7BGyJAOgmaXY9uv319Jjl+vNrX+bbXaZix73Zpjfyg== +"@angular/animations@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-11.2.8.tgz#d68fd6c61c199299df5a964bfdc106b09aab52dc" + integrity sha512-fYPXO8xgMYEpIc19o5B2f8U3BCmElQf4n/lIvVk9gky8CF5alSlClbbTe31orWDwGiqUnWkHWDZvCwi2C2Srvw== dependencies: tslib "^2.0.0" -"@angular/cdk@^11.0.3": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.0.tgz#4f0d8e9865d29ee1b2ab3ce7be9a7af0a87b0ef4" - integrity sha512-25k1giKAJ7DPzJBZfAVZmw/VfR4pZUaZnhgVAMwIdGPl5SaXJEW3e2znGlhzwkuQsiBgrSKfMgJmwKSyUbe2tg== +"@angular/cdk@^11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.7.tgz#1ddcd71cba2506e53beb51a6be7c6a766f7af05e" + integrity sha512-18h7dyXHl/h+rsXFoNpqxiFCDhqewXVPpLG/WWeiFXKdtHeIk1yzfoSjo7nBzclicFFN/A+M2IQSIt21doJ0aA== dependencies: tslib "^2.0.0" optionalDependencies: parse5 "^5.0.0" -"@angular/cli@^11.0.6": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.0.tgz#f611f0851f6f92008f0f5aaaade947751b27687f" - integrity sha512-waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q== +"@angular/cli@^11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-11.2.7.tgz#5e37cf778303c2777f90d0ba71d5d7c554e57eae" + integrity sha512-+0uC485NHE5Z8FCyCAeZnb7OCOZSGzEsUxGS5pEs8V9+c02/FmMg5aFBmxoXJhCWMJnb2QrJgAjb6rgka8e4Hg== dependencies: - "@angular-devkit/architect" "0.1102.0" - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" - "@schematics/angular" "11.2.0" - "@schematics/update" "0.1102.0" + "@angular-devkit/architect" "0.1102.7" + "@angular-devkit/core" "11.2.7" + "@angular-devkit/schematics" "11.2.7" + "@schematics/angular" "11.2.7" + "@schematics/update" "0.1102.7" "@yarnpkg/lockfile" "1.1.0" ansi-colors "4.1.1" debug "4.3.1" @@ -250,17 +235,17 @@ universal-analytics "0.4.23" uuid "8.3.2" -"@angular/common@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.1.tgz#4952cf1ae4734b1436dc262bf6d6b3338610b896" - integrity sha512-6FuZvJkYq8ZD4Bi6n7zaok1BMe5ve3EZDXLM7cDl2Hktpc+z0/mIZtVYMR0zvf7VX48E4zUU039779ixy0zDMw== +"@angular/common@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-11.2.8.tgz#1dbc4cf9223295854b27445f2d1e6189030112cf" + integrity sha512-li3UjvtrTf66hf75JBJsurPt6UTuICEpwDgtrTelbj76bvR78OCC3roLpYXy16QX/VTpJpjE8e4rKDXrgpFkDg== dependencies: tslib "^2.0.0" -"@angular/compiler-cli@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.1.tgz#7eb3c8d0b685c61a88ac665067043c90129df573" - integrity sha512-btbCM+KrAmQnikwldBr5P7I5yQBBZqyGBhs/ANjcCcBkE1cMVMFlRUvD4jp0uHjcdGshcFi71s2DSOcPukh59A== +"@angular/compiler-cli@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-11.2.8.tgz#723426afb7208ba72fefb5c1d01e41cfb29ca5a1" + integrity sha512-UyAR+9FeQmk5MwmS0XcrhUNyvEhlhqK5w28eWJH6dFX5RSviZh7EPvVh+9CWHPi29iLeDM0dxuo6pdbNNpneZg== dependencies: "@babel/core" "^7.8.6" "@babel/types" "^7.8.6" @@ -276,17 +261,17 @@ source-map "^0.6.1" sourcemap-codec "^1.4.8" tslib "^2.0.0" - yargs "^16.1.1" + yargs "^16.2.0" "@angular/compiler@9.0.0": version "9.0.0" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5" integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ== -"@angular/compiler@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.1.tgz#3ccca59b5075b2162525e31e0f2423c54d200986" - integrity sha512-dejydNtCGMs06zP6aTJ4fYi3cyrXZ9GSS88DT/pZUC1ay9eZUTfm1tLH6NlCDPUwlDSUWKOWAIHwSBzHEkDJ6w== +"@angular/compiler@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.2.8.tgz#106f2e940e6a50cdf3be0b14071e00e3dd4db55c" + integrity sha512-m2BXvXfp286BZY7tvRLqszXTfs7szb41HhmEmuAIjfDIDSIk79pUAYB3A3RrgOTin9aeNVW397apyICNrvG8zA== dependencies: tslib "^2.0.0" @@ -302,17 +287,17 @@ dependencies: tslib "^2.0.0" -"@angular/core@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.1.tgz#d0bfd48cfe0d9e5340614ae364cba20c4cb084ac" - integrity sha512-FfMMG9yWW1xfZmHp8NtXJlNbLrgZ5Fm7FguRfTAuH007gDoknm+V3INKGyQfYOsIlxuJCSzyEeM3270lmbzYaQ== +"@angular/core@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.8.tgz#d021cc8607c9fb349ead90255be19fe61a1e4b1b" + integrity sha512-6Epm1gPy0V8nraQuzhLOmIGfpY230zAp2ETFIa2YOH/1sSRoU6Y7gpQ5My84nGq6Z6jaQ6oOThJl46IDUMx9sg== dependencies: tslib "^2.0.0" -"@angular/forms@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.1.tgz#c08d942a47e80f44f612447a8d1794ab1f0dd65d" - integrity sha512-/Xy1DQCZkCs1qWudmxooscPmVDkOEsgy9YJIoAYzsrRNINOpggBxBYRO9dztRmp2yDvRSAFTylmfQyTOrWrK7Q== +"@angular/forms@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-11.2.8.tgz#2a4398b3f49236777d67d54fca7d4f6a4b6d7853" + integrity sha512-qAhLnSg65YIU+9+u0TE3L5SxwnD4DfQP5l94AMLBf52knNB02XPK3SpadaiYkdaQjl68F4Pn+akYWi26tdPUww== dependencies: tslib "^2.0.0" @@ -323,39 +308,46 @@ dependencies: tslib "^1.9.0" -"@angular/language-service@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.1.tgz#527ad4739b35d1cc701026f0033aab0b088c770a" - integrity sha512-xJ6UNn3bWWDDfjf7C3F2DXAv8m2LQznxQgsPKdtHbypw5wWDbUVEqFk5sSt81g2TRiFrGYbDa9mChaKx3rttUA== +"@angular/language-service@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-11.2.8.tgz#8d249b2de8aa540dbe87b4bcf1bdf29332c97b19" + integrity sha512-OOBexa5Wap3NnH5Z/i94qhyh3lf0OajDPhqCvVdBjL0fG62lgcU12EKClq4CnXQyEbihYIrF2uKZ9PP67wWGYA== -"@angular/material@^11.0.3": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.1.tgz#f8fe426787219bfe9bd6d2fedb6337de015b0264" - integrity sha512-unHC8W+GcZSNRNSZ4l3ABdbezf6PIUtShx5MMG6HXgieqlkEgkU0W0BAeGvO/61vl6yEebizMYD/+5yqM9lUlw== +"@angular/material@^11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.7.tgz#7985f86f1659b4fa2219bdcf878873ae6a74cbc4" + integrity sha512-mNIGKxBzZGlOEezprInTiQIwktiz9XSJuxZ2fp6rtJ7jqpSrUprCwBECRl6X62JWrDVwIFTDQO1FxS3mrBIZ2Q== dependencies: tslib "^2.0.0" -"@angular/platform-browser-dynamic@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.1.tgz#0b4e80f29d477a0ce6ae840d4a0e9c5d920b316d" - integrity sha512-7DEAwy3w2GqhVDe9e5AZoFFEd6e/cnACkz39R4VWY8YiSz/HFtOQ7lQPmjzkmXMEKuGVnQzFwD4aAQWXd/myQg== +"@angular/platform-browser-dynamic@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.8.tgz#6420c026d71686c6814ae2091c7836bc76c5b5d3" + integrity sha512-Ev49eFtBbvG9ENzoj5YGdlFI/d6FtCffpsMvl/qCbXt2GGnuSbJtZ+anjEWHjeMe6Q4eHud3sRsD7KO7xpn5BA== dependencies: tslib "^2.0.0" -"@angular/platform-browser@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.1.tgz#0b03c025a8e86d139dcd0301a4c3fb203e46d320" - integrity sha512-wu1B6AY0Om1Pj3U7woLGNbuAgajKEg+B6IKIaCwXv03lID53hpMagyBiNJLLEL6PIRO33G3rPbRKW9gGEr52vg== +"@angular/platform-browser@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-11.2.8.tgz#67428473b0165365c6238b50bfa78c539e80e806" + integrity sha512-bWYln8Jb7UM4Jnd51hB8X51EBb2puIIyDjhFoDvDg1e6rS0NCBCP/ZLys9zkjwhnAXwEEEFZc/XSaHvgaT1Nag== dependencies: tslib "^2.0.0" -"@angular/router@^11.0.8": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.1.tgz#7f7d62f312af5a578cee28d595559f9120e766ac" - integrity sha512-YAq3zO8xdfjqEZ8Ur3go+5JXGIwpSTDj86dzZUMhTIsUuSVluBNdG1A+BQV2X5QNLh7VtdwfW5Npbjkn0Go/Cw== +"@angular/router@^11.2.8": + version "11.2.8" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-11.2.8.tgz#dd57abf097d4dbc42dbe69aea963b47ad5ea2087" + integrity sha512-HkHIe0yxRFXSOlotK6jN7kU0y7MU1I9R15ahxIe33bNDXM6ZQO3ZPiaulM+nxmu6lYjjFVfbUame0vs70R5mkA== dependencies: tslib "^2.0.0" +"@arcanis/slice-ansi@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@arcanis/slice-ansi/-/slice-ansi-1.0.2.tgz#35331e41a1062e3c53c01ad2ec1555c5c1959d8f" + integrity sha512-lDL63z0W/L/WTgqrwVOuNyMAsTv+pvjybd21z9SWdStmQoXT59E/iVWwat3gYjcdTNBf6oHAMoyFm8dtjpXEYw== + dependencies: + grapheme-splitter "^1.0.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" @@ -363,30 +355,29 @@ dependencies: "@babel/highlight" "^7.12.13" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.13.tgz#27e19e0ed3726ccf54067ced4109501765e7e2e8" - integrity sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg== +"@babel/compat-data@^7.12.7", "@babel/compat-data@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1" + integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ== -"@babel/core@7.12.3": - version "7.12.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8" - integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g== +"@babel/core@7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.1" + "@babel/generator" "^7.12.10" "@babel/helper-module-transforms" "^7.12.1" - "@babel/helpers" "^7.12.1" - "@babel/parser" "^7.12.3" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.12.1" - "@babel/types" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" - resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" @@ -411,16 +402,25 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468" - integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg== +"@babel/generator@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.11.tgz#98a7df7b8c358c9a37ab07a24056853016aba3af" + integrity sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA== dependencies: - "@babel/types" "^7.12.1" + "@babel/types" "^7.12.11" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.12.17": +"@babel/generator@^7.12.10", "@babel/generator@^7.13.9": + version "7.13.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" + integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== + dependencies: + "@babel/types" "^7.13.0" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/generator@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.17.tgz#9ef1dd792d778b32284411df63f4f668a9957287" integrity sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg== @@ -444,15 +444,15 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.12.1": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz#91d83fae61ef390d39c3f0507cb83979bab837c7" - integrity sha512-5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA== +"@babel/helper-compilation-targets@^7.12.5": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5" + integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ== dependencies: - "@babel/compat-data" "^7.12.13" + "@babel/compat-data" "^7.13.12" "@babel/helper-validator-option" "^7.12.17" browserslist "^4.14.5" - semver "^5.5.0" + semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.12.13": version "7.12.17" @@ -517,6 +517,13 @@ dependencies: "@babel/types" "^7.12.13" +"@babel/helper-module-imports@^7.12.5": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== + dependencies: + "@babel/types" "^7.13.12" + "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz#7c75b987d6dfd5b48e575648f81eaac891539509" @@ -544,6 +551,20 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== +"@babel/helper-plugin-utils@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" + integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== + +"@babel/helper-remap-async-to-generator@^7.12.1": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" + integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-wrap-function" "^7.13.0" + "@babel/types" "^7.13.0" + "@babel/helper-remap-async-to-generator@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878" @@ -589,7 +610,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.17": +"@babel/helper-validator-option@^7.12.11", "@babel/helper-validator-option@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== @@ -604,7 +625,17 @@ "@babel/traverse" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.17": +"@babel/helper-wrap-function@^7.13.0": + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" + integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== + dependencies: + "@babel/helper-function-name" "^7.12.13" + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + +"@babel/helpers@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.17.tgz#71e03d2981a6b5ee16899964f4101dc8471d60bc" integrity sha512-tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg== @@ -613,6 +644,15 @@ "@babel/traverse" "^7.12.17" "@babel/types" "^7.12.17" +"@babel/helpers@^7.12.5": + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8" + integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ== + dependencies: + "@babel/template" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.0" + "@babel/highlight@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" @@ -622,7 +662,12 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.4", "@babel/parser@^7.12.13", "@babel/parser@^7.12.17", "@babel/parser@^7.12.3": +"@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.13.13": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" + integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== + +"@babel/parser@^7.12.13", "@babel/parser@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.17.tgz#bc85d2d47db38094e5bb268fc761716e7d693848" integrity sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg== @@ -684,7 +729,7 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-numeric-separator@^7.12.1": +"@babel/plugin-proposal-numeric-separator@^7.12.7": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== @@ -709,14 +754,14 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz#e382becadc2cb16b7913b6c672d92e4b33385b5c" - integrity sha512-TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA== +"@babel/plugin-proposal-optional-chaining@^7.12.7": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" + integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-proposal-private-methods@^7.12.1": version "7.12.13" @@ -804,7 +849,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0": +"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -825,6 +870,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" +"@babel/plugin-transform-async-to-generator@7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1" + integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-remap-async-to-generator" "^7.12.1" + "@babel/plugin-transform-async-to-generator@^7.12.1": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz#fed8c69eebf187a535bfa4ee97a614009b24f7ae" @@ -841,7 +895,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-block-scoping@^7.12.1": +"@babel/plugin-transform-block-scoping@^7.12.11": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== @@ -1015,14 +1069,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5" - integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg== +"@babel/plugin-transform-runtime@7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562" + integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA== dependencies: - "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - resolve "^1.8.1" semver "^5.5.1" "@babel/plugin-transform-shorthand-properties@^7.12.1": @@ -1040,7 +1093,7 @@ "@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" -"@babel/plugin-transform-sticky-regex@^7.12.1": +"@babel/plugin-transform-sticky-regex@^7.12.7": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== @@ -1054,7 +1107,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-typeof-symbol@^7.12.1": +"@babel/plugin-transform-typeof-symbol@^7.12.10": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== @@ -1076,16 +1129,16 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2" - integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg== +"@babel/preset-env@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9" + integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw== dependencies: - "@babel/compat-data" "^7.12.1" - "@babel/helper-compilation-targets" "^7.12.1" - "@babel/helper-module-imports" "^7.12.1" + "@babel/compat-data" "^7.12.7" + "@babel/helper-compilation-targets" "^7.12.5" + "@babel/helper-module-imports" "^7.12.5" "@babel/helper-plugin-utils" "^7.10.4" - "@babel/helper-validator-option" "^7.12.1" + "@babel/helper-validator-option" "^7.12.11" "@babel/plugin-proposal-async-generator-functions" "^7.12.1" "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-dynamic-import" "^7.12.1" @@ -1093,10 +1146,10 @@ "@babel/plugin-proposal-json-strings" "^7.12.1" "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-numeric-separator" "^7.12.1" + "@babel/plugin-proposal-numeric-separator" "^7.12.7" "@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-optional-catch-binding" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" "@babel/plugin-proposal-private-methods" "^7.12.1" "@babel/plugin-proposal-unicode-property-regex" "^7.12.1" "@babel/plugin-syntax-async-generators" "^7.8.0" @@ -1114,7 +1167,7 @@ "@babel/plugin-transform-arrow-functions" "^7.12.1" "@babel/plugin-transform-async-to-generator" "^7.12.1" "@babel/plugin-transform-block-scoped-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.11" "@babel/plugin-transform-classes" "^7.12.1" "@babel/plugin-transform-computed-properties" "^7.12.1" "@babel/plugin-transform-destructuring" "^7.12.1" @@ -1138,14 +1191,14 @@ "@babel/plugin-transform-reserved-words" "^7.12.1" "@babel/plugin-transform-shorthand-properties" "^7.12.1" "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-sticky-regex" "^7.12.1" + "@babel/plugin-transform-sticky-regex" "^7.12.7" "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/plugin-transform-typeof-symbol" "^7.12.1" + "@babel/plugin-transform-typeof-symbol" "^7.12.10" "@babel/plugin-transform-unicode-escapes" "^7.12.1" "@babel/plugin-transform-unicode-regex" "^7.12.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.12.1" - core-js-compat "^3.6.2" + "@babel/types" "^7.12.11" + core-js-compat "^3.8.0" semver "^5.5.0" "@babel/preset-modules@^0.1.3": @@ -1159,20 +1212,27 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime@7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" - integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== +"@babel/runtime@7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e" + integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg== dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.12.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d" integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw== dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.13.8": + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" + integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.8.4": version "7.12.18" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b" @@ -1180,16 +1240,16 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/template@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" - integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA== +"@babel/template@7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/parser" "^7.10.4" - "@babel/types" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" -"@babel/template@^7.10.4", "@babel/template@^7.12.13": +"@babel/template@^7.12.13", "@babel/template@^7.12.7": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== @@ -1198,7 +1258,21 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.12.1", "@babel/traverse@^7.12.13", "@babel/traverse@^7.12.17": +"@babel/traverse@^7.12.10", "@babel/traverse@^7.13.0": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d" + integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg== + dependencies: + "@babel/code-frame" "^7.12.13" + "@babel/generator" "^7.13.9" + "@babel/helper-function-name" "^7.12.13" + "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/parser" "^7.13.13" + "@babel/types" "^7.13.13" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.17": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.17.tgz#40ec8c7ffb502c4e54c7f95492dc11b88d718619" integrity sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ== @@ -1213,7 +1287,7 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.10.4", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.4.4", "@babel/types@^7.8.6": +"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.4.4", "@babel/types@^7.8.6": version "7.12.17" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.17.tgz#9d711eb807e0934c90b8b1ca0eb1f7230d150963" integrity sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ== @@ -1222,6 +1296,20 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" +"@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13": + version "7.13.14" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d" + integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== + dependencies: + "@babel/helper-validator-identifier" "^7.12.11" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + +"@deepcode/dcignore@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@deepcode/dcignore/-/dcignore-1.0.2.tgz#39e4a3df7dde8811925330506e4bb3fbf3c288d8" + integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg== + "@develar/schema-utils@~2.6.5": version "2.6.5" resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" @@ -1230,6 +1318,11 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" +"@discoveryjs/json-ext@0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" + integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== + "@electron/get@^1.0.1": version "1.12.4" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" @@ -1246,20 +1339,31 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@fluentui/date-time-utilities@^7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.0.tgz#4c8570b3af8bc654963ecb034d0fd100010e7d6d" - integrity sha512-D8p5WWeonqRO1EgIvo7WSlX1rcm87r2VQd62zTJPQImx8rpwc77CRI+iAvfxyVHRZMdt4Qk6Jq99dUaudPWaZw== +"@electron/universal@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" + integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== dependencies: - "@uifabric/set-version" "^7.0.23" + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.0.3" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + +"@fluentui/date-time-utilities@^7.9.1": + version "7.9.1" + resolved "https://registry.yarnpkg.com/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz#bb486dc0a0fff33ef5803adabbf95e2cbf4be7be" + integrity sha512-o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ== + dependencies: + "@uifabric/set-version" "^7.0.24" tslib "^1.10.0" -"@fluentui/dom-utilities@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz#b0bbab665fe726f245800bb9e7883b1ceb54248b" - integrity sha512-w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g== +"@fluentui/dom-utilities@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz#1a53e51e1ab1d40696ae7d355a970c68d496845f" + integrity sha512-XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw== dependencies: - "@uifabric/set-version" "^7.0.23" + "@uifabric/set-version" "^7.0.24" tslib "^1.10.0" "@fluentui/keyboard-key@^0.2.12": @@ -1269,34 +1373,34 @@ dependencies: tslib "^1.10.0" -"@fluentui/react-focus@^7.17.4": - version "7.17.4" - resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-7.17.4.tgz#8e0773be88b908e44ed3a633ce04ba9cc52b4af4" - integrity sha512-L7MK538JOSpLQubyVxYZV1ftd3hViBQhcFftuJfah/mdekQkIcFTS0fsymQ4MK5i7bn13jE7lPM8QfH23wpaJg== +"@fluentui/react-focus@^7.17.6": + version "7.17.6" + resolved "https://registry.yarnpkg.com/@fluentui/react-focus/-/react-focus-7.17.6.tgz#aa23413c56d27615fdc8363bf8b8c70d5817c929" + integrity sha512-JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg== dependencies: "@fluentui/keyboard-key" "^0.2.12" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.18.0" - "@uifabric/utilities" "^7.33.4" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/set-version" "^7.0.24" + "@uifabric/styling" "^7.19.0" + "@uifabric/utilities" "^7.33.5" tslib "^1.10.0" -"@fluentui/react-window-provider@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz#8ec71db8cfd57e11f00ed42c5c1377ef4dfe5f6b" - integrity sha512-5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w== +"@fluentui/react-window-provider@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz#634f1f2e77fca9b3e8dbff9599d0c86d6c77dd73" + integrity sha512-fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw== dependencies: - "@uifabric/set-version" "^7.0.23" + "@uifabric/set-version" "^7.0.24" tslib "^1.10.0" -"@fluentui/theme@^1.7.3": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-1.7.3.tgz#cf3b3e0782a6d3c7b0de38b06f4b883c9d981de5" - integrity sha512-S97i1SBL5ytQtZQpygAIvOnQSg9tFZM25843xCY40eWRA/eAdPixzWvVmV8PPQs/K5WmXhghepWaC1SjxVO90g== +"@fluentui/theme@^1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@fluentui/theme/-/theme-1.7.4.tgz#8582bab5a7445585c631d05d44b5ebb56f18b6ba" + integrity sha512-o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ== dependencies: - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.4" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/set-version" "^7.0.24" + "@uifabric/utilities" "^7.33.5" tslib "^1.10.0" "@istanbuljs/schema@^0.1.2": @@ -1326,6 +1430,13 @@ merge-source-map "^1.1.0" schema-utils "^2.7.0" +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + "@mattlewis92/dom-autoscroller@^2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" @@ -1336,14 +1447,14 @@ resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.147.tgz#20dafb4c681a91b2cc8cdd1e01ef9cf33b6660a7" integrity sha512-fqkftQUoc2fjR9F+4uZkCt2hJhgZlkgM33k4qD4UdI75+SDOK9Zp5iU3dWzvwDWWVIXTOE+GKMFlmUtrlKZ+fg== -"@ngtools/webpack@11.0.7": - version "11.0.7" - resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.0.7.tgz#3ec8cd967fdf1dfc79e6b1469369148bc3a93bd1" - integrity sha512-OWGiiDc7s4T53BBCY8tLkLUjgw44HrixW8Wh8e4thFH1eIUM0NHe087s/B5hDNu72W/GqK4IoBbhNQ2wiCR7qQ== +"@ngtools/webpack@11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-11.2.7.tgz#963d00ccb099bb82252cdaf37a1abce548b14706" + integrity sha512-TxvyCZHkNBlEXdacMi8iuFEs4dU78FUlf195DoEggBtTIP0RUhj3PYL5vUxutJSZ0vaIuSnfgOgJlHqinFx8/w== dependencies: - "@angular-devkit/core" "11.0.7" - enhanced-resolve "5.3.1" - webpack-sources "2.0.1" + "@angular-devkit/core" "11.2.7" + enhanced-resolve "5.7.0" + webpack-sources "2.2.0" "@nodelib/fs.scandir@2.1.4": version "2.1.4" @@ -1449,7 +1560,7 @@ resolved "https://registry.yarnpkg.com/@restart/context/-/context-2.1.4.tgz#a99d87c299a34c28bd85bb489cb07bfd23149c02" integrity sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q== -"@restart/hooks@^0.3.21", "@restart/hooks@^0.3.25": +"@restart/hooks@^0.3.25", "@restart/hooks@^0.3.26": version "0.3.26" resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.26.tgz#ade155a7b0b014ef1073391dda46972c3a14a129" integrity sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g== @@ -1457,13 +1568,13 @@ lodash "^4.17.20" lodash-es "^4.17.20" -"@schematics/angular@11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.2.0.tgz#da903e0fc09e834cf53452a30ea7d2eb78608ebc" - integrity sha512-PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw== +"@schematics/angular@11.2.7": + version "11.2.7" + resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-11.2.7.tgz#e997f1754b2aabcdc3984b9816d5a36b9fce2398" + integrity sha512-LI6FkFHmwS/MCt+QENpGT/xl1Y6RMvcDqQ/efbZ3qz2W+0W0DkaPSlDmVbbNzgol+eJ7eHx4kmJr2U2r9ZOQgg== dependencies: - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" + "@angular-devkit/core" "11.2.7" + "@angular-devkit/schematics" "11.2.7" jsonc-parser "3.0.0" "@schematics/angular@^9.1.0": @@ -1474,13 +1585,13 @@ "@angular-devkit/core" "9.1.14" "@angular-devkit/schematics" "9.1.14" -"@schematics/update@0.1102.0": - version "0.1102.0" - resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1102.0.tgz#6aa5e25cd18ab9e99d8cd06752583d1ed21a6a65" - integrity sha512-2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g== +"@schematics/update@0.1102.7": + version "0.1102.7" + resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.1102.7.tgz#22120128f850f3f0003f2435d50d07a5c16e2589" + integrity sha512-aSuG4VtGlcEGNIhcRS+99Sbhs+IRJn1JLOG1rWV5U5d40M/kLDsNx5O5JCXE062ga209sJc++sgLXRXn5yrEiQ== dependencies: - "@angular-devkit/core" "11.2.0" - "@angular-devkit/schematics" "11.2.0" + "@angular-devkit/core" "11.2.7" + "@angular-devkit/schematics" "11.2.7" "@yarnpkg/lockfile" "1.1.0" ini "2.0.0" npm-package-arg "^8.0.0" @@ -1498,24 +1609,25 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/browser@^5.29.2": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3" - integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw== +"@sentry/browser@^6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.2.5.tgz#35e259e16521d26f348a06b31eb495e0033111d6" + integrity sha512-nlvaE+D7oaj4MxoY9ikw+krQDOjftnDYJQnOwOraXPk7KYM6YwmkakLuE+x/AkaH3FQVTQF330VAa9d6SWETlA== dependencies: - "@sentry/core" "5.30.0" - "@sentry/types" "5.30.0" - "@sentry/utils" "5.30.0" + "@sentry/core" "6.2.5" + "@sentry/types" "6.2.5" + "@sentry/utils" "6.2.5" tslib "^1.9.3" -"@sentry/cli@^1.61.0": - version "1.62.0" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.62.0.tgz#2e2d8cacb5ec494f86c188ef95b41745605be028" - integrity sha512-MCkx+zjetdIWhAVaFuEuoD4MOAFlb3/GLR5B5uFZ1AcegcsggasLo/3rb2gq6jYIic/pubtRjH4ltmOL/s3cag== +"@sentry/cli@^1.63.2": + version "1.63.2" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.63.2.tgz#b0f7fefe3c13efc5c57bb6ec042cc2b693476bd3" + integrity sha512-oG1Cg85BI/sc7MjgmShmCp0feB+LDi7XZKpiUggrOUVUgcWy4o+hkmESAwNCJsIXg0mW8TTCjmRFU8b836c+Mw== dependencies: https-proxy-agent "^5.0.0" mkdirp "^0.5.5" node-fetch "^2.6.0" + npmlog "^4.1.2" progress "^2.0.3" proxy-from-env "^1.1.0" @@ -1530,21 +1642,21 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/core@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3" - integrity sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg== +"@sentry/core@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.2.5.tgz#e75093f8598becc0a4a0be927f32f7ac49e8588f" + integrity sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag== dependencies: - "@sentry/hub" "5.30.0" - "@sentry/minimal" "5.30.0" - "@sentry/types" "5.30.0" - "@sentry/utils" "5.30.0" + "@sentry/hub" "6.2.5" + "@sentry/minimal" "6.2.5" + "@sentry/types" "6.2.5" + "@sentry/utils" "6.2.5" tslib "^1.9.3" -"@sentry/electron@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.2.0.tgz#e59d9cea4e5c3b003e2fc6fc9ecf1bfc1af15eb6" - integrity sha512-wNUIsRxb86zK1tV77MZaSLWHM2CxgC1QLJCWxr+Tkash6tESfMY2XlC4+7XQKHfASU3QHt5l4R55/rhrr7ChJA== +"@sentry/electron@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.4.0.tgz#b45e5c8922b1c895f7ad39e4e775588a4e33bdf0" + integrity sha512-xA+cdcVms8JCR2Oc/gSSKbuQ/KQQ+u1DCZ6klxgMF1qzdHkaXuj+t+9leIuiHyYCs1RlKfF/Fd8I+ieGigSrtw== dependencies: "@sentry/browser" "5.27.6" "@sentry/core" "5.27.6" @@ -1563,13 +1675,13 @@ "@sentry/utils" "5.27.6" tslib "^1.9.3" -"@sentry/hub@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz#2453be9b9cb903404366e198bd30c7ca74cdc100" - integrity sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ== +"@sentry/hub@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.2.5.tgz#324cae0c90d736cd1032e94104bf3f18becec4d6" + integrity sha512-YlEFdEhcfqpl2HC+/dWXBsBJEljyMzFS7LRRjCk8QANcOdp9PhwQjwebUB4/ulOBjHPP2WZk7fBBd/IKDasTUg== dependencies: - "@sentry/types" "5.30.0" - "@sentry/utils" "5.30.0" + "@sentry/types" "6.2.5" + "@sentry/utils" "6.2.5" tslib "^1.9.3" "@sentry/minimal@5.27.6": @@ -1581,13 +1693,13 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/minimal@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz#ce3d3a6a273428e0084adcb800bc12e72d34637b" - integrity sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw== +"@sentry/minimal@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.2.5.tgz#3e963e868bfa68e97581403521fd4e09a8965b02" + integrity sha512-RKP4Qx3p7Cv0oX1cPKAkNVFYM7p2k1t32cNk1+rrVQS4hwlJ7Eg6m6fsqsO+85jd6Ne/FnyYsfo9cDD3ImTlWQ== dependencies: - "@sentry/hub" "5.30.0" - "@sentry/types" "5.30.0" + "@sentry/hub" "6.2.5" + "@sentry/types" "6.2.5" tslib "^1.9.3" "@sentry/node@5.27.6": @@ -1621,10 +1733,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.27.6.tgz#b5054eafcb8ac11d4bc4787c7bc7fc113cad8b80" integrity sha512-XOW9W8DrMk++4Hk7gWi9o5VR0o/GrqGfTKyFsHSIjqt2hL6kiMPvKeb2Hhmp7Iq37N2bDmRdWpM5m+68S2Jk6w== -"@sentry/types@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz#19709bbe12a1a0115bc790b8942917da5636f402" - integrity sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw== +"@sentry/types@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.2.5.tgz#34b75285b149e0b9bc5fd54fcc2c445d978c7f2e" + integrity sha512-1Sux6CLYrV9bETMsGP/HuLFLouwKoX93CWzG8BjMueW+Di0OGxZphYjXrGuDs8xO8bAKEVGCHgVQdcB2jevS0w== "@sentry/utils@5.27.6": version "5.27.6" @@ -1634,12 +1746,12 @@ "@sentry/types" "5.27.6" tslib "^1.9.3" -"@sentry/utils@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz#9a5bd7ccff85ccfe7856d493bffa64cabc41e980" - integrity sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww== +"@sentry/utils@6.2.5": + version "6.2.5" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.2.5.tgz#be90d056b09ed1216097d7a29e3e81ba39238e1b" + integrity sha512-fJoLUZHrd5MPylV1dT4qL74yNFDl1Ur/dab+pKNSyvnHPnbZ/LRM7aJ8VaRY/A7ZdpRowU+E14e/Yeem2c6gtQ== dependencies: - "@sentry/types" "5.30.0" + "@sentry/types" "6.2.5" tslib "^1.9.3" "@sindresorhus/is@^0.14.0": @@ -1652,6 +1764,11 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1" integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== +"@sindresorhus/is@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4" + integrity sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ== + "@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.0.3", "@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": version "2.11.0" resolved "https://registry.yarnpkg.com/@snyk/cli-interface/-/cli-interface-2.11.0.tgz#9df68c8cd54de5dff69f0ab797a188541d9c8965" @@ -1669,6 +1786,29 @@ js-yaml "^3.13.1" tslib "^1.10.0" +"@snyk/code-client@3.4.0": + version "3.4.0" + resolved "https://registry.yarnpkg.com/@snyk/code-client/-/code-client-3.4.0.tgz#7741abef6dcf5dfc50a1a0538918972360c5a1e7" + integrity sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg== + dependencies: + "@deepcode/dcignore" "^1.0.2" + "@snyk/fast-glob" "^3.2.6-patch" + "@types/flat-cache" "^2.0.0" + "@types/lodash.chunk" "^4.2.6" + "@types/lodash.omit" "^4.5.6" + "@types/lodash.union" "^4.6.6" + "@types/micromatch" "^4.0.1" + "@types/sarif" "^2.1.3" + "@types/uuid" "^8.3.0" + axios "^0.21.1" + ignore "^5.1.8" + lodash.chunk "^4.2.0" + lodash.omit "^4.5.0" + lodash.union "^4.6.0" + micromatch "^4.0.2" + queue "^6.0.1" + uuid "^8.3.2" + "@snyk/composer-lockfile-parser@^1.4.1": version "1.4.1" resolved "https://registry.yarnpkg.com/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz#2f7c93ad367520322b16d9490a208fec08445e0e" @@ -1679,7 +1819,7 @@ lodash.invert "^4.3.0" lodash.isempty "^4.4.0" -"@snyk/dep-graph@1.23.1", "@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1": +"@snyk/dep-graph@^1.19.3", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1": version "1.23.1" resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.23.1.tgz#c884811669983febb6685f9107b322b3c0603f42" integrity sha512-bSlTRVJP0PHtvoilhE463AMt0fhsf9PxCEqJ28VHCVSe5QFzIlgGdljtytV+2DheadGwu27BgLGqPDGMdTBHRQ== @@ -1704,6 +1844,31 @@ semver "^6.0.0" tslib "^1.13.0" +"@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": + version "1.28.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.28.0.tgz#d68c0576cb3562c6e819ca8a8c7ac29ee11d9776" + integrity sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg== + dependencies: + event-loop-spinner "^2.1.0" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.isempty "^4.4.0" + lodash.isequal "^4.5.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" + object-hash "^2.0.3" + semver "^7.0.0" + tslib "^1.13.0" + "@snyk/docker-registry-v2-client@1.13.9": version "1.13.9" resolved "https://registry.yarnpkg.com/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz#54c2e3071de58fc6fc12c5fef5eaeae174ecda12" @@ -1713,11 +1878,43 @@ parse-link-header "^1.0.1" tslib "^1.10.0" +"@snyk/fast-glob@^3.2.6-patch": + version "3.2.6-patch" + resolved "https://registry.yarnpkg.com/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz#a0866bedb17f95255e4050dad08daeaff0f4caa8" + integrity sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + "@snyk/glob-parent" "^5.1.2-patch.1" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" + +"@snyk/fix@1.526.0": + version "1.526.0" + resolved "https://registry.yarnpkg.com/@snyk/fix/-/fix-1.526.0.tgz#589bc5e6745b1f81f36cfa46199d98871113e7b7" + integrity sha512-+aMUNRhOdoN4YPGxXlN9+NwvKOr/DNBCGgC8DnNSujcJ9Nj1M8oHrnVoTy56/tgbJ8qyw/zwmCKAm383CfURKg== + dependencies: + "@snyk/dep-graph" "^1.21.0" + chalk "4.1.0" + debug "^4.3.1" + micromatch "4.0.2" + ora "5.3.0" + p-map "^4.0.0" + strip-ansi "6.0.0" + "@snyk/gemfile@1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== +"@snyk/glob-parent@^5.1.2-patch.1": + version "5.1.2-patch.1" + resolved "https://registry.yarnpkg.com/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz#87733b4ab282043fa7915200bc94cb391df6d44f" + integrity sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ== + dependencies: + is-glob "^4.0.1" + "@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": version "2.1.9-patch.3" resolved "https://registry.yarnpkg.com/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz#b8edb2335af1978db7f3cb1f28f5d562960acf23" @@ -1795,6 +1992,33 @@ tslib "^1.9.3" xml-js "^1.6.11" +"@snyk/java-call-graph-builder@1.20.0": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz#ffca734cf7ce276a69277963149358190eaac3e5" + integrity sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww== + dependencies: + "@snyk/graphlib" "2.1.9-patch.3" + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" + +"@snyk/mix-parser@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@snyk/mix-parser/-/mix-parser-1.1.1.tgz#3493222b4e3d84a6fb56bce5238922a532a81191" + integrity sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg== + dependencies: + "@snyk/dep-graph" "^1.28.0" + tslib "^2.0.0" + "@snyk/rpm-parser@^2.0.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-2.2.1.tgz#b61ccf5478684b203576bd2be68de434ccbb0069" @@ -1823,6 +2047,16 @@ tar-stream "^2.1.2" tmp "^0.1.0" +"@snyk/snyk-hex-plugin@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.1.tgz#108b27382af91a7984abe34b1778b71aadd76b62" + integrity sha512-z6tmxLOdLlwdTuDI+Di5M44RnkKQU1yS9CKANfJLIxwqg6HP45oxEqwSqIRmHHJoD/xS//09kH1ORgKR9BslKg== + dependencies: + "@snyk/dep-graph" "^1.28.0" + "@snyk/mix-parser" "^1.1.1" + debug "^4.3.1" + tslib "^2.0.0" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -1842,6 +2076,11 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@types/braces@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb" + integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw== + "@types/cacheable-request@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976" @@ -2108,10 +2347,46 @@ dependencies: electron "*" -"@types/fs-extra@^9.0.1": - version "9.0.7" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" - integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== +"@types/emscripten@^1.38.0": + version "1.39.4" + resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.39.4.tgz#d61990c0cee72c4e475de737a140b51fe925a2c8" + integrity sha512-k3LLVMFrdNA9UCvMDPWMbFrGPNb+GcPyw29ktJTo1RCN7RmxFG5XzPZcPKRlnLuLT/FRm8wp4ohvDwNY7GlROQ== + +"@types/eslint-scope@^3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86" + integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.2.8" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.8.tgz#45cd802380fcc352e5680e1781d43c50916f12ee" + integrity sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*": + version "0.0.47" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4" + integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg== + +"@types/estree@^0.0.46": + version "0.0.46" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" + integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== + +"@types/flat-cache@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/flat-cache/-/flat-cache-2.0.0.tgz#64e5d3b426c392b603a208a55bdcc7d920ce6e57" + integrity sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww== + +"@types/fs-extra@^9.0.7": + version "9.0.10" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.10.tgz#8023a72e3d06cf54929ea47ec7634e47f33f4046" + integrity sha512-O9T2LLkRDiTlalOBdjEkcnT0MRdT2+wglCl7pJUJ3mkWkR8hX4K+5bg2raQNJcLv4V8zGuTXe7Ud3wSqkTyuyQ== dependencies: "@types/node" "*" @@ -2133,11 +2408,6 @@ resolved "https://registry.yarnpkg.com/@types/graphlib/-/graphlib-2.1.7.tgz#e6a47a4f43511f5bad30058a669ce5ce93bfd823" integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== -"@types/hosted-git-info@^2.7.0": - version "2.7.0" - resolved "https://registry.yarnpkg.com/@types/hosted-git-info/-/hosted-git-info-2.7.0.tgz#5199b4df62d53f51d60520d61513eaa4b2dd3d3d" - integrity sha512-OW/D8GqCyQtH8F7xDdDxzPJTBgknZeZhlCakUcBCya2rYPRN53F+0YJVwSPyiyAhrknnjkl3P9qVk0oBI4S1qw== - "@types/http-cache-semantics@*": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" @@ -2167,11 +2437,16 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jasmine@*", "@types/jasmine@~3.6.0": +"@types/jasmine@*": version "3.6.3" resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.3.tgz#824df555b8a5114f91619e78d8f59624d6f23050" integrity sha512-5QKAG8WfC9XrOgYLXPrxv1G2IIUE6zDyzTWamhNWJO0LqPRUbZ0q0zGHDhDJ7MpFloUuyME/jpBIdPjq3/P3jA== +"@types/jasmine@~3.6.9": + version "3.6.9" + resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.9.tgz#8785870f87839b7d91b45d7b226380f28dee5d9f" + integrity sha512-B53NIwMj/AO0O+xfSWLYmKB0Mo6TYxfv2Mk8/c1T2w/e38t55iaPR6p7pHXTTtqfTmevPK3i8T1YweYFTZlxDw== + "@types/jasminewd2@^2.0.8": version "2.0.8" resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.8.tgz#67afe5098d5ef2386073a7b7384b69a840dfe93b" @@ -2179,10 +2454,10 @@ dependencies: "@types/jasmine" "*" -"@types/jest@^26.0.20": - version "26.0.20" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307" - integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA== +"@types/jest@^26.0.22": + version "26.0.22" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.22.tgz#8308a1debdf1b807aa47be2838acdcd91e88fbe6" + integrity sha512-eeWwWjlqxvBxc4oQdkueW5OF/gtfSceKk4OnOAGlUSwS/liBRtZppbJuz1YkgbrbfGOoeBHun9fOvXnjNwrSOw== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" @@ -2192,7 +2467,7 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1" integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": version "7.0.7" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== @@ -2204,15 +2479,48 @@ dependencies: "@types/node" "*" +"@types/lodash.chunk@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz#9d35f05360b0298715d7f3d9efb34dd4f77e5d2a" + integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== + dependencies: + "@types/lodash" "*" + +"@types/lodash.omit@^4.5.6": + version "4.5.6" + resolved "https://registry.yarnpkg.com/@types/lodash.omit/-/lodash.omit-4.5.6.tgz#f2a9518259e481a48ff7ec423420fa8fd58933e2" + integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== + dependencies: + "@types/lodash" "*" + +"@types/lodash.union@^4.6.6": + version "4.6.6" + resolved "https://registry.yarnpkg.com/@types/lodash.union/-/lodash.union-4.6.6.tgz#2f77f2088326ed147819e9e384182b99aae8d4b0" + integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw== + dependencies: + "@types/lodash" "*" + +"@types/lodash@*": + version "4.14.168" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" + integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== + +"@types/micromatch@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7" + integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw== + dependencies: + "@types/braces" "*" + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/mocha@^8.2.0": - version "8.2.0" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.0.tgz#3eb56d13a1de1d347ecb1957c6860c911704bc44" - integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ== +"@types/mocha@^8.2.2": + version "8.2.2" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-8.2.2.tgz#91daa226eb8c2ff261e6a8cbf8c7304641e095e0" + integrity sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw== "@types/mousetrap@^1.6.0": version "1.6.5" @@ -2224,26 +2532,34 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== -"@types/node@14.14.10": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== +"@types/node@14.14.37", "@types/node@^14.6.2": + version "14.14.37" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e" + integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== "@types/node@^12.0.12": version "12.20.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.1.tgz#63d36c10e162666f0107f247cdca76542c3c7472" integrity sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g== -"@types/node@^6.14.7": - version "6.14.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.13.tgz#b6649578fc0b5dac88c4ef48a46cab33c50a6c72" - integrity sha512-J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw== +"@types/node@^13.7.0": + version "13.13.48" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.48.tgz#46a3df718aed5217277f2395a682e055a487e341" + integrity sha512-z8wvSsgWQzkr4sVuMEEOvwMdOQjiRY2Y/ZW4fDfjfe3+TfQrZqFKOthBgk2RnVEmtOKrkwdZ7uTvsxTBLjKGDQ== "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/plist@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + "@types/prop-types@*", "@types/prop-types@^15.7.3": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" @@ -2259,26 +2575,27 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== -"@types/react-dom@^17.0.0": - version "17.0.1" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.1.tgz#d92d77d020bfb083e07cc8e0ac9f933599a4d56a" - integrity sha512-yIVyopxQb8IDZ7SOHeTovurFq+fXiPICa+GV3gp0Xedsl+MwQlMLKmvrnEjFbQxjliH5YVAEWFh975eVNmKj7Q== +"@types/react-dom@^17.0.3": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.3.tgz#7fdf37b8af9d6d40127137865bb3fff8871d7ee1" + integrity sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w== dependencies: "@types/react" "*" -"@types/react-transition-group@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d" - integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w== +"@types/react-transition-group@^4.4.1": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" + integrity sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.0": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== +"@types/react@*", "@types/react@>=16.9.11", "@types/react@>=16.9.35", "@types/react@^17.0.3": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79" + integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" "@types/responselike@*", "@types/responselike@^1.0.0": @@ -2288,16 +2605,46 @@ dependencies: "@types/node" "*" +"@types/sarif@^2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.3.tgz#1f9c16033f1461536ac014284920350109614c02" + integrity sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w== + +"@types/scheduler@*": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" + integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== + "@types/selenium-webdriver@^3.0.0": version "3.0.17" resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b" integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw== +"@types/semver@^7.1.0": + version "7.3.4" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb" + integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ== + "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== +"@types/treeify@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/treeify/-/treeify-1.0.0.tgz#f04743cb91fc38254e8585d692bd92503782011c" + integrity sha512-ONpcZAEYlbPx4EtJwfTyCDQJGUpKf4sEcuySdCVjK5Fj/3vHp5HII1fqa1/+qrsLnpYELCQTfVW/awsGJePoIg== + +"@types/uuid@^8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f" + integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ== + +"@types/verror@^1.10.3": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b" + integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg== + "@types/warning@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" @@ -2317,81 +2664,89 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.0", "@types/yargs@^15.0.5": +"@types/yargs@^15.0.0", "@types/yargs@^15.0.13": version "15.0.13" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" -"@uifabric/foundation@^7.9.24": - version "7.9.24" - resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.9.24.tgz#a86211d1913d691e05efed9d95cefbe2209079ae" - integrity sha512-f9W6x6gqczgkayA89TsiGzdze2A8RJXc/GbANYvBad3zeyDlQahepMrlgRMOXcTiwZIiltTje+7ADtvD/o176Q== +"@uifabric/foundation@^7.9.26": + version "7.9.26" + resolved "https://registry.yarnpkg.com/@uifabric/foundation/-/foundation-7.9.26.tgz#483e4199d0ce8c25ea94910054c68abf2d3a27ce" + integrity sha512-1FLTb+jlH/Tuel2L9wT/zLl5ZW6W4Lbjrs5VUVjv81vWxzznvPnTf8+Ew0qkzaH7xDuMNMl7okswhV0IfJyheg== dependencies: - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.18.0" - "@uifabric/utilities" "^7.33.4" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/set-version" "^7.0.24" + "@uifabric/styling" "^7.19.0" + "@uifabric/utilities" "^7.33.5" tslib "^1.10.0" -"@uifabric/icons@^7.5.21": - version "7.5.21" - resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.5.21.tgz#a665ccd9dede47096f2591395d2e21384136e17c" - integrity sha512-ZTqLpdCZeCChcMWCgEyWUke2wJxfi3SNdSjNFXWK90SsDWlafg3s/eDd7+n6oRi4pHlF6eBnc4oTLR6PFXt8kQ== +"@uifabric/icons@^7.5.23": + version "7.5.23" + resolved "https://registry.yarnpkg.com/@uifabric/icons/-/icons-7.5.23.tgz#5244bbe901406d1d44ff13322264270a0ab94f2c" + integrity sha512-eIvUbH0EWgFgdfgFfINgqS2ZVZTyJ/9n5nR4bmcyAe75wsKxm4ser4WIT9IvaBF6+HFVfjUF/v6+VMD7y2LBng== dependencies: - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.18.0" + "@uifabric/set-version" "^7.0.24" + "@uifabric/styling" "^7.19.0" tslib "^1.10.0" -"@uifabric/merge-styles@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz#446b3da48ce9925d1649edd0fc232221974b00c9" - integrity sha512-yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A== +"@uifabric/merge-styles@^7.19.2": + version "7.19.2" + resolved "https://registry.yarnpkg.com/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz#e020adc2f9b238f0feb855274dfeedaf6d5822a7" + integrity sha512-kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g== dependencies: - "@uifabric/set-version" "^7.0.23" + "@uifabric/set-version" "^7.0.24" tslib "^1.10.0" -"@uifabric/react-hooks@^7.13.11": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.13.11.tgz#62af56b53248a0a6dfd44208d6e6524902f016e6" - integrity sha512-9qX4hiZ4MelUxOxx4IPl+vgn9/e43KkYTpYedl2QtUxFpDjsOVJ0jbG3Dkokyl+Kvw1gerYCT1SXL8UC4kG97w== +"@uifabric/react-hooks@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz#f9a1ee54eea0f09c84cf79102329063408e146d6" + integrity sha512-Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg== dependencies: - "@fluentui/react-window-provider" "^1.0.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.4" + "@fluentui/react-window-provider" "^1.0.2" + "@uifabric/set-version" "^7.0.24" + "@uifabric/utilities" "^7.33.5" tslib "^1.10.0" -"@uifabric/set-version@^7.0.23": - version "7.0.23" - resolved "https://registry.yarnpkg.com/@uifabric/set-version/-/set-version-7.0.23.tgz#bfe10b6ba17a2518704cca856bdba8adbc11ffb0" - integrity sha512-9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA== +"@uifabric/set-version@^7.0.24": + version "7.0.24" + resolved "https://registry.yarnpkg.com/@uifabric/set-version/-/set-version-7.0.24.tgz#8c67d8f1d67c1636a170efa8b622132da2d294a9" + integrity sha512-t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg== dependencies: tslib "^1.10.0" -"@uifabric/styling@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.18.0.tgz#3f12f2addef285aced24e2ad110c93aeeaf98d6a" - integrity sha512-PuCSr2PeVDLTtyqOjS67QBgN7rDYf044oRvMEkSCP57p9Du8rIAJio0LQjVNRKo+QlmfgFzmT3XjpS2LYkhFIg== +"@uifabric/styling@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@uifabric/styling/-/styling-7.19.0.tgz#10bef6152cc94bd72c22da923f766b8197f63652" + integrity sha512-fXComDtGV7dHF4rP4cLHwI6fC+1f/nvPavpMBz4IQdySwixta9TVMKbzt0OA6i0mJztqZCVAd27F/sl9R/JmcQ== dependencies: - "@fluentui/theme" "^1.7.3" + "@fluentui/theme" "^1.7.4" "@microsoft/load-themed-styles" "^1.10.26" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" - "@uifabric/utilities" "^7.33.4" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/set-version" "^7.0.24" + "@uifabric/utilities" "^7.33.5" tslib "^1.10.0" -"@uifabric/utilities@^7.33.4": - version "7.33.4" - resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.33.4.tgz#11ce778c420c1f72b1f29032530c39545affb53a" - integrity sha512-FgEL2+GWOHMNMQqmI5Mko293W3c9PWIc/WrlU6jQ5AU83M1BQSxhS0LPNnRbahukiEFNkosCOOKzKCNdjzkCwA== +"@uifabric/utilities@^7.33.5": + version "7.33.5" + resolved "https://registry.yarnpkg.com/@uifabric/utilities/-/utilities-7.33.5.tgz#4e7ed4bab725c054005e9ac37b0f01d743089be4" + integrity sha512-I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ== dependencies: - "@fluentui/dom-utilities" "^1.1.1" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/set-version" "^7.0.23" + "@fluentui/dom-utilities" "^1.1.2" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/set-version" "^7.0.24" prop-types "^15.7.2" tslib "^1.10.0" +"@webassemblyjs/ast@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f" + integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2401,16 +2756,31 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wast-parser" "1.9.0" +"@webassemblyjs/floating-point-hex-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c" + integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA== + "@webassemblyjs/floating-point-hex-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== +"@webassemblyjs/helper-api-error@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4" + integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w== + "@webassemblyjs/helper-api-error@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== +"@webassemblyjs/helper-buffer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642" + integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA== + "@webassemblyjs/helper-buffer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" @@ -2435,11 +2805,35 @@ dependencies: "@webassemblyjs/ast" "1.9.0" +"@webassemblyjs/helper-numbers@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9" + integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1" + integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA== + "@webassemblyjs/helper-wasm-bytecode@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== +"@webassemblyjs/helper-wasm-section@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b" + integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/helper-wasm-section@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" @@ -2450,6 +2844,13 @@ "@webassemblyjs/helper-wasm-bytecode" "1.9.0" "@webassemblyjs/wasm-gen" "1.9.0" +"@webassemblyjs/ieee754@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf" + integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA== + dependencies: + "@xtuc/ieee754" "^1.2.0" + "@webassemblyjs/ieee754@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" @@ -2457,6 +2858,13 @@ dependencies: "@xtuc/ieee754" "^1.2.0" +"@webassemblyjs/leb128@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b" + integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g== + dependencies: + "@xtuc/long" "4.2.2" + "@webassemblyjs/leb128@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" @@ -2464,11 +2872,30 @@ dependencies: "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf" + integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw== + "@webassemblyjs/utf8@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== +"@webassemblyjs/wasm-edit@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78" + integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/helper-wasm-section" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-opt" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wast-printer" "1.11.0" + "@webassemblyjs/wasm-edit@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" @@ -2483,6 +2910,17 @@ "@webassemblyjs/wasm-parser" "1.9.0" "@webassemblyjs/wast-printer" "1.9.0" +"@webassemblyjs/wasm-gen@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe" + integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-gen@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" @@ -2494,6 +2932,16 @@ "@webassemblyjs/leb128" "1.9.0" "@webassemblyjs/utf8" "1.9.0" +"@webassemblyjs/wasm-opt@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978" + integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-buffer" "1.11.0" + "@webassemblyjs/wasm-gen" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + "@webassemblyjs/wasm-opt@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" @@ -2504,6 +2952,18 @@ "@webassemblyjs/wasm-gen" "1.9.0" "@webassemblyjs/wasm-parser" "1.9.0" +"@webassemblyjs/wasm-parser@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754" + integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/helper-api-error" "1.11.0" + "@webassemblyjs/helper-wasm-bytecode" "1.11.0" + "@webassemblyjs/ieee754" "1.11.0" + "@webassemblyjs/leb128" "1.11.0" + "@webassemblyjs/utf8" "1.11.0" + "@webassemblyjs/wasm-parser@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" @@ -2528,6 +2988,14 @@ "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" +"@webassemblyjs/wast-printer@1.11.0": + version "1.11.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e" + integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ== + dependencies: + "@webassemblyjs/ast" "1.11.0" + "@xtuc/long" "4.2.2" + "@webassemblyjs/wast-printer@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" @@ -2547,11 +3015,103 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarnpkg/core@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/core/-/core-2.4.0.tgz#b5d8cc7ee2ddb022816c7afa3f83c3ee3d317c80" + integrity sha512-FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw== + dependencies: + "@arcanis/slice-ansi" "^1.0.2" + "@types/semver" "^7.1.0" + "@types/treeify" "^1.0.0" + "@yarnpkg/fslib" "^2.4.0" + "@yarnpkg/json-proxy" "^2.1.0" + "@yarnpkg/libzip" "^2.2.1" + "@yarnpkg/parsers" "^2.3.0" + "@yarnpkg/pnp" "^2.3.2" + "@yarnpkg/shell" "^2.4.1" + binjumper "^0.1.4" + camelcase "^5.3.1" + chalk "^3.0.0" + ci-info "^2.0.0" + clipanion "^2.6.2" + cross-spawn "7.0.3" + diff "^4.0.1" + globby "^11.0.1" + got "^11.7.0" + json-file-plus "^3.3.1" + lodash "^4.17.15" + micromatch "^4.0.2" + mkdirp "^0.5.1" + p-limit "^2.2.0" + pluralize "^7.0.0" + pretty-bytes "^5.1.0" + semver "^7.1.2" + stream-to-promise "^2.2.0" + tar-stream "^2.0.1" + treeify "^1.1.0" + tslib "^1.13.0" + tunnel "^0.0.6" + +"@yarnpkg/fslib@^2.1.0", "@yarnpkg/fslib@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/fslib/-/fslib-2.4.0.tgz#a265b737cd089ef293ad964e06c143f5efd411a9" + integrity sha512-CwffYY9owtl3uImNOn1K4jl5iIb/L16a9UZ9Q3lkBARk6tlUsPrNFX00eoUlFcLn49TTfd3zdN6higloGCyncw== + dependencies: + "@yarnpkg/libzip" "^2.2.1" + tslib "^1.13.0" + +"@yarnpkg/json-proxy@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/json-proxy/-/json-proxy-2.1.0.tgz#362a161678cd7dda74b47b4fc848a2f1730d16cd" + integrity sha512-rOgCg2DkyviLgr80mUMTt9vzdf5RGOujQB26yPiXjlz4WNePLBshKlTNG9rKSoKQSOYEQcw6cUmosfOKDatrCw== + dependencies: + "@yarnpkg/fslib" "^2.1.0" + tslib "^1.13.0" + +"@yarnpkg/libzip@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@yarnpkg/libzip/-/libzip-2.2.1.tgz#61c9b8b2499ee6bd9c4fcbf8248f68e07bd89948" + integrity sha512-AYDJXrkzayoDd3ZlVgFJ+LyDX+Zj/cki3vxIpcYxejtgkl3aquVWOxlC0DD9WboBWsJFIP1MjrUbchLyh++/7A== + dependencies: + "@types/emscripten" "^1.38.0" + tslib "^1.13.0" + "@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +"@yarnpkg/parsers@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-2.3.0.tgz#7b9564c6df02f4921d5cfe8287c4b648e93ea84b" + integrity sha512-qgz0QUgOvnhtF92kaluIhIIKBUHlYlHUBQxqh5v9+sxEQvUeF6G6PKiFlzo3E6O99XwvNEGpVu1xZPoSGyGscQ== + dependencies: + js-yaml "^3.10.0" + tslib "^1.13.0" + +"@yarnpkg/pnp@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@yarnpkg/pnp/-/pnp-2.3.2.tgz#9a052a06bf09c9f0b7c31e0867a7e725cb6401ed" + integrity sha512-JdwHu1WBCISqJEhIwx6Hbpe8MYsYbkGMxoxolkDiAeJ9IGEe08mQcbX1YmUDV1ozSWlm9JZE90nMylcDsXRFpA== + dependencies: + "@types/node" "^13.7.0" + "@yarnpkg/fslib" "^2.4.0" + tslib "^1.13.0" + +"@yarnpkg/shell@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@yarnpkg/shell/-/shell-2.4.1.tgz#abc557f8924987c9c382703e897433a82780265d" + integrity sha512-oNNJkH8ZI5uwu0dMkJf737yMSY1WXn9gp55DqSA5wAOhKvV5DJTXFETxkVgBQhO6Bow9tMGSpvowTMD/oAW/9g== + dependencies: + "@yarnpkg/fslib" "^2.4.0" + "@yarnpkg/parsers" "^2.3.0" + clipanion "^2.6.2" + cross-spawn "7.0.3" + fast-glob "^3.2.2" + micromatch "^4.0.2" + stream-buffers "^3.0.2" + tslib "^1.13.0" + abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" @@ -2575,6 +3135,11 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^8.0.4: + version "8.1.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe" + integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA== + adjust-sourcemap-loader@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e" @@ -2588,13 +3153,6 @@ adm-zip@^0.4.9: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== -agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" - integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== - dependencies: - es6-promisify "^5.0.0" - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2602,10 +3160,10 @@ agent-base@6: dependencies: debug "4" -agent-base@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" - integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== +agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== dependencies: es6-promisify "^5.0.0" @@ -2656,7 +3214,7 @@ ajv@6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2684,7 +3242,7 @@ angular-persistence@^1.0.1: resolved "https://registry.yarnpkg.com/angular-persistence/-/angular-persistence-1.0.1.tgz#79ffe7317f1f7aed88e69f07705f0ac32ccdb9da" integrity sha1-ef/nMX8feu2I5p8HcF8KwyzNudo= -angular-resizable-element@^3.3.4: +angular-resizable-element@^3.3.5: version "3.3.5" resolved "https://registry.yarnpkg.com/angular-resizable-element/-/angular-resizable-element-3.3.5.tgz#e0c86655e53280306c5a6e0ed1d1f60b323b0497" integrity sha512-PT7p3CGva1BmcTt8LA80yOblHqynZHPQYQ1KMMLgllCn3UZx/+0eCRtSXKwnWT5IYHBg9qI3tmd92SFExa1UMg== @@ -2791,6 +3349,11 @@ ansicolors@^0.3.2: resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= +any-promise@^1.1.0, any-promise@~1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -2807,37 +3370,38 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.10: - version "3.5.10" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d" - integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ== +app-builder-bin@3.5.12: + version "3.5.12" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" + integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== -app-builder-lib@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c" - integrity sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A== +app-builder-lib@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" + integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.0.4" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chromium-pickle-js "^0.2.0" - debug "^4.3.0" - ejs "^3.1.5" - electron-publish "22.9.1" - fs-extra "^9.0.1" - hosted-git-info "^3.0.5" + debug "^4.3.2" + ejs "^3.1.6" + electron-publish "22.10.5" + fs-extra "^9.1.0" + hosted-git-info "^3.0.8" is-ci "^2.0.0" - isbinaryfile "^4.0.6" - js-yaml "^3.14.0" + istextorbinary "^5.12.0" + js-yaml "^4.0.0" lazy-val "^1.0.4" minimatch "^3.0.4" - normalize-package-data "^2.5.0" + normalize-package-data "^3.0.0" read-config-file "6.0.0" sanitize-filename "^1.6.3" - semver "^7.3.2" + semver "^7.3.4" temp-file "^3.3.7" app-root-path@^3.0.0: @@ -2875,6 +3439,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + aria-query@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc" @@ -2950,6 +3519,18 @@ asap@^2.0.0, asap@~2.0.3: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +asar@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b" + integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -2990,13 +3571,6 @@ ast-types-flow@0.0.7: resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= -ast-types@0.x.x: - version "0.14.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd" - integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA== - dependencies: - tslib "^2.0.1" - async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -3044,17 +3618,16 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@9.8.6: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== +autoprefixer@10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1" + integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw== dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" + browserslist "^4.16.1" + caniuse-lite "^1.0.30001181" colorette "^1.2.1" + fraction.js "^4.0.13" normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" postcss-value-parser "^4.1.0" aws-sign2@~0.7.0: @@ -3067,6 +3640,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + axobject-query@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9" @@ -3074,15 +3654,14 @@ axobject-query@2.0.2: dependencies: ast-types-flow "0.0.7" -babel-loader@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" - integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== +babel-loader@8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" + integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== dependencies: - find-cache-dir "^2.1.0" + find-cache-dir "^3.3.1" loader-utils "^1.4.0" - mkdirp "^0.5.3" - pify "^4.0.1" + make-dir "^3.1.0" schema-utils "^2.6.5" babel-plugin-dynamic-import-node@^2.3.3: @@ -3102,7 +3681,7 @@ base64-arraybuffer@0.1.4: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= -base64-js@^1.0.2, base64-js@^1.3.1: +base64-js@^1.0.2, base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -3152,6 +3731,11 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +binaryextensions@^4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" + integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== + bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -3159,6 +3743,11 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +binjumper@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/binjumper/-/binjumper-0.1.4.tgz#4acc0566832714bd6508af6d666bd9e5e21fc7f8" + integrity sha512-Gdxhj+U295tIM6cO4bJO1jsvSjBVHNpj2o/OwW7pqDEtaqF6KdOxjtbo93jMMKAkP7+u09+bV8DhSqjIv4qR3w== + bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -3235,7 +3824,7 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== -bootstrap@^4.5.3: +bootstrap@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== @@ -3254,6 +3843,20 @@ boxen@^4.2.0: type-fest "^0.8.1" widest-line "^3.1.0" +boxen@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" + integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.0" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3358,7 +3961,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.9.1: +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.1, browserslist@^4.16.3, browserslist@^4.9.1: version "4.16.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== @@ -3381,6 +3984,11 @@ buffer-crc32@~0.2.3: resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -3405,7 +4013,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^5.5.0: +buffer@^5.1.0, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -3413,30 +4021,30 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.2: - version "8.7.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" - integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA== +builder-util-runtime@8.7.3: + version "8.7.3" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" + integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== dependencies: - debug "^4.1.1" + debug "^4.3.2" sax "^1.2.4" -builder-util@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af" - integrity sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw== +builder-util@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" + integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.1" - app-builder-bin "3.5.10" + "@types/fs-extra" "^9.0.7" + app-builder-bin "3.5.12" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.2" + builder-util-runtime "8.7.3" chalk "^4.1.0" - debug "^4.3.0" - fs-extra "^9.0.1" + debug "^4.3.2" + fs-extra "^9.1.0" is-ci "^2.0.0" - js-yaml "^3.14.0" + js-yaml "^4.0.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.3.7" @@ -3593,7 +4201,7 @@ camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0: +camelcase@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -3608,7 +4216,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001181: version "1.0.30001191" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9" integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw== @@ -3623,7 +4231,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3632,6 +4240,14 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4. escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -3651,14 +4267,6 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -3738,10 +4346,10 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-dependency-plugin@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93" - integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw== +circular-dependency-plugin@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600" + integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ== class-utils@^0.3.5: version "0.3.6" @@ -3763,7 +4371,7 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-boxes@^2.2.0: +cli-boxes@^2.2.0, cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== @@ -3785,11 +4393,24 @@ cli-spinners@^2.2.0, cli-spinners@^2.4.0, cli-spinners@^2.5.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.5.0.tgz#12763e47251bf951cb75c201dfa58ff1bcb2d047" integrity sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ== +cli-truncate@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" + integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== + dependencies: + slice-ansi "^1.0.0" + string-width "^2.0.0" + cli-width@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== +clipanion@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-2.6.2.tgz#820e7440812052442455b248f927b187ed732f71" + integrity sha512-0tOHJNMF9+4R3qcbBL+4IxLErpaYSYvzs10aXuECDbZdJOuJHdagJMAqvLdeaUQTI/o2uSCDRpet6ywDiKOAYw== + cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -3838,11 +4459,6 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -3857,7 +4473,7 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codelyzer@^6.0.0: +codelyzer@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.1.tgz#c0e9668e847255b37c759e68fb2700b11e277d0f" integrity sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g== @@ -3930,6 +4546,16 @@ colorette@^1.2.1: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + colors@1.4.0, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -3952,7 +4578,14 @@ commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^5.1.0: +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^5.0.0, commander@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== @@ -4098,6 +4731,13 @@ cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +copy-anything@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" + integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== + dependencies: + is-what "^3.12.0" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -4115,10 +4755,10 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz#8015e4d5c5e637ab7b39c76daa9e03c7a4bf1ae5" - integrity sha512-VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q== +copy-webpack-plugin@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz#0e920a6c181a5052aa6e2861b164bda03f83afeb" + integrity sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA== dependencies: cacache "^15.0.5" fast-glob "^3.2.4" @@ -4132,24 +4772,24 @@ copy-webpack-plugin@6.2.1: serialize-javascript "^5.0.1" webpack-sources "^1.4.3" -core-js-compat@^3.6.2: - version "3.9.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.0.tgz#29da39385f16b71e1915565aa0385c4e0963ad56" - integrity sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ== +core-js-compat@^3.8.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.0.tgz#3600dc72869673c110215ee7a005a8609dea0fe1" + integrity sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ== dependencies: browserslist "^4.16.3" semver "7.0.0" -core-js@3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" - integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== - -core-js@^3.6.5, core-js@^3.8.2: +core-js@3.8.3, core-js@^3.6.5: version "3.8.3" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== +core-js@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.0.tgz#9a020547c8b6879f929306949e31496bbe2ae9b3" + integrity sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -4184,6 +4824,13 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" @@ -4215,6 +4862,31 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +critters@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.7.tgz#548b470360f4f3c51e622de3b7aa733c8f0b17bf" + integrity sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ== + dependencies: + chalk "^4.1.0" + css "^3.0.0" + parse5 "^6.0.1" + parse5-htmlparser2-tree-adapter "^6.0.1" + pretty-bytes "^5.3.0" + +cross-spawn@7.0.3, cross-spawn@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -4261,22 +4933,22 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" - integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== +css-loader@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.0.1.tgz#9e4de0d6636a6266a585bd0900b422c85539d25f" + integrity sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw== dependencies: - camelcase "^6.0.0" + camelcase "^6.2.0" cssesc "^3.0.0" - icss-utils "^4.1.1" + icss-utils "^5.0.0" loader-utils "^2.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.3" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" + postcss "^8.1.4" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.0" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^2.7.1" + schema-utils "^3.0.0" semver "^7.3.2" css-parse@~2.0.0: @@ -4345,6 +5017,15 @@ css@^2.0.0: source-map-resolve "^0.5.2" urix "^0.1.0" +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + cssauron@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8" @@ -4433,9 +5114,9 @@ csso@^4.0.2: css-tree "^1.1.2" csstype@^3.0.2: - version "3.0.6" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef" - integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b" + integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g== custom-event@~1.0.0: version "1.0.1" @@ -4571,7 +5252,7 @@ d3-interpolate@1.1: dependencies: d3-color "1" -d3-ng2-service@^2.1.0: +d3-ng2-service@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/d3-ng2-service/-/d3-ng2-service-2.2.0.tgz#e92448bcbabdf8912cda963480b04a793404e23f" integrity sha512-0qVkrWgBzBvRNzNVZc9KX3WGK4DqZDkWOCKEZFEzqnsWWGS2miTAPYyF4Eb4WFctcAJeUXCaitkgsv6Ya814AQ== @@ -4793,11 +5474,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -data-uri-to-buffer@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835" - integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ== - date-format@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf" @@ -4808,34 +5484,41 @@ date-format@^3.0.0: resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95" integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w== -debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@3.1.0, debug@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - -debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.0, debug@~4.3.1: +debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@~4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +debug@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -4882,11 +5565,6 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= - default-gateway@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" @@ -4941,15 +5619,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -degenerator@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095" - integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU= - dependencies: - ast-types "0.x.x" - escodegen "1.x.x" - esprima "3.x.x" - del@^2.2.0: version "2.2.2" resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" @@ -5046,6 +5715,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -5053,17 +5732,34 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f" - integrity sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ== +dmg-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" + integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== dependencies: - app-builder-lib "22.9.1" - builder-util "22.9.1" - fs-extra "^9.0.1" + app-builder-lib "22.10.5" + builder-util "22.10.5" + fs-extra "^9.1.0" iconv-lite "^0.6.2" - js-yaml "^3.14.0" + js-yaml "^4.0.0" sanitize-filename "^1.6.3" + optionalDependencies: + dmg-license "^1.0.8" + +dmg-license@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.8.tgz#d52e234815f1a07a59706e5f2a2fea71991cf784" + integrity sha512-47GOb6b4yVzpovXC34heXElpH++ICg9GuWBeOTaokUNLAoAdWpE4VehudYEEtu96j2jXsgQWYf78nW7r+0Y3eg== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + cli-truncate "^1.1.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.5" + plist "^3.0.1" + smart-buffer "^4.0.2" + verror "^1.10.0" dns-equal@^1.0.0: version "1.0.0" @@ -5095,10 +5791,10 @@ docker-modem@2.1.3: split-ca "^1.0.1" ssh2 "^0.8.7" -dockerfile-ast@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.1.0.tgz#29d611517b6fa207430ac99e9f59db1636a25b1f" - integrity sha512-qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ== +dockerfile-ast@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz#13cc4a6fe3aea30a4104622b30f49a0fe3a5c038" + integrity sha512-iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw== dependencies: vscode-languageserver-types "^3.16.0" @@ -5203,6 +5899,14 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +editions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" + integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== + dependencies: + errlop "^4.0.0" + version-range "^1.0.0" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -5213,53 +5917,53 @@ eev@^0.1.5: resolved "https://registry.yarnpkg.com/eev/-/eev-0.1.5.tgz#800c04d450b31972b02660b97182cd28a3058e06" integrity sha512-U7+up/+0JaC+ffyrMicGDzb+j2Q04Fy22tKK1Xh6hHFWdVtXwoBF8M2DwFofwsJzJcs3W3NPDvmxcMak5/iQaA== -ejs@^3.1.5: +ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60" - integrity sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA== +electron-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" + integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== dependencies: - "@types/yargs" "^15.0.5" - app-builder-lib "22.9.1" + "@types/yargs" "^15.0.13" + app-builder-lib "22.10.5" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chalk "^4.1.0" - dmg-builder "22.9.1" - fs-extra "^9.0.1" + dmg-builder "22.10.5" + fs-extra "^9.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" read-config-file "6.0.0" sanitize-filename "^1.6.3" - update-notifier "^4.1.1" - yargs "^16.0.3" + update-notifier "^5.1.0" + yargs "^16.2.0" -electron-publish@22.9.1: - version "22.9.1" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e" - integrity sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w== +electron-publish@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" + integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== dependencies: - "@types/fs-extra" "^9.0.1" + "@types/fs-extra" "^9.0.7" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.10.5" + builder-util-runtime "8.7.3" chalk "^4.1.0" - fs-extra "^9.0.1" + fs-extra "^9.1.0" lazy-val "^1.0.4" - mime "^2.4.6" + mime "^2.5.0" electron-to-chromium@^1.3.649: version "1.3.672" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.672.tgz#3a6e335016dab4bc584d5292adc4f98f54541f6a" integrity sha512-gFQe7HBb0lbOMqK2GAS5/1F+B0IMdYiAgB9OT/w1F4M7lgJK2aNOMNOM622aEax+nS1cTMytkiT0uMOkbtFmHw== -electron@*, electron@^11.2.0: +electron@*: version "11.2.3" resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== @@ -5268,6 +5972,15 @@ electron@*, electron@^11.2.0: "@types/node" "^12.0.12" extract-zip "^1.0.3" +electron@^12.0.2: + version "12.0.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.2.tgz#d92be205f1937627bd6718aad44ac161382b4c2d" + integrity sha512-14luh9mGzfL4e0sncyy0+kW37IU7Y0Y1tvI97FDRSW0ZBQxi5cmAwSs5dmPmNBFBIGtzkaGaEB01j9RjZuCmow== + dependencies: + "@electron/get" "^1.0.1" + "@types/node" "^14.6.2" + extract-zip "^1.0.3" + elfy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/elfy/-/elfy-1.0.0.tgz#7a1c86af7d41e0a568cbb4a3fa5b685648d9efcd" @@ -5332,6 +6045,13 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" +end-of-stream@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07" + integrity sha1-6TUyWLqpEIll78QcsO+K3i88+wc= + dependencies: + once "~1.3.0" + endian-reader@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" @@ -5357,13 +6077,13 @@ engine.io@~4.1.0: engine.io-parser "~4.0.0" ws "~7.4.2" -enhanced-resolve@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz#3f988d0d7775bdc2d96ede321dc81f8249492f57" - integrity sha512-G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w== +enhanced-resolve@5.7.0, enhanced-resolve@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c" + integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw== dependencies: graceful-fs "^4.2.4" - tapable "^2.0.0" + tapable "^2.2.0" enhanced-resolve@^4.3.0: version "4.5.0" @@ -5399,6 +6119,11 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== +errlop@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" + integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== + errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5450,6 +6175,11 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: string.prototype.trimend "^1.0.3" string.prototype.trimstart "^1.0.3" +es-module-lexer@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e" + integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA== + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -5527,18 +6257,6 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escodegen@1.x.x: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== - dependencies: - esprima "^4.0.1" - estraverse "^4.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -5547,24 +6265,27 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -esprima@3.x.x: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" -esprima@^4.0.0, esprima@^4.0.1: +esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esrecurse@^4.1.0: +esrecurse@^4.1.0, esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -5591,6 +6312,13 @@ event-loop-spinner@^2.0.0: dependencies: tslib "^1.10.0" +event-loop-spinner@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/event-loop-spinner/-/event-loop-spinner-2.1.0.tgz#75f501d585105c6d57f174073b39af1b6b3a1567" + integrity sha512-RJ10wL8/F9AlfBgRCvYctJIXSb9XkVmSCK3GGUvPD3dJrvTjDeDT0tmhcbEC6I2NEjNM9xD38HQJ4F/f/gb4VQ== + dependencies: + tslib "^2.1.0" + eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -5601,6 +6329,11 @@ events@^3.0.0: resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== +events@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + eventsource@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" @@ -5758,7 +6491,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1, fast-glob@^3.2.4: +fast-glob@^3.1.1, fast-glob@^3.2.2, fast-glob@^3.2.4: version "3.2.5" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== @@ -5775,11 +6508,6 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - fastparse@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" @@ -5792,14 +6520,7 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.1: +faye-websocket@^0.11.3: version "0.11.3" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== @@ -5825,15 +6546,7 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-loader@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa" - integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -file-loader@^6.2.0: +file-loader@6.2.0, file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== @@ -5841,12 +6554,12 @@ file-loader@^6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.2: +file-saver@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== -file-uri-to-path@1, file-uri-to-path@1.0.0: +file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== @@ -5934,7 +6647,7 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: +follow-redirects@^1.0.0, follow-redirects@^1.10.0: version "1.13.3" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== @@ -5963,6 +6676,11 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fraction.js@^4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.13.tgz#3c1c315fa16b35c85fffa95725a36fa729c69dfe" + integrity sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -6006,7 +6724,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1: +fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -6046,24 +6764,11 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== - fsevents@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== -ftp@~0.3.10: - version "0.3.10" - resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d" - integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0= - dependencies: - readable-stream "1.1.x" - xregexp "2.0.0" - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -6116,18 +6821,6 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-uri@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.4.tgz#d4937ab819e218d4cb5ae18e4f5962bef169cc6a" - integrity sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q== - dependencies: - data-uri-to-buffer "1" - debug "2" - extend "~3.0.2" - file-uri-to-path "1" - ftp "~0.3.10" - readable-stream "2" - get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -6155,6 +6848,11 @@ glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob@7.1.6, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -6180,6 +6878,19 @@ global-agent@^2.0.2: semver "^7.3.2" serialize-error "^7.0.1" +global-agent@^2.1.12: + version "2.2.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" + integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== + dependencies: + boolean "^3.0.1" + core-js "^3.6.5" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + global-dirs@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" @@ -6187,6 +6898,13 @@ global-dirs@^2.0.1: dependencies: ini "1.3.7" +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + dependencies: + ini "2.0.0" + global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -6261,6 +6979,23 @@ got@11.4.0: p-cancelable "^2.0.0" responselike "^2.0.0" +got@^11.7.0: + version "11.8.2" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.2.tgz#7abb3959ea28c31f3576f1576c1effce23f33599" + integrity sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.1" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -6283,6 +7018,16 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== + gunzip-maybe@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac" @@ -6400,6 +7145,15 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hcl-to-json@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/hcl-to-json/-/hcl-to-json-0.1.1.tgz#39674aa2a5a4d2b4c2b6762c8196af4af4f12903" + integrity sha512-sj1RPsdgX/ilBGZGnyjbSHQbRe20hyA6VDXYBGJedHSCdwSWkr/7tr85N7FGeM7KvBjIQX7Gl897bo0Ug73Z/A== + dependencies: + debug "^3.0.1" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + hex-color-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" @@ -6414,18 +7168,25 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: +hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== -hosted-git-info@^3.0.4, hosted-git-info@^3.0.5, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: +hosted-git-info@^3.0.4, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7, hosted-git-info@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" @@ -6461,10 +7222,10 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-to-image@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-0.1.3.tgz#9661a54c30ed9c4b269f4612416b1c7e887de3a7" - integrity sha512-8JTGEAAdJGL/nlp3wb/WI8fLMx2dHKOFZMdsvdon23D45ZdtsXDeRm39Wddf04ludQe3OPmvjMJ9nPjI/7hPlg== +html-to-image@^1.3.21: + version "1.6.0" + resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.6.0.tgz#fdf1ea5514af96b58cfc85a63eb97614097023ab" + integrity sha512-omzkdNnZOacH7udio09I3eGkOrE8VcpzabQbLYmjojpi+FmtofpNY9lHV2fn2DaDO9G9p10O3E8SF5HHgFhSWg== http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: version "4.1.0" @@ -6487,17 +7248,6 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@1.7.3, http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -6508,19 +7258,22 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-parser-js@>=0.5.1: version "0.5.3" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== -http-proxy-agent@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" - integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== - dependencies: - agent-base "4" - debug "3.1.0" - http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -6566,11 +7319,27 @@ http2-wrapper@^1.0.0-beta.4.5: quick-lru "^5.1.1" resolve-alpn "^1.0.0" +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + https-proxy-agent@^2.2.1: version "2.2.4" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" @@ -6579,22 +7348,6 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" -https-proxy-agent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" - integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== - dependencies: - agent-base "^4.3.0" - debug "^3.1.0" - -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6602,6 +7355,14 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +iconv-corefoundation@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.5.tgz#90596d444a579aeb109f5ca113f6bb665a41be2b" + integrity sha512-hI4m7udfV04OcjleOmDaR4gwXnH4xumxN+ZmywHDiKf2CmAzsT9SVYe7Y4pdnQbyZfXwAQyrElykbE5PrPRfmQ== + dependencies: + cli-truncate "^1.1.0" + node-addon-api "^1.6.3" + iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6616,12 +7377,10 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" +icss-utils@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== ieee754@^1.1.13, ieee754@^1.1.4: version "1.2.1" @@ -6640,7 +7399,7 @@ ignore-walk@^3.0.3: dependencies: minimatch "^3.0.4" -ignore@^5.1.4: +ignore@^5.1.4, ignore@^5.1.8: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== @@ -6732,12 +7491,12 @@ ini@1.3.7: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== -ini@2.0.0: +ini@2.0.0, ini@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -6781,7 +7540,7 @@ ip-regex@^2.1.0: resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= -ip@1.1.5, ip@^1.1.0, ip@^1.1.5: +ip@^1.1.0, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= @@ -6851,7 +7610,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.2: +is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== @@ -6995,6 +7754,14 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" @@ -7015,6 +7782,11 @@ is-npm@^4.0.0: resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -7075,6 +7847,11 @@ is-path-inside@^3.0.1: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== +is-path-inside@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -7119,6 +7896,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-what@^3.12.0: + version "3.14.1" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" + integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -7141,10 +7923,10 @@ is-yarn-global@^0.3.0: resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= +is@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/is/-/is-3.3.0.tgz#61cff6dd3c4193db94a3d62582072b44e5645d79" + integrity sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg== isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" @@ -7226,6 +8008,15 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +istextorbinary@^5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" + integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== + dependencies: + binaryextensions "^4.15.0" + editions "^6.1.0" + textextensions "^5.11.0" + jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -7236,7 +8027,7 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jasmine-core@^3.6.0, jasmine-core@~3.6.0: +jasmine-core@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20" integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw== @@ -7246,10 +8037,15 @@ jasmine-core@~2.8.0: resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e" integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4= -jasmine-spec-reporter@~5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95" - integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g== +jasmine-core@~3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561" + integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ== + +jasmine-spec-reporter@~6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-6.0.0.tgz#3b9c85689676a351f343ba8dd6d3957f11a4bf1d" + integrity sha512-MvTOVoMxDZAftQYBApIlSfKnGMzi9cj351nXeqtnZTuXffPlbONN31+Es7F+Ke4okUeQ2xISukt4U1npfzLVrQ== dependencies: colors "1.4.0" @@ -7282,16 +8078,7 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-worker@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30" - integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^26.5.0: +jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7300,17 +8087,17 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jquery@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" - integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== +jquery@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" + integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.14.0: +js-yaml@^3.10.0, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -7318,6 +8105,13 @@ js-yaml@^3.13.1, js-yaml@^3.14.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -7343,6 +8137,17 @@ json-buffer@3.0.1: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== +json-file-plus@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/json-file-plus/-/json-file-plus-3.3.1.tgz#f4363806b82819ff8803d83d539d6a9edd2a5258" + integrity sha512-wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA== + dependencies: + is "^3.2.1" + node.extend "^2.0.0" + object.assign "^4.1.0" + promiseback "^2.0.2" + safer-buffer "^2.0.2" + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -7368,7 +8173,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json3@^3.3.2: +json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -7457,7 +8262,7 @@ karma-cli@^2.0.0: dependencies: resolve "^1.3.3" -karma-coverage-istanbul-reporter@~3.0.2: +karma-coverage-istanbul-reporter@~3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz#f3b5303553aadc8e681d40d360dfdc19bc7e9fe9" integrity sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw== @@ -7468,12 +8273,12 @@ karma-coverage-istanbul-reporter@~3.0.2: istanbul-reports "^3.0.2" minimatch "^3.0.4" -karma-jasmine-html-reporter@^1.5.0: +karma-jasmine-html-reporter@^1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz#669f33d694d88fce1b0ccfda57111de716cb0192" integrity sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q== -karma-jasmine@~4.0.0: +karma-jasmine@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82" integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw== @@ -7487,10 +8292,10 @@ karma-source-map-support@1.4.0: dependencies: source-map-support "^0.5.5" -karma@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.1.1.tgz#a7539618cca0f2cbb26d5497120ec31fe340c2a1" - integrity sha512-vVDFxFGAsclgmFjZA/qGw5xqWdZIWxVD7xLyCukYUYd5xs/uGzYbXGOT5zOruVBQleKEmXIr4H2hzGCTn+M9Cg== +karma@^6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.2.tgz#24b62fbae3e8b5218cc32a0dac49ad08a541e76d" + integrity sha512-fo4Wt0S99/8vylZMxNj4cBFyOBBnC1bewZ0QOlePij/2SZVWxqbyLeIddY13q6URa2EpLRW8ixvFRUMjkmo1bw== dependencies: body-parser "^1.19.0" braces "^3.0.2" @@ -7564,7 +8369,7 @@ klona@^2.0.4: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== -latest-version@^5.0.0: +latest-version@^5.0.0, latest-version@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== @@ -7576,20 +8381,22 @@ lazy-val@^1.0.4: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== -less-loader@7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.0.2.tgz#0d73a49ec32a9d3ff12614598e6e2b47fb2a35c4" - integrity sha512-7MKlgjnkCf63E3Lv6w2FvAEgLMx3d/tNBExITcanAq7ys5U8VPWT3F6xcRjYmdNfkoQ9udoVFb1r2azSiTnD6w== +less-loader@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" + integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== dependencies: klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" -less@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/less/-/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" - integrity sha512-+1V2PCMFkL+OIj2/HrtrvZw0BC0sYLMICJfbQjuj/K8CEnlrFX6R5cKKgzzttsZDHyxQNL1jqMREjKN3ja/E3Q== +less@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" + integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== dependencies: + copy-anything "^2.0.1" + parse-node-version "^1.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" @@ -7597,17 +8404,9 @@ less@3.12.2: image-size "~0.5.0" make-dir "^2.1.0" mime "^1.4.1" - native-request "^1.0.5" + needle "^2.5.2" source-map "~0.6.0" -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - license-checker@^25.0.1: version "25.0.1" resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-25.0.1.tgz#4d14504478a5240a857bb3c21cd0491a00d761fa" @@ -7624,10 +8423,10 @@ license-checker@^25.0.1: spdx-satisfies "^4.0.0" treeify "^1.1.0" -license-webpack-plugin@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.1.tgz#08eddb2f776c7c64c02f308a00e017d6e824d0b6" - integrity sha512-yhqTmlYIEpZWA122lf6E0G8+rkn0AzoQ1OpzUKKs/lXUqG1plmGnwmkuuPlfggzJR5y6DLOdot/Tv00CC51CeQ== +license-webpack-plugin@2.3.11: + version "2.3.11" + resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz#0d93188a31fce350a44c86212badbaf33dcd29d8" + integrity sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw== dependencies: "@types/webpack-sources" "^0.1.5" webpack-sources "^1.2.0" @@ -7649,6 +8448,11 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== +loader-runner@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" @@ -7711,6 +8515,11 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= +lodash.chunk@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc" + integrity sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw= + lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" @@ -7936,7 +8745,7 @@ lodash@^4.17.10, lodash@^4.17.20, lodash@^4.17.5: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19: +lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8035,7 +8844,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2: +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -8204,6 +9013,11 @@ mime-db@1.46.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== + mime-types@^2.1.12, mime-types@~2.1.19: version "2.1.28" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" @@ -8211,6 +9025,13 @@ mime-types@^2.1.12, mime-types@~2.1.19: dependencies: mime-db "1.45.0" +mime-types@^2.1.27: + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== + dependencies: + mime-db "1.47.0" + mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.29" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" @@ -8223,16 +9044,11 @@ mime@1.6.0, mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.4.4, mime@^2.4.5: +mime@^2.4.4, mime@^2.4.5, mime@^2.5.0: version "2.5.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== -mime@^2.4.6: - version "2.5.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" - integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -8248,10 +9064,10 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -mini-css-extract-plugin@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.2.1.tgz#30ea7dee632b3002b0c77aeed447790408cb247e" - integrity sha512-G3yw7/TQaPfkuiR73MDcyiqhyP8SnbmLhUbpC76H+wtQxA6wfKhMCQOCb6wnPK0dQbjORAeOILQqEesg4/wF7A== +mini-css-extract-plugin@1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz#252166e78879c106e0130f229d44e0cbdfcebed3" + integrity sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" @@ -8437,6 +9253,11 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nanoid@^3.1.20, nanoid@^3.1.22: + version "3.1.22" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" + integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -8454,21 +9275,7 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-request@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" - integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== - -needle@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0" - integrity sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -needle@^2.3.3, needle@^2.5.0: +needle@2.6.0, needle@^2.3.3, needle@^2.5.0, needle@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== @@ -8487,11 +9294,6 @@ neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -netmask@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" - integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU= - next-tick@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" @@ -8504,7 +9306,7 @@ ng-circle-progress@^1.6.0: dependencies: tslib "^2.0.0" -ng2-file-upload@^1.3.0: +ng2-file-upload@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz#8dea28d573234c52af474ad2a4001b335271e5c4" integrity sha512-3J/KPU/tyh/ad6TFeUbrxX+SihUj0iOEt2Zsg4EX7mB3GFiQscXOfcUOxCkBtPWWWaqt3azrYbVGzsYa3/7NzQ== @@ -8518,14 +9320,14 @@ ngx-childprocess@^0.0.6: dependencies: "@types/electron" "^1.4.38" -ngx-device-detector@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/ngx-device-detector/-/ngx-device-detector-2.0.5.tgz#73f3a35d4630ed01ffd7819bd1780f85df0ea7e4" - integrity sha512-doLj7etMrXT8NtpqSyEWKcSE5vCGUgxAjj0T9IWHAbsNFDOqbZs61/xIDfaCq3DqXT0zUV2VxhPFu/IikxSrIw== +ngx-device-detector@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/ngx-device-detector/-/ngx-device-detector-2.0.6.tgz#10754ad7acf53dc2989bfb4936ab018464de6a31" + integrity sha512-ltxY19jYl0GzdU/jSOaa3RVrdA9ER7KTZJA/Milp7DyXhhaSymCB8CttnydAmj8gj3AeMi7j3u2bGsycJbDKnA== dependencies: tslib "^2.0.0" -ngx-electron@^2.1.1: +ngx-electron@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ngx-electron/-/ngx-electron-2.2.0.tgz#8ab65427476153b499d26f332fa5ca88714d8477" integrity sha512-Yl7Dsnvp97k0XpIuiB54X7Ij2+zU5x0pCAYnN//VZ9tF7c6S3//OZ9dN9Et7p/zIjCV3Hg9vyw68dPJEZGk+LQ== @@ -8537,6 +9339,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -8597,6 +9404,14 @@ node-releases@^1.1.70: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08" integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw== +node.extend@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-2.0.2.tgz#b4404525494acc99740f3703c496b7d5182cc6cc" + integrity sha512-pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ== + dependencies: + has "^1.0.3" + is "^3.2.1" + nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" @@ -8612,7 +9427,7 @@ nopt@^5.0.0: dependencies: abbrev "1" -normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: +normalize-package-data@^2.0.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -8622,6 +9437,16 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== + dependencies: + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -8747,11 +9572,6 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -8847,22 +9667,22 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -office-ui-fabric-react@^7.156.0: - version "7.160.1" - resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.160.1.tgz#cb5b84831dacaa2e9028785d22291736861ce9e2" - integrity sha512-yfwYBXZscIJgL8r/SRSiAhgLzp9QvbA7UtWsDxEleJH1YG2FG7fbUe/JkO/76WkUJjytilXGgAS9ZbL5NLdBXA== +office-ui-fabric-react@^7.166.0: + version "7.166.0" + resolved "https://registry.yarnpkg.com/office-ui-fabric-react/-/office-ui-fabric-react-7.166.0.tgz#75df23c1aaa74c000e1884a1ff42f3ab6a42ce1c" + integrity sha512-HXf6JDM20/8ockn77LFOvUUosC/8zCSEttNpFJdIZDqBCxWeN4YDgRgdluUyGQk64Kq/oU+uIbFY9KNz2m6wOw== dependencies: - "@fluentui/date-time-utilities" "^7.9.0" - "@fluentui/react-focus" "^7.17.4" - "@fluentui/react-window-provider" "^1.0.1" + "@fluentui/date-time-utilities" "^7.9.1" + "@fluentui/react-focus" "^7.17.6" + "@fluentui/react-window-provider" "^1.0.2" "@microsoft/load-themed-styles" "^1.10.26" - "@uifabric/foundation" "^7.9.24" - "@uifabric/icons" "^7.5.21" - "@uifabric/merge-styles" "^7.19.1" - "@uifabric/react-hooks" "^7.13.11" - "@uifabric/set-version" "^7.0.23" - "@uifabric/styling" "^7.18.0" - "@uifabric/utilities" "^7.33.4" + "@uifabric/foundation" "^7.9.26" + "@uifabric/icons" "^7.5.23" + "@uifabric/merge-styles" "^7.19.2" + "@uifabric/react-hooks" "^7.14.0" + "@uifabric/set-version" "^7.0.24" + "@uifabric/styling" "^7.19.0" + "@uifabric/utilities" "^7.33.5" prop-types "^15.7.2" tslib "^1.10.0" @@ -8885,6 +9705,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +once@~1.3.0: + version "1.3.3" + resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" + integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA= + dependencies: + wrappy "1" + onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -8892,14 +9719,6 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -open@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69" - integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw== - dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" - open@7.4.0: version "7.4.0" resolved "https://registry.yarnpkg.com/open/-/open-7.4.0.tgz#ad95b98f871d9acb0ec8fecc557082cc9986626b" @@ -8923,18 +9742,6 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - ora@4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05" @@ -8963,20 +9770,6 @@ ora@5.0.0: strip-ansi "^6.0.0" wcwidth "^1.0.1" -ora@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" - integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w== - dependencies: - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.4.0" - is-interactive "^1.0.0" - log-symbols "^4.0.0" - mute-stream "0.0.8" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - ora@5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/ora/-/ora-5.3.0.tgz#fb832899d3a1372fe71c8b2c534bbfe74961bb6f" @@ -9051,7 +9844,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -9096,31 +9889,6 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pac-proxy-agent@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz#115b1e58f92576cac2eba718593ca7b0e37de2ad" - integrity sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ== - dependencies: - agent-base "^4.2.0" - debug "^4.1.1" - get-uri "^2.0.0" - http-proxy-agent "^2.1.0" - https-proxy-agent "^3.0.0" - pac-resolver "^3.0.0" - raw-body "^2.2.0" - socks-proxy-agent "^4.0.1" - -pac-resolver@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26" - integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA== - dependencies: - co "^4.6.0" - degenerator "^1.0.4" - ip "^1.1.5" - netmask "^1.0.6" - thunkify "^2.1.2" - package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -9218,6 +9986,11 @@ parse-link-header@^1.0.1: dependencies: xtend "~4.0.1" +parse-node-version@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + parse5-html-rewriting-stream@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b" @@ -9226,6 +9999,13 @@ parse5-html-rewriting-stream@6.0.1: parse5 "^6.0.1" parse5-sax-parser "^6.0.1" +parse5-htmlparser2-tree-adapter@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" + integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== + dependencies: + parse5 "^6.0.1" + parse5-sax-parser@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba" @@ -9288,6 +10068,11 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" @@ -9379,6 +10164,20 @@ pkg-dir@^4.1.0: dependencies: find-up "^4.0.0" +plist@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" + integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== + dependencies: + base64-js "^1.5.1" + xmlbuilder "^9.0.7" + xmldom "^0.5.0" + +pluralize@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" + integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== + pnp-webpack-plugin@1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" @@ -9461,26 +10260,25 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" -postcss-import@12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" - integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== +postcss-import@14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296" + integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg== dependencies: - postcss "^7.0.1" - postcss-value-parser "^3.2.3" + postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-loader@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.0.4.tgz#b2d005b52e008a44991cf8123bee207e635eb53e" - integrity sha512-pntA9zIR14drQo84yGTjQJg1m7T0DkXR4vXYHBngiRZdJtEeCrojL6lOpqUanMzG375lIJbT4Yug85zC/AJWGw== +postcss-loader@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4" + integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" loader-utils "^2.0.0" schema-utils "^3.0.0" - semver "^7.3.2" + semver "^7.3.4" postcss-merge-longhand@^4.0.11: version "4.0.11" @@ -9544,38 +10342,33 @@ postcss-minify-selectors@^4.0.2: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== +postcss-modules-local-by-default@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" + icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - -postcss-modules-values@^3.0.0: +postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" postcss-normalize-charset@^4.0.1: version "4.0.1" @@ -9696,7 +10489,7 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== @@ -9725,12 +10518,12 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -9744,16 +10537,16 @@ postcss@7.0.21: source-map "^0.6.1" supports-color "^6.1.0" -postcss@7.0.32: - version "7.0.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" - integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== +postcss@8.2.4: + version "8.2.4" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.4.tgz#20a98a39cf303d15129c2865a9ec37eda0031d04" + integrity sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg== dependencies: - chalk "^2.4.2" + colorette "^1.2.1" + nanoid "^3.1.20" source-map "^0.6.1" - supports-color "^6.1.0" -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: version "7.0.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== @@ -9762,10 +10555,14 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 source-map "^0.6.1" supports-color "^6.1.0" -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +postcss@^8.1.4: + version "8.2.9" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.9.tgz#fd95ff37b5cee55c409b3fdd237296ab4096fba3" + integrity sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.22" + source-map "^0.6.1" prepend-http@^2.0.0: version "2.0.0" @@ -9777,6 +10574,11 @@ prettier@^2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +pretty-bytes@^5.1.0, pretty-bytes@^5.3.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== + pretty-format@^26.0.0, pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -9802,6 +10604,13 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== +promise-deferred@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/promise-deferred/-/promise-deferred-2.0.3.tgz#b99c9588820798501862a593d49cece51d06fd7f" + integrity sha512-n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ== + dependencies: + promise "^7.3.1" + promise-fs@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/promise-fs/-/promise-fs-2.1.1.tgz#0b725a592c165ff16157d1f13640ba390637e557" @@ -9835,13 +10644,21 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" -"promise@>=3.2 <8": +"promise@>=3.2 <8", promise@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== dependencies: asap "~2.0.3" +promiseback@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/promiseback/-/promiseback-2.0.3.tgz#bd468d86930e8cd44bfc3292de9a6fbafb6378e6" + integrity sha512-VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w== + dependencies: + is-callable "^1.1.5" + promise-deferred "^2.0.3" + prop-types-extra@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b" @@ -9893,20 +10710,6 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.1" -proxy-agent@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.1.tgz#7e04e06bf36afa624a1540be247b47c970bd3014" - integrity sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw== - dependencies: - agent-base "^4.2.0" - debug "4" - http-proxy-agent "^2.1.0" - https-proxy-agent "^3.0.0" - lru-cache "^5.1.1" - pac-proxy-agent "^3.0.1" - proxy-from-env "^1.0.0" - socks-proxy-agent "^4.0.1" - proxy-from-env@^1.0.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" @@ -9984,7 +10787,7 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.0.1: +pupa@^2.0.1, pupa@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== @@ -10036,6 +10839,13 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== +queue@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" + integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== + dependencies: + inherits "~2.0.3" + quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -10071,16 +10881,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@^2.2.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c" - integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA== - dependencies: - bytes "3.1.0" - http-errors "1.7.3" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-loader@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" @@ -10099,38 +10899,38 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-bootstrap@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.4.3.tgz#9a76a66800b57f422dd824c9dbe4c9dcef634790" - integrity sha512-4tYhk26KRnK0myMEp2wvNjOvnHMwWfa6pWFIiCtj9wewYaTxP7TrCf7MwcIMBgUzyX0SJXx6UbbDG0+hObiXNg== +react-bootstrap@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.5.2.tgz#07dabec53d10491a520c49f102170b440fa89008" + integrity sha512-mGKPY5+lLd7Vtkx2VFivoRkPT4xAHazuFfIhJLTEgHlDfIUSePn7qrmpZe5gXH9zvHV0RsBaQ9cLfXjxnZrOpA== dependencies: - "@babel/runtime" "^7.4.2" + "@babel/runtime" "^7.13.8" "@restart/context" "^2.1.4" - "@restart/hooks" "^0.3.21" + "@restart/hooks" "^0.3.26" "@types/classnames" "^2.2.10" "@types/invariant" "^2.2.33" "@types/prop-types" "^15.7.3" "@types/react" ">=16.9.35" - "@types/react-transition-group" "^4.4.0" + "@types/react-transition-group" "^4.4.1" "@types/warning" "^3.0.0" classnames "^2.2.6" dom-helpers "^5.1.2" invariant "^2.2.4" prop-types "^15.7.2" prop-types-extra "^1.1.0" - react-overlays "^4.1.0" + react-overlays "^5.0.0" react-transition-group "^4.4.1" - uncontrollable "^7.0.0" + uncontrollable "^7.2.1" warning "^4.0.3" -react-dom@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" - integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - scheduler "^0.20.1" + scheduler "^0.20.2" react-is@^16.3.2, react-is@^16.8.1: version "16.13.1" @@ -10147,10 +10947,10 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-overlays@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-4.1.1.tgz#0060107cbe1c5171a744ccda3fbf0556d064bc5f" - integrity sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ== +react-overlays@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-5.0.0.tgz#b50351de194dda0706b40f9632d261c9f0011c4c" + integrity sha512-TKbqfAv23TFtCJ2lzISdx76p97G/DP8Rp4TOFdqM9n8GTruVYgE3jX7Zgb8+w7YJ18slTVcDTQ1/tFzdCqjVhA== dependencies: "@babel/runtime" "^7.12.1" "@popperjs/core" "^2.5.3" @@ -10171,10 +10971,10 @@ react-transition-group@^4.4.1: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== +react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -10237,7 +11037,7 @@ read-package-json@^2.0.0: normalize-package-data "^2.0.0" npm-normalize-package-bin "^1.0.0" -"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -10250,16 +11050,6 @@ read-package-json@^2.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@1.1.x: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -10398,10 +11188,10 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -replace@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/replace/-/replace-1.2.0.tgz#a25da288841aab22f0f7e95dc1d249dbd2ed6e26" - integrity sha512-e3AP5GkRk+N/Qm1MUBaMhEHr4X3sHNI44a8m4ww6/qShJphTsStxSezbYtFNTFGCXZtWrwz4McVvCEwBv+ebAw== +replace@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/replace/-/replace-1.2.1.tgz#e6e28db8dc7dcfa2a6c0b99c8922360570f1aead" + integrity sha512-KZCBe/tPanwBlbjSMQby4l+zjSiFi3CLEP/6VLClnRYgJ46DZ5u9tmA6ceWeFS8coaUnU4ZdGNb/puUGMHNSRg== dependencies: chalk "2.4.2" minimatch "3.0.4" @@ -10499,7 +11289,7 @@ resolve@1.19.0: is-core-module "^2.1.0" path-parse "^1.0.6" -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.8.1: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.3.3: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -10611,12 +11401,12 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" -rollup@2.32.1: - version "2.32.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c" - integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== +rollup@2.38.4: + version "2.38.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.4.tgz#1b84ea8728c73b1a00a6a6e9c630ec8c3fe48cea" + integrity sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg== optionalDependencies: - fsevents "~2.1.2" + fsevents "~2.3.1" run-async@^2.4.0: version "2.4.1" @@ -10642,10 +11432,10 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= -rxjs-compat@^6.6.3: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.6.3.tgz#141405fcee11f48718d428b99c8f01826f594e5c" - integrity sha512-y+wUqq7bS2dG+7rH2fNMoxsDiJ32RQzFxZQE/JdtpnmEZmwLQrb1tCiItyHxdXJHXjmHnnzFscn3b6PEmORGKw== +rxjs-compat@^6.6.7: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.6.7.tgz#6eb4ef75c0a58ea672854a701ccc8d49f41e69cb" + integrity sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw== rxjs-tslint@^0.1.8: version "0.1.8" @@ -10672,13 +11462,20 @@ rxjs@6.6.2: dependencies: tslib "^1.9.0" -rxjs@6.6.3, rxjs@^6.5.3, rxjs@^6.6.0, rxjs@^6.6.3: +rxjs@6.6.3, rxjs@^6.5.3, rxjs@^6.6.0: version "6.6.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== dependencies: tslib "^1.9.0" +rxjs@^6.6.7: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -10708,10 +11505,10 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@10.0.5: - version "10.0.5" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769" - integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w== +sass-loader@10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" + integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -10719,10 +11516,10 @@ sass-loader@10.0.5: schema-utils "^3.0.0" semver "^7.3.2" -sass@1.27.0: - version "1.27.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.27.0.tgz#0657ff674206b95ec20dc638a93e179c78f6ada2" - integrity sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig== +sass@1.32.6: + version "1.32.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393" + integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ== dependencies: chokidar ">=2.0.0 <4.0.0" @@ -10740,16 +11537,16 @@ saucelabs@^1.5.0: dependencies: https-proxy-agent "^2.2.1" -save-html-as-image@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/save-html-as-image/-/save-html-as-image-1.3.4.tgz#5288ad4ea2aa04154f43e9b1e6f1462e0b1d9158" - integrity sha512-E5nxHUxs0iH3TBTB31WmtrxIF2pqBP+1Dvl+Z2kD84tZjFUKd334eBKuX/QglcTuzQKiTlp9m8NdDLR7rXrrUQ== +save-html-as-image@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/save-html-as-image/-/save-html-as-image-1.5.2.tgz#e8952c0d2eb4a976c7a93d6a17fe4f753df34875" + integrity sha512-WE4+UBgYWnDOxCtmfvAIOXZE2pPcB0Tuo5gxfcvvHdhJ2dOO6vAIx8mA1PXzK/B3977YrFiYdVPEswp6KrXjHw== dependencies: - file-saver "^2.0.2" - html-to-image "^0.1.1" - save-svg-as-png "^1.4.14" + file-saver "^2.0.5" + html-to-image "^1.3.21" + save-svg-as-png "^1.4.17" -save-svg-as-png@^1.4.14: +save-svg-as-png@^1.4.17: version "1.4.17" resolved "https://registry.yarnpkg.com/save-svg-as-png/-/save-svg-as-png-1.4.17.tgz#294442002772a24f1db1bf8a2aaf7df4ab0cdc55" integrity sha512-7QDaqJsVhdFPwviCxkgHiGm9omeaMBe1VKbHySWU6oFB2LtnGCcYS13eVoslUgq6VZC6Tjq/HddBd1K6p2PGpA== @@ -10759,10 +11556,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" - integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -10776,7 +11573,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: +schema-utils@^2.6.5, schema-utils@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10794,7 +11591,7 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -schematics-scss-migrate@^1.2.10: +schematics-scss-migrate@^1.3.13: version "1.3.13" resolved "https://registry.yarnpkg.com/schematics-scss-migrate/-/schematics-scss-migrate-1.3.13.tgz#daa9529a0dc7b6c6a87bc50ff1d78872e0845e29" integrity sha512-gQNTzq4tj8wDNOnsrIDRETvEDgesHYexHc9w62H71UBrbw2j2xa773qcmV3ofI/KXqC8XQTKUwwVDPvIPqNMng== @@ -10821,7 +11618,7 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: tmp "0.0.30" xml2js "^0.4.17" -selfsigned@^1.10.7: +selfsigned@^1.10.8: version "1.10.8" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== @@ -10864,11 +11661,6 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" @@ -10876,11 +11668,18 @@ semver@7.3.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2: dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.1.2, semver@^7.3.4: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -11001,11 +11800,23 @@ shebang-command@^1.2.0: dependencies: shebang-regex "^1.0.0" +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -11023,12 +11834,19 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slice-ansi@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" + integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== + dependencies: + is-fullwidth-code-point "^2.0.0" + slide@~1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= -smart-buffer@^4.1.0: +smart-buffer@^4.0.2, smart-buffer@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== @@ -11063,17 +11881,7 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snyk-config@4.0.0-rc.2: - version "4.0.0-rc.2" - resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-4.0.0-rc.2.tgz#c6c94afe733e9063df546cd71a7adf6957135594" - integrity sha512-HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g== - dependencies: - async "^3.2.0" - debug "^4.1.1" - lodash.merge "^4.6.2" - minimist "^1.2.5" - -snyk-config@^4.0.0-rc.2: +snyk-config@4.0.0, snyk-config@^4.0.0-rc.2: version "4.0.0" resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-4.0.0.tgz#21d459f19087991246cc07a7ffb4501dce6f4159" integrity sha512-E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ== @@ -11094,10 +11902,10 @@ snyk-cpp-plugin@2.2.1: hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@4.17.2: - version "4.17.2" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.17.2.tgz#e22c7633311a1b17b89d125d0af638e1fa5c5167" - integrity sha512-fOz1KYM6Xs40pBhuXTMmVQmb+ySnxSRWJLJSIrVgOuJ3Ot05v1O2MCzZHwQzyVPGSaHpIxKFGvA09dOBjd76qQ== +snyk-docker-plugin@4.19.3: + version "4.19.3" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz#14569f25c52a3fc71a20f80f5beac4ccdc326c11" + integrity sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" @@ -11105,12 +11913,12 @@ snyk-docker-plugin@4.17.2: chalk "^2.4.2" debug "^4.1.1" docker-modem "2.1.3" - dockerfile-ast "0.1.0" + dockerfile-ast "0.2.0" elfy "^1.0.0" event-loop-spinner "^2.0.0" gunzip-maybe "^1.4.2" mkdirp "^1.0.4" - semver "^6.1.0" + semver "^7.3.4" snyk-nodejs-lockfile-parser "1.30.2" tar-stream "^2.1.0" tmp "^0.2.1" @@ -11125,10 +11933,10 @@ snyk-go-parser@1.4.1: toml "^3.0.0" tslib "^1.10.0" -snyk-go-plugin@1.16.5: - version "1.16.5" - resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.16.5.tgz#3f30ee6151648d1278cbcc68362c0222b17b1d6b" - integrity sha512-m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA== +snyk-go-plugin@1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz#56d0c92d7def29ba4c3c2030c5830093e3b0dd26" + integrity sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q== dependencies: "@snyk/dep-graph" "^1.23.1" "@snyk/graphlib" "2.1.9-patch.3" @@ -11137,21 +11945,21 @@ snyk-go-plugin@1.16.5: tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.12.5: - version "3.12.5" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.5.tgz#7e5ed9179ad7972663867f0b443144765d6e4329" - integrity sha512-Z4qEzzPuRO1BxfL0vgfv4pzJ58ox6dksf8i18Vi1+yqDKmYEHmcMBYe33faFPJFZYf1PP7RerADpPssFJiYyLg== +snyk-gradle-plugin@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz#26c9833c97ef50e83b022b2e3077a9056f8674e1" + integrity sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg== dependencies: "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "^1.23.1" - "@snyk/java-call-graph-builder" "1.19.1" + "@snyk/dep-graph" "^1.28.0" + "@snyk/java-call-graph-builder" "1.20.0" "@types/debug" "^4.1.4" chalk "^3.0.0" debug "^4.1.1" tmp "0.2.1" tslib "^2.0.0" -snyk-module@3.1.0, snyk-module@^3.1.0: +snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-3.1.0.tgz#3e088ff473ddf0d4e253a46ea6749d76d8e6e7ba" integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== @@ -11159,16 +11967,6 @@ snyk-module@3.1.0, snyk-module@^3.1.0: debug "^4.1.1" hosted-git-info "^3.0.4" -snyk-module@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/snyk-module/-/snyk-module-2.1.0.tgz#80d9e9b64f202ae753ed3b33b372ca6f5ec323da" - integrity sha512-K5xeA39vLbm23Y/29wFEhKGvo7FwV4x9XhCP5gB22dBPyYiCCNiDERX4ofHQvtM6q96cL0hIroMdlbctv/0nPw== - dependencies: - "@types/hosted-git-info" "^2.7.0" - "@types/node" "^6.14.7" - debug "^3.1.0" - hosted-git-info "^2.7.1" - snyk-mvn-plugin@2.25.3: version "2.25.3" resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz#fb7f6fa1d565b9f07c032e8b34e6308c310b2a27" @@ -11203,6 +12001,27 @@ snyk-nodejs-lockfile-parser@1.30.2: uuid "^8.3.0" yaml "^1.9.2" +snyk-nodejs-lockfile-parser@1.32.0: + version "1.32.0" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.32.0.tgz#2e25ea8622ef03ae7457a93ae70e156d6c46c2ef" + integrity sha512-FdYa/7NibnJPqBfobyw5jgI1/rd0LpMZf2W4WYYLRc2Hz7LZjKAByPjIX6qoA+lB9SC7yk5HYwWj2n4Fbg/DDw== + dependencies: + "@snyk/graphlib" "2.1.9-patch.3" + "@yarnpkg/core" "^2.4.0" + "@yarnpkg/lockfile" "^1.1.0" + event-loop-spinner "^2.0.0" + got "11.4.0" + lodash.clonedeep "^4.5.0" + lodash.flatmap "^4.5.0" + lodash.isempty "^4.4.0" + lodash.set "^4.3.2" + lodash.topairs "^4.3.0" + p-map "2.1.0" + snyk-config "^4.0.0-rc.2" + tslib "^1.9.3" + uuid "^8.3.0" + yaml "^1.9.2" + snyk-nuget-plugin@1.21.0: version "1.21.0" resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz#d9d3976cf0b4572ae97c47f758f84fc43040216f" @@ -11231,10 +12050,10 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" -snyk-poetry-lockfile-parser@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz#bd0ebc9b1dd3bde33e27e5b64bea22e25e7aee5d" - integrity sha512-HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA== +snyk-poetry-lockfile-parser@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz#bab5a279c103cbcca8eb86ab87717b115592881e" + integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== dependencies: "@snyk/cli-interface" "^2.9.2" "@snyk/dep-graph" "^1.23.0" @@ -11242,28 +12061,28 @@ snyk-poetry-lockfile-parser@^1.1.5: toml "^3.0.0" tslib "^2.0.0" -snyk-policy@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.14.1.tgz#4e48ea993573aca18e8d883b8c62171b9d35a3e0" - integrity sha512-C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g== +snyk-policy@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.19.0.tgz#0cbc442d9503970fb3afea938f57d57993a914ad" + integrity sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg== dependencies: debug "^4.1.1" email-validator "^2.0.4" js-yaml "^3.13.1" lodash.clonedeep "^4.5.0" + promise-fs "^2.1.1" semver "^6.0.0" - snyk-module "^2.0.2" - snyk-resolve "^1.0.1" - snyk-try-require "^1.3.1" - then-fs "^2.0.0" + snyk-module "^3.0.0" + snyk-resolve "^1.1.0" + snyk-try-require "^2.0.0" -snyk-python-plugin@1.19.4: - version "1.19.4" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.4.tgz#03b70c12c0adfd5104839e0d9d9ba7083271e905" - integrity sha512-d1c/QKb3Il3xF1HY0IYoqQ+16+i0Ex5ai+J4KqOMbcKFvNcfkiOSPpCsrgSNJtBa50srbRleUrILdorALxaV2w== +snyk-python-plugin@1.19.7: + version "1.19.7" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz#d7e536694a481fd48e7d0cc8e7753c3f15a9c8be" + integrity sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A== dependencies: "@snyk/cli-interface" "^2.0.3" - snyk-poetry-lockfile-parser "^1.1.5" + snyk-poetry-lockfile-parser "^1.1.6" tmp "0.0.33" snyk-resolve-deps@4.7.2: @@ -11287,15 +12106,7 @@ snyk-resolve-deps@4.7.2: snyk-try-require "^1.1.1" then-fs "^2.0.0" -snyk-resolve@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.0.1.tgz#eaa4a275cf7e2b579f18da5b188fe601b8eed9ab" - integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== - dependencies: - debug "^3.1.0" - then-fs "^2.0.0" - -snyk-resolve@^1.0.0, snyk-resolve@^1.0.1: +snyk-resolve@1.1.0, snyk-resolve@^1.0.0, snyk-resolve@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/snyk-resolve/-/snyk-resolve-1.1.0.tgz#52740cb01ba477851086855f9857b3a44296ee0e" integrity sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw== @@ -11321,7 +12132,7 @@ snyk-tree@^1.0.0: dependencies: archy "^1.0.0" -snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: +snyk-try-require@1.3.1, snyk-try-require@^1.1.1: version "1.3.1" resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-1.3.1.tgz#6e026f92e64af7fcccea1ee53d524841e418a212" integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= @@ -11331,18 +12142,30 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.437.3: - version "1.455.0" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.455.0.tgz#a4ac3d82d8946b0137cbbb96513721fe50dc97ee" - integrity sha512-SDdmPxgQ1yB2wZ5KJ0YAq3a4i7HJFJhoVfCvzs458Jr5vvBN6W8PAwLQnniqQIPtyX/H70QW6PkkYu4rO8CkpA== +snyk-try-require@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/snyk-try-require/-/snyk-try-require-2.0.1.tgz#076ae9bc505d64d28389452ce19fcac28f26655a" + integrity sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA== + dependencies: + debug "^4.1.1" + lodash.clonedeep "^4.3.0" + lru-cache "^5.1.1" + +snyk@^1.528.0: + version "1.528.0" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.528.0.tgz#083bf40dff76cf9ee499551b549f191964bd94a9" + integrity sha512-ejzvipU9WD42M9xpoJljG+Jh1Olb6cHF96wn8PyPvOY7R5NZgQBtHKdBnLYi5xenauFdOgFPnLnxmP65xRbKnw== dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" - "@snyk/dep-graph" "1.23.1" + "@snyk/code-client" "3.4.0" + "@snyk/dep-graph" "^1.27.1" + "@snyk/fix" "1.526.0" "@snyk/gemfile" "1.2.0" "@snyk/graphlib" "^2.1.9-patch.3" "@snyk/inquirer" "^7.3.3-patch" "@snyk/snyk-cocoapods-plugin" "2.5.2" + "@snyk/snyk-hex-plugin" "1.0.1" abbrev "^1.1.1" ansi-escapes "3.2.0" chalk "^2.4.2" @@ -11350,6 +12173,8 @@ snyk@^1.437.3: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" + global-agent "^2.1.12" + hcl-to-json "^0.1.1" lodash.assign "^4.2.0" lodash.camelcase "^4.3.0" lodash.clonedeep "^4.5.0" @@ -11368,32 +12193,34 @@ snyk@^1.437.3: lodash.upperfirst "^4.3.1" lodash.values "^4.3.0" micromatch "4.0.2" - needle "2.5.0" + needle "2.6.0" open "^7.0.3" + ora "5.3.0" os-name "^3.0.0" promise-queue "^2.2.5" - proxy-agent "^3.1.1" proxy-from-env "^1.0.0" + rimraf "^2.6.3" semver "^6.0.0" - snyk-config "4.0.0-rc.2" + snyk-config "4.0.0" snyk-cpp-plugin "2.2.1" - snyk-docker-plugin "4.17.2" - snyk-go-plugin "1.16.5" - snyk-gradle-plugin "3.12.5" + snyk-docker-plugin "4.19.3" + snyk-go-plugin "1.17.0" + snyk-gradle-plugin "3.14.0" snyk-module "3.1.0" snyk-mvn-plugin "2.25.3" - snyk-nodejs-lockfile-parser "1.30.2" + snyk-nodejs-lockfile-parser "1.32.0" snyk-nuget-plugin "1.21.0" snyk-php-plugin "1.9.2" - snyk-policy "1.14.1" - snyk-python-plugin "1.19.4" - snyk-resolve "1.0.1" + snyk-policy "1.19.0" + snyk-python-plugin "1.19.7" + snyk-resolve "1.1.0" snyk-resolve-deps "4.7.2" snyk-sbt-plugin "2.11.0" snyk-tree "^1.0.0" snyk-try-require "1.3.1" source-map-support "^0.5.11" strip-ansi "^5.2.0" + tar "^6.1.0" tempfile "^2.0.0" update-notifier "^4.1.0" uuid "^3.3.2" @@ -11428,34 +12255,26 @@ socket.io@^3.1.0: socket.io-adapter "~2.1.0" socket.io-parser "~4.0.3" -sockjs-client@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" - integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== +sockjs-client@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6" + integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ== dependencies: - debug "^3.2.5" + debug "^3.2.6" eventsource "^1.0.7" - faye-websocket "~0.11.1" - inherits "^2.0.3" - json3 "^3.3.2" - url-parse "^1.4.3" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.5.1" -sockjs@0.3.20: - version "0.3.20" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" - integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== dependencies: - faye-websocket "^0.10.0" + faye-websocket "^0.11.3" uuid "^3.4.0" - websocket-driver "0.6.5" - -socks-proxy-agent@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" - integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== - dependencies: - agent-base "~4.2.1" - socks "~2.3.2" + websocket-driver "^0.7.4" socks-proxy-agent@^5.0.0: version "5.0.0" @@ -11474,23 +12293,15 @@ socks@^2.3.3: ip "^1.1.5" smart-buffer "^4.1.0" -socks@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3" - integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA== - dependencies: - ip "1.1.5" - smart-buffer "^4.1.0" - source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-loader@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" - integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== +source-map-loader@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820" + integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA== dependencies: abab "^2.0.5" iconv-lite "^0.6.2" @@ -11510,6 +12321,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@0.5.19, source-map-support@^0.5.11, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.5, source-map-support@^0.5.7, source-map-support@~0.5.12, source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -11627,12 +12446,12 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -speed-measure-webpack-plugin@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.3.tgz#6ff894fc83e8a6310dde3af863a0329cd79da4f5" - integrity sha512-2ljD4Ch/rz2zG3HsLsnPfp23osuPBS0qPuz9sGpkNXTN1Ic4M+W9xB8l8rS8ob2cO4b1L+WTJw/0AJwWYVgcxQ== +speed-measure-webpack-plugin@1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz#1608e62d3bdb45f01810010e1b5bfedefedfa58f" + integrity sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw== dependencies: - chalk "^2.0.1" + chalk "^4.1.0" split-ca@^1.0.1: version "1.0.1" @@ -11732,6 +12551,11 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" +stream-buffers@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521" + integrity sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ== + stream-each@^1.1.0: version "1.2.3" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" @@ -11756,6 +12580,22 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== +stream-to-array@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353" + integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M= + dependencies: + any-promise "^1.1.0" + +stream-to-promise@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/stream-to-promise/-/stream-to-promise-2.2.0.tgz#b1edb2e1c8cb11289d1b503c08d3f2aef51e650f" + integrity sha1-se2y4cjLESidG1A8CNPyrvUeZQ8= + dependencies: + any-promise "~1.3.0" + end-of-stream "~1.1.0" + stream-to-array "~2.3.0" + streamroller@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-2.2.4.tgz#c198ced42db94086a6193608187ce80a5f2b0e53" @@ -11779,7 +12619,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2": +"string-width@^1.0.2 || 2", string-width@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -11837,11 +12677,6 @@ string_decoder@^1.0.0, string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -11849,6 +12684,13 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@6.0.0, strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -11870,13 +12712,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -11911,10 +12746,10 @@ stylenames@^1.1.6: dependencies: es6-symbol "^3.1.0" -stylus-loader@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.1.tgz#8b4e749294d9fe0729c2e5e1f04cbf87e1c941aa" - integrity sha512-apDYJEM5ZpOAWbWInWcsbtI8gHNr/XYVcSY/tWqOUPt7M5tqhtwXVsAkgyiVjhuvw2Yrjq474a9H+g4d047Ebw== +stylus-loader@4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-4.3.3.tgz#381bb6341272ac50bcdfd0b877707eac99b6b757" + integrity sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ== dependencies: fast-glob "^3.2.4" klona "^2.0.4" @@ -12003,12 +12838,12 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0: +tapable@^2.1.1, tapable@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== -tar-stream@^2.1.0, tar-stream@^2.1.2: +tar-stream@^2.0.1, tar-stream@^2.1.0, tar-stream@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -12092,10 +12927,22 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@5.3.7: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.3.7.tgz#798a4ae2e7ff67050c3e99fcc4e00725827d97e2" - integrity sha512-lJbKdfxWvjpV330U4PBZStCT9h3N9A4zZVA5Y4k9sCWXknrpdyxi1oMsRKLmQ/YDMDxSBKIh88v0SkdhdqX06w== +terser-webpack-plugin@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" + integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q== + dependencies: + jest-worker "^26.6.2" + p-limit "^3.1.0" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + source-map "^0.6.1" + terser "^5.5.1" + +terser@5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289" + integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -12119,11 +12966,25 @@ terser@^5.3.4: source-map "~0.7.2" source-map-support "~0.5.19" +terser@^5.5.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.1.tgz#a48eeac5300c0a09b36854bf90d9c26fb201973c" + integrity sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw== + dependencies: + commander "^2.20.0" + source-map "~0.7.2" + source-map-support "~0.5.19" + text-table@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +textextensions@^5.11.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" + integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== + then-fs@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" @@ -12144,11 +13005,6 @@ through@X.X.X, through@^2.3.6: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -thunkify@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d" - integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0= - thunky@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" @@ -12259,7 +13115,7 @@ tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tree-kill@1.2.2, tree-kill@^1.2.1, tree-kill@^1.2.2: +tree-kill@1.2.2, tree-kill@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== @@ -12283,12 +13139,13 @@ ts-mockito@^2.6.1: dependencies: lodash "^4.17.5" -ts-node@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3" - integrity sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg== +ts-node@~9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" + integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== dependencies: arg "^4.1.0" + create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" source-map-support "^0.5.17" @@ -12304,20 +13161,20 @@ tslib@1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== -tslib@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c" - integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ== +tslib@2.1.0, tslib@^2.0.0, tslib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tslib@^1, tslib@^1.10.0, tslib@^1.11.2, tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" + integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== tslint-config-prettier@^1.18.0: version "1.18.0" @@ -12391,13 +13248,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - type-fest@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" @@ -12408,6 +13258,11 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -12453,12 +13308,7 @@ typescript@4.0.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== -typescript@4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" - integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== - -typescript@>=2.8.3: +typescript@4.1.5, typescript@>=2.8.3: version "4.1.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA== @@ -12473,7 +13323,7 @@ ua-parser-js@^0.7.23: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== -uncontrollable@^7.0.0: +uncontrollable@^7.0.0, uncontrollable@^7.2.1: version "7.2.1" resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.2.1.tgz#1fa70ba0c57a14d5f78905d533cf63916dc75738" integrity sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ== @@ -12589,7 +13439,7 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-notifier@^4.1.0, update-notifier@^4.1.1: +update-notifier@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== @@ -12608,6 +13458,26 @@ update-notifier@^4.1.0, update-notifier@^4.1.1: semver-diff "^3.1.1" xdg-basedir "^4.0.0" +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== + dependencies: + boxen "^5.0.0" + chalk "^4.1.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -12627,7 +13497,7 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.4.3: +url-parse@^1.4.3, url-parse@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== @@ -12697,7 +13567,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@8.3.2, uuid@^8.2.0, uuid@^8.3.0: +uuid@8.3.2, uuid@^8.2.0, uuid@^8.3.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -12732,7 +13602,7 @@ vendors@^1.0.0: resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== -verror@1.10.0: +verror@1.10.0, verror@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= @@ -12741,6 +13611,18 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +version-compare@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" + integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== + +version-range@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" + integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== + dependencies: + version-compare "^1.0.0" + vm-browserify@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" @@ -12781,6 +13663,14 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" +watchpack@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7" + integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -12842,10 +13732,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" - integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== +webpack-dev-server@3.11.2: + version "3.11.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" + integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -12867,11 +13757,11 @@ webpack-dev-server@3.11.0: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.8" semver "^6.3.0" serve-index "^1.9.1" - sockjs "0.3.20" - sockjs-client "1.4.0" + sockjs "^0.3.21" + sockjs-client "^1.5.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -12889,18 +13779,18 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.2.0.tgz#31cbcc954f8f89cd4b06ca8d97a38549f7f3f0c9" - integrity sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA== +webpack-merge@5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" + integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.0.1.tgz#1467f6e692ddce91e88b8044c44347b1087bbd4f" - integrity sha512-A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw== +webpack-sources@2.2.0, webpack-sources@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -12913,10 +13803,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -webpack-subresource-integrity@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.1.tgz#6f44ea99987266b70c4ec42ac51064d33e982277" - integrity sha512-uekbQ93PZ9e7BFB8Hl9cFIVYQyQqiXp2ExKk9Zv+qZfH/zHXHrCFAfw1VW0+NqWbTWrs/HnuDrto3+tiPXh//Q== +webpack-subresource-integrity@1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e" + integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw== dependencies: webpack-sources "^1.3.0" @@ -12949,14 +13839,36 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -websocket-driver@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= +webpack@5.31.0: + version "5.31.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.31.0.tgz#fab61d0be896feca4af87bdad5c18815c0d63455" + integrity sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ== dependencies: - websocket-extensions ">=0.1.1" + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.46" + "@webassemblyjs/ast" "1.11.0" + "@webassemblyjs/wasm-edit" "1.11.0" + "@webassemblyjs/wasm-parser" "1.11.0" + acorn "^8.0.4" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.7.0" + es-module-lexer "^0.4.0" + eslint-scope "^5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" + json-parse-better-errors "^1.0.2" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.0.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.1" + watchpack "^2.0.0" + webpack-sources "^2.1.1" -websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== @@ -12987,7 +13899,7 @@ which@^1.2.1, which@^1.2.9: dependencies: isexe "^2.0.0" -which@^2.0.2: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -13020,11 +13932,6 @@ windows-release@^3.1.0: dependencies: execa "^1.0.0" -word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -13113,15 +14020,25 @@ xml2js@0.4.23, xml2js@^0.4.17: sax ">=0.6.0" xmlbuilder "~11.0.0" +xmlbuilder@>=11.0.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xregexp@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" - integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= +xmldom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" @@ -13133,15 +14050,15 @@ xterm-addon-attach@^0.6.0: resolved "https://registry.yarnpkg.com/xterm-addon-attach/-/xterm-addon-attach-0.6.0.tgz#220c23addd62ab88c9914e2d4c06f7407e44680e" integrity sha512-Mo8r3HTjI/EZfczVCwRU6jh438B4WLXxdFO86OB7bx0jGhwh2GdF4ifx/rP+OB+Cb2vmLhhVIZ00/7x3YSP3dg== -xterm-addon-fit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193" - integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w== +xterm-addon-fit@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" + integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm@^4.9.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0.tgz#fc4f554e3e718aff9b83622e858e64b0953067bb" - integrity sha512-Wn66I8YpSVkgP3R95GjABC6Eb21pFfnCSnyIqKIIoUI13ohvwd0KGVzUDfyEFfSAzKbPJfrT2+vt7SfUXBZQKQ== +xterm@^4.11.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.11.0.tgz#d7dabc7af5299579e4663fedf2b3a179af9aaff9" + integrity sha512-NeJH909WTO2vth/ZlC0gkP3AGzupbvVHVlmtrpBw56/sGFXaF9bNdKgqKa3tf8qbGvXMzL2JhCcHVklqFztIRw== y18n@^4.0.0: version "4.0.1" @@ -13227,7 +14144,7 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0: +yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -13266,10 +14183,10 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zone.js@^0.11.3: - version "0.11.3" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.3.tgz#255a6313174731cc014d63233ef04fd9858da375" - integrity sha512-Y4hTHoh4VcxU5BDGAqEoOnOiyT254w6CiHtpQxAJUSMZPyVgdbKf+5R7Mwz6xsPhMIeBXk5rTopRZDpjssTCUg== +zone.js@^0.11.4: + version "0.11.4" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.4.tgz#0f70dcf6aba80f698af5735cbb257969396e8025" + integrity sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw== dependencies: tslib "^2.0.0" From 12d1f7fd4193349d26d317ccaf3965452d9c2421 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Thu, 8 Apr 2021 10:10:32 +0200 Subject: [PATCH 55/76] Update adbutler.component.scss --- src/app/components/adbutler/adbutler.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/components/adbutler/adbutler.component.scss b/src/app/components/adbutler/adbutler.component.scss index 43942aa0..cc71b0b8 100644 --- a/src/app/components/adbutler/adbutler.component.scss +++ b/src/app/components/adbutler/adbutler.component.scss @@ -8,6 +8,7 @@ padding-bottom: 10px; font-size: 12px; font-weight: bold; + opacity: 0.8; } .adInnerContainer { From 0e71897317d55389f9d44a8b0ccaaca026c2c6dc Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Thu, 8 Apr 2021 10:41:03 +0200 Subject: [PATCH 56/76] Fix styling for new title bar --- src/app/components/project-map/project-map.component.html | 5 +++-- src/app/components/project-map/project-map.component.scss | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html index a7a77ab6..ea3cf3f6 100644 --- a/src/app/components/project-map/project-map.component.html +++ b/src/app/components/project-map/project-map.component.html @@ -11,10 +11,11 @@
-
+
-
@@ -142,13 +147,13 @@ - - -
diff --git a/src/app/components/project-map/project-map.component.scss b/src/app/components/project-map/project-map.component.scss index d795d675..d6e0208b 100644 --- a/src/app/components/project-map/project-map.component.scss +++ b/src/app/components/project-map/project-map.component.scss @@ -89,10 +89,6 @@ g.node:hover { &.lightTheme { background-color: white !important; - mat-icon { - color: black !important; - } - .selected mat-icon { color: #0097a7 !important; } @@ -112,7 +108,6 @@ g.node:hover { mat-icon { font-size: 20px; - color: white; } .menu-button { @@ -126,6 +121,18 @@ g.node:hover { margin: 2px 0px; } + .zoom-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + border-radius: 18px; + background: none; + margin: 2px 0px; + color: white; + } + .selection-button { margin-bottom: 0px !important; } @@ -150,12 +157,9 @@ g.node:hover { &.lightTheme { background-color: rgba(244, 248, 252, 0.95) !important; - mat-icon { - color: black; - } - - .menu-button { + .zoom-button { opacity: 0.7; + color: black; } .section { @@ -361,3 +365,15 @@ g.node text, mat-menu-panel { min-height: 0px; } + +.unmarked { + color: white!important; +} + +.unmarkedLight { + color: black!important; +} + +.marked { + color: #0097a7!important; +} From c4df0e49f9d32b56cfe86c09956a961792a7d997 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Thu, 8 Apr 2021 12:00:20 +0200 Subject: [PATCH 59/76] Update topology-summary.component.scss --- .../topology-summary/topology-summary.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/components/topology-summary/topology-summary.component.scss b/src/app/components/topology-summary/topology-summary.component.scss index 865efd1d..e47673b7 100644 --- a/src/app/components/topology-summary/topology-summary.component.scss +++ b/src/app/components/topology-summary/topology-summary.component.scss @@ -4,6 +4,10 @@ } } +mat-tab-group { + width: 100%; +} + .summaryWrapper { box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; From 7d9928609dfc2c06b5400506540c5334aa648797 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Thu, 8 Apr 2021 13:17:21 +0200 Subject: [PATCH 60/76] Fix for styling zoom buttons & color of left menu --- .../project-map/project-map.component.html | 2 +- .../project-map/project-map.component.scss | 28 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html index b7437fcd..66d2c379 100644 --- a/src/app/components/project-map/project-map.component.html +++ b/src/app/components/project-map/project-map.component.html @@ -150,7 +150,7 @@ -
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 12c9e5a7..bb8b37b0 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -73,6 +73,7 @@ import { Title } from '@angular/platform-browser'; import { NewTemplateDialogComponent } from './new-template-dialog/new-template-dialog.component'; import { NodeConsoleService } from '../../services/nodeConsole.service'; import * as Mousetrap from 'mousetrap'; +import { SymbolService } from '../../services/symbol.service'; @Component({ @@ -98,6 +99,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public layersVisibility: boolean = false; public gridVisibility: boolean = false; public toolbarVisibility: boolean = true; + public symbolScaling: boolean = true; tools = { selection: true, @@ -165,6 +167,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { private themeService: ThemeService, private title: Title, private nodeConsoleService: NodeConsoleService, + private symbolService: SymbolService, private cd: ChangeDetectorRef ) {} @@ -195,6 +198,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.cd.detectChanges(); this.settings = this.settingsService.getAll(); + this.symbolScaling = this.mapSettingsService.getSymbolScaling(); this.isTopologySummaryVisible = this.mapSettingsService.isTopologySummaryVisible; this.isConsoleVisible = this.mapSettingsService.isLogConsoleVisible; this.mapSettingsService.logConsoleSubject.subscribe(value => this.isConsoleVisible = value); @@ -220,11 +224,18 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.projectMapSubscription.add( this.nodesDataSource.changes.subscribe((nodes: Node[]) => { if (!this.server) return; - nodes.forEach((node: Node) => { + nodes.forEach(async (node: Node) => { node.symbol_url = `${this.server.protocol}//${this.server.host}:${this.server.port}/v2/symbols/${node.symbol}/raw`; + + if (node.width == 0 && node.height == 0) { + let symbolDimensions = await this.symbolService.getDimensions(this.server, node.symbol).toPromise(); + node.width = symbolDimensions.width; + node.height = symbolDimensions.height; + } }); this.nodes = nodes; + if (this.mapSettingsService.getSymbolScaling()) this.applyScalingOfNodeSymbols(); this.mapChangeDetectorRef.detectChanges(); }) ); @@ -249,6 +260,20 @@ export class ProjectMapComponent implements OnInit, OnDestroy { message: message }); })); + + this.projectMapSubscription.add(this.mapSettingsService.symbolScalingSubject.subscribe((value) => { + if (value) this.applyScalingOfNodeSymbols(); + })); + } + + applyScalingOfNodeSymbols() { + this.nodesDataSource.getItems().forEach((node) => { + if ((node.width > this.symbolService.getMaximumSymbolSize() || node.height > this.symbolService.getMaximumSymbolSize()) && !(node.node_type === 'cloud' || node.node_type === 'nat')) { + let newDimensions = this.symbolService.scaleDimensionsForNode(node); + node.width = newDimensions.width; + node.height = newDimensions.height; + } + }); } getData() { @@ -693,6 +718,11 @@ export class ProjectMapComponent implements OnInit, OnDestroy { return this.inReadOnlyMode; } + public toggleSymbolScaling(value: boolean) { + this.symbolScaling = value; + this.mapSettingsService.setSymbolScaling(value); + } + public toggleMovingMode() { this.tools.moving = !this.tools.moving; this.movingEventSource.movingModeState.emit(this.tools.moving); diff --git a/src/app/services/mapsettings.service.ts b/src/app/services/mapsettings.service.ts index ee6cf7f3..a54700c5 100644 --- a/src/app/services/mapsettings.service.ts +++ b/src/app/services/mapsettings.service.ts @@ -1,10 +1,12 @@ import { Injectable, EventEmitter } from "@angular/core"; -import { Subject } from 'rxjs'; +import { BehaviorSubject, Subject } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class MapSettingsService { + public symbolScalingSubject : Subject = new Subject(); + public isScrollDisabled = new Subject(); public isMapLocked = new Subject(); public isTopologySummaryVisible: boolean = true; @@ -19,6 +21,26 @@ export class MapSettingsService { constructor() { this.isLayerNumberVisible = localStorage.getItem('layersVisibility') === 'true' ? true : false; if (localStorage.getItem('integrateLinkLabelsToLinks')) this.integrateLinkLabelsToLinks = localStorage.getItem('integrateLinkLabelsToLinks') === 'true' ? true : false; + + let isSymbolScalingEnabled = true; + if (localStorage.getItem('symbolScaling')) { + isSymbolScalingEnabled = localStorage.getItem('symbolScaling') === 'true' ? true : false; + } else { + localStorage.setItem('symbolScaling', 'true'); + } + } + + public getSymbolScaling() : boolean { + return localStorage.getItem('symbolScaling') === 'true' ? true : false; + } + + public setSymbolScaling(value: boolean) { + if (value) { + localStorage.setItem('symbolScaling', 'true'); + } else { + localStorage.setItem('symbolScaling', 'false'); + } + this.symbolScalingSubject.next(value); } changeMapLockValue(value: boolean) { diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts index b5476d6b..9727544e 100644 --- a/src/app/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -5,6 +5,7 @@ import { Symbol } from '../models/symbol'; import { Server } from '../models/server'; import { HttpServer } from './http-server.service'; import { shareReplay } from 'rxjs/operators'; +import { Node } from '../cartography/models/node'; const CACHE_SIZE = 1; @@ -12,13 +13,31 @@ const CACHE_SIZE = 1; export class SymbolService { public symbols: BehaviorSubject = new BehaviorSubject([]); private cache: Observable; + private maximumSymbolSize: number = 80; constructor(private httpServer: HttpServer) {} + getMaximumSymbolSize() { + return this.maximumSymbolSize; + } + get(symbol_id: string): Symbol { return this.symbols.getValue().find((symbol: Symbol) => symbol.symbol_id === symbol_id); } + getDimensions(server: Server, symbol_id: string): Observable { + const encoded_uri = encodeURI(symbol_id); + return this.httpServer.get(server, `/symbols/${encoded_uri}/dimensions`); + } + + scaleDimensionsForNode(node: Node): SymbolDimension { + let scale = node.width > node.height ? this.maximumSymbolSize/node.width : this.maximumSymbolSize/node.height; + return { + width: node.width * scale, + height: node.height * scale + } + } + getByFilename(symbol_filename: string) { return this.symbols.getValue().find((symbol: Symbol) => symbol.filename === symbol_filename); } @@ -47,3 +66,8 @@ export class SymbolService { return this.httpServer.getText(server, `/symbols/${encoded_uri}/raw`); } } + +class SymbolDimension { + width: number; + height: number +} From ee943eacadd13dc54337bbc4a734bc0f64c0c09e Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Fri, 9 Apr 2021 14:10:14 +0200 Subject: [PATCH 64/76] Update project-map.component.ts --- src/app/components/project-map/project-map.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index bb8b37b0..547e9a1f 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -268,7 +268,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { applyScalingOfNodeSymbols() { this.nodesDataSource.getItems().forEach((node) => { - if ((node.width > this.symbolService.getMaximumSymbolSize() || node.height > this.symbolService.getMaximumSymbolSize()) && !(node.node_type === 'cloud' || node.node_type === 'nat')) { + if (node.height > this.symbolService.getMaximumSymbolSize()) { let newDimensions = this.symbolService.scaleDimensionsForNode(node); node.width = newDimensions.width; node.height = newDimensions.height; From 7362f2625b234f79531fe790cfbb6b885277c287 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Fri, 9 Apr 2021 14:30:14 +0200 Subject: [PATCH 65/76] Fix unit tests after updating fonts package --- src/app/cartography/helpers/font-bbox-calculator.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/cartography/helpers/font-bbox-calculator.spec.ts b/src/app/cartography/helpers/font-bbox-calculator.spec.ts index aa608add..9425ac09 100644 --- a/src/app/cartography/helpers/font-bbox-calculator.spec.ts +++ b/src/app/cartography/helpers/font-bbox-calculator.spec.ts @@ -10,8 +10,8 @@ describe('FontBBoxCalculator', () => { it('should calculate font width and height', () => { const box = calculator.calculate('My text', 'font-family:Arial; font-size: 12px; font-weight:bold'); - expect(box.height).toEqual(14); - expect(box.width).toEqual(41.34375); + expect(box.height).toEqual(15); + expect(box.width).toEqual(41); }); xit('should calculate font width and height for different font', () => { From 1dc488707157e255aff3005929646b09f2cd1a30 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Sat, 10 Apr 2021 23:43:57 +0200 Subject: [PATCH 66/76] Update console-wrapper.component.scss --- .../project-map/console-wrapper/console-wrapper.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.scss b/src/app/components/project-map/console-wrapper/console-wrapper.component.scss index f68f93fe..3f64f51f 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.scss +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.scss @@ -15,6 +15,7 @@ color: white; overflow: hidden; font-size: 12px; + border-radius: 8px } .lightTheme { From bba7d8b2210f52b2ccf8f0625d51866edf556644 Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Mon, 12 Apr 2021 13:15:45 +0200 Subject: [PATCH 67/76] Code optimization --- e2e/app.e2e-spec.ts | 2 +- e2e/helpers/common.po.ts | 26 +- e2e/helpers/project-map.po.ts | 84 +- e2e/helpers/project.po.ts | 30 +- e2e/helpers/server.po.ts | 58 +- e2e/project-map.e2e-spec.ts | 56 +- e2e/projects.e2e-spec.ts | 46 +- e2e/servers.e2e-spec.ts | 70 +- src/app/app-routing.module.ts | 119 +- src/app/app.component.html | 6 +- src/app/app.component.scss | 6 +- src/app/app.component.spec.ts | 2 +- src/app/app.component.ts | 18 +- src/app/app.module.ts | 12 +- src/app/cartography/angular-map.imports.ts | 2 +- src/app/cartography/cartography.module.ts | 8 +- .../components/d3-map/d3-map.component.html | 32 +- .../d3-map/d3-map.component.spec.ts | 2 +- .../components/d3-map/d3-map.component.ts | 37 +- .../draggable-selection.component.spec.ts | 28 +- .../draggable-selection.component.ts | 58 +- .../drawing-adding.component.spec.ts | 4 +- .../drawing-adding.component.ts | 12 +- .../drawing-resizing.component.spec.ts | 4 +- .../drawing-resizing.component.ts | 6 +- .../draggable/draggable.component.spec.ts | 2 +- .../draggable/draggable.component.ts | 6 +- .../drawing/drawing.component.spec.ts | 2 +- .../drawing/drawing.component.ts | 2 +- .../ellipse/ellipse.component.spec.ts | 2 +- .../drawings/ellipse/ellipse.component.ts | 2 +- .../drawings/image/image.component.spec.ts | 2 +- .../drawing/drawings/image/image.component.ts | 2 +- .../drawings/line/line.component.spec.ts | 2 +- .../drawing/drawings/line/line.component.ts | 2 +- .../drawings/rect/rect.component.spec.ts | 2 +- .../drawing/drawings/rect/rect.component.ts | 2 +- .../drawings/text/text.component.spec.ts | 2 +- .../drawing/drawings/text/text.component.ts | 2 +- .../experimental-map.component.ts | 6 +- .../interface-label.component.spec.ts | 2 +- .../interface-label.component.ts | 4 +- .../link/link.component.spec.ts | 2 +- .../experimental-map/link/link.component.ts | 4 +- .../link/strategies/ethernet-link-strategy.ts | 2 +- .../link/strategies/serial-link-strategy.ts | 8 +- .../node/node.component.spec.ts | 2 +- .../experimental-map/node/node.component.ts | 4 +- .../selection/selection.component.spec.ts | 2 +- .../selection/selection.component.ts | 2 +- .../status/status.component.spec.ts | 2 +- .../status/status.component.ts | 4 +- .../selection-control.component.ts | 22 +- .../selection-select.component.spec.ts | 2 +- .../selection-select.component.ts | 7 +- .../text-editor/text-editor.component.spec.ts | 4 +- .../text-editor/text-editor.component.ts | 82 +- .../map/link-to-map-link-converter.ts | 4 +- .../map/map-drawing-to-svg-converter.ts | 22 +- .../map/map-link-to-link-converter.ts | 2 +- .../map/map-node-to-node-converter.ts | 2 +- .../map/node-to-map-node-converter.ts | 6 +- .../styles-to-font-converter.spec.ts | 2 +- .../converters/styles-to-font-converter.ts | 12 +- src/app/cartography/d3-map.imports.ts | 2 +- src/app/cartography/datasources/datasource.ts | 6 +- .../moving-canvas.directive.spec.ts | 310 +++-- .../directives/moving-canvas.directive.ts | 108 +- .../zooming-canvas.directive.spec.ts | 252 ++-- .../directives/zooming-canvas.directive.ts | 86 +- .../events/drawings-event-source.ts | 2 +- .../cartography/events/moving-event-source.ts | 4 +- src/app/cartography/helpers/css-fixer.ts | 6 +- .../helpers/default-drawings-factory.ts | 2 +- .../helpers/font-bbox-calculator.ts | 2 +- .../cartography/helpers/font-fixer.spec.ts | 8 +- src/app/cartography/helpers/font-fixer.ts | 10 +- .../helpers/multi-link-calculator-helper.ts | 2 +- .../cartography/helpers/qt-dasharray-fixer.ts | 2 +- .../helpers/svg-to-drawing-converter.ts | 2 +- .../managers/graph-data-manager.ts | 12 +- .../cartography/managers/selection-manager.ts | 12 +- src/app/cartography/testing.ts | 9 +- src/app/cartography/tools/moving-tool.spec.ts | 12 +- src/app/cartography/tools/moving-tool.ts | 2 +- src/app/cartography/tools/selection-tool.ts | 26 +- src/app/cartography/widgets/drawing-line.ts | 13 +- src/app/cartography/widgets/drawing.ts | 59 +- src/app/cartography/widgets/drawings.ts | 40 +- .../widgets/drawings/ellipse-drawing.spec.ts | 5 +- .../widgets/drawings/ellipse-drawing.ts | 38 +- .../widgets/drawings/image-drawing.spec.ts | 5 +- .../widgets/drawings/image-drawing.ts | 9 +- .../widgets/drawings/line-drawing.spec.ts | 5 +- .../widgets/drawings/line-drawing.ts | 29 +- .../widgets/drawings/rect-drawing.spec.ts | 5 +- .../widgets/drawings/rect-drawing.ts | 39 +- .../widgets/drawings/text-drawing.spec.ts | 15 +- .../widgets/drawings/text-drawing.ts | 13 +- src/app/cartography/widgets/graph-layout.ts | 10 +- .../widgets/interface-label.spec.ts | 5 +- .../cartography/widgets/interface-label.ts | 22 +- .../cartography/widgets/interface-status.ts | 83 +- src/app/cartography/widgets/label.ts | 24 +- src/app/cartography/widgets/layers.ts | 5 +- src/app/cartography/widgets/link.ts | 84 +- src/app/cartography/widgets/links.spec.ts | 5 +- .../widgets/links/ethernet-link.ts | 13 +- .../cartography/widgets/links/serial-link.ts | 24 +- src/app/cartography/widgets/node.spec.ts | 2 +- src/app/cartography/widgets/node.ts | 39 +- .../error-handlers/sentry-error-handler.ts | 20 +- .../toaster-error-handler.spec.ts | 4 +- .../error-handlers/toaster-error-handler.ts | 10 +- .../progress-dialog.component.spec.ts | 2 +- .../progress-dialog.component.ts | 2 +- .../progress-dialog.service.spec.ts | 2 +- .../progress-dialog.service.ts | 2 +- .../common/progress/progress.component.html | 8 +- .../progress/progress.component.spec.ts | 6 +- src/app/common/progress/progress.component.ts | 4 +- .../common/progress/progress.service.spec.ts | 4 +- .../adbutler/adbutler.component.html | 20 +- .../adbutler/adbutler.component.scss | 18 +- .../adbutler/adbutler.component.spec.ts | 5 +- .../components/adbutler/adbutler.component.ts | 95 +- .../bundled-server-finder.component.spec.ts | 7 +- .../bundled-server-finder.component.ts | 17 +- .../dialogs/information-dialog.component.ts | 2 +- .../direct-link/direct-link.component.ts | 35 +- .../drawing-added.component.spec.ts | 4 +- .../drawing-added/drawing-added.component.ts | 4 +- .../drawing-dragged.component.spec.ts | 8 +- .../drawing-dragged.component.ts | 4 +- .../drawing-resized.component.spec.ts | 8 +- .../drawing-resized.component.ts | 4 +- .../interface-label-dragged.component.spec.ts | 12 +- .../interface-label-dragged.component.ts | 6 +- .../link-created.component.spec.ts | 8 +- .../link-created/link-created.component.ts | 75 +- .../node-dragged.component.spec.ts | 6 +- .../node-dragged/node-dragged.component.ts | 6 +- .../node-label-dragged.component.spec.ts | 6 +- .../node-label-dragged.component.ts | 4 +- .../text-added/text-added.component.spec.ts | 4 +- .../text-added/text-added.component.ts | 10 +- .../text-edited/text-edited.component.spec.ts | 6 +- .../text-edited/text-edited.component.ts | 4 +- src/app/components/help/help.component.html | 76 +- src/app/components/help/help.component.scss | 4 +- src/app/components/help/help.component.ts | 44 +- .../install-software.component.html | 2 +- .../install-software.component.spec.ts | 5 +- .../install-software.component.ts | 17 +- .../installed-software.component.html | 65 +- .../installed-software.component.spec.ts | 5 +- .../installed-software.component.ts | 9 +- .../page-not-found.component.html | 9 +- .../page-not-found.component.scss | 2 +- .../page-not-found.component.ts | 8 +- .../built-in-preferences.component.html | 38 +- .../built-in-preferences.component.spec.ts | 69 +- .../built-in-preferences.component.ts | 21 +- .../cloud-nodes-add-template.component.html | 48 +- ...cloud-nodes-add-template.component.spec.ts | 128 +- .../cloud-nodes-add-template.component.ts | 133 +- ...loud-nodes-template-details.component.html | 311 ++--- ...d-nodes-template-details.component.spec.ts | 100 +- .../cloud-nodes-template-details.component.ts | 196 +-- .../cloud-nodes-templates.component.html | 68 +- .../cloud-nodes-templates.component.spec.ts | 73 +- .../cloud-nodes-templates.component.ts | 61 +- .../ethernet-hubs-add-template.component.html | 54 +- ...hernet-hubs-add-template.component.spec.ts | 153 ++- .../ethernet-hubs-add-template.component.ts | 153 +-- ...ernet-hubs-template-details.component.html | 122 +- ...et-hubs-template-details.component.spec.ts | 168 +-- ...thernet-hubs-template-details.component.ts | 137 +- .../ethernet-hubs-templates.component.html | 68 +- .../ethernet-hubs-templates.component.spec.ts | 73 +- .../ethernet-hubs-templates.component.ts | 65 +- ...ernet-switches-add-template.component.html | 54 +- ...et-switches-add-template.component.spec.ts | 153 ++- ...thernet-switches-add-template.component.ts | 157 +-- ...t-switches-template-details.component.html | 153 ++- ...witches-template-details.component.spec.ts | 162 ++- ...net-switches-template-details.component.ts | 133 +- ...ethernet-switches-templates.component.html | 68 +- ...ernet-switches-templates.component.spec.ts | 73 +- .../ethernet-switches-templates.component.ts | 67 +- .../custom-adapters-table.component.html | 58 +- .../custom-adapters-table.component.ts | 35 +- .../custom-adapters.component.html | 34 +- .../custom-adapters.component.spec.ts | 70 +- .../custom-adapters.component.ts | 57 +- .../delete-confirmation-dialog.component.html | 20 +- .../delete-confirmation-dialog.component.scss | 8 +- .../delete-confirmation-dialog.component.ts | 37 +- .../delete-template.component.ts | 62 +- .../empty-templates-list.component.html | 10 +- .../empty-templates-list.component.scss | 4 +- .../empty-templates-list.component.ts | 21 +- .../common/ports/ports.component.html | 93 +- .../common/ports/ports.component.ts | 73 +- .../symbols-menu/symbols-menu.component.html | 18 +- .../symbols-menu/symbols-menu.component.ts | 37 +- .../common/symbols/symbols.component.html | 59 +- .../common/symbols/symbols.component.scss | 56 +- .../common/symbols/symbols.component.spec.ts | 87 +- .../common/symbols/symbols.component.ts | 137 +- .../udp-tunnels/udp-tunnels.component.html | 76 +- .../udp-tunnels/udp-tunnels.component.ts | 71 +- .../add-docker-template.component.html | 194 +-- .../add-docker-template.component.spec.ts | 289 ++-- .../add-docker-template.component.ts | 203 +-- .../copy-docker-template.component.html | 36 +- .../copy-docker-template.component.ts | 102 +- .../docker-template-details.component.html | 239 ++-- .../docker-template-details.component.spec.ts | 105 +- .../docker-template-details.component.ts | 135 +- .../docker-templates.component.html | 74 +- .../docker-templates.component.spec.ts | 68 +- .../docker-templates.component.ts | 77 +- .../add-ios-template.component.html | 287 ++-- .../add-ios-template.component.scss | 2 +- .../add-ios-template.component.spec.ts | 186 +-- .../add-ios-template.component.ts | 432 +++--- .../copy-ios-template.component.html | 36 +- .../copy-ios-template.component.ts | 102 +- .../dynamips-preferences.component.html | 18 +- .../dynamips-preferences.component.scss | 6 +- .../dynamips-preferences.component.spec.ts | 82 +- .../dynamips-preferences.component.ts | 41 +- .../ios-template-details.component.html | 478 ++++--- .../ios-template-details.component.spec.ts | 125 +- .../ios-template-details.component.ts | 243 ++-- .../ios-templates.component.html | 74 +- .../ios-templates.component.spec.ts | 73 +- .../ios-templates/ios-templates.component.ts | 79 +- .../general-preferences.component.html | 14 +- .../general-preferences.component.spec.ts | 69 +- .../general/general-preferences.component.ts | 21 +- .../preferences/gns3vm/gns3vm.component.html | 110 +- .../preferences/gns3vm/gns3vm.component.scss | 8 +- .../preferences/gns3vm/gns3vm.component.ts | 133 +- .../add-iou-template.component.html | 151 +- .../add-iou-template.component.spec.ts | 152 +- .../add-iou-template.component.ts | 258 ++-- .../copy-iou-template.component.html | 36 +- .../copy-iou-template.component.ts | 102 +- .../iou-template-details.component.html | 263 ++-- .../iou-template-details.component.spec.ts | 106 +- .../iou-template-details.component.ts | 151 +- .../iou-templates.component.html | 74 +- .../iou-templates.component.spec.ts | 68 +- .../iou-templates/iou-templates.component.ts | 69 +- .../preferences/preferences.component.html | 56 +- .../preferences/preferences.component.scss | 68 +- .../preferences/preferences.component.spec.ts | 103 +- .../preferences/preferences.component.ts | 21 +- .../add-qemu-vm-template.component.html | 215 +-- .../add-qemu-vm-template.component.spec.ts | 218 +-- .../add-qemu-vm-template.component.ts | 267 ++-- .../copy-qemu-vm-template.component.html | 36 +- .../copy-qemu-vm-template.component.ts | 104 +- .../qemu-preferences.component.html | 56 +- .../qemu-preferences.component.scss | 4 +- .../qemu-preferences.component.spec.ts | 82 +- .../qemu-preferences.component.ts | 85 +- .../qemu-vm-template-details.component.html | 636 ++++----- ...qemu-vm-template-details.component.spec.ts | 192 +-- .../qemu-vm-template-details.component.ts | 269 ++-- .../qemu-vm-templates.component.html | 74 +- .../qemu-vm-templates.component.spec.ts | 73 +- .../qemu-vm-templates.component.ts | 69 +- .../add-traceng-template.component.html | 38 +- .../add-traceng-template.component.ts | 103 +- .../traceng-preferences.component.html | 18 +- .../traceng-preferences.component.scss | 2 +- .../traceng-preferences.component.ts | 36 +- .../traceng-template-details.component.html | 83 +- .../traceng-template-details.component.ts | 109 +- .../traceng-templates.component.html | 68 +- .../traceng-templates.component.ts | 60 +- .../add-virtual-box-template.component.html | 49 +- ...add-virtual-box-template.component.spec.ts | 174 +-- .../add-virtual-box-template.component.ts | 111 +- .../virtual-box-preferences.component.html | 18 +- .../virtual-box-preferences.component.ts | 36 +- .../virtual-box-prefernces.component.spec.ts | 71 +- ...irtual-box-template-details.component.html | 294 ++-- ...ual-box-template-details.component.spec.ts | 184 +-- .../virtual-box-template-details.component.ts | 237 ++-- .../virtual-box-templates.component.html | 68 +- .../virtual-box-templates.component.spec.ts | 73 +- .../virtual-box-templates.component.ts | 63 +- .../add-vmware-template.component.html | 49 +- .../add-vmware-template.component.ts | 109 +- .../add-vmware.component.template.spec.ts | 132 +- .../vmware-preferences.component.html | 18 +- .../vmware-preferences.component.scss | 2 +- .../vmware-preferences.component.spec.ts | 71 +- .../vmware-preferences.component.ts | 36 +- .../vmware-template-details.component.html | 277 ++-- .../vmware-template-details.component.spec.ts | 184 +-- .../vmware-template-details.component.ts | 211 ++- .../vmware-templates.component.html | 68 +- .../vmware-templates.component.spec.ts | 73 +- .../vmware-templates.component.ts | 61 +- .../add-vpcs-template.component.html | 48 +- .../add-vpcs-template.component.spec.ts | 132 +- .../add-vpcs-template.component.ts | 137 +- .../vpcs-preferences.component.html | 18 +- .../vpcs-preferences.component.scss | 2 +- .../vpcs-preferences.component.spec.ts | 73 +- .../vpcs-preferences.component.ts | 36 +- .../vpcs-template-details.component.html | 143 +- .../vpcs-template-details.component.spec.ts | 177 +-- .../vpcs-template-details.component.ts | 129 +- .../vpcs-templates.component.html | 68 +- .../vpcs-templates.component.spec.ts | 73 +- .../vpcs-templates.component.ts | 56 +- .../change-hostname-dialog.component.html | 26 +- .../change-hostname-dialog.component.scss | 2 +- .../change-hostname-dialog.component.ts | 73 +- .../change-symbol-dialog.component.html | 12 +- .../change-symbol-dialog.component.scss | 16 +- .../change-symbol-dialog.component.ts | 45 +- .../console-wrapper.component.html | 130 +- .../console-wrapper.component.scss | 134 +- .../console-wrapper.component.spec.ts | 32 +- .../console-wrapper.component.ts | 254 ++-- .../context-console-menu.component.html | 36 +- .../context-console-menu.component.scss | 20 +- .../context-console-menu.component.spec.ts | 30 +- .../context-console-menu.component.ts | 83 +- .../align-horizontally.component.html | 4 +- .../align-horizontally.component.ts | 21 +- .../align-vertically.component.html | 4 +- .../align-vertically.component.ts | 21 +- .../bring-to-front-action.component.html | 4 +- .../bring-to-front-action.component.spec.ts | 29 +- .../bring-to-front-action.component.ts | 6 +- .../change-hostname-action.component.html | 4 +- .../change-hostname-action.component.ts | 14 +- .../change-symbol-action.component.html | 4 +- .../change-symbol-action.component.ts | 18 +- .../config-action.component.html | 4 +- .../config-action/config-action.component.ts | 5 +- ...nsole-device-action-browser.component.html | 4 +- ...console-device-action-browser.component.ts | 68 +- .../console-device-action.component.spec.ts | 52 +- .../console-device-action.component.ts | 18 +- .../delete-action.component.html | 4 +- .../delete-action.component.spec.ts | 112 +- .../delete-action/delete-action.component.ts | 14 +- .../duplicate-action.component.html | 4 +- .../duplicate-action.component.spec.ts | 106 +- .../duplicate-action.component.ts | 70 +- .../edit-config-action.component.html | 12 +- .../edit-config-action.component.ts | 36 +- .../edit-style-action.component.ts | 4 +- .../edit-text-action.component.ts | 4 +- .../export-config-action.component.html | 12 +- .../export-config-action.component.ts | 85 +- ...http-console-new-tab-action.component.html | 4 +- .../http-console-new-tab-action.component.ts | 12 +- .../http-console-action.component.html | 4 +- .../http-console-action.component.ts | 7 +- .../import-config-action.component.html | 11 +- .../import-config-action.component.scss | 2 +- .../import-config-action.component.ts | 92 +- .../lock-action/lock-action.component.html | 4 +- .../lock-action/lock-action.component.ts | 62 +- .../move-layer-down-action.component.spec.ts | 2 +- .../move-layer-down-action.component.ts | 2 +- .../move-layer-up-action.component.spec.ts | 2 +- .../move-layer-up-action.component.ts | 2 +- .../open-file-explorer-action.component.html | 4 +- .../open-file-explorer-action.component.ts | 7 +- .../packet-filters-action.component.html | 4 +- .../packet-filters-action.component.ts | 38 +- .../reload-node-action.component.html | 4 +- .../reload-node-action.component.ts | 15 +- .../resume-link-action.component.html | 4 +- .../resume-link-action.component.ts | 18 +- .../show-node-action.component.html | 4 +- .../show-node-action.component.ts | 12 +- ...art-capture-on-started-link.component.html | 4 +- ...start-capture-on-started-link.component.ts | 6 +- .../start-capture-action.component.html | 4 +- .../start-capture-action.component.ts | 8 +- .../start-node-action.component.spec.ts | 2 +- .../start-node-action.component.ts | 16 +- .../stop-capture-action.component.html | 4 +- .../stop-capture-action.component.ts | 6 +- .../stop-node-action.component.spec.ts | 2 +- .../stop-node-action.component.ts | 7 +- .../suspend-link-action.component.html | 4 +- .../suspend-link-action.component.ts | 18 +- .../suspend-node-action.component.html | 4 +- .../suspend-node-action.component.ts | 7 +- .../context-menu/context-menu.component.html | 114 +- .../context-menu/context-menu.component.scss | 14 +- .../context-menu.component.spec.ts | 10 +- .../context-menu/context-menu.component.ts | 12 +- .../config-dialog.component.html | 18 +- .../config-dialog.component.scss | 6 +- .../config-dialog/config-dialog.component.ts | 16 +- .../draw-link-tool.component.spec.ts | 2 +- .../draw-link-tool.component.ts | 6 +- .../style-editor/style-editor.component.html | 30 +- .../style-editor/style-editor.component.scss | 14 +- .../style-editor/style-editor.component.ts | 9 +- .../text-editor/text-editor.component.html | 12 +- .../text-editor/text-editor.component.scss | 14 +- .../text-editor/text-editor.component.ts | 56 +- .../help-dialog/help-dialog.component.html | 20 +- .../help-dialog/help-dialog.component.scss | 4 +- .../help-dialog/help-dialog.component.ts | 20 +- .../node-created-label-styles-fixer.spec.ts | 16 +- .../node-created-label-styles-fixer.ts | 4 +- .../import-appliance.component.ts | 257 ++-- .../info-dialog/info-dialog.component.html | 42 +- .../info-dialog/info-dialog.component.scss | 2 +- .../info-dialog/info-dialog.component.ts | 37 +- .../log-console/log-console.component.html | 51 +- .../log-console/log-console.component.scss | 106 +- .../log-console/log-console.component.spec.ts | 48 +- .../log-console/log-console.component.ts | 546 ++++---- .../appliance-info-dialog.component.html | 24 +- .../appliance-info-dialog.component.ts | 22 +- .../new-template-dialog.component.html | 637 +++++---- .../new-template-dialog.component.scss | 58 +- .../new-template-dialog.component.ts | 1220 +++++++++-------- .../template-name-dialog.component.html | 4 +- .../template-name-dialog.component.scss | 4 +- .../template-name-dialog.component.ts | 15 +- .../config-editor.component.html | 20 +- .../config-editor.component.scss | 8 +- .../config-editor.component.spec.ts | 10 +- .../config-editor/config-editor.component.ts | 74 +- .../configurator-atm-switch.component.html | 188 ++- .../configurator-atm-switch.component.ts | 270 ++-- .../cloud/configurator-cloud.component.html | 154 +-- .../cloud/configurator-cloud.component.ts | 178 ++- .../configurator/configurator.component.scss | 34 +- .../docker/configurator-docker.component.html | 171 ++- .../docker/configurator-docker.component.ts | 141 +- .../configure-custom-adapters.component.html | 40 +- .../configure-custom-adapters.component.scss | 14 +- .../configure-custom-adapters.component.ts | 79 +- .../edit-network-configuration.component.html | 4 +- .../edit-network-configuration.component.scss | 4 +- .../edit-network-configuration.component.ts | 55 +- ...onfigurator-ethernet-switch.component.html | 49 +- .../configurator-ethernet-switch.component.ts | 89 +- .../configurator-ethernet-hub.component.html | 42 +- .../configurator-ethernet-hub.component.ts | 111 +- .../ios/configurator-ios.component.html | 96 +- .../ios/configurator-ios.component.ts | 101 +- .../iou/configurator-iou.component.html | 108 +- .../iou/configurator-iou.component.ts | 101 +- .../nat/configurator-nat.component.html | 26 +- .../nat/configurator-nat.component.ts | 73 +- .../qemu/configurator-qemu.component.html | 518 ++++--- .../qemu/configurator-qemu.component.ts | 215 ++- .../qemu-image-creator.component.html | 196 +-- .../qemu-image-creator.component.ts | 197 ++- .../switch/configurator-switch.component.html | 142 +- .../switch/configurator-switch.component.ts | 216 +-- .../configurator-traceng.component.html | 26 +- .../traceng/configurator-traceng.component.ts | 73 +- .../configurator-virtualbox.component.html | 123 +- .../configurator-virtualbox.component.ts | 123 +- .../vmware/configurator-vmware.component.html | 115 +- .../vmware/configurator-vmware.component.ts | 121 +- .../vpcs/configurator-vpcs.component.html | 55 +- .../vpcs/configurator-vpcs.component.ts | 85 +- .../node-select-interface.component.scss | 2 +- .../node-select-interface.component.spec.ts | 2 +- .../node-select-interface.component.ts | 29 +- .../nodes-menu/nodes-menu.component.html | 86 +- .../nodes-menu/nodes-menu.component.scss | 4 +- .../nodes-menu/nodes-menu.component.spec.ts | 98 +- .../nodes-menu/nodes-menu.component.ts | 112 +- .../packet-filters.component.html | 76 +- .../packet-filters.component.scss | 58 +- .../packet-filters.component.spec.ts | 88 +- .../packet-filters.component.ts | 148 +- .../start-capture.component.html | 40 +- .../start-capture.component.scss | 2 +- .../start-capture.component.spec.ts | 118 +- .../start-capture/start-capture.component.ts | 132 +- .../project-map-menu.component.html | 154 ++- .../project-map-menu.component.scss | 8 +- .../project-map-menu.component.spec.ts | 96 +- .../project-map-menu.component.ts | 305 +++-- .../project-map/project-map.component.html | 149 +- .../project-map/project-map.component.scss | 294 ++-- .../project-map/project-map.component.spec.ts | 48 +- .../project-map/project-map.component.ts | 319 +++-- .../screenshot-dialog.component.html | 10 +- .../screenshot-dialog.component.scss | 6 +- .../screenshot-dialog.component.ts | 23 +- .../web-console/web-console.component.scss | 4 +- .../web-console/web-console.component.ts | 125 +- .../add-blank-project-dialog.component.html | 4 +- .../add-blank-project-dialog.component.scss | 6 +- ...add-blank-project-dialog.component.spec.ts | 20 +- .../add-blank-project-dialog.component.ts | 17 +- .../choose-name-dialog.component.html | 10 +- .../choose-name-dialog.component.scss | 2 +- .../choose-name-dialog.component.ts | 40 +- .../confirmation-bottomsheet.component.html | 12 +- .../confirmation-bottomsheet.component.scss | 18 +- .../confirmation-bottomsheet.component.ts | 34 +- .../confirmation-dialog.component.ts | 2 +- .../edit-project-dialog.component.html | 159 ++- .../edit-project-dialog.component.scss | 8 +- .../edit-project-dialog.component.ts | 20 +- .../import-project-dialog.component.html | 11 +- .../import-project-dialog.component.scss | 36 +- .../import-project-dialog.component.spec.ts | 20 +- .../import-project-dialog.component.ts | 14 +- .../navigation-dialog.component.html | 12 +- .../navigation-dialog.component.scss | 18 +- .../navigation-dialog.component.ts | 34 +- .../projects/projects.component.html | 66 +- .../projects/projects.component.scss | 14 +- .../projects/projects.component.spec.ts | 20 +- .../components/projects/projects.component.ts | 31 +- .../save-project-dialog.component.scss | 4 +- .../save-project-dialog.component.ts | 31 +- .../add-server-dialog.component.html | 11 +- .../add-server-dialog.component.ts | 78 +- .../configure-gns3vm-dialog.component.html | 2 +- .../configure-gns3vm-dialog.component.ts | 2 +- .../server-discovery.component.spec.ts | 16 +- .../server-discovery.component.ts | 41 +- .../components/servers/servers.component.html | 54 +- .../components/servers/servers.component.scss | 4 +- .../servers/servers.component.spec.ts | 2 +- .../components/servers/servers.component.ts | 37 +- .../settings/console/console.component.html | 45 +- .../settings/console/console.component.scss | 2 +- .../console/console.component.spec.ts | 25 +- .../settings/console/console.component.ts | 16 +- .../settings/settings.component.html | 8 +- .../settings/settings.component.scss | 8 +- .../settings/settings.component.spec.ts | 22 +- .../components/settings/settings.component.ts | 4 +- .../create-snapshot-dialog.component.html | 15 +- .../create-snapshot-dialog.component.scss | 20 +- .../create-snapshot-dialog.component.spec.ts | 2 +- .../create-snapshot-dialog.component.ts | 7 +- .../list-of-snaphshots.component.spec.ts | 222 +-- .../list-of-snapshots.component.html | 94 +- .../list-of-snapshots.component.scss | 4 +- .../list-of-snapshots.component.ts | 120 +- .../snapshot-menu-item.component.html | 13 +- .../snapshot-menu-item.component.spec.ts | 2 +- .../snapshot-menu-item.component.ts | 20 +- .../status-chart/status-chart.component.html | 300 ++-- .../status-chart/status-chart.component.scss | 16 +- .../status-chart/status-chart.component.ts | 37 +- .../status-info/status-info.component.html | 10 +- .../status-info/status-info.component.ts | 63 +- .../system-status.component.html | 14 +- .../system-status/system-status.component.ts | 21 +- .../template-list-dialog.component.html | 79 +- .../template-list-dialog.component.scss | 2 +- .../template-list-dialog.component.spec.ts | 2 +- .../template-list-dialog.component.ts | 51 +- .../template/template.component.html | 128 +- .../template/template.component.scss | 50 +- .../template/template.component.spec.ts | 2 +- .../components/template/template.component.ts | 33 +- .../topology-summary.component.html | 189 +-- .../topology-summary.component.scss | 130 +- .../topology-summary.component.spec.ts | 217 ++- .../topology-summary.component.ts | 467 ++++--- .../web-console-full-window.component.html | 2 +- .../web-console-full-window.component.ts | 175 ++- src/app/filters/dataSourceFilter.ts | 21 +- src/app/filters/dateFilter.pipe.ts | 23 +- src/app/filters/nameFilter.pipe.ts | 21 +- src/app/filters/projectsFilter.pipe.ts | 21 +- src/app/filters/searchFilter.pipe.ts | 21 +- src/app/filters/templateFilter.pipe.ts | 21 +- src/app/guards/console-guard.ts | 27 +- .../project-web-service-handler.spec.ts | 2 +- .../default-layout.component.html | 15 +- .../default-layout.component.scss | 10 +- .../default-layout.component.spec.ts | 19 +- .../default-layout.component.ts | 27 +- src/app/material.imports.ts | 2 +- src/app/models/adbutler.ts | 30 +- src/app/models/appliance.ts | 136 +- src/app/models/capturingSettings.ts | 4 +- src/app/models/compute.ts | 28 +- src/app/models/computeStatistics.ts | 28 +- src/app/models/docker/docker-image.ts | 2 +- .../models/ethernetHub/ports-mapping-enity.ts | 18 +- src/app/models/filter-description.ts | 18 +- src/app/models/filter.ts | 10 +- src/app/models/gns3vm/gns3vm.ts | 16 +- src/app/models/gns3vm/gns3vmEngine.ts | 12 +- src/app/models/gns3vm/vm.ts | 2 +- src/app/models/images/ios-image.ts | 8 +- src/app/models/iou/iou-image.ts | 8 +- src/app/models/logEvent.ts | 4 +- src/app/models/message.ts | 4 +- src/app/models/project-statistics.ts | 8 +- src/app/models/qemu/qemu-binary.ts | 4 +- src/app/models/qemu/qemu-custom-adapter.ts | 4 +- src/app/models/qemu/qemu-image.ts | 8 +- src/app/models/qemu/qemu-img.ts | 20 +- .../models/server-settings-models/builtin.ts | 4 +- .../models/server-settings-models/docker.ts | 4 +- .../models/server-settings-models/dynamips.ts | 12 +- .../server-settings-models/graphics-view.ts | 32 +- src/app/models/server-settings-models/iou.ts | 6 +- src/app/models/server-settings-models/qemu.ts | 12 +- .../server-settings-models/virtual-box.ts | 4 +- .../models/server-settings-models/vmware.ts | 12 +- src/app/models/server-settings-models/vpcs.ts | 4 +- src/app/models/server.ts | 2 +- src/app/models/serverSettings.ts | 20 +- src/app/models/settings/qemu-settings.ts | 4 +- src/app/models/software.ts | 20 +- src/app/models/symbol.ts | 8 +- src/app/models/templates/cloud-template.ts | 26 +- src/app/models/templates/docker-template.ts | 40 +- .../models/templates/ethernet-hub-template.ts | 18 +- .../templates/ethernet-switch-template.ts | 20 +- src/app/models/templates/ios-template.ts | 82 +- src/app/models/templates/iou-template.ts | 40 +- src/app/models/templates/qemu-template.ts | 84 +- src/app/models/templates/traceng-template.ts | 20 +- .../models/templates/virtualbox-template.ts | 46 +- src/app/models/templates/vmware-template.ts | 44 +- src/app/models/templates/vpcs-template.ts | 22 +- src/app/models/virtualBox/virtual-box-vm.ts | 4 +- src/app/models/vmware/vmware-vm.ts | 4 +- src/app/resolvers/server-resolve.ts | 12 +- src/app/services/appliances.service.ts | 26 +- ...uilt-in-templates-configuration.service.ts | 80 +- .../built-in-templates.service.spec.ts | 248 ++-- .../services/built-in-templates.service.ts | 33 +- src/app/services/compute.service.ts | 20 +- .../services/docker-configuration.service.ts | 42 +- src/app/services/docker.service.ts | 39 +- src/app/services/drawing.service.spec.ts | 21 +- src/app/services/drawing.service.ts | 27 +- ...ternal-software-definition.service.spec.ts | 18 +- .../external-software-definition.service.ts | 29 +- src/app/services/gns3vm.service.ts | 26 +- src/app/services/google-analytics.service.ts | 11 +- src/app/services/http-server.service.spec.ts | 26 +- src/app/services/http-server.service.ts | 6 +- src/app/services/indexed-db.service.spec.ts | 2 +- src/app/services/info.service.ts | 134 +- .../services/installed-software.service.ts | 8 +- src/app/services/ios-configuration.service.ts | 505 ++++--- src/app/services/ios.service.ts | 44 +- src/app/services/iou-configuration.service.ts | 26 +- src/app/services/iou.service.ts | 45 +- src/app/services/link.service.spec.ts | 18 +- src/app/services/link.service.ts | 46 +- src/app/services/mapScale.service.ts | 38 +- src/app/services/mapsettings.service.ts | 125 +- src/app/services/node.service.spec.ts | 38 +- src/app/services/node.service.ts | 66 +- src/app/services/nodeConsole.service.ts | 4 +- src/app/services/packet-capture.service.ts | 12 +- src/app/services/platform.service.spec.ts | 9 +- src/app/services/platform.service.ts | 5 +- src/app/services/project.service.spec.ts | 7 +- src/app/services/project.service.ts | 10 +- .../services/qemu-configuration.service.ts | 177 +-- src/app/services/qemu.service.spec.ts | 240 ++-- src/app/services/qemu.service.ts | 58 +- .../services/recentlyOpenedProject.service.ts | 53 +- .../server-management.service.spec.ts | 37 +- src/app/services/server-management.service.ts | 19 +- .../services/server-settings.service.spec.ts | 34 +- src/app/services/server-settings.service.ts | 36 +- src/app/services/server.service.spec.ts | 30 +- src/app/services/server.service.ts | 81 +- src/app/services/settings.service.spec.ts | 10 +- src/app/services/settings.service.ts | 10 +- .../services/settings/console.service.spec.ts | 2 +- src/app/services/settings/console.service.ts | 8 +- .../settings/default-console.service.spec.ts | 12 +- .../settings/default-console.service.ts | 15 +- src/app/services/snapshot.service.spec.ts | 2 +- src/app/services/symbol.service.spec.ts | 2 +- src/app/services/symbol.service.ts | 16 +- src/app/services/template-mocks.service.ts | 522 +++---- src/app/services/template.service.spec.ts | 2 +- src/app/services/theme.service.ts | 2 +- src/app/services/toaster.service.spec.ts | 8 +- src/app/services/toaster.service.ts | 10 +- src/app/services/traceng.service.ts | 32 +- src/app/services/version.service.spec.ts | 2 +- .../virtual-box-configuration.service.ts | 62 +- src/app/services/virtual-box.service.spec.ts | 174 +-- src/app/services/virtual-box.service.ts | 45 +- .../services/vmware-configuration.service.ts | 57 +- src/app/services/vmware.service.spec.ts | 170 +-- src/app/services/vmware.service.ts | 38 +- .../services/vpcs-configuration.service.ts | 26 +- src/app/services/vpcs.service.spec.ts | 116 +- src/app/services/vpcs.service.ts | 32 +- .../testing/app-testing/app-testing.module.ts | 2 +- src/app/validators/non-negative-validator.ts | 4 +- .../project-name-async-validator.ts | 14 +- src/app/validators/rotation-validator.ts | 4 +- .../template-name-async-validator.ts | 14 +- src/environments/environment.electron.prod.ts | 2 +- src/environments/environment.electron.ts | 2 +- src/environments/environment.github.prod.ts | 2 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- src/index.html | 8 +- src/main.ts | 8 +- src/styles.scss | 18 +- src/test.ts | 1 - src/theme.scss | 10 +- 730 files changed, 21307 insertions(+), 19956 deletions(-) diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts index 7e2a1898..217ef4e7 100644 --- a/e2e/app.e2e-spec.ts +++ b/e2e/app.e2e-spec.ts @@ -10,7 +10,7 @@ describe('GNS3 Web UI Application', () => { it('should have correct page title', async () => { // arrange await page.navigateTo(); - + // act let text = await page.getTitleText(); diff --git a/e2e/helpers/common.po.ts b/e2e/helpers/common.po.ts index 3dae8252..5d06c069 100644 --- a/e2e/helpers/common.po.ts +++ b/e2e/helpers/common.po.ts @@ -2,21 +2,21 @@ import { browser, by, element } from 'protractor'; import { ServersPage } from './server.po'; export class TestHelper { - sleep(value: number) { - browser.sleep(value); - } + sleep(value: number) { + browser.sleep(value); + } - waitForLoading() { - browser.waitForAngular(); - } + waitForLoading() { + browser.waitForAngular(); + } - async asyncForEach(array, callback) { - for (let index = 0; index < array.length; index++) { - await callback(array[index], index, array); - } + async asyncForEach(array, callback) { + for (let index = 0; index < array.length; index++) { + await callback(array[index], index, array); } + } - getCurrentUrl() { - return browser.getCurrentUrl(); - } + getCurrentUrl() { + return browser.getCurrentUrl(); + } } diff --git a/e2e/helpers/project-map.po.ts b/e2e/helpers/project-map.po.ts index 7ce8c823..d2df6967 100644 --- a/e2e/helpers/project-map.po.ts +++ b/e2e/helpers/project-map.po.ts @@ -1,50 +1,50 @@ -import { TestHelper } from "./common.po" -import { browser, by } from "protractor"; +import { TestHelper } from './common.po'; +import { browser, by } from 'protractor'; export class ProjectMapPage { - helper = new TestHelper(); + helper = new TestHelper(); - async openAddProjectDialog() { - let addButton = await browser.driver.findElement(by.css('button.addNode')); - await addButton.click(); + async openAddProjectDialog() { + let addButton = await browser.driver.findElement(by.css('button.addNode')); + await addButton.click(); + } + + async addNode() { + let inputs = await browser.driver.findElements(by.css('input.mat-input-element')); + await inputs[0].sendKeys('VPCS'); + this.helper.sleep(1000); + + let selects = await browser.driver.findElements(by.css('mat-select.mat-select')); + await selects[1].click(); + this.helper.sleep(1000); + + let options = await browser.driver.findElements(by.css('mat-option.mat-option')); + await options[1].click(); //first option should be chosen + this.helper.sleep(1000); + + // new select appears after refreshing data + selects = await browser.driver.findElements(by.css('mat-select.mat-select')); + if (selects[2]) { + await selects[2].click(); + this.helper.sleep(1000); + + options = await browser.driver.findElements(by.css('mat-option.mat-option')); + await options[0].click(); + this.helper.sleep(1000); } - async addNode() { - let inputs = await browser.driver.findElements(by.css('input.mat-input-element')); - await inputs[0].sendKeys('VPCS'); - this.helper.sleep(1000); + let addButton = await browser.driver.findElement(by.css('button.addButton')); + await addButton.click(); + this.helper.sleep(1000); + } - let selects = await browser.driver.findElements(by.css('mat-select.mat-select')); - await selects[1].click(); - this.helper.sleep(1000); + async verifyIfNodeWithLabelExists(labelToFind: string) { + this.helper.sleep(5000); + let nodeLabel = await browser.driver.findElement(by.css('#map > g > g.layer > g.nodes > g > g > g > g > text')); + let selectedNode; + let textFromNodeLabel = await nodeLabel.getText(); + if (textFromNodeLabel == labelToFind) selectedNode = nodeLabel; - let options = await browser.driver.findElements(by.css('mat-option.mat-option')); - await options[1].click(); //first option should be chosen - this.helper.sleep(1000); - - // new select appears after refreshing data - selects = await browser.driver.findElements(by.css('mat-select.mat-select')); - if (selects[2]) { - await selects[2].click(); - this.helper.sleep(1000); - - options = await browser.driver.findElements(by.css('mat-option.mat-option')); - await options[0].click(); - this.helper.sleep(1000); - } - - let addButton = await browser.driver.findElement(by.css('button.addButton')); - await addButton.click(); - this.helper.sleep(1000); - } - - async verifyIfNodeWithLabelExists(labelToFind: string) { - this.helper.sleep(5000); - let nodeLabel = await browser.driver.findElement(by.css('#map > g > g.layer > g.nodes > g > g > g > g > text')); - let selectedNode; - let textFromNodeLabel = await nodeLabel.getText(); - if (textFromNodeLabel == labelToFind) selectedNode = nodeLabel; - - return selectedNode ? true : false; - } + return selectedNode ? true : false; + } } diff --git a/e2e/helpers/project.po.ts b/e2e/helpers/project.po.ts index 76b60ec2..0afcc74e 100644 --- a/e2e/helpers/project.po.ts +++ b/e2e/helpers/project.po.ts @@ -1,20 +1,20 @@ -import { TestHelper } from "./common.po" -import { browser, by } from "protractor"; +import { TestHelper } from './common.po'; +import { browser, by } from 'protractor'; export class ProjectsPage { - helper = new TestHelper(); + helper = new TestHelper(); - async openAddProjectDialog() { - let addButton = await browser.driver.findElement(by.css('button.add-button')); - await addButton.click(); - } + async openAddProjectDialog() { + let addButton = await browser.driver.findElement(by.css('button.add-button')); + await addButton.click(); + } - async createProject() { - let today = new Date(); - let inputs = await browser.driver.findElements(by.css('input.mat-input-element')); - await inputs[1].sendKeys('test project ' + today.getUTCMilliseconds()); - this.helper.sleep(2000); - let dialogButton = await browser.driver.findElement(by.css('button.add-project-button')); - await dialogButton.click(); - } + async createProject() { + let today = new Date(); + let inputs = await browser.driver.findElements(by.css('input.mat-input-element')); + await inputs[1].sendKeys('test project ' + today.getUTCMilliseconds()); + this.helper.sleep(2000); + let dialogButton = await browser.driver.findElement(by.css('button.add-project-button')); + await dialogButton.click(); + } } diff --git a/e2e/helpers/server.po.ts b/e2e/helpers/server.po.ts index ece2422b..eec3956c 100644 --- a/e2e/helpers/server.po.ts +++ b/e2e/helpers/server.po.ts @@ -2,40 +2,40 @@ import { browser, by, element } from 'protractor'; import { TestHelper } from './common.po'; export class ServersPage { - helper = new TestHelper; + helper = new TestHelper(); - maximizeWindow() { - browser.driver.manage().window().maximize(); - } + maximizeWindow() { + browser.driver.manage().window().maximize(); + } - navigateToServersPage() { - return browser.get('/servers'); - } + navigateToServersPage() { + return browser.get('/servers'); + } - getAddServerNotificationText() { - return browser.driver.findElement(by.className('mat-card-content')).getText(); - } + getAddServerNotificationText() { + return browser.driver.findElement(by.className('mat-card-content')).getText(); + } - async clickAddServer() { - let serversTable = await this.checkServersTable(); - if (serversTable.length === 0) { - let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base')); - await buttons[3].click(); - } + async clickAddServer() { + let serversTable = await this.checkServersTable(); + if (serversTable.length === 0) { + let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base')); + await buttons[3].click(); } + } - checkServersTable() { - return browser.driver.findElements(by.css('mat-cell')); - } + checkServersTable() { + return browser.driver.findElements(by.css('mat-cell')); + } - async navigateToServerProjects() { - this.helper.sleep(2000); - let hyperlinks = await browser.driver.findElements(by.css('a.table-link')); - let serverLink; - await this.helper.asyncForEach(hyperlinks, async element => { - let text = await element.getText(); - if (text === '127.0.0.1') serverLink = element; - }); - await serverLink.click(); - } + async navigateToServerProjects() { + this.helper.sleep(2000); + let hyperlinks = await browser.driver.findElements(by.css('a.table-link')); + let serverLink; + await this.helper.asyncForEach(hyperlinks, async (element) => { + let text = await element.getText(); + if (text === '127.0.0.1') serverLink = element; + }); + await serverLink.click(); + } } diff --git a/e2e/project-map.e2e-spec.ts b/e2e/project-map.e2e-spec.ts index f5379d9d..d489b1d5 100644 --- a/e2e/project-map.e2e-spec.ts +++ b/e2e/project-map.e2e-spec.ts @@ -5,37 +5,37 @@ import { ProjectsPage } from './helpers/project.po'; import { ProjectMapPage } from './helpers/project-map.po'; describe('Project map page', () => { - let serversPage: ServersPage; - let projectsPage: ProjectsPage; - let projectMapPage: ProjectMapPage; - let helper: TestHelper; + let serversPage: ServersPage; + let projectsPage: ProjectsPage; + let projectMapPage: ProjectMapPage; + let helper: TestHelper; - beforeEach(async () => { - serversPage = new ServersPage(); - projectsPage = new ProjectsPage(); - projectMapPage = new ProjectMapPage(); - helper = new TestHelper(); + beforeEach(async () => { + serversPage = new ServersPage(); + projectsPage = new ProjectsPage(); + projectMapPage = new ProjectMapPage(); + helper = new TestHelper(); - serversPage.maximizeWindow(); - await serversPage.navigateToServersPage(); - await serversPage.clickAddServer(); - await serversPage.navigateToServerProjects(); - await projectsPage.openAddProjectDialog(); - helper.sleep(2000); - await projectsPage.createProject(); - helper.sleep(2000); - }); + serversPage.maximizeWindow(); + await serversPage.navigateToServersPage(); + await serversPage.clickAddServer(); + await serversPage.navigateToServerProjects(); + await projectsPage.openAddProjectDialog(); + helper.sleep(2000); + await projectsPage.createProject(); + helper.sleep(2000); + }); - it('user should have possibility to add nodes to map', async () => { - // arrange - projectMapPage.openAddProjectDialog(); - helper.sleep(2000); + it('user should have possibility to add nodes to map', async () => { + // arrange + projectMapPage.openAddProjectDialog(); + helper.sleep(2000); - //act - projectMapPage.addNode(); - helper.sleep(2000); + //act + projectMapPage.addNode(); + helper.sleep(2000); - //assert - expect(await projectMapPage.verifyIfNodeWithLabelExists('PC1')).toBe(true); - }); + //assert + expect(await projectMapPage.verifyIfNodeWithLabelExists('PC1')).toBe(true); + }); }); diff --git a/e2e/projects.e2e-spec.ts b/e2e/projects.e2e-spec.ts index 977c3656..0333b065 100644 --- a/e2e/projects.e2e-spec.ts +++ b/e2e/projects.e2e-spec.ts @@ -4,31 +4,31 @@ import { element } from 'protractor'; import { ProjectsPage } from './helpers/project.po'; describe('Projects page', () => { - let serversPage: ServersPage; - let projectsPage: ProjectsPage; - let helper: TestHelper; + let serversPage: ServersPage; + let projectsPage: ProjectsPage; + let helper: TestHelper; - beforeEach(() => { - serversPage = new ServersPage(); - projectsPage = new ProjectsPage(); - helper = new TestHelper(); - }); + beforeEach(() => { + serversPage = new ServersPage(); + projectsPage = new ProjectsPage(); + helper = new TestHelper(); + }); - it('user should have possibility to create new project', async () => { - // arrange - serversPage.maximizeWindow(); - await serversPage.navigateToServersPage(); - await serversPage.clickAddServer(); - await serversPage.navigateToServerProjects(); - helper.sleep(2000); + it('user should have possibility to create new project', async () => { + // arrange + serversPage.maximizeWindow(); + await serversPage.navigateToServersPage(); + await serversPage.clickAddServer(); + await serversPage.navigateToServerProjects(); + helper.sleep(2000); - //act - await projectsPage.openAddProjectDialog(); - helper.sleep(2000); - await projectsPage.createProject(); - helper.sleep(2000); + //act + await projectsPage.openAddProjectDialog(); + helper.sleep(2000); + await projectsPage.createProject(); + helper.sleep(2000); - //assert - expect(helper.getCurrentUrl()).toMatch('server/1/project/'); - }); + //assert + expect(helper.getCurrentUrl()).toMatch('server/1/project/'); + }); }); diff --git a/e2e/servers.e2e-spec.ts b/e2e/servers.e2e-spec.ts index 1d177f4b..be7f65c9 100644 --- a/e2e/servers.e2e-spec.ts +++ b/e2e/servers.e2e-spec.ts @@ -3,42 +3,42 @@ import { TestHelper } from './helpers/common.po'; import { element } from 'protractor'; describe('Servers page', () => { - let page: ServersPage; - let helper: TestHelper; + let page: ServersPage; + let helper: TestHelper; - beforeEach(() => { - page = new ServersPage(); - helper = new TestHelper(); + beforeEach(() => { + page = new ServersPage(); + helper = new TestHelper(); + }); + + xit('user should have possibility to add server', async () => { + // arrange + page.maximizeWindow(); + await page.navigateToServersPage(); + + // act + let text = await page.getAddServerNotificationText(); + + // assert + expect(text).toBe("We've discovered GNS3 server on 127.0.0.1:3080, would you like to add to the list?"); + }); + + it('user should see added server in the list', async () => { + // arrange + page.maximizeWindow(); + await page.navigateToServersPage(); + await page.clickAddServer(); + helper.sleep(1000); + + // act + let firstRowOfServersTable = await page.checkServersTable(); + let serverData = []; + await helper.asyncForEach(firstRowOfServersTable, async (element) => { + serverData.push(await element.getText()); }); - xit('user should have possibility to add server', async () => { - // arrange - page.maximizeWindow(); - await page.navigateToServersPage(); - - // act - let text = await page.getAddServerNotificationText(); - - // assert - expect(text).toBe("We've discovered GNS3 server on 127.0.0.1:3080, would you like to add to the list?"); - }); - - it('user should see added server in the list', async () => { - // arrange - page.maximizeWindow(); - await page.navigateToServersPage(); - await page.clickAddServer(); - helper.sleep(1000); - - // act - let firstRowOfServersTable = await page.checkServersTable(); - let serverData = []; - await helper.asyncForEach(firstRowOfServersTable, async element => { - serverData.push(await element.getText()); - }); - - // assert - expect(serverData).toContain('127.0.0.1'); - expect(serverData).toContain('3080'); - }); + // assert + expect(serverData).toContain('127.0.0.1'); + expect(serverData).toContain('3080'); + }); }); diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e1552e7c..46959a94 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -74,10 +74,10 @@ const routes: Routes = [ { path: '', redirectTo: 'servers', pathMatch: 'full' }, { path: 'servers', component: ServersComponent }, { path: 'bundled', component: BundledServerFinderComponent }, - { - path: 'server/:server_id/projects', + { + path: 'server/:server_id/projects', component: ProjectsComponent, - resolve: { server : ServerResolve } + resolve: { server: ServerResolve }, }, { path: 'help', component: HelpComponent }, { path: 'help/reportissue', component: ReportIssueComponent }, @@ -86,54 +86,87 @@ const routes: Routes = [ { path: 'installed-software', component: InstalledSoftwareComponent }, { path: 'server/:server_id/systemstatus', component: SystemStatusComponent }, - { path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent}, - { - path: 'server/:server_id/project/:project_id/snapshots', + { path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent }, + { + path: 'server/:server_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent, - resolve: { server : ServerResolve } + resolve: { server: ServerResolve }, }, { path: 'server/:server_id/preferences', component: PreferencesComponent }, { path: 'server/:server_id/preferences/gns3vm', component: Gns3vmComponent }, // { path: 'server/:server_id/preferences/general', component: GeneralPreferencesComponent }, - { path: 'server/:server_id/preferences/builtin', component: BuiltInPreferencesComponent}, + { path: 'server/:server_id/preferences/builtin', component: BuiltInPreferencesComponent }, { path: 'server/:server_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent }, - { path: 'server/:server_id/preferences/builtin/ethernet-hubs/addtemplate', component: EthernetHubsAddTemplateComponent }, - { path: 'server/:server_id/preferences/builtin/ethernet-hubs/:template_id', component: EthernetHubsTemplateDetailsComponent }, + { + path: 'server/:server_id/preferences/builtin/ethernet-hubs/addtemplate', + component: EthernetHubsAddTemplateComponent, + }, + { + path: 'server/:server_id/preferences/builtin/ethernet-hubs/:template_id', + component: EthernetHubsTemplateDetailsComponent, + }, - { path: 'server/:server_id/preferences/builtin/ethernet-switches', component: EthernetSwitchesTemplatesComponent }, - { path: 'server/:server_id/preferences/builtin/ethernet-switches/addtemplate', component: EthernetSwitchesAddTemplateComponent }, - { path: 'server/:server_id/preferences/builtin/ethernet-switches/:template_id', component: EthernetSwitchesTemplateDetailsComponent }, + { + path: 'server/:server_id/preferences/builtin/ethernet-switches', + component: EthernetSwitchesTemplatesComponent, + }, + { + path: 'server/:server_id/preferences/builtin/ethernet-switches/addtemplate', + component: EthernetSwitchesAddTemplateComponent, + }, + { + path: 'server/:server_id/preferences/builtin/ethernet-switches/:template_id', + component: EthernetSwitchesTemplateDetailsComponent, + }, { path: 'server/:server_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent }, - { path: 'server/:server_id/preferences/builtin/cloud-nodes/addtemplate', component: CloudNodesAddTemplateComponent }, - { path: 'server/:server_id/preferences/builtin/cloud-nodes/:template_id', component: CloudNodesTemplateDetailsComponent }, + { + path: 'server/:server_id/preferences/builtin/cloud-nodes/addtemplate', + component: CloudNodesAddTemplateComponent, + }, + { + path: 'server/:server_id/preferences/builtin/cloud-nodes/:template_id', + component: CloudNodesTemplateDetailsComponent, + }, //{ path: 'server/:server_id/preferences/dynamips', component: DynamipsPreferencesComponent }, { path: 'server/:server_id/preferences/dynamips/templates', component: IosTemplatesComponent }, { path: 'server/:server_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent }, { path: 'server/:server_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent }, - { path: 'server/:server_id/preferences/dynamips/templates/:template_id/copy', component: CopyIosTemplateComponent }, + { + path: 'server/:server_id/preferences/dynamips/templates/:template_id/copy', + component: CopyIosTemplateComponent, + }, // { path: 'server/:server_id/preferences/qemu', component: QemuPreferencesComponent }, { path: 'server/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent }, - { path: 'server/:server_id/preferences/qemu/templates/:template_id/copy', component: CopyQemuVmTemplateComponent }, + { + path: 'server/:server_id/preferences/qemu/templates/:template_id/copy', + component: CopyQemuVmTemplateComponent, + }, { path: 'server/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent }, { path: 'server/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent }, // { path: 'server/:server_id/preferences/vpcs', component: VpcsPreferencesComponent }, { path: 'server/:server_id/preferences/vpcs/templates', component: VpcsTemplatesComponent }, - { path: 'server/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent}, + { path: 'server/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent }, { path: 'server/:server_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent }, // { path: 'server/:server_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent }, { path: 'server/:server_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent }, - { path: 'server/:server_id/preferences/virtualbox/templates/:template_id', component: VirtualBoxTemplateDetailsComponent }, + { + path: 'server/:server_id/preferences/virtualbox/templates/:template_id', + component: VirtualBoxTemplateDetailsComponent, + }, { path: 'server/:server_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent }, // { path: 'server/:server_id/preferences/vmware', component: VmwarePreferencesComponent }, { path: 'server/:server_id/preferences/vmware/templates', component: VmwareTemplatesComponent }, - { path: 'server/:server_id/preferences/vmware/templates/:template_id', component: VmwareTemplateDetailsComponent }, + { + path: 'server/:server_id/preferences/vmware/templates/:template_id', + component: VmwareTemplateDetailsComponent, + }, { path: 'server/:server_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent }, // { path: 'server/:server_id/preferences/traceng', component: TracengPreferencesComponent }, @@ -142,37 +175,49 @@ const routes: Routes = [ // { path: 'server/:server_id/preferences/traceng/addtemplate', component: AddTracengTemplateComponent }, { path: 'server/:server_id/preferences/docker/templates', component: DockerTemplatesComponent }, - { path: 'server/:server_id/preferences/docker/templates/:template_id', component: DockerTemplateDetailsComponent }, - { path: 'server/:server_id/preferences/docker/templates/:template_id/copy', component: CopyDockerTemplateComponent }, + { + path: 'server/:server_id/preferences/docker/templates/:template_id', + component: DockerTemplateDetailsComponent, + }, + { + path: 'server/:server_id/preferences/docker/templates/:template_id/copy', + component: CopyDockerTemplateComponent, + }, { path: 'server/:server_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent }, { path: 'server/:server_id/preferences/iou/templates', component: IouTemplatesComponent }, { path: 'server/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent }, { path: 'server/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent }, - { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent } - ] + { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent }, + ], }, - { - path: 'server/:server_id/project/:project_id', + { + path: 'server/:server_id/project/:project_id', component: ProjectMapComponent, - canDeactivate: [ConsoleGuard] + canDeactivate: [ConsoleGuard], }, - { - path: 'server/:server_id/project/:project_id/nodes/:node_id', - component: WebConsoleFullWindowComponent + { + path: 'server/:server_id/project/:project_id/nodes/:node_id', + component: WebConsoleFullWindowComponent, }, - { - path: 'static/web-ui/server/:server_id/project/:project_id/nodes/:node_id', - component: WebConsoleFullWindowComponent + { + path: 'static/web-ui/server/:server_id/project/:project_id/nodes/:node_id', + component: WebConsoleFullWindowComponent, }, { path: '**', - component: PageNotFoundComponent - } + component: PageNotFoundComponent, + }, ]; @NgModule({ - imports: [RouterModule.forRoot(routes, { anchorScrolling: 'enabled', enableTracing: false, scrollPositionRestoration: 'enabled'})], - exports: [RouterModule] + imports: [ + RouterModule.forRoot(routes, { + anchorScrolling: 'enabled', + enableTracing: false, + scrollPositionRestoration: 'enabled', + }), + ], + exports: [RouterModule], }) export class AppRoutingModule {} diff --git a/src/app/app.component.html b/src/app/app.component.html index 69475d67..db17fd83 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,4 +1,4 @@ -
- - +
+ +
diff --git a/src/app/app.component.scss b/src/app/app.component.scss index bad2bc18..193c4c31 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,11 +1,11 @@ mat-menu-panel { - min-height: 0px; + min-height: 0px; } .dark { - background: #263238!important; + background: #263238 !important; } .light { - background: white!important; + background: white !important; } diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 1eb4a588..00903884 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -22,7 +22,7 @@ describe('AppComponent', () => { declarations: [AppComponent], imports: [RouterTestingModule, MatIconModule, NgxElectronModule], providers: [SettingsService, PersistenceService, ProgressService], - schemas: [NO_ERRORS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); electronService = TestBed.get(ElectronService); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cd6c901f..8d89c006 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,12 +6,12 @@ import { SettingsService } from './services/settings.service'; import { ThemeService } from './services/theme.service'; import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router'; import { ProgressService } from './common/progress/progress.service'; -import { OverlayContainer} from '@angular/cdk/overlay'; +import { OverlayContainer } from '@angular/cdk/overlay'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'] + styleUrls: ['./app.component.scss'], }) export class AppComponent implements OnInit { public darkThemeEnabled: boolean = false; @@ -38,7 +38,7 @@ export class AppComponent implements OnInit { ngOnInit(): void { if (this.electronService.isElectronApp) { - this.settingsService.subscribe(settings => { + this.settingsService.subscribe((settings) => { this.electronService.ipcRenderer.send('settings.changed', settings); }); } @@ -59,14 +59,14 @@ export class AppComponent implements OnInit { this.componentCssClass = theme; } - checkEvent(routerEvent) : void { + checkEvent(routerEvent): void { if (routerEvent instanceof NavigationStart) { this.progressService.activate(); - } - - else if (routerEvent instanceof NavigationEnd || - routerEvent instanceof NavigationCancel || - routerEvent instanceof NavigationError) { + } else if ( + routerEvent instanceof NavigationEnd || + routerEvent instanceof NavigationCancel || + routerEvent instanceof NavigationError + ) { this.progressService.deactivate(); } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 670201b2..a05a1878 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -470,7 +470,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; TemplateNameDialogComponent, ConfigureCustomAdaptersDialogComponent, EditNetworkConfigurationDialogComponent, - ReportIssueComponent + ReportIssueComponent, ], imports: [ AngularReactBrowserModule, @@ -492,7 +492,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; NgxChildProcessModule, MATERIAL_IMPORTS, NgCircleProgressModule.forRoot(), - OverlayModule + OverlayModule, ], providers: [ SettingsService, @@ -567,7 +567,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; ConsoleGuard, Title, ApplianceService, - UpdatesService + UpdatesService, ], entryComponents: [ AddServerDialogComponent, @@ -615,10 +615,10 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; ChangeHostnameDialogComponent, ApplianceInfoDialogComponent, ConfigureCustomAdaptersDialogComponent, - EditNetworkConfigurationDialogComponent + EditNetworkConfigurationDialogComponent, ], - bootstrap: [AppComponent] + bootstrap: [AppComponent], }) export class AppModule { - constructor(protected _googleAnalyticsService: GoogleAnalyticsService) { } + constructor(protected _googleAnalyticsService: GoogleAnalyticsService) {} } diff --git a/src/app/cartography/angular-map.imports.ts b/src/app/cartography/angular-map.imports.ts index e2a53e9f..06856ccf 100644 --- a/src/app/cartography/angular-map.imports.ts +++ b/src/app/cartography/angular-map.imports.ts @@ -23,5 +23,5 @@ export const ANGULAR_MAP_DECLARATIONS = [ TextComponent, DraggableComponent, SelectionComponent, - InterfaceLabelComponent + InterfaceLabelComponent, ]; diff --git a/src/app/cartography/cartography.module.ts b/src/app/cartography/cartography.module.ts index 3ebad213..46c44721 100644 --- a/src/app/cartography/cartography.module.ts +++ b/src/app/cartography/cartography.module.ts @@ -37,7 +37,7 @@ import { MapNodesDataSource, MapLinksDataSource, MapDrawingsDataSource, - MapSymbolsDataSource + MapSymbolsDataSource, } from './datasources/map-datasource'; import { LinksEventSource } from './events/links-event-source'; import { D3MapComponent } from './components/d3-map/d3-map.component'; @@ -75,7 +75,7 @@ import { SerialLinkWidget } from './widgets/links/serial-link'; SelectionSelectComponent, DraggableSelectionComponent, MovingCanvasDirective, - ZoomingCanvasDirective + ZoomingCanvasDirective, ], providers: [ CssFixer, @@ -122,8 +122,8 @@ import { SerialLinkWidget } from './widgets/links/serial-link'; StylesToFontConverter, EthernetLinkWidget, SerialLinkWidget, - ...D3_MAP_IMPORTS + ...D3_MAP_IMPORTS, ], - exports: [D3MapComponent, ExperimentalMapComponent] + exports: [D3MapComponent, ExperimentalMapComponent], }) export class CartographyModule {} diff --git a/src/app/cartography/components/d3-map/d3-map.component.html b/src/app/cartography/components/d3-map/d3-map.component.html index b409cd50..e166c697 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.html +++ b/src/app/cartography/components/d3-map/d3-map.component.html @@ -1,14 +1,38 @@ - - + + - - + + diff --git a/src/app/cartography/components/d3-map/d3-map.component.spec.ts b/src/app/cartography/components/d3-map/d3-map.component.spec.ts index 110f85cc..1cafcb0e 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.spec.ts +++ b/src/app/cartography/components/d3-map/d3-map.component.spec.ts @@ -8,7 +8,7 @@ describe('D3MapComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [D3MapComponent] + declarations: [D3MapComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/d3-map/d3-map.component.ts b/src/app/cartography/components/d3-map/d3-map.component.ts index 44960512..46368f45 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.ts +++ b/src/app/cartography/components/d3-map/d3-map.component.ts @@ -9,7 +9,7 @@ import { SimpleChange, EventEmitter, Output, - ViewChild + ViewChild, } from '@angular/core'; import { Selection, select } from 'd3-selection'; @@ -38,7 +38,7 @@ import { MapSettingsService } from '../../../services/mapsettings.service'; @Component({ selector: 'app-d3-map', templateUrl: './d3-map.component.html', - styleUrls: ['./d3-map.component.scss'] + styleUrls: ['./d3-map.component.scss'], }) export class D3MapComponent implements OnInit, OnChanges, OnDestroy { @Input() nodes: Node[] = []; @@ -60,7 +60,7 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { private subscriptions: Subscription[] = []; private drawLinkTool: boolean; protected settings = { - show_interface_labels: true + show_interface_labels: true, }; public gridVisibility: number = 0; @@ -148,9 +148,7 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { } }); - this.subscriptions.push( - this.mapScaleService.scaleChangeEmitter.subscribe((value: number) => this.redraw()) - ); + this.subscriptions.push(this.mapScaleService.scaleChangeEmitter.subscribe((value: number) => this.redraw())); this.subscriptions.push( this.toolsService.isMovingToolActivated.subscribe((value: boolean) => { @@ -172,7 +170,7 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { ); this.gridVisibility = localStorage.getItem('gridVisibility') === 'true' ? 1 : 0; - this.mapSettingsService.isScrollDisabled.subscribe(val => this.resize(val)); + this.mapSettingsService.isScrollDisabled.subscribe((val) => this.resize(val)); } ngOnDestroy() { @@ -190,10 +188,7 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { public createGraph(domElement: HTMLElement) { const rootElement = select(domElement); this.svg = rootElement.select('svg'); - this.graphLayout.connect( - this.svg, - this.context - ); + this.graphLayout.connect(this.svg, this.context); this.graphLayout.draw(this.svg, this.context); this.mapChangeDetectorRef.hasBeenDrawn = true; } @@ -227,11 +222,23 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy { } updateGrid() { - if (this.project.grid_size && this.project.grid_size > 0) this.nodeGridX = (this.project.scene_width/2 - (Math.floor(this.project.scene_width/2 / this.project.grid_size) * this.project.grid_size)); - if (this.project.grid_size && this.project.grid_size > 0) this.nodeGridY = (this.project.scene_height/2 - (Math.floor(this.project.scene_height/2 / this.project.grid_size) * this.project.grid_size)); + if (this.project.grid_size && this.project.grid_size > 0) + this.nodeGridX = + this.project.scene_width / 2 - + Math.floor(this.project.scene_width / 2 / this.project.grid_size) * this.project.grid_size; + if (this.project.grid_size && this.project.grid_size > 0) + this.nodeGridY = + this.project.scene_height / 2 - + Math.floor(this.project.scene_height / 2 / this.project.grid_size) * this.project.grid_size; - if (this.project.drawing_grid_size && this.project.drawing_grid_size > 0) this.drawingGridX = (this.project.scene_width/2 - (Math.floor(this.project.scene_width/2 / this.project.drawing_grid_size) * this.project.drawing_grid_size)); - if (this.project.drawing_grid_size && this.project.drawing_grid_size > 0) this.drawingGridY = (this.project.scene_height/2 - (Math.floor(this.project.scene_height/2 / this.project.drawing_grid_size) * this.project.drawing_grid_size)); + if (this.project.drawing_grid_size && this.project.drawing_grid_size > 0) + this.drawingGridX = + this.project.scene_width / 2 - + Math.floor(this.project.scene_width / 2 / this.project.drawing_grid_size) * this.project.drawing_grid_size; + if (this.project.drawing_grid_size && this.project.drawing_grid_size > 0) + this.drawingGridY = + this.project.scene_height / 2 - + Math.floor(this.project.scene_height / 2 / this.project.drawing_grid_size) * this.project.drawing_grid_size; } @HostListener('window:resize', ['$event']) diff --git a/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts b/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts index 2bb40d57..492da989 100644 --- a/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts +++ b/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts @@ -67,8 +67,8 @@ describe('DraggableSelectionComponent', () => { draggable: { start: nodesStartEventEmitter, drag: nodesDragEventEmitter, - end: nodesEndEventEmitter - } + end: nodesEndEventEmitter, + }, }; const drawingsWidgetStub = { @@ -76,11 +76,11 @@ describe('DraggableSelectionComponent', () => { draggable: { start: drawingsStartEventEmitter, drag: drawingsDragEventEmitter, - end: drawingsEndEventEmitter - } + end: drawingsEndEventEmitter, + }, }; const linksWidgetStub = { - redrawLink: () => {} + redrawLink: () => {}, }; const labelWidgetStub = { @@ -88,27 +88,27 @@ describe('DraggableSelectionComponent', () => { draggable: { start: labelStartEventEmitter, drag: labelDragEventEmitter, - end: labelEndEventEmitter - } + end: labelEndEventEmitter, + }, }; const interfaceLabelWidgetStub = { draggable: { start: interfaceLabelStartEventEmitter, drag: interfaceLabelDragEventEmitter, - end: interfaceLabelEndEventEmitter - } + end: interfaceLabelEndEventEmitter, + }, }; const nodesEventSourceStub = { dragged: { emit: () => {} }, - labelDragged: { emit: () => {} } + labelDragged: { emit: () => {} }, }; const drawingsEventSourceStub = { - dragged: { emit: () => {} } + dragged: { emit: () => {} }, }; const linksEventSourceStub = { - interfaceDragged: { emit: () => {} } + interfaceDragged: { emit: () => {} }, }; TestBed.configureTestingModule({ @@ -123,9 +123,9 @@ describe('DraggableSelectionComponent', () => { { provide: DrawingsEventSource, useValue: drawingsEventSourceStub }, { provide: GraphDataManager, useValue: mockedGraphDataManager }, { provide: LinksEventSource, useValue: linksEventSourceStub }, - { provide: MapSettingsService, useClass: MapSettingsService } + { provide: MapSettingsService, useClass: MapSettingsService }, ], - declarations: [DraggableSelectionComponent] + declarations: [DraggableSelectionComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/draggable-selection/draggable-selection.component.ts b/src/app/cartography/components/draggable-selection/draggable-selection.component.ts index ffb73210..3bcf8c74 100644 --- a/src/app/cartography/components/draggable-selection/draggable-selection.component.ts +++ b/src/app/cartography/components/draggable-selection/draggable-selection.component.ts @@ -22,7 +22,7 @@ import { MapSettingsService } from '../../../services/mapsettings.service'; @Component({ selector: 'app-draggable-selection', templateUrl: './draggable-selection.component.html', - styleUrls: ['./draggable-selection.component.scss'] + styleUrls: ['./draggable-selection.component.scss'], }) export class DraggableSelectionComponent implements OnInit, OnDestroy { private start: Subscription; @@ -62,25 +62,25 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { ).subscribe((evt: DraggableStart) => { const selected = this.selectionManager.getSelected(); if (evt.datum instanceof MapNode) { - if (selected.filter(item => item instanceof MapNode && item.id === evt.datum.id).length === 0) { + if (selected.filter((item) => item instanceof MapNode && item.id === evt.datum.id).length === 0) { this.selectionManager.setSelected([evt.datum]); } } if (evt.datum instanceof MapDrawing) { - if (selected.filter(item => item instanceof MapDrawing && item.id === evt.datum.id).length === 0) { + if (selected.filter((item) => item instanceof MapDrawing && item.id === evt.datum.id).length === 0) { this.selectionManager.setSelected([evt.datum]); } } if (evt.datum instanceof MapLabel) { - if (selected.filter(item => item instanceof MapLabel && item.id === evt.datum.id).length === 0) { + if (selected.filter((item) => item instanceof MapLabel && item.id === evt.datum.id).length === 0) { this.selectionManager.setSelected([evt.datum]); } } if (evt.datum instanceof MapLinkNode) { - if (selected.filter(item => item instanceof MapLinkNode && item.id === evt.datum.id).length === 0) { + if (selected.filter((item) => item instanceof MapLinkNode && item.id === evt.datum.id).length === 0) { this.selectionManager.setSelected([evt.datum]); } } @@ -95,7 +95,7 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { if (!this.isMapLocked) { const selected = this.selectionManager.getSelected(); // update nodes - let mapNodes = selected.filter(item => item instanceof MapNode); + let mapNodes = selected.filter((item) => item instanceof MapNode); const lockedNodes = mapNodes.filter((item: MapNode) => item.locked); const selectedNodes = mapNodes.filter((item: MapNode) => !item.locked); selectedNodes.forEach((node: MapNode) => { @@ -107,18 +107,18 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { const links = this.graphDataManager .getLinks() .filter( - link => + (link) => (link.target !== undefined && link.target.id === node.id) || (link.source !== undefined && link.source.id === node.id) ); - links.forEach(link => { + links.forEach((link) => { this.linksWidget.redrawLink(svg, link); }); }); // update drawings - let mapDrawings = selected.filter(item => item instanceof MapDrawing); + let mapDrawings = selected.filter((item) => item instanceof MapDrawing); const selectedDrawings = mapDrawings.filter((item: MapDrawing) => !item.locked); selectedDrawings.forEach((drawing: MapDrawing) => { drawing.x += evt.dx; @@ -127,32 +127,36 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { }); // update labels - let mapLabels = selected.filter(item => item instanceof MapLabel); - const selectedLabels = mapLabels.filter((item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0); + let mapLabels = selected.filter((item) => item instanceof MapLabel); + const selectedLabels = mapLabels.filter( + (item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0 + ); selectedLabels.forEach((label: MapLabel) => { - const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0; + const isParentNodeSelected = selectedNodes.filter((node) => node.id === label.nodeId).length > 0; if (isParentNodeSelected) { return; } - const node = this.graphDataManager.getNodes().filter(node => node.id === label.nodeId)[0]; + const node = this.graphDataManager.getNodes().filter((node) => node.id === label.nodeId)[0]; node.label.x += evt.dx; node.label.y += evt.dy; this.labelWidget.redrawLabel(svg, label); }); // update interface labels - let mapLinkNodes = selected.filter(item => item instanceof MapLinkNode); - const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0); + let mapLinkNodes = selected.filter((item) => item instanceof MapLinkNode); + const selectedLinkNodes = mapLinkNodes.filter( + (item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0 + ); selectedLinkNodes.forEach((interfaceLabel: MapLinkNode) => { - const isParentNodeSelected = selectedNodes.filter(node => node.id === interfaceLabel.nodeId).length > 0; + const isParentNodeSelected = selectedNodes.filter((node) => node.id === interfaceLabel.nodeId).length > 0; if (isParentNodeSelected) { return; } const link = this.graphDataManager .getLinks() - .filter(link => link.nodes[0].id === interfaceLabel.id || link.nodes[1].id === interfaceLabel.id)[0]; + .filter((link) => link.nodes[0].id === interfaceLabel.id || link.nodes[1].id === interfaceLabel.id)[0]; if (link.nodes[0].id === interfaceLabel.id) { link.nodes[0].label.x += evt.dx; link.nodes[0].label.y += evt.dy; @@ -176,23 +180,25 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { if (!this.isMapLocked) { const selected = this.selectionManager.getSelected(); - let mapNodes = selected.filter(item => item instanceof MapNode); + let mapNodes = selected.filter((item) => item instanceof MapNode); const lockedNodes = mapNodes.filter((item: MapNode) => item.locked); const selectedNodes = mapNodes.filter((item: MapNode) => !item.locked); selectedNodes.forEach((item: MapNode) => { this.nodesEventSource.dragged.emit(new DraggedDataEvent(item, evt.dx, evt.dy)); }); - let mapDrawings = selected.filter(item => item instanceof MapDrawing); + let mapDrawings = selected.filter((item) => item instanceof MapDrawing); const selectedDrawings = mapDrawings.filter((item: MapDrawing) => !item.locked); selectedDrawings.forEach((item: MapDrawing) => { this.drawingsEventSource.dragged.emit(new DraggedDataEvent(item, evt.dx, evt.dy)); }); - let mapLabels = selected.filter(item => item instanceof MapLabel); - const selectedLabels = mapLabels.filter((item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0); + let mapLabels = selected.filter((item) => item instanceof MapLabel); + const selectedLabels = mapLabels.filter( + (item: MapLabel) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0 + ); selectedLabels.forEach((label: MapLabel) => { - const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0; + const isParentNodeSelected = selectedNodes.filter((node) => node.id === label.nodeId).length > 0; if (isParentNodeSelected) { return; } @@ -200,10 +206,12 @@ export class DraggableSelectionComponent implements OnInit, OnDestroy { this.nodesEventSource.labelDragged.emit(new DraggedDataEvent(label, evt.dx, evt.dy)); }); - let mapLinkNodes = selected.filter(item => item instanceof MapLinkNode); - const selectedLinkNodes = mapLinkNodes.filter((item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0) + let mapLinkNodes = selected.filter((item) => item instanceof MapLinkNode); + const selectedLinkNodes = mapLinkNodes.filter( + (item: MapLinkNode) => lockedNodes.filter((node) => node.id === item.nodeId).length === 0 + ); selectedLinkNodes.forEach((label: MapLinkNode) => { - const isParentNodeSelected = selectedNodes.filter(node => node.id === label.nodeId).length > 0; + const isParentNodeSelected = selectedNodes.filter((node) => node.id === label.nodeId).length > 0; if (isParentNodeSelected) { return; } diff --git a/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts b/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts index f8854882..8b67bff4 100644 --- a/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts +++ b/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts @@ -14,9 +14,9 @@ describe('DrawingAddingComponent', () => { imports: [NoopAnimationsModule], providers: [ { provide: DrawingsEventSource, useValue: drawingsEventSource }, - { provide: Context, useClass: Context } + { provide: Context, useClass: Context }, ], - declarations: [DrawingAddingComponent] + declarations: [DrawingAddingComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/drawing-adding/drawing-adding.component.ts b/src/app/cartography/components/drawing-adding/drawing-adding.component.ts index cc380967..48880ec9 100644 --- a/src/app/cartography/components/drawing-adding/drawing-adding.component.ts +++ b/src/app/cartography/components/drawing-adding/drawing-adding.component.ts @@ -7,7 +7,7 @@ import { Subscription } from 'rxjs'; @Component({ selector: 'app-drawing-adding', templateUrl: './drawing-adding.component.html', - styleUrls: ['./drawing-adding.component.scss'] + styleUrls: ['./drawing-adding.component.scss'], }) export class DrawingAddingComponent implements OnInit, OnDestroy { @Input('svg') svg: SVGSVGElement; @@ -18,15 +18,19 @@ export class DrawingAddingComponent implements OnInit, OnDestroy { constructor(private drawingsEventSource: DrawingsEventSource, private context: Context) {} ngOnInit() { - this.drawingSelected = this.drawingsEventSource.selected.subscribe(evt => { + this.drawingSelected = this.drawingsEventSource.selected.subscribe((evt) => { evt === '' ? this.deactivate() : this.activate(); }); } activate() { let listener = (event: MouseEvent) => { - let x = (event.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x))/this.context.transformation.k; - let y = (event.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y))/this.context.transformation.k; + let x = + (event.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x)) / + this.context.transformation.k; + let y = + (event.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y)) / + this.context.transformation.k; this.drawingsEventSource.pointToAddSelected.emit(new AddedDataEvent(x, y)); this.deactivate(); diff --git a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts index 9b530960..8801f747 100644 --- a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts +++ b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts @@ -36,9 +36,9 @@ describe('DrawingResizingComponent', () => { imports: [NoopAnimationsModule], providers: [ { provide: DrawingsWidget, useValue: drawingsWidgetMock }, - { provide: DrawingsEventSource, useValue: drawingsEventSource } + { provide: DrawingsEventSource, useValue: drawingsEventSource }, ], - declarations: [DrawingResizingComponent] + declarations: [DrawingResizingComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts index 05c654c1..de912d6c 100644 --- a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts +++ b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts @@ -8,10 +8,8 @@ import { ResizingEnd } from '../../events/resizing'; @Component({ selector: 'app-drawing-resizing', - template: ` - - `, - styleUrls: ['./drawing-resizing.component.scss'] + template: ` `, + styleUrls: ['./drawing-resizing.component.scss'], }) export class DrawingResizingComponent implements OnInit, OnDestroy { resizingFinished: Subscription; diff --git a/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts b/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts index 5712ef99..ff6afe29 100644 --- a/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts +++ b/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts @@ -8,7 +8,7 @@ describe('DraggableComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [DraggableComponent] + declarations: [DraggableComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/draggable/draggable.component.ts b/src/app/cartography/components/experimental-map/draggable/draggable.component.ts index d1207a80..43125bbf 100644 --- a/src/app/cartography/components/experimental-map/draggable/draggable.component.ts +++ b/src/app/cartography/components/experimental-map/draggable/draggable.component.ts @@ -8,10 +8,8 @@ export class DraggableDraggedEvent { @Component({ selector: '[app-draggable]', - template: ` - - `, - styleUrls: ['./draggable.component.scss'] + template: ` `, + styleUrls: ['./draggable.component.scss'], }) export class DraggableComponent implements OnInit, AfterViewInit, OnDestroy { @Input('app-draggable') item: Point; diff --git a/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts index 4578bb54..eb7027c0 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts @@ -8,7 +8,7 @@ describe('DrawingComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [DrawingComponent] + declarations: [DrawingComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts index dfd9cc9f..727bf748 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts @@ -12,7 +12,7 @@ import { DrawingsEventSource } from '../../../events/drawings-event-source'; @Component({ selector: '[app-drawing]', templateUrl: './drawing.component.html', - styleUrls: ['./drawing.component.scss'] + styleUrls: ['./drawing.component.scss'], }) export class DrawingComponent implements OnInit { @Input('app-drawing') drawing: MapDrawing; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts index 6fe0e0d8..3d1cc6f9 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts @@ -8,7 +8,7 @@ describe('EllipseComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [EllipseComponent] + declarations: [EllipseComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts index f1437436..f3019e6b 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts @@ -5,7 +5,7 @@ import { QtDasharrayFixer } from '../../../../../helpers/qt-dasharray-fixer'; @Component({ selector: '[app-ellipse]', templateUrl: './ellipse.component.html', - styleUrls: ['./ellipse.component.scss'] + styleUrls: ['./ellipse.component.scss'], }) export class EllipseComponent implements OnInit { @Input('app-ellipse') ellipse: EllipseElement; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts index 6ee6952c..0ea04f1d 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts @@ -8,7 +8,7 @@ describe('ImageComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ImageComponent] + declarations: [ImageComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts index 5ddd968c..25a96833 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts @@ -4,7 +4,7 @@ import { ImageElement } from '../../../../../models/drawings/image-element'; @Component({ selector: '[app-image]', templateUrl: './image.component.html', - styleUrls: ['./image.component.scss'] + styleUrls: ['./image.component.scss'], }) export class ImageComponent implements OnInit { @Input('app-image') image: ImageElement; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts index 3f83bf9e..5318150e 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts @@ -8,7 +8,7 @@ describe('LineComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [LineComponent] + declarations: [LineComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts index ae6018b1..8c75758a 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts @@ -5,7 +5,7 @@ import { LineElement } from '../../../../../models/drawings/line-element'; @Component({ selector: '[app-line]', templateUrl: './line.component.html', - styleUrls: ['./line.component.scss'] + styleUrls: ['./line.component.scss'], }) export class LineComponent implements OnInit { @Input('app-line') line: LineElement; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts index 949ca269..b739bbdc 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts @@ -8,7 +8,7 @@ describe('RectComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [RectComponent] + declarations: [RectComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts index 4caa423f..def416c5 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts @@ -5,7 +5,7 @@ import { QtDasharrayFixer } from '../../../../../helpers/qt-dasharray-fixer'; @Component({ selector: '[app-rect]', templateUrl: './rect.component.html', - styleUrls: ['./rect.component.scss'] + styleUrls: ['./rect.component.scss'], }) export class RectComponent implements OnInit { @Input('app-rect') rect: RectElement; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts index 87012b5c..7d8e11ac 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts @@ -8,7 +8,7 @@ describe('TextComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TextComponent] + declarations: [TextComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts index c1f97e1c..5afc6fba 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts @@ -6,7 +6,7 @@ import { FontFixer } from '../../../../../helpers/font-fixer'; @Component({ selector: '[app-text]', templateUrl: './text.component.html', - styleUrls: ['./text.component.scss'] + styleUrls: ['./text.component.scss'], }) export class TextComponent implements OnInit, DoCheck { static MARGIN = 4; diff --git a/src/app/cartography/components/experimental-map/experimental-map.component.ts b/src/app/cartography/components/experimental-map/experimental-map.component.ts index d5b0708e..22c0201b 100644 --- a/src/app/cartography/components/experimental-map/experimental-map.component.ts +++ b/src/app/cartography/components/experimental-map/experimental-map.component.ts @@ -9,7 +9,7 @@ import { SimpleChange, ChangeDetectionStrategy, ChangeDetectorRef, - ViewChild + ViewChild, } from '@angular/core'; import { GraphLayout } from '../../widgets/graph-layout'; @@ -29,7 +29,7 @@ import { LayersManager } from '../../managers/layers-manager'; selector: 'app-experimental-map', templateUrl: './experimental-map.component.html', styleUrls: ['./experimental-map.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class ExperimentalMapComponent implements OnInit, OnChanges, OnDestroy { @Input() nodes: Node[] = []; @@ -48,7 +48,7 @@ export class ExperimentalMapComponent implements OnInit, OnChanges, OnDestroy { private changesDetected: Subscription; protected settings = { - show_interface_labels: true + show_interface_labels: true, }; constructor( diff --git a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts index 93c68e13..d2d7cd5a 100644 --- a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts +++ b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts @@ -8,7 +8,7 @@ describe('InterfaceLabelComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [InterfaceLabelComponent] + declarations: [InterfaceLabelComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts index 0a2c8921..9c1e2a0b 100644 --- a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts +++ b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts @@ -5,7 +5,7 @@ import { CssFixer } from '../../../helpers/css-fixer'; @Component({ selector: '[app-interface-label]', templateUrl: './interface-label.component.html', - styleUrls: ['./interface-label.component.scss'] + styleUrls: ['./interface-label.component.scss'], }) export class InterfaceLabelComponent implements OnInit { @Input('app-interface-label') ignore: any; @@ -17,7 +17,7 @@ export class InterfaceLabelComponent implements OnInit { y: 0, text: '', style: '', - rotation: 0 + rotation: 0, }; borderSize = 5; diff --git a/src/app/cartography/components/experimental-map/link/link.component.spec.ts b/src/app/cartography/components/experimental-map/link/link.component.spec.ts index 127cafff..50849f8b 100644 --- a/src/app/cartography/components/experimental-map/link/link.component.spec.ts +++ b/src/app/cartography/components/experimental-map/link/link.component.spec.ts @@ -8,7 +8,7 @@ describe('LinkComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [LinkComponent] + declarations: [LinkComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/link/link.component.ts b/src/app/cartography/components/experimental-map/link/link.component.ts index f89139dc..c6a86d97 100644 --- a/src/app/cartography/components/experimental-map/link/link.component.ts +++ b/src/app/cartography/components/experimental-map/link/link.component.ts @@ -6,7 +6,7 @@ import { ElementRef, EventEmitter, ChangeDetectorRef, - OnDestroy + OnDestroy, } from '@angular/core'; import { Subscription } from 'rxjs'; import { LinkStrategy } from './strategies/link-strategy'; @@ -19,7 +19,7 @@ import { MapLink } from '../../../models/map/map-link'; @Component({ selector: '[app-link]', templateUrl: './link.component.html', - styleUrls: ['./link.component.scss'] + styleUrls: ['./link.component.scss'], }) export class LinkComponent implements OnInit, OnDestroy { @Input('app-link') link: MapLink; diff --git a/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts b/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts index a3df16a1..554d17f0 100644 --- a/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts +++ b/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts @@ -6,7 +6,7 @@ export class EthernetLinkStrategy implements LinkStrategy { public d(link: MapLink): string { const points = [ [link.source.x + link.source.width / 2, link.source.y + link.source.height / 2], - [link.target.x + link.target.width / 2, link.target.y + link.target.height / 2] + [link.target.x + link.target.width / 2, link.target.y + link.target.height / 2], ]; const line_generator = path(); diff --git a/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts b/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts index 4f0a04fe..63cb4b12 100644 --- a/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts +++ b/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts @@ -6,11 +6,11 @@ export class SerialLinkStrategy implements LinkStrategy { private linkToPoints(link: MapLink) { const source = { x: link.source.x + link.source.width / 2, - y: link.source.y + link.source.height / 2 + y: link.source.y + link.source.height / 2, }; const target = { x: link.target.x + link.target.width / 2, - y: link.target.y + link.target.height / 2 + y: link.target.y + link.target.height / 2, }; const dx = target.x - source.x; @@ -22,12 +22,12 @@ export class SerialLinkStrategy implements LinkStrategy { const angle_source: [number, number] = [ source.x + dx / 2.0 + 15 * vect_rot[0], - source.y + dy / 2.0 + 15 * vect_rot[1] + source.y + dy / 2.0 + 15 * vect_rot[1], ]; const angle_target: [number, number] = [ target.x - dx / 2.0 - 15 * vect_rot[0], - target.y - dy / 2.0 - 15 * vect_rot[1] + target.y - dy / 2.0 - 15 * vect_rot[1], ]; return [[source.x, source.y], angle_source, angle_target, [target.x, target.y]]; diff --git a/src/app/cartography/components/experimental-map/node/node.component.spec.ts b/src/app/cartography/components/experimental-map/node/node.component.spec.ts index 76c09dc4..82d887f9 100644 --- a/src/app/cartography/components/experimental-map/node/node.component.spec.ts +++ b/src/app/cartography/components/experimental-map/node/node.component.spec.ts @@ -8,7 +8,7 @@ describe('NodeComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [NodeComponent] + declarations: [NodeComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/node/node.component.ts b/src/app/cartography/components/experimental-map/node/node.component.ts index 896ec653..fdd1d842 100644 --- a/src/app/cartography/components/experimental-map/node/node.component.ts +++ b/src/app/cartography/components/experimental-map/node/node.component.ts @@ -10,7 +10,7 @@ import { EventEmitter, OnDestroy, OnChanges, - AfterViewInit + AfterViewInit, } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { Subscription } from 'rxjs'; @@ -25,7 +25,7 @@ import { DraggedDataEvent } from '../../../events/event-source'; selector: '[app-node]', templateUrl: './node.component.html', styleUrls: ['./node.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class NodeComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit { static NODE_LABEL_MARGIN = 3; diff --git a/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts b/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts index 9cf81f57..174d5211 100644 --- a/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts +++ b/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts @@ -8,7 +8,7 @@ describe('SelectionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [SelectionComponent] + declarations: [SelectionComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/selection/selection.component.ts b/src/app/cartography/components/experimental-map/selection/selection.component.ts index cc51bc47..c8fb8959 100644 --- a/src/app/cartography/components/experimental-map/selection/selection.component.ts +++ b/src/app/cartography/components/experimental-map/selection/selection.component.ts @@ -5,7 +5,7 @@ import { Rectangle } from '../../../models/rectangle'; @Component({ selector: '[app-selection]', templateUrl: './selection.component.html', - styleUrls: ['./selection.component.scss'] + styleUrls: ['./selection.component.scss'], }) export class SelectionComponent implements OnInit, AfterViewInit { @Input('app-selection') svg: SVGSVGElement; diff --git a/src/app/cartography/components/experimental-map/status/status.component.spec.ts b/src/app/cartography/components/experimental-map/status/status.component.spec.ts index d4f8f4a9..69e3562e 100644 --- a/src/app/cartography/components/experimental-map/status/status.component.spec.ts +++ b/src/app/cartography/components/experimental-map/status/status.component.spec.ts @@ -8,7 +8,7 @@ describe('StatusComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [StatusComponent] + declarations: [StatusComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/experimental-map/status/status.component.ts b/src/app/cartography/components/experimental-map/status/status.component.ts index af2d9dab..cb7a5547 100644 --- a/src/app/cartography/components/experimental-map/status/status.component.ts +++ b/src/app/cartography/components/experimental-map/status/status.component.ts @@ -3,7 +3,7 @@ import { Component, ElementRef, Input, ChangeDetectorRef } from '@angular/core'; @Component({ selector: '[app-status]', templateUrl: './status.component.html', - styleUrls: ['./status.component.scss'] + styleUrls: ['./status.component.scss'], }) export class StatusComponent { static STOPPED_STATUS_RECT_WIDTH = 10; @@ -12,7 +12,7 @@ export class StatusComponent { status: '', path: null, direction: null, - d: null + d: null, }; constructor(protected element: ElementRef, private ref: ChangeDetectorRef) {} diff --git a/src/app/cartography/components/selection-control/selection-control.component.ts b/src/app/cartography/components/selection-control/selection-control.component.ts index 52ed1c6a..aa9f14d4 100644 --- a/src/app/cartography/components/selection-control/selection-control.component.ts +++ b/src/app/cartography/components/selection-control/selection-control.component.ts @@ -9,7 +9,7 @@ import { Rectangle } from '../../models/rectangle'; @Component({ selector: 'app-selection-control', templateUrl: './selection-control.component.html', - styleUrls: ['./selection-control.component.scss'] + styleUrls: ['./selection-control.component.scss'], }) export class SelectionControlComponent implements OnInit, OnDestroy { private onSelection: Subscription; @@ -23,21 +23,21 @@ export class SelectionControlComponent implements OnInit, OnDestroy { ngOnInit() { this.onSelection = this.selectionEventSource.selected.subscribe((rectangle: Rectangle) => { - const selectedNodes = this.graphDataManager.getNodes().filter(node => { + const selectedNodes = this.graphDataManager.getNodes().filter((node) => { return this.inRectangleHelper.inRectangle(rectangle, node.x, node.y); }); - const selectedLinks = this.graphDataManager.getLinks().filter(link => { + const selectedLinks = this.graphDataManager.getLinks().filter((link) => { return this.inRectangleHelper.inRectangle(rectangle, link.x, link.y); }); - const selectedDrawings = this.graphDataManager.getDrawings().filter(drawing => { + const selectedDrawings = this.graphDataManager.getDrawings().filter((drawing) => { return this.inRectangleHelper.inRectangle(rectangle, drawing.x, drawing.y); }); const selectedLabels = this.graphDataManager .getNodes() - .filter(node => { + .filter((node) => { if (node.label === undefined) { return false; } @@ -45,11 +45,11 @@ export class SelectionControlComponent implements OnInit, OnDestroy { const labelY = node.y + node.label.y; return this.inRectangleHelper.inRectangle(rectangle, labelX, labelY); }) - .map(node => node.label); + .map((node) => node.label); const selectedInterfacesLabelsSources = this.graphDataManager .getLinks() - .filter(link => { + .filter((link) => { if (link.source === undefined || link.nodes.length != 2 || link.nodes[0].label === undefined) { return false; } @@ -57,11 +57,11 @@ export class SelectionControlComponent implements OnInit, OnDestroy { const interfaceLabelY = link.source.y + link.nodes[0].label.y; return this.inRectangleHelper.inRectangle(rectangle, interfaceLabelX, interfaceLabelY); }) - .map(link => link.nodes[0]); + .map((link) => link.nodes[0]); const selectedInterfacesLabelsTargets = this.graphDataManager .getLinks() - .filter(link => { + .filter((link) => { if (link.target === undefined || link.nodes.length != 2 || link.nodes[1].label === undefined) { return false; } @@ -69,7 +69,7 @@ export class SelectionControlComponent implements OnInit, OnDestroy { const interfaceLabelY = link.target.y + link.nodes[1].label.y; return this.inRectangleHelper.inRectangle(rectangle, interfaceLabelX, interfaceLabelY); }) - .map(link => link.nodes[1]); + .map((link) => link.nodes[1]); const selectedInterfaces = [...selectedInterfacesLabelsSources, ...selectedInterfacesLabelsTargets]; @@ -78,7 +78,7 @@ export class SelectionControlComponent implements OnInit, OnDestroy { ...selectedLinks, ...selectedDrawings, ...selectedLabels, - ...selectedInterfaces + ...selectedInterfaces, ]; this.selectionManager.setSelected(selected); diff --git a/src/app/cartography/components/selection-select/selection-select.component.spec.ts b/src/app/cartography/components/selection-select/selection-select.component.spec.ts index 4117b6cb..e7c45496 100644 --- a/src/app/cartography/components/selection-select/selection-select.component.spec.ts +++ b/src/app/cartography/components/selection-select/selection-select.component.spec.ts @@ -8,7 +8,7 @@ describe('SelectionSelectComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [SelectionSelectComponent] + declarations: [SelectionSelectComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/selection-select/selection-select.component.ts b/src/app/cartography/components/selection-select/selection-select.component.ts index a1ca43e7..38e2775c 100644 --- a/src/app/cartography/components/selection-select/selection-select.component.ts +++ b/src/app/cartography/components/selection-select/selection-select.component.ts @@ -6,16 +6,13 @@ import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; @Component({ selector: 'app-selection-select', templateUrl: './selection-select.component.html', - styleUrls: ['./selection-select.component.scss'] + styleUrls: ['./selection-select.component.scss'], }) export class SelectionSelectComponent implements OnInit, OnDestroy { private onSelected: Subscription; private onUnselected: Subscription; - constructor( - private selectionManager: SelectionManager, - private mapChangeDetectorRef: MapChangeDetectorRef - ) {} + constructor(private selectionManager: SelectionManager, private mapChangeDetectorRef: MapChangeDetectorRef) {} ngOnInit() { this.onSelected = this.selectionManager.selected.subscribe(() => { diff --git a/src/app/cartography/components/text-editor/text-editor.component.spec.ts b/src/app/cartography/components/text-editor/text-editor.component.spec.ts index 15836896..ef059460 100644 --- a/src/app/cartography/components/text-editor/text-editor.component.spec.ts +++ b/src/app/cartography/components/text-editor/text-editor.component.spec.ts @@ -31,9 +31,9 @@ describe('TextEditorComponent', () => { { provide: NodesDataSource, useClass: NodesDataSource }, { provide: LinksDataSource, useClass: LinksDataSource }, { provide: SelectionManager, useClass: SelectionManager }, - { provide: FontFixer, useClass: FontFixer } + { provide: FontFixer, useClass: FontFixer }, ], - declarations: [TextEditorComponent] + declarations: [TextEditorComponent], }).compileComponents(); })); diff --git a/src/app/cartography/components/text-editor/text-editor.component.ts b/src/app/cartography/components/text-editor/text-editor.component.ts index e98cea56..237fc3f8 100644 --- a/src/app/cartography/components/text-editor/text-editor.component.ts +++ b/src/app/cartography/components/text-editor/text-editor.component.ts @@ -1,4 +1,14 @@ -import { Component, ViewChild, ElementRef, OnInit, Input, EventEmitter, OnDestroy, Renderer2, NgZone } from '@angular/core'; +import { + Component, + ViewChild, + ElementRef, + OnInit, + Input, + EventEmitter, + OnDestroy, + Renderer2, + NgZone, +} from '@angular/core'; import { DrawingsEventSource } from '../../events/drawings-event-source'; import { TextAddedDataEvent, TextEditedDataEvent } from '../../events/event-source'; import { ToolsService } from '../../../services/tools.service'; @@ -24,7 +34,7 @@ import { Font } from '../../models/font'; @Component({ selector: 'app-text-editor', templateUrl: './text-editor.component.html', - styleUrls: ['./text-editor.component.scss'] + styleUrls: ['./text-editor.component.scss'], }) export class TextEditorComponent implements OnInit, OnDestroy { @ViewChild('temporaryTextElement') temporaryTextElement: ElementRef; @@ -73,7 +83,11 @@ export class TextEditorComponent implements OnInit, OnDestroy { this.leftPosition = event.pageX.toString() + 'px'; this.topPosition = event.pageY.toString() + 'px'; this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial'); - this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`); + this.renderer.setStyle( + this.temporaryTextElement.nativeElement, + 'transform', + `scale(${this.mapScaleService.getScale()})` + ); this.temporaryTextElement.nativeElement.focus(); let textListener = () => { @@ -113,7 +127,11 @@ export class TextEditorComponent implements OnInit, OnDestroy { this.selectionManager.setSelected([]); this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial'); - this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`); + this.renderer.setStyle( + this.temporaryTextElement.nativeElement, + 'transform', + `scale(${this.mapScaleService.getScale()})` + ); this.editedLink = elem; select(textElements[index]).attr('visibility', 'hidden'); @@ -121,34 +139,52 @@ export class TextEditorComponent implements OnInit, OnDestroy { this.editedNode = this.nodesDataSource.get(elem.nodeId); this.editedLink = elem; - let x = ((elem.label.originalX + this.editedNode.x - 1) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; - let y = ((elem.label.originalY + this.editedNode.y + 4) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; + let x = + (elem.label.originalX + this.editedNode.x - 1) * this.context.transformation.k + + this.context.getZeroZeroTransformationPoint().x + + this.context.transformation.x; + let y = + (elem.label.originalY + this.editedNode.y + 4) * this.context.transformation.k + + this.context.getZeroZeroTransformationPoint().y + + this.context.transformation.y; this.leftPosition = x.toString() + 'px'; this.topPosition = y.toString() + 'px'; this.temporaryTextElement.nativeElement.innerText = elem.label.text; let styleProperties: StyleProperty[] = []; - for (let property of elem.label.style.split(";")){ + for (let property of elem.label.style.split(';')) { styleProperties.push({ - property: property.split(": ")[0], - value: property.split(": ")[1] + property: property.split(': ')[0], + value: property.split(': ')[1], }); } let font: Font = { - font_family: styleProperties.find(p => p.property === 'font-family') ? styleProperties.find(p => p.property === 'font-family').value : 'TypeWriter', - font_size: styleProperties.find(p => p.property === 'font-size') ? Number(styleProperties.find(p => p.property === 'font-size').value) : 10.0, - font_weight: styleProperties.find(p => p.property === 'font-weight') ? styleProperties.find(p => p.property === 'font-weight').value : 'normal' + font_family: styleProperties.find((p) => p.property === 'font-family') + ? styleProperties.find((p) => p.property === 'font-family').value + : 'TypeWriter', + font_size: styleProperties.find((p) => p.property === 'font-size') + ? Number(styleProperties.find((p) => p.property === 'font-size').value) + : 10.0, + font_weight: styleProperties.find((p) => p.property === 'font-weight') + ? styleProperties.find((p) => p.property === 'font-weight').value + : 'normal', }; font = this.fontFixer.fix(font); - this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'color', styleProperties.find(p => p.property === 'fill') ? styleProperties.find(p => p.property === 'fill').value : '#000000'); + this.renderer.setStyle( + this.temporaryTextElement.nativeElement, + 'color', + styleProperties.find((p) => p.property === 'fill') + ? styleProperties.find((p) => p.property === 'fill').value + : '#000000' + ); this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-family', font.font_family); this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-size', `${font.font_size}pt`); this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-weight', font.font_weight); - + let listener = () => { let innerText = this.temporaryTextElement.nativeElement.innerText; let link: Link = this.linksDataSource.get(this.editedLink.linkId); - link.nodes.find(n => n.node_id === this.editedNode.node_id).label.text = innerText; + link.nodes.find((n) => n.node_id === this.editedNode.node_id).label.text = innerText; this.linkService.updateLink(this.server, link).subscribe((link: Link) => { rootElement @@ -177,7 +213,11 @@ export class TextEditorComponent implements OnInit, OnDestroy { .selectAll('text.text_element') .on('dblclick', (elem, index, textElements) => { this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial'); - this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`); + this.renderer.setStyle( + this.temporaryTextElement.nativeElement, + 'transform', + `scale(${this.mapScaleService.getScale()})` + ); this.editedElement = elem; select(textElements[index]).attr('visibility', 'hidden'); @@ -185,8 +225,14 @@ export class TextEditorComponent implements OnInit, OnDestroy { this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute('drawing_id'); var transformData = textElements[index].parentElement.getAttribute('transform').split(/\(|\)/); - var x = (Number(transformData[1].split(/,/)[0]) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; - var y = (Number(transformData[1].split(/,/)[1]) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; + var x = + Number(transformData[1].split(/,/)[0]) * this.context.transformation.k + + this.context.getZeroZeroTransformationPoint().x + + this.context.transformation.x; + var y = + Number(transformData[1].split(/,/)[1]) * this.context.transformation.k + + this.context.getZeroZeroTransformationPoint().y + + this.context.transformation.y; this.leftPosition = x.toString() + 'px'; this.topPosition = y.toString() + 'px'; this.temporaryTextElement.nativeElement.innerText = elem.text; diff --git a/src/app/cartography/converters/map/link-to-map-link-converter.ts b/src/app/cartography/converters/map/link-to-map-link-converter.ts index b9afd052..d22c646d 100644 --- a/src/app/cartography/converters/map/link-to-map-link-converter.ts +++ b/src/app/cartography/converters/map/link-to-map-link-converter.ts @@ -17,7 +17,9 @@ export class LinkToMapLinkConverter implements Converter { mapLink.capturing = link.capturing; mapLink.filters = link.filters; mapLink.linkType = link.link_type; - mapLink.nodes = link.nodes.map(linkNode => this.linkNodeToMapLinkNode.convert(linkNode, { link_id: link.link_id })); + mapLink.nodes = link.nodes.map((linkNode) => + this.linkNodeToMapLinkNode.convert(linkNode, { link_id: link.link_id }) + ); mapLink.projectId = link.project_id; mapLink.suspend = link.suspend; return mapLink; diff --git a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts index cc1cb9b4..661b344a 100644 --- a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts +++ b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts @@ -15,27 +15,13 @@ export class MapDrawingToSvgConverter implements Converter { let elem = ``; if (mapDrawing.element instanceof RectElement) { - elem = ``; + elem = ``; } else if (mapDrawing.element instanceof EllipseElement) { - elem = ``; + elem = ``; } else if (mapDrawing.element instanceof LineElement) { - elem = ``; + elem = ``; } else if (mapDrawing.element instanceof TextElement) { - elem = `${ - mapDrawing.element.text - }`; + elem = `${mapDrawing.element.text}`; } else return ''; return `${elem}`; diff --git a/src/app/cartography/converters/map/map-link-to-link-converter.ts b/src/app/cartography/converters/map/map-link-to-link-converter.ts index 857ac394..ba56d14e 100644 --- a/src/app/cartography/converters/map/map-link-to-link-converter.ts +++ b/src/app/cartography/converters/map/map-link-to-link-converter.ts @@ -17,7 +17,7 @@ export class MapLinkToLinkConverter implements Converter { link.capturing = mapLink.capturing; link.filters = mapLink.filters; link.link_type = mapLink.linkType; - link.nodes = mapLink.nodes.map(mapLinkNode => this.mapLinkNodeToMapLinkNode.convert(mapLinkNode)); + link.nodes = mapLink.nodes.map((mapLinkNode) => this.mapLinkNodeToMapLinkNode.convert(mapLinkNode)); link.project_id = mapLink.projectId; link.suspend = mapLink.suspend; return link; diff --git a/src/app/cartography/converters/map/map-node-to-node-converter.ts b/src/app/cartography/converters/map/map-node-to-node-converter.ts index ae8be713..3a207c55 100644 --- a/src/app/cartography/converters/map/map-node-to-node-converter.ts +++ b/src/app/cartography/converters/map/map-node-to-node-converter.ts @@ -27,7 +27,7 @@ export class MapNodeToNodeConverter implements Converter { node.node_type = mapNode.nodeType; node.port_name_format = mapNode.portNameFormat; node.port_segment_size = mapNode.portSegmentSize; - node.ports = mapNode.ports ? mapNode.ports.map(mapPort => this.mapPortToPort.convert(mapPort)) : []; + node.ports = mapNode.ports ? mapNode.ports.map((mapPort) => this.mapPortToPort.convert(mapPort)) : []; node.project_id = mapNode.projectId; node.status = mapNode.status; node.symbol = mapNode.symbol; diff --git a/src/app/cartography/converters/map/node-to-map-node-converter.ts b/src/app/cartography/converters/map/node-to-map-node-converter.ts index 4608082b..b56ce698 100644 --- a/src/app/cartography/converters/map/node-to-map-node-converter.ts +++ b/src/app/cartography/converters/map/node-to-map-node-converter.ts @@ -29,14 +29,16 @@ export class NodeToMapNodeConverter implements Converter { mapNode.consoleType = node.console_type; mapNode.firstPortName = node.first_port_name; mapNode.height = node.height; - mapNode.label = this.labelToMapLabel ? this.labelToMapLabel.convert(node.label, { node_id: node.node_id }) : undefined; + mapNode.label = this.labelToMapLabel + ? this.labelToMapLabel.convert(node.label, { node_id: node.node_id }) + : undefined; mapNode.locked = node.locked; mapNode.name = node.name; mapNode.nodeDirectory = node.node_directory; mapNode.nodeType = node.node_type; mapNode.portNameFormat = node.port_name_format; mapNode.portSegmentSize = node.port_segment_size; - mapNode.ports = node.ports ? node.ports.map(port => this.portToMapPort.convert(port)) : []; + mapNode.ports = node.ports ? node.ports.map((port) => this.portToMapPort.convert(port)) : []; mapNode.projectId = node.project_id; mapNode.status = node.status; mapNode.symbol = node.symbol; diff --git a/src/app/cartography/converters/styles-to-font-converter.spec.ts b/src/app/cartography/converters/styles-to-font-converter.spec.ts index 8726a6b1..2283dc98 100644 --- a/src/app/cartography/converters/styles-to-font-converter.spec.ts +++ b/src/app/cartography/converters/styles-to-font-converter.spec.ts @@ -14,7 +14,7 @@ describe('StylesToFontConverter', () => { const expectedFont: Font = { font_family: 'TypeWriter', font_size: 10, - font_weight: 'bold' + font_weight: 'bold', }; expect(converter.convert(styles)).toEqual(expectedFont); diff --git a/src/app/cartography/converters/styles-to-font-converter.ts b/src/app/cartography/converters/styles-to-font-converter.ts index 9fa1e5e6..26cb132c 100644 --- a/src/app/cartography/converters/styles-to-font-converter.ts +++ b/src/app/cartography/converters/styles-to-font-converter.ts @@ -10,30 +10,30 @@ export class StylesToFontConverter implements Converter { const font: Font = { font_family: undefined, font_size: undefined, - font_weight: undefined + font_weight: undefined, }; const ast = csstree.parse(styles, { - context: 'declarationList' + context: 'declarationList', }); - ast.children.forEach(child => { + ast.children.forEach((child) => { if (child.property === 'font-size' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Dimension') { font.font_size = parseInt(value.value); } }); } if (child.property === 'font-family' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Identifier') { font.font_family = value.name; } }); } if (child.property === 'font-weight' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Identifier') { font.font_weight = value.name; } diff --git a/src/app/cartography/d3-map.imports.ts b/src/app/cartography/d3-map.imports.ts index ee956b81..4f4ab643 100644 --- a/src/app/cartography/d3-map.imports.ts +++ b/src/app/cartography/d3-map.imports.ts @@ -37,5 +37,5 @@ export const D3_MAP_IMPORTS = [ LineDrawingWidget, RectDrawingWidget, TextDrawingWidget, - DrawingWidget + DrawingWidget, ]; diff --git a/src/app/cartography/datasources/datasource.ts b/src/app/cartography/datasources/datasource.ts index ce5aaf06..e4f1275c 100644 --- a/src/app/cartography/datasources/datasource.ts +++ b/src/app/cartography/datasources/datasource.ts @@ -20,7 +20,7 @@ export abstract class DataSource { } public set(data: T[]) { - data.forEach(item => { + data.forEach((item) => { const index = this.findIndex(item); if (index >= 0) { const updated = Object.assign(this.data[index], item); @@ -31,9 +31,9 @@ export abstract class DataSource { }); const toRemove = this.data.filter( - item => data.filter(i => this.getItemKey(i) === this.getItemKey(item)).length === 0 + (item) => data.filter((i) => this.getItemKey(i) === this.getItemKey(item)).length === 0 ); - toRemove.forEach(item => this.remove(item)); + toRemove.forEach((item) => this.remove(item)); this.dataChange.next(this.data); } diff --git a/src/app/cartography/directives/moving-canvas.directive.spec.ts b/src/app/cartography/directives/moving-canvas.directive.spec.ts index 1813c8c4..db5333cf 100644 --- a/src/app/cartography/directives/moving-canvas.directive.spec.ts +++ b/src/app/cartography/directives/moving-canvas.directive.spec.ts @@ -6,164 +6,188 @@ import { MovingCanvasDirective } from './moving-canvas.directive'; import { Component } from '@angular/core'; @Component({ - template: `` + template: ` + + `, }) class DummyComponent { - constructor(){} + constructor() {} } describe('MovingCanvasDirective', () => { - let component: DummyComponent; - let fixture: ComponentFixture; - let movingEventSource = new MovingEventSource(); + let component: DummyComponent; + let fixture: ComponentFixture; + let movingEventSource = new MovingEventSource(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [NoopAnimationsModule], - providers: [ - { provide: MovingEventSource, useValue: movingEventSource }, - { provide: Context, useClass: Context } - ], - declarations: [DummyComponent, MovingCanvasDirective] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DummyComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule], + providers: [ + { provide: MovingEventSource, useValue: movingEventSource }, + { provide: Context, useClass: Context }, + ], + declarations: [DummyComponent, MovingCanvasDirective], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DummyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should move canvas if moving mode is activated', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let xMovement: number = 200; - let yMovement: number = 200; + it('should create', () => { + expect(component).toBeTruthy(); + }); - canvas.dispatchEvent(new MouseEvent('mousedown', { - bubbles: true, - clientX: 0, - clientY: 0, - screenY: 0, - screenX: 0, - view: window - })); - tick(); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: xMovement, - movementY: yMovement - } as MouseEventInit)); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); - })); + it('should move canvas if moving mode is activated', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let xMovement: number = 200; + let yMovement: number = 200; - it('should not move canvas if moving mode is not activated', fakeAsync(() => { - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + canvas.dispatchEvent( + new MouseEvent('mousedown', { + bubbles: true, + clientX: 0, + clientY: 0, + screenY: 0, + screenX: 0, + view: window, + }) + ); + tick(); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: xMovement, + movementY: yMovement, + } as MouseEventInit) + ); + tick(); - canvas.dispatchEvent(new MouseEvent('mousedown', { - bubbles: true, - clientX: 0, - clientY: 0, - screenY: 0, - screenX: 0, - view: window - })); - tick(); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: 1000, - movementY: 1000 - } as MouseEventInit)); - tick(); - - expect(canvas.getAttribute('transform')).toEqual('translate(0, 0) scale(1)'); - })); + expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); + })); - it('should not move canvas after mouseup event', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let xMovement: number = 200; - let yMovement: number = 200; + it('should not move canvas if moving mode is not activated', fakeAsync(() => { + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - canvas.dispatchEvent(new MouseEvent('mousedown', { - bubbles: true, - clientX: 0, - clientY: 0, - screenY: 0, - screenX: 0, - view: window - })); - tick(); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: xMovement, - movementY: yMovement - } as MouseEventInit)); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); - - canvas.dispatchEvent(new MouseEvent('mouseup', { - bubbles: true, - relatedTarget: canvas, - movementX: 1000, - movementY: 1000 - } as MouseEventInit)); - tick(); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: xMovement, - movementY: yMovement - } as MouseEventInit)); - tick(); + canvas.dispatchEvent( + new MouseEvent('mousedown', { + bubbles: true, + clientX: 0, + clientY: 0, + screenY: 0, + screenX: 0, + view: window, + }) + ); + tick(); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: 1000, + movementY: 1000, + } as MouseEventInit) + ); + tick(); - expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); - })); + expect(canvas.getAttribute('transform')).toEqual('translate(0, 0) scale(1)'); + })); - it('should not move canvas after deactivation of moving mode', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let xMovement: number = 200; - let yMovement: number = 200; + it('should not move canvas after mouseup event', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let xMovement: number = 200; + let yMovement: number = 200; - canvas.dispatchEvent(new MouseEvent('mousedown', { - bubbles: true, - clientX: 0, - clientY: 0, - screenY: 0, - screenX: 0, - view: window - })); - tick(); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: xMovement, - movementY: yMovement - } as MouseEventInit)); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); - - movingEventSource.movingModeState.emit(false); - canvas.dispatchEvent(new MouseEvent('mousemove', { - bubbles: true, - relatedTarget: canvas, - movementX: 1000, - movementY: 1000 - } as MouseEventInit)); - tick(); + canvas.dispatchEvent( + new MouseEvent('mousedown', { + bubbles: true, + clientX: 0, + clientY: 0, + screenY: 0, + screenX: 0, + view: window, + }) + ); + tick(); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: xMovement, + movementY: yMovement, + } as MouseEventInit) + ); + tick(); - expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); - })); + expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); + + canvas.dispatchEvent( + new MouseEvent('mouseup', { + bubbles: true, + relatedTarget: canvas, + movementX: 1000, + movementY: 1000, + } as MouseEventInit) + ); + tick(); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: xMovement, + movementY: yMovement, + } as MouseEventInit) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); + })); + + it('should not move canvas after deactivation of moving mode', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let xMovement: number = 200; + let yMovement: number = 200; + + canvas.dispatchEvent( + new MouseEvent('mousedown', { + bubbles: true, + clientX: 0, + clientY: 0, + screenY: 0, + screenX: 0, + view: window, + }) + ); + tick(); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: xMovement, + movementY: yMovement, + } as MouseEventInit) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); + + movingEventSource.movingModeState.emit(false); + canvas.dispatchEvent( + new MouseEvent('mousemove', { + bubbles: true, + relatedTarget: canvas, + movementX: 1000, + movementY: 1000, + } as MouseEventInit) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(${xMovement}, ${yMovement}) scale(1)`); + })); }); diff --git a/src/app/cartography/directives/moving-canvas.directive.ts b/src/app/cartography/directives/moving-canvas.directive.ts index 4fe6c197..79fdfbd0 100644 --- a/src/app/cartography/directives/moving-canvas.directive.ts +++ b/src/app/cartography/directives/moving-canvas.directive.ts @@ -1,65 +1,73 @@ -import { HostListener, ElementRef, Directive, Input, OnInit, OnDestroy, Renderer2 } from '@angular/core' +import { HostListener, ElementRef, Directive, Input, OnInit, OnDestroy, Renderer2 } from '@angular/core'; import { Subscription } from 'rxjs'; import { MovingEventSource } from '../events/moving-event-source'; import { Context } from '../models/context'; import { select } from 'd3-selection'; @Directive({ - selector: '[movingCanvas]', + selector: '[movingCanvas]', }) export class MovingCanvasDirective implements OnInit, OnDestroy { - private mouseupListener: Function; - private mousemoveListener: Function; - private movingModeState: Subscription; - private activated: boolean = false; - - constructor( - private element: ElementRef, - private movingEventSource: MovingEventSource, - private context: Context - ) {} + private mouseupListener: Function; + private mousemoveListener: Function; + private movingModeState: Subscription; + private activated: boolean = false; - ngOnInit() { - this.movingModeState = this.movingEventSource.movingModeState.subscribe((event: boolean) => { - this.activated = event; - if (!event) this.removelisteners(); + constructor(private element: ElementRef, private movingEventSource: MovingEventSource, private context: Context) {} + + ngOnInit() { + this.movingModeState = this.movingEventSource.movingModeState.subscribe((event: boolean) => { + this.activated = event; + if (!event) this.removelisteners(); + }); + } + + ngOnDestroy() { + this.movingModeState.unsubscribe(); + } + + @HostListener('mousedown', ['$event']) + onMouseDown(event: MouseEvent) { + if (this.activated) { + this.mousemoveListener = (event: MouseEvent) => { + const view = select(this.element.nativeElement); + const canvas = view.selectAll('g.canvas').data([this.context]); + + canvas.attr('transform', () => { + this.context.transformation.x = this.context.transformation.x + event.movementX; + this.context.transformation.y = this.context.transformation.y + event.movementY; + + const xTrans = this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; + const yTrans = this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; + const kTrans = this.context.transformation.k; + + return `translate(${xTrans}, ${yTrans}) scale(${kTrans})`; }); - } + }; - ngOnDestroy() { - this.movingModeState.unsubscribe(); - } + this.mouseupListener = (event: MouseEvent) => { + this.removelisteners(); + }; - @HostListener('mousedown', ['$event']) - onMouseDown(event: MouseEvent) { - if (this.activated) { - this.mousemoveListener = (event: MouseEvent) => { - const view = select(this.element.nativeElement); - const canvas = view.selectAll('g.canvas').data([this.context]); - - canvas.attr('transform', () => { - this.context.transformation.x = this.context.transformation.x + event.movementX; - this.context.transformation.y = this.context.transformation.y + event.movementY; - - const xTrans = this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; - const yTrans = this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; - const kTrans = this.context.transformation.k; - - return `translate(${xTrans}, ${yTrans}) scale(${kTrans})`; - }); - }; - - this.mouseupListener = (event: MouseEvent) => { - this.removelisteners(); - }; - - this.element.nativeElement.addEventListener('mouseup', this.mouseupListener as EventListenerOrEventListenerObject); - this.element.nativeElement.addEventListener('mousemove', this.mousemoveListener as EventListenerOrEventListenerObject); - } + this.element.nativeElement.addEventListener( + 'mouseup', + this.mouseupListener as EventListenerOrEventListenerObject + ); + this.element.nativeElement.addEventListener( + 'mousemove', + this.mousemoveListener as EventListenerOrEventListenerObject + ); } + } - removelisteners() { - this.element.nativeElement.removeEventListener('mouseup', this.mouseupListener as EventListenerOrEventListenerObject); - this.element.nativeElement.removeEventListener('mousemove', this.mousemoveListener as EventListenerOrEventListenerObject); - } + removelisteners() { + this.element.nativeElement.removeEventListener( + 'mouseup', + this.mouseupListener as EventListenerOrEventListenerObject + ); + this.element.nativeElement.removeEventListener( + 'mousemove', + this.mousemoveListener as EventListenerOrEventListenerObject + ); + } } diff --git a/src/app/cartography/directives/zooming-canvas.directive.spec.ts b/src/app/cartography/directives/zooming-canvas.directive.spec.ts index 8e84de01..9b4e077a 100644 --- a/src/app/cartography/directives/zooming-canvas.directive.spec.ts +++ b/src/app/cartography/directives/zooming-canvas.directive.spec.ts @@ -7,133 +7,145 @@ import { ZoomingCanvasDirective } from './zooming-canvas.directive'; import { MapScaleService } from '../../services/mapScale.service'; @Component({ - template: `` + template: ` + + `, }) class DummyComponent { - constructor(){} + constructor() {} } describe('ZoomingCanvasDirective', () => { - let component: DummyComponent; - let fixture: ComponentFixture; - let movingEventSource = new MovingEventSource(); + let component: DummyComponent; + let fixture: ComponentFixture; + let movingEventSource = new MovingEventSource(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [NoopAnimationsModule], - providers: [ - { provide: MovingEventSource, useValue: movingEventSource }, - { provide: Context, useClass: Context }, - { provide: MapScaleService, useClass: MapScaleService } - ], - declarations: [DummyComponent, ZoomingCanvasDirective] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DummyComponent); - component = fixture.componentInstance; - fixture.detectChanges(); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule], + providers: [ + { provide: MovingEventSource, useValue: movingEventSource }, + { provide: Context, useClass: Context }, + { provide: MapScaleService, useClass: MapScaleService }, + ], + declarations: [DummyComponent, ZoomingCanvasDirective], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DummyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should zoom in canvas if moving mode is activated', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let deltaMode: number = 0; + let zoom: number = -1000; + + canvas.dispatchEvent( + new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, + }) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); + })); + + it('should zoom out canvas if moving mode is activated', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let deltaMode: number = 0; + let zoom: number = 100; + + canvas.dispatchEvent( + new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, + }) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(0.9)`); + })); + + it('should not zoom in/out canvas if moving mode is not activated', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let deltaMode: number = 0; + let zoom: number = -1000; + + canvas.dispatchEvent( + new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, + }) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); + + movingEventSource.movingModeState.emit(false); + canvas.dispatchEvent( + new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, + }) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); + })); + + it('should not zoom in/out canvas after deactivation of moving mode', fakeAsync(() => { + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let deltaMode: number = 0; + let zoom: number = -1000; + + canvas.dispatchEvent( + new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, + }) + ); + tick(); + + expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(1)`); + })); + + it('should prevent from default wheel behaviour when moving mode activated', fakeAsync(() => { + movingEventSource.movingModeState.emit(true); + const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); + let deltaMode: number = 0; + let zoom: number = -1000; + const event = new WheelEvent('wheel', { + bubbles: true, + relatedTarget: canvas, + deltaMode: deltaMode, + deltaY: zoom, }); + spyOn(event, 'preventDefault'); - it('should create', () => { - expect(component).toBeTruthy(); - }); + canvas.dispatchEvent(event); + tick(); - it('should zoom in canvas if moving mode is activated', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let deltaMode: number = 0; - let zoom: number = -1000; - - canvas.dispatchEvent(new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - })); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); - })); - - it('should zoom out canvas if moving mode is activated', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let deltaMode: number = 0; - let zoom: number = 100; - - canvas.dispatchEvent(new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - })); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(0.9)`); - })); - - it('should not zoom in/out canvas if moving mode is not activated', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let deltaMode: number = 0; - let zoom: number = -1000; - - canvas.dispatchEvent(new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - })); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); - - movingEventSource.movingModeState.emit(false); - canvas.dispatchEvent(new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - })); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(2)`); - })); - - it('should not zoom in/out canvas after deactivation of moving mode', fakeAsync(() => { - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let deltaMode: number = 0; - let zoom: number = -1000; - - canvas.dispatchEvent(new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - })); - tick(); - - expect(canvas.getAttribute('transform')).toEqual(`translate(0, 0) scale(1)`); - })); - - it('should prevent from default wheel behaviour when moving mode activated', fakeAsync(() => { - movingEventSource.movingModeState.emit(true); - const canvas: HTMLElement = fixture.debugElement.nativeElement.querySelector('.canvas'); - let deltaMode: number = 0; - let zoom: number = -1000; - const event = new WheelEvent('wheel', { - bubbles: true, - relatedTarget: canvas, - deltaMode: deltaMode, - deltaY: zoom - }); - spyOn(event, 'preventDefault'); - - canvas.dispatchEvent(event); - tick(); - - expect(event.preventDefault).toHaveBeenCalled(); - })); + expect(event.preventDefault).toHaveBeenCalled(); + })); }); diff --git a/src/app/cartography/directives/zooming-canvas.directive.ts b/src/app/cartography/directives/zooming-canvas.directive.ts index c2b25288..bc1b6b61 100644 --- a/src/app/cartography/directives/zooming-canvas.directive.ts +++ b/src/app/cartography/directives/zooming-canvas.directive.ts @@ -1,4 +1,4 @@ -import { ElementRef, Directive, OnInit, OnDestroy } from '@angular/core' +import { ElementRef, Directive, OnInit, OnDestroy } from '@angular/core'; import { Subscription } from 'rxjs'; import { MovingEventSource } from '../events/moving-event-source'; import { Context } from '../models/context'; @@ -6,56 +6,58 @@ import { select } from 'd3-selection'; import { MapScaleService } from '../../services/mapScale.service'; @Directive({ - selector: '[zoomingCanvas]', + selector: '[zoomingCanvas]', }) export class ZoomingCanvasDirective implements OnInit, OnDestroy { - private wheelListener: Function; - private movingModeState: Subscription; - - constructor( - private element: ElementRef, - private movingEventSource: MovingEventSource, - private context: Context, - private mapsScaleService: MapScaleService - ) {} + private wheelListener: Function; + private movingModeState: Subscription; - ngOnInit() { - this.movingModeState = this.movingEventSource.movingModeState.subscribe((event: boolean) => { - event ? this.addListener() : this.removeListener(); - }); - } + constructor( + private element: ElementRef, + private movingEventSource: MovingEventSource, + private context: Context, + private mapsScaleService: MapScaleService + ) {} - ngOnDestroy() { - this.movingModeState.unsubscribe(); - } + ngOnInit() { + this.movingModeState = this.movingEventSource.movingModeState.subscribe((event: boolean) => { + event ? this.addListener() : this.removeListener(); + }); + } - addListener() { - this.wheelListener = (event: WheelEvent) => { - event.stopPropagation(); - event.preventDefault(); + ngOnDestroy() { + this.movingModeState.unsubscribe(); + } - let zoom = event.deltaY; - zoom = event.deltaMode === 0 ? zoom/100 : zoom/3; + addListener() { + this.wheelListener = (event: WheelEvent) => { + event.stopPropagation(); + event.preventDefault(); - const view = select(this.element.nativeElement); - const canvas = view.selectAll('g.canvas').data([this.context]); - - canvas.attr('transform', () => { - this.context.transformation.k = this.context.transformation.k - zoom/10; + let zoom = event.deltaY; + zoom = event.deltaMode === 0 ? zoom / 100 : zoom / 3; - const xTrans = this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; - const yTrans = this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; - const kTrans = this.context.transformation.k; - this.mapsScaleService.setScale(kTrans); + const view = select(this.element.nativeElement); + const canvas = view.selectAll('g.canvas').data([this.context]); - return `translate(${xTrans}, ${yTrans}) scale(${kTrans})`; - }); - }; + canvas.attr('transform', () => { + this.context.transformation.k = this.context.transformation.k - zoom / 10; - this.element.nativeElement.addEventListener('wheel', this.wheelListener as EventListenerOrEventListenerObject, {passive: false}); - } + const xTrans = this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x; + const yTrans = this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y; + const kTrans = this.context.transformation.k; + this.mapsScaleService.setScale(kTrans); - removeListener() { - this.element.nativeElement.removeEventListener('wheel', this.wheelListener as EventListenerOrEventListenerObject); - } + return `translate(${xTrans}, ${yTrans}) scale(${kTrans})`; + }); + }; + + this.element.nativeElement.addEventListener('wheel', this.wheelListener as EventListenerOrEventListenerObject, { + passive: false, + }); + } + + removeListener() { + this.element.nativeElement.removeEventListener('wheel', this.wheelListener as EventListenerOrEventListenerObject); + } } diff --git a/src/app/cartography/events/drawings-event-source.ts b/src/app/cartography/events/drawings-event-source.ts index fa4d09f5..35173a19 100644 --- a/src/app/cartography/events/drawings-event-source.ts +++ b/src/app/cartography/events/drawings-event-source.ts @@ -4,7 +4,7 @@ import { ResizedDataEvent, TextAddedDataEvent, TextEditedDataEvent, - AddedDataEvent + AddedDataEvent, } from './event-source'; import { MapDrawing } from '../models/map/map-drawing'; diff --git a/src/app/cartography/events/moving-event-source.ts b/src/app/cartography/events/moving-event-source.ts index afa0d1a1..1dc96de8 100644 --- a/src/app/cartography/events/moving-event-source.ts +++ b/src/app/cartography/events/moving-event-source.ts @@ -1,6 +1,6 @@ -import { Injectable, EventEmitter } from "@angular/core"; +import { Injectable, EventEmitter } from '@angular/core'; @Injectable() export class MovingEventSource { - public movingModeState = new EventEmitter(); + public movingModeState = new EventEmitter(); } diff --git a/src/app/cartography/helpers/css-fixer.ts b/src/app/cartography/helpers/css-fixer.ts index 69e7e327..6b021b61 100644 --- a/src/app/cartography/helpers/css-fixer.ts +++ b/src/app/cartography/helpers/css-fixer.ts @@ -6,13 +6,13 @@ import { Injectable } from '@angular/core'; export class CssFixer { public fix(styles: string): string { const ast = csstree.parse(styles, { - context: 'declarationList' + context: 'declarationList', }); // fixes font-size when unit (pt|px) is not defined - ast.children.forEach(child => { + ast.children.forEach((child) => { if (child.property === 'font-size' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Number') { const fontSize = value.value.toString(); if (!(fontSize.indexOf('pt') >= 0 || fontSize.indexOf('px') >= 0)) { diff --git a/src/app/cartography/helpers/default-drawings-factory.ts b/src/app/cartography/helpers/default-drawings-factory.ts index 036679b4..d87af1e9 100644 --- a/src/app/cartography/helpers/default-drawings-factory.ts +++ b/src/app/cartography/helpers/default-drawings-factory.ts @@ -21,7 +21,7 @@ export class DefaultDrawingsFactory { text: this.textElementFactory, ellipse: this.ellipseElementFactory, rectangle: this.rectangleElementFactory, - line: this.lineElementFactory + line: this.lineElementFactory, }; } diff --git a/src/app/cartography/helpers/font-bbox-calculator.ts b/src/app/cartography/helpers/font-bbox-calculator.ts index 69a6dee7..d06468d1 100644 --- a/src/app/cartography/helpers/font-bbox-calculator.ts +++ b/src/app/cartography/helpers/font-bbox-calculator.ts @@ -14,7 +14,7 @@ export class FontBBoxCalculator { return { width: bbox.width, - height: bbox.height + height: bbox.height, }; } } diff --git a/src/app/cartography/helpers/font-fixer.spec.ts b/src/app/cartography/helpers/font-fixer.spec.ts index 273b8756..67064c12 100644 --- a/src/app/cartography/helpers/font-fixer.spec.ts +++ b/src/app/cartography/helpers/font-fixer.spec.ts @@ -12,13 +12,13 @@ describe('FontFixer', () => { const font: Font = { font_family: 'TypeWriter', font_size: 10, - font_weight: 'bold' + font_weight: 'bold', }; expect(fixer.fix(font)).toEqual({ font_family: 'Noto Sans', font_size: 11, - font_weight: 'bold' + font_weight: 'bold', }); }); @@ -26,13 +26,13 @@ describe('FontFixer', () => { const font: Font = { font_family: 'OtherFont', font_size: 11, - font_weight: 'bold' + font_weight: 'bold', }; expect(fixer.fix(font)).toEqual({ font_family: 'OtherFont', font_size: 11, - font_weight: 'bold' + font_weight: 'bold', }); }); diff --git a/src/app/cartography/helpers/font-fixer.ts b/src/app/cartography/helpers/font-fixer.ts index 760dcdce..75a4bbc0 100644 --- a/src/app/cartography/helpers/font-fixer.ts +++ b/src/app/cartography/helpers/font-fixer.ts @@ -22,16 +22,16 @@ export class FontFixer { public fixStyles(styles: string) { const ast = csstree.parse(styles, { - context: 'declarationList' + context: 'declarationList', }); let fontFamilyPointer = null; let fontSizePointer = null; let isByIdentifier = true; - ast.children.forEach(child => { + ast.children.forEach((child) => { if (child.property === 'font-family' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Identifier') { fontFamilyPointer = value; } @@ -42,7 +42,7 @@ export class FontFixer { }); } if (child.property === 'font-size' && child.value && child.value.children) { - child.value.children.forEach(value => { + child.value.children.forEach((value) => { if (value.type === 'Dimension') { fontSizePointer = value; } @@ -62,7 +62,7 @@ export class FontFixer { const fixedFont = this.fix({ font_family: fontFamilyValue.split('"').join(''), - font_size: parseInt(fontSizeValue, 10) + font_size: parseInt(fontSizeValue, 10), } as Font); if (isByIdentifier) { diff --git a/src/app/cartography/helpers/multi-link-calculator-helper.ts b/src/app/cartography/helpers/multi-link-calculator-helper.ts index 11c5c99e..93d96069 100644 --- a/src/app/cartography/helpers/multi-link-calculator-helper.ts +++ b/src/app/cartography/helpers/multi-link-calculator-helper.ts @@ -25,7 +25,7 @@ export class MultiLinkCalculatorHelper { } return { dx: x2_x0, - dy: y2_y0 + dy: y2_y0, }; } diff --git a/src/app/cartography/helpers/qt-dasharray-fixer.ts b/src/app/cartography/helpers/qt-dasharray-fixer.ts index 54f1ced6..1f13a71f 100644 --- a/src/app/cartography/helpers/qt-dasharray-fixer.ts +++ b/src/app/cartography/helpers/qt-dasharray-fixer.ts @@ -11,7 +11,7 @@ export class QtDasharrayFixer { '25, 25': '10, 2', '5, 25': '4, 2', '5, 25, 25': '5, 5, 1, 5', - '25, 25, 5, 25, 5': '5, 2, 5, 2, 5' + '25, 25, 5, 25, 5': '5, 2, 5, 2, 5', }; public fix(dasharray: string): string { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter.ts index 27b70568..77eea3a7 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter.ts @@ -19,7 +19,7 @@ export class SvgToDrawingConverter { image: new ImageConverter(), rect: new RectConverter(), line: new LineConverter(), - ellipse: new EllipseConverter() + ellipse: new EllipseConverter(), }; } diff --git a/src/app/cartography/managers/graph-data-manager.ts b/src/app/cartography/managers/graph-data-manager.ts index 0de68ed5..5f682600 100644 --- a/src/app/cartography/managers/graph-data-manager.ts +++ b/src/app/cartography/managers/graph-data-manager.ts @@ -14,7 +14,7 @@ import { MapNodesDataSource, MapLinksDataSource, MapDrawingsDataSource, - MapSymbolsDataSource + MapSymbolsDataSource, } from '../datasources/map-datasource'; import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; @@ -35,7 +35,7 @@ export class GraphDataManager { public setNodes(nodes: Node[]) { if (nodes) { - const mapNodes = nodes.map(n => this.nodeToMapNode.convert(n)); + const mapNodes = nodes.map((n) => this.nodeToMapNode.convert(n)); this.mapNodesDataSource.set(mapNodes); this.assignDataToLinks(); @@ -45,7 +45,7 @@ export class GraphDataManager { public setLinks(links: Link[]) { if (links) { - const mapLinks = links.map(l => this.linkToMapLink.convert(l)); + const mapLinks = links.map((l) => this.linkToMapLink.convert(l)); this.mapLinksDataSource.set(mapLinks); this.assignDataToLinks(); @@ -55,16 +55,16 @@ export class GraphDataManager { public setDrawings(drawings: Drawing[]) { if (drawings) { - const mapDrawings = drawings.map(d => this.drawingToMapDrawing.convert(d)); + const mapDrawings = drawings.map((d) => this.drawingToMapDrawing.convert(d)); this.mapDrawingsDataSource.set(mapDrawings); - + this.onDataUpdate(); } } public setSymbols(symbols: Symbol[]) { if (symbols) { - const mapSymbols = symbols.map(s => this.symbolToMapSymbol.convert(s)); + const mapSymbols = symbols.map((s) => this.symbolToMapSymbol.convert(s)); this.mapSymbolsDataSource.set(mapSymbols); } } diff --git a/src/app/cartography/managers/selection-manager.ts b/src/app/cartography/managers/selection-manager.ts index a25e18a3..5be598f8 100644 --- a/src/app/cartography/managers/selection-manager.ts +++ b/src/app/cartography/managers/selection-manager.ts @@ -13,16 +13,16 @@ export class SelectionManager { const dictItems = this.convertToKeyDict(items); const selected = Object.keys(dictItems) - .filter(key => { + .filter((key) => { return !this.isSelectedByKey(key); }) - .map(key => dictItems[key]); + .map((key) => dictItems[key]); const unselected = Object.keys(this.selection) - .filter(key => { + .filter((key) => { return !(key in dictItems); }) - .map(key => this.selection[key]); + .map((key) => this.selection[key]); this.selection = dictItems; @@ -36,7 +36,7 @@ export class SelectionManager { } public getSelected(): Indexed[] { - return Object.keys(this.selection).map(key => this.selection[key]); + return Object.keys(this.selection).map((key) => this.selection[key]); } public isSelected(item): boolean { @@ -55,7 +55,7 @@ export class SelectionManager { private convertToKeyDict(items: Indexed[]) { const dict = {}; - items.forEach(item => { + items.forEach((item) => { dict[this.getKey(item)] = item; }); return dict; diff --git a/src/app/cartography/testing.ts b/src/app/cartography/testing.ts index a8bfefe6..8a410c9e 100644 --- a/src/app/cartography/testing.ts +++ b/src/app/cartography/testing.ts @@ -9,17 +9,12 @@ export class TestSVGCanvas { } public create() { - this.svg = select('body') - .append('svg') - .attr('width', 1000) - .attr('height', 1000); + this.svg = select('body').append('svg').attr('width', 1000).attr('height', 1000); this.canvas = this.svg.append('g').attr('class', 'canvas'); } public destroy() { - select('body') - .selectAll('svg') - .remove(); + select('body').selectAll('svg').remove(); } } diff --git a/src/app/cartography/tools/moving-tool.spec.ts b/src/app/cartography/tools/moving-tool.spec.ts index fa74340c..06ee6607 100644 --- a/src/app/cartography/tools/moving-tool.spec.ts +++ b/src/app/cartography/tools/moving-tool.spec.ts @@ -16,11 +16,7 @@ describe('MovingTool', () => { tool = new MovingTool(context); svg = new TestSVGCanvas(); - node = svg.canvas - .append('g') - .attr('class', 'node') - .attr('x', 10) - .attr('y', 20); + node = svg.canvas.append('g').attr('class', 'node').attr('x', 10).attr('y', 20); tool.setEnabled(true); tool.draw(svg.svg, context); @@ -39,7 +35,7 @@ describe('MovingTool', () => { relatedTarget: svg.svg.node(), screenY: 1024, screenX: 1024, - view: window + view: window, }) ); @@ -70,7 +66,7 @@ describe('MovingTool', () => { relatedTarget: svg.svg.node(), screenY: 1024, screenX: 1024, - view: window + view: window, }) ); @@ -101,7 +97,7 @@ describe('MovingTool', () => { relatedTarget: svg.svg.node(), screenY: 1024, screenX: 1024, - view: window + view: window, }) ); diff --git a/src/app/cartography/tools/moving-tool.ts b/src/app/cartography/tools/moving-tool.ts index 6590fe85..62b27867 100644 --- a/src/app/cartography/tools/moving-tool.ts +++ b/src/app/cartography/tools/moving-tool.ts @@ -42,7 +42,7 @@ export class MovingTool { private activate(selection: SVGSelection) { const self = this; - const onZoom = function(this: SVGSVGElement) { + const onZoom = function (this: SVGSVGElement) { const canvas = selection.select('g.canvas'); const e: D3ZoomEvent = event; canvas.attr('transform', () => { diff --git a/src/app/cartography/tools/selection-tool.ts b/src/app/cartography/tools/selection-tool.ts index 40c037a9..9d1e24dd 100644 --- a/src/app/cartography/tools/selection-tool.ts +++ b/src/app/cartography/tools/selection-tool.ts @@ -17,14 +17,9 @@ export class SelectionTool { private path; private enabled = false; - public constructor( - private context: Context, - private selectionEventSource: SelectionEventSource - ) {} + public constructor(private context: Context, private selectionEventSource: SelectionEventSource) {} - public disableContextMenu(){ - - } + public disableContextMenu() {} public setEnabled(enabled) { this.enabled = enabled; @@ -34,7 +29,7 @@ export class SelectionTool { private activate(selection) { const self = this; - selection.on('mousedown', function() { + selection.on('mousedown', function () { // prevent deselection on right click if (event.button == 2) { selection.on('contextmenu', () => { @@ -55,11 +50,11 @@ export class SelectionTool { selection.selectAll(SelectionTool.SELECTABLE_CLASS).classed('selected', false); subject - .on('mousemove.selection', function() { + .on('mousemove.selection', function () { const end = self.transformation(mouse(parent)); self.moveSelection(start, end); }) - .on('mouseup.selection', function() { + .on('mouseup.selection', function () { const end = self.transformation(mouse(parent)); self.endSelection(start, end); subject.on('mousemove.selection', null).on('mouseup.selection', null); @@ -100,9 +95,12 @@ export class SelectionTool { } private moveSelection(start, move) { - let x = start[0]/this.context.transformation.k; - let y = start[1]/this.context.transformation.k; - this.path.attr('d', this.rect(x, y, move[0]/this.context.transformation.k - x, move[1]/this.context.transformation.k - y)); + let x = start[0] / this.context.transformation.k; + let y = start[1] / this.context.transformation.k; + this.path.attr( + 'd', + this.rect(x, y, move[0] / this.context.transformation.k - x, move[1] / this.context.transformation.k - y) + ); this.selectedEvent(start, move); } @@ -127,7 +125,7 @@ export class SelectionTool { const transformation_point = this.context.getZeroZeroTransformationPoint(); return [ point[0] - transformation_point.x - this.context.transformation.x, - point[1] - transformation_point.y - this.context.transformation.y + point[1] - transformation_point.y - this.context.transformation.y, ]; } } diff --git a/src/app/cartography/widgets/drawing-line.ts b/src/app/cartography/widgets/drawing-line.ts index 5f7f85bd..bb694524 100644 --- a/src/app/cartography/widgets/drawing-line.ts +++ b/src/app/cartography/widgets/drawing-line.ts @@ -23,7 +23,7 @@ export class DrawingLineWidget { this.drawingLine.start = new Point(x, y); this.drawingLine.end = new Point(x, y); - const over = function(this, d, i) { + const over = function (this, d, i) { const node = self.selection.select('g.canvas').node(); const coordinates = mouse(node); self.drawingLine.end.x = coordinates[0]; @@ -60,7 +60,10 @@ export class DrawingLineWidget { if (this.drawing) { link_data = [ - [[this.drawingLine.start.x, this.drawingLine.start.y], [this.drawingLine.end.x, this.drawingLine.end.y]] + [ + [this.drawingLine.start.x, this.drawingLine.start.y], + [this.drawingLine.end.x, this.drawingLine.end.y], + ], ]; } @@ -72,11 +75,7 @@ export class DrawingLineWidget { const enter = tool.enter().append('path'); - tool - .merge(enter) - .attr('d', value_line) - .attr('stroke', '#000') - .attr('stroke-width', '2'); + tool.merge(enter).attr('d', value_line).attr('stroke', '#000').attr('stroke-width', '2'); tool.exit().remove(); } diff --git a/src/app/cartography/widgets/drawing.ts b/src/app/cartography/widgets/drawing.ts index 2f55b8dc..4e82080d 100644 --- a/src/app/cartography/widgets/drawing.ts +++ b/src/app/cartography/widgets/drawing.ts @@ -33,52 +33,49 @@ export class DrawingWidget implements Widget { this.imageDrawingWidget, this.rectDrawingWidget, this.lineDrawingWidget, - this.ellipseDrawingWidget + this.ellipseDrawingWidget, ]; } public draw(view: SVGSelection) { const drawing_body = view.selectAll('g.drawing_body').data((l: MapDrawing) => [l]); - const drawing_body_enter = drawing_body - .enter() - .append('g') - .attr('class', 'drawing_body'); + const drawing_body_enter = drawing_body.enter().append('g').attr('class', 'drawing_body'); const drawing_body_merge = drawing_body.merge(drawing_body_enter).attr('transform', (d: MapDrawing) => { return `translate(${d.x},${d.y}) rotate(${d.rotation})`; }); - this.drawingWidgets.forEach(widget => { + this.drawingWidgets.forEach((widget) => { widget.draw(drawing_body_merge); }); drawing_body_merge.select('.layer_label_wrapper').remove(); if (this.mapSettingsService.isLayerNumberVisible) { drawing_body_merge - .filter(n => ((n.element instanceof RectElement) || (n.element instanceof EllipseElement))) + .filter((n) => n.element instanceof RectElement || n.element instanceof EllipseElement) .append('rect') .attr('class', 'layer_label_wrapper') .attr('width', '26') .attr('height', '26') - .attr('x', n => n.element ? n.element.width/2 - 13 : 0) - .attr('y', n => n.element ? n.element.height/2 - 13 : 0) + .attr('x', (n) => (n.element ? n.element.width / 2 - 13 : 0)) + .attr('y', (n) => (n.element ? n.element.height / 2 - 13 : 0)) .attr('fill', 'red'); } drawing_body_merge.select('.layer_label').remove(); if (this.mapSettingsService.isLayerNumberVisible) { drawing_body_merge - .filter(n => ((n.element instanceof RectElement) || (n.element instanceof EllipseElement))) + .filter((n) => n.element instanceof RectElement || n.element instanceof EllipseElement) .append('text') .attr('class', 'layer_label') .text((elem) => elem.z) - .attr('x', function(n) { - if(n.z >= 100 ) return n.element ? n.element.width/2 - 13 : 0 - else if(n.z >= 10 ) return n.element ? n.element.width/2 - 9 : 0 - else return n.element.width/2 - 5 + .attr('x', function (n) { + if (n.z >= 100) return n.element ? n.element.width / 2 - 13 : 0; + else if (n.z >= 10) return n.element ? n.element.width / 2 - 9 : 0; + else return n.element.width / 2 - 5; }) - .attr('y', n => n.element ? n.element.height/2 + 5 : 0) + .attr('y', (n) => (n.element ? n.element.height / 2 + 5 : 0)) .attr('style', () => { const styles: string[] = []; styles.push(`font-family: "Noto Sans"`); @@ -93,10 +90,10 @@ export class DrawingWidget implements Widget { .select('line.top') .attr('stroke', 'transparent') .attr('stroke-width', '8px') - .attr('x1', drawing => + .attr('x1', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cx - drawing.element.width / 10 : '0' ) - .attr('x2', drawing => + .attr('x2', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cx + drawing.element.width / 10 : drawing.element.width @@ -110,16 +107,16 @@ export class DrawingWidget implements Widget { .select('line.bottom') .attr('stroke', 'transparent') .attr('stroke-width', '8px') - .attr('x1', drawing => + .attr('x1', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cx - drawing.element.width / 10 : '0' ) - .attr('x2', drawing => + .attr('x2', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cx + drawing.element.width / 10 : drawing.element.width ) - .attr('y1', drawing => drawing.element.height) - .attr('y2', drawing => drawing.element.height) + .attr('y1', (drawing) => drawing.element.height) + .attr('y2', (drawing) => drawing.element.height) .attr('draggable', 'true') .attr('cursor', 'ns-resize'); @@ -129,10 +126,10 @@ export class DrawingWidget implements Widget { .attr('stroke-width', '8px') .attr('x1', '0') .attr('x2', '0') - .attr('y1', drawing => + .attr('y1', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cy - drawing.element.height / 10 : '0' ) - .attr('y2', drawing => + .attr('y2', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cy + drawing.element.height / 10 : drawing.element.height @@ -144,12 +141,12 @@ export class DrawingWidget implements Widget { .select('line.left') .attr('stroke', 'transparent') .attr('stroke-width', '8px') - .attr('x1', drawing => drawing.element.width) - .attr('x2', drawing => drawing.element.width) - .attr('y1', drawing => + .attr('x1', (drawing) => drawing.element.width) + .attr('x2', (drawing) => drawing.element.width) + .attr('y1', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cy - drawing.element.height / 10 : '0' ) - .attr('y2', drawing => + .attr('y2', (drawing) => drawing.element instanceof EllipseElement ? drawing.element.cy + drawing.element.height / 10 : drawing.element.height @@ -162,8 +159,8 @@ export class DrawingWidget implements Widget { .attr('draggable', 'true') .attr('fill', 'transparent') .attr('stroke', 'transparent') - .attr('cx', drawing => (drawing.element as LineElement).x1) - .attr('cy', drawing => (drawing.element as LineElement).y1) + .attr('cx', (drawing) => (drawing.element as LineElement).x1) + .attr('cy', (drawing) => (drawing.element as LineElement).y1) .attr('r', 10) .attr('cursor', 'move'); @@ -172,8 +169,8 @@ export class DrawingWidget implements Widget { .attr('draggable', 'true') .attr('fill', 'transparent') .attr('stroke', 'transparent') - .attr('cx', drawing => (drawing.element as LineElement).x2) - .attr('cy', drawing => (drawing.element as LineElement).y2) + .attr('cx', (drawing) => (drawing.element as LineElement).x2) + .attr('cy', (drawing) => (drawing.element as LineElement).y2) .attr('r', 10) .attr('cursor', 'move'); diff --git a/src/app/cartography/widgets/drawings.ts b/src/app/cartography/widgets/drawings.ts index 734c0bfd..6bd108d3 100644 --- a/src/app/cartography/widgets/drawings.ts +++ b/src/app/cartography/widgets/drawings.ts @@ -111,15 +111,18 @@ export class DrawingsWidget implements Widget { } } } else { - dy = y - (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y)); - y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); + dy = + y - + (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y)); + y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); if (datum.element.height + dy < 0) { isReflectedVertical = false; y = topEdge; datum.element.height = Math.abs(datum.element.height + evt.dy); } else { - datum.y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); + datum.y = + evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); datum.element.height += dy; if (datum.element instanceof EllipseElement) { (datum.element as EllipseElement).cy = @@ -143,7 +146,7 @@ export class DrawingsWidget implements Widget { let top = drag() .on('start', (datum: MapDrawing) => { - y = event.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); + y = event.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); bottomEdge = y + datum.element.height; document.body.style.cursor = 'ns-resize'; }) @@ -151,15 +154,18 @@ export class DrawingsWidget implements Widget { const evt = event; if (!isReflectedVertical) { - dy = y - (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y)); - y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); + dy = + y - + (evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y)); + y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); if (datum.element.height + dy < 0) { y = bottomEdge; isReflectedVertical = true; datum.element.height = Math.abs(datum.element.height + evt.dy); } else { - datum.y = evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); + datum.y = + evt.sourceEvent.pageY - (this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y); datum.element.height += dy; if (datum.element instanceof EllipseElement) { (datum.element as EllipseElement).cy = @@ -207,7 +213,7 @@ export class DrawingsWidget implements Widget { let isReflectedHorizontal: boolean = false; let right = drag() .on('start', (datum: MapDrawing) => { - x = event.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); + x = event.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); leftEdge = x + datum.element.width; document.body.style.cursor = 'ew-resize'; }) @@ -215,15 +221,18 @@ export class DrawingsWidget implements Widget { const evt = event; if (!isReflectedHorizontal) { - dx = x - (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x)); - x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); + dx = + x - + (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x)); + x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); if (datum.element.width + dx < 0) { x = leftEdge; isReflectedHorizontal = true; datum.element.width = Math.abs(datum.element.width + evt.dx); } else { - datum.x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); + datum.x = + evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); datum.element.width += dx; if (datum.element instanceof EllipseElement) { (datum.element as EllipseElement).cx = @@ -290,15 +299,18 @@ export class DrawingsWidget implements Widget { datum.element.width = datum.element.width + evt.dx < 0 ? 1 : (datum.element.width += evt.dx); } } else { - dx = x - (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x)); - x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); + dx = + x - + (evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x)); + x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); if (datum.element.width + dx < 0) { x = rightEdge; isReflectedHorizontal = false; datum.element.width = Math.abs(datum.element.width + evt.dx); } else { - datum.x = evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); + datum.x = + evt.sourceEvent.pageX - (this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x); datum.element.width += dx; if (datum.element instanceof EllipseElement) { (datum.element as EllipseElement).cx = diff --git a/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts index 82a2918f..42d0ad42 100644 --- a/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts @@ -33,10 +33,7 @@ describe('EllipseDrawingWidget', () => { drawing.element = ellipse; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); diff --git a/src/app/cartography/widgets/drawings/ellipse-drawing.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.ts index 8fce84d2..005fe033 100644 --- a/src/app/cartography/widgets/drawings/ellipse-drawing.ts +++ b/src/app/cartography/widgets/drawings/ellipse-drawing.ts @@ -17,25 +17,13 @@ export class EllipseDrawingWidget implements DrawingShapeWidget { return d.element && d.element instanceof EllipseElement ? [d.element] : []; }); - drawing - .enter() - .append('line') - .attr('class', 'top'); + drawing.enter().append('line').attr('class', 'top'); - drawing - .enter() - .append('line') - .attr('class', 'bottom'); + drawing.enter().append('line').attr('class', 'bottom'); - drawing - .enter() - .append('line') - .attr('class', 'right'); + drawing.enter().append('line').attr('class', 'right'); - drawing - .enter() - .append('line') - .attr('class', 'left'); + drawing.enter().append('line').attr('class', 'left'); const drawing_enter = drawing .enter() @@ -45,15 +33,15 @@ export class EllipseDrawingWidget implements DrawingShapeWidget { const merge = drawing.merge(drawing_enter); merge - .attr('fill', ellipse => ellipse.fill) - .attr('fill-opacity', ellipse => ellipse.fill_opacity) - .attr('stroke', ellipse => ellipse.stroke) - .attr('stroke-width', ellipse => ellipse.stroke_width) - .attr('stroke-dasharray', ellipse => this.qtDasharrayFixer.fix(ellipse.stroke_dasharray)) - .attr('cx', ellipse => ellipse.cx) - .attr('cy', ellipse => ellipse.cy) - .attr('rx', ellipse => ellipse.rx) - .attr('ry', ellipse => ellipse.ry); + .attr('fill', (ellipse) => ellipse.fill) + .attr('fill-opacity', (ellipse) => ellipse.fill_opacity) + .attr('stroke', (ellipse) => ellipse.stroke) + .attr('stroke-width', (ellipse) => ellipse.stroke_width) + .attr('stroke-dasharray', (ellipse) => this.qtDasharrayFixer.fix(ellipse.stroke_dasharray)) + .attr('cx', (ellipse) => ellipse.cx) + .attr('cy', (ellipse) => ellipse.cy) + .attr('rx', (ellipse) => ellipse.rx) + .attr('ry', (ellipse) => ellipse.ry); drawing.exit().remove(); } diff --git a/src/app/cartography/widgets/drawings/image-drawing.spec.ts b/src/app/cartography/widgets/drawings/image-drawing.spec.ts index 119d0d25..16b8e524 100644 --- a/src/app/cartography/widgets/drawings/image-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/image-drawing.spec.ts @@ -26,10 +26,7 @@ describe('ImageDrawingWidget', () => { drawing.element = image; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); diff --git a/src/app/cartography/widgets/drawings/image-drawing.ts b/src/app/cartography/widgets/drawings/image-drawing.ts index 0cf94b72..25e44700 100644 --- a/src/app/cartography/widgets/drawings/image-drawing.ts +++ b/src/app/cartography/widgets/drawings/image-drawing.ts @@ -12,17 +12,14 @@ export class ImageDrawingWidget implements DrawingShapeWidget { return d.element && d.element instanceof ImageElement ? [d.element] : []; }); - const drawing_enter = drawing - .enter() - .append('image') - .attr('class', 'image_element noselect'); + const drawing_enter = drawing.enter().append('image').attr('class', 'image_element noselect'); const merge = drawing.merge(drawing_enter); merge .attr('xlink:href', (image: ImageElement) => image.data) - .attr('width', image => image.width) - .attr('height', image => image.height); + .attr('width', (image) => image.width) + .attr('height', (image) => image.height); drawing.exit().remove(); } diff --git a/src/app/cartography/widgets/drawings/line-drawing.spec.ts b/src/app/cartography/widgets/drawings/line-drawing.spec.ts index 32f673a6..c0b9e6a7 100644 --- a/src/app/cartography/widgets/drawings/line-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/line-drawing.spec.ts @@ -31,10 +31,7 @@ describe('LineDrawingWidget', () => { drawing.element = line; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); diff --git a/src/app/cartography/widgets/drawings/line-drawing.ts b/src/app/cartography/widgets/drawings/line-drawing.ts index c642d9c8..f56ad918 100644 --- a/src/app/cartography/widgets/drawings/line-drawing.ts +++ b/src/app/cartography/widgets/drawings/line-drawing.ts @@ -15,31 +15,22 @@ export class LineDrawingWidget implements DrawingShapeWidget { return d.element && d.element instanceof LineElement ? [d.element] : []; }); - drawing - .enter() - .append('circle') - .attr('class', 'right'); + drawing.enter().append('circle').attr('class', 'right'); - drawing - .enter() - .append('circle') - .attr('class', 'left'); + drawing.enter().append('circle').attr('class', 'left'); - const drawing_enter = drawing - .enter() - .append('line') - .attr('class', 'line_element noselect'); + const drawing_enter = drawing.enter().append('line').attr('class', 'line_element noselect'); const merge = drawing.merge(drawing_enter); merge - .attr('stroke', line => line.stroke) - .attr('stroke-width', line => line.stroke_width) - .attr('stroke-dasharray', line => this.qtDasharrayFixer.fix(line.stroke_dasharray)) - .attr('x1', line => line.x1) - .attr('x2', line => line.x2) - .attr('y1', line => line.y1) - .attr('y2', line => line.y2); + .attr('stroke', (line) => line.stroke) + .attr('stroke-width', (line) => line.stroke_width) + .attr('stroke-dasharray', (line) => this.qtDasharrayFixer.fix(line.stroke_dasharray)) + .attr('x1', (line) => line.x1) + .attr('x2', (line) => line.x2) + .attr('y1', (line) => line.y1) + .attr('y2', (line) => line.y2); drawing.exit().remove(); } diff --git a/src/app/cartography/widgets/drawings/rect-drawing.spec.ts b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts index 2e14ad1b..eaf3a043 100644 --- a/src/app/cartography/widgets/drawings/rect-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts @@ -31,10 +31,7 @@ describe('RectDrawingWidget', () => { drawing.element = rect; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); diff --git a/src/app/cartography/widgets/drawings/rect-drawing.ts b/src/app/cartography/widgets/drawings/rect-drawing.ts index 1661d1c1..1153cfb0 100644 --- a/src/app/cartography/widgets/drawings/rect-drawing.ts +++ b/src/app/cartography/widgets/drawings/rect-drawing.ts @@ -15,41 +15,26 @@ export class RectDrawingWidget implements DrawingShapeWidget { return d.element && d.element instanceof RectElement ? [d.element] : []; }); - drawing - .enter() - .append('line') - .attr('class', 'top'); + drawing.enter().append('line').attr('class', 'top'); - drawing - .enter() - .append('line') - .attr('class', 'bottom'); + drawing.enter().append('line').attr('class', 'bottom'); - drawing - .enter() - .append('line') - .attr('class', 'right'); + drawing.enter().append('line').attr('class', 'right'); - drawing - .enter() - .append('line') - .attr('class', 'left'); + drawing.enter().append('line').attr('class', 'left'); - const drawing_enter = drawing - .enter() - .append('rect') - .attr('class', 'rect_element noselect'); + const drawing_enter = drawing.enter().append('rect').attr('class', 'rect_element noselect'); const merge = drawing.merge(drawing_enter); merge - .attr('fill', rect => rect.fill) - .attr('fill-opacity', rect => rect.fill_opacity) - .attr('stroke', rect => rect.stroke) - .attr('stroke-width', rect => rect.stroke_width) - .attr('stroke-dasharray', rect => this.qtDasharrayFixer.fix(rect.stroke_dasharray)) - .attr('width', rect => rect.width) - .attr('height', rect => rect.height); + .attr('fill', (rect) => rect.fill) + .attr('fill-opacity', (rect) => rect.fill_opacity) + .attr('stroke', (rect) => rect.stroke) + .attr('stroke-width', (rect) => rect.stroke_width) + .attr('stroke-dasharray', (rect) => this.qtDasharrayFixer.fix(rect.stroke_dasharray)) + .attr('width', (rect) => rect.width) + .attr('height', (rect) => rect.height); drawing.exit().remove(); } diff --git a/src/app/cartography/widgets/drawings/text-drawing.spec.ts b/src/app/cartography/widgets/drawings/text-drawing.spec.ts index 3425b36d..57f907c1 100644 --- a/src/app/cartography/widgets/drawings/text-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/text-drawing.spec.ts @@ -32,10 +32,7 @@ describe('TextDrawingWidget', () => { drawing.element = text; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); @@ -55,10 +52,7 @@ describe('TextDrawingWidget', () => { drawing.element = text; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); @@ -81,10 +75,7 @@ describe('TextDrawingWidget', () => { drawing.element = text; const drawings = svg.canvas.selectAll('g.drawing').data([drawing]); - const drawings_enter = drawings - .enter() - .append('g') - .classed('drawing', true); + const drawings_enter = drawings.enter().append('g').classed('drawing', true); const drawings_merge = drawings.merge(drawings_enter); widget.draw(drawings_merge); diff --git a/src/app/cartography/widgets/drawings/text-drawing.ts b/src/app/cartography/widgets/drawings/text-drawing.ts index 09bac88c..f72902eb 100644 --- a/src/app/cartography/widgets/drawings/text-drawing.ts +++ b/src/app/cartography/widgets/drawings/text-drawing.ts @@ -18,10 +18,7 @@ export class TextDrawingWidget implements DrawingShapeWidget { return d.element && d.element instanceof TextElement ? [d.element] : []; }); - const drawing_enter = drawing - .enter() - .append('text') - .attr('class', 'text_element noselect'); + const drawing_enter = drawing.enter().append('text').attr('class', 'text_element noselect'); const merge = drawing.merge(drawing_enter); merge @@ -40,8 +37,8 @@ export class TextDrawingWidget implements DrawingShapeWidget { } return styles.join('; '); }) - .attr('fill', text => text.fill) - .attr('text-decoration', text => text.text_decoration); + .attr('fill', (text) => text.fill) + .attr('text-decoration', (text) => text.text_decoration); const lines = merge.selectAll('tspan').data((text: TextElement) => { return text.text.split(/\r?\n/); @@ -52,14 +49,14 @@ export class TextDrawingWidget implements DrawingShapeWidget { const lines_merge = lines.merge(lines_enter); lines_merge - .text(line => line) + .text((line) => line) .attr('xml:space', 'preserve') .attr('x', 0) .attr('dy', (line, i) => (i === 0 ? '0em' : '1.4em')); lines.exit().remove(); - merge.attr('transform', function(this: SVGTextElement) { + merge.attr('transform', function (this: SVGTextElement) { // SVG calculates y pos by the /bottom/ of the first tspan, hence we need to make some // approx and make it matching to GUI const tspan = select(this).selectAll('tspan'); diff --git a/src/app/cartography/widgets/graph-layout.ts b/src/app/cartography/widgets/graph-layout.ts index ab100626..eeb86e55 100644 --- a/src/app/cartography/widgets/graph-layout.ts +++ b/src/app/cartography/widgets/graph-layout.ts @@ -33,10 +33,7 @@ export class GraphLayout implements Widget { } connect(view: SVGSelection, context: Context) { - this.drawingLineTool.connect( - view, - context - ); + this.drawingLineTool.connect(view, context); } draw(view: SVGSelection, context: Context) { @@ -44,10 +41,7 @@ export class GraphLayout implements Widget { const canvas = view.selectAll('g.canvas').data([context]); - const canvasEnter = canvas - .enter() - .append('g') - .attr('class', 'canvas'); + const canvasEnter = canvas.enter().append('g').attr('class', 'canvas'); canvas.merge(canvasEnter).attr('transform', (ctx: Context) => { const xTrans = ctx.getZeroZeroTransformationPoint().x + ctx.transformation.x; diff --git a/src/app/cartography/widgets/interface-label.spec.ts b/src/app/cartography/widgets/interface-label.spec.ts index 180f25aa..453b5aac 100644 --- a/src/app/cartography/widgets/interface-label.spec.ts +++ b/src/app/cartography/widgets/interface-label.spec.ts @@ -58,10 +58,7 @@ describe('InterfaceLabelsWidget', () => { const linksSelection = svg.canvas.selectAll('g.link').data(links); - linksEnter = linksSelection - .enter() - .append('g') - .attr('class', 'link'); + linksEnter = linksSelection.enter().append('g').attr('class', 'link'); linksSelection.exit().remove(); diff --git a/src/app/cartography/widgets/interface-label.ts b/src/app/cartography/widgets/interface-label.ts index 7adcb0e2..d72d155e 100644 --- a/src/app/cartography/widgets/interface-label.ts +++ b/src/app/cartography/widgets/interface-label.ts @@ -36,7 +36,10 @@ export class InterfaceLabelWidget { const link_node_position = selection .selectAll('g.link_node_position') - .data((link: MapLink) => [[link.source, link.nodes[0]], [link.target, link.nodes[1]]]); + .data((link: MapLink) => [ + [link.source, link.nodes[0]], + [link.target, link.nodes[1]], + ]); const enter_link_node_position = link_node_position .enter() @@ -58,10 +61,7 @@ export class InterfaceLabelWidget { return []; }); - const enter = labels - .enter() - .append('g') - .classed('interface_label_container', true); + const enter = labels.enter().append('g').classed('interface_label_container', true); // create surrounding rect enter.append('rect').attr('class', 'interface_label_selection'); @@ -72,12 +72,10 @@ export class InterfaceLabelWidget { .attr('class', 'interface_label noselect') .attr('interface_label_id', (i: MapLinkNode) => `${i.id}`); - const merge = labels - .merge(enter) - .on('contextmenu', (n: MapLinkNode, i: number) => { - event.preventDefault(); - self.onContextMenu.emit(new InterfaceLabelContextMenu(event, n)); - }); + const merge = labels.merge(enter).on('contextmenu', (n: MapLinkNode, i: number) => { + event.preventDefault(); + self.onContextMenu.emit(new InterfaceLabelContextMenu(event, n)); + }); // update label merge @@ -102,7 +100,7 @@ export class InterfaceLabelWidget { .attr('stroke-dasharray', '3,3') .attr('stroke-width', '0.5') .attr('fill', 'none') - .each(function(this: SVGRectElement, l: MapLinkNode) { + .each(function (this: SVGRectElement, l: MapLinkNode) { const current = select(this); const textLabel = merge.select(`text[interface_label_id="${l.id}"]`); const bbox = textLabel.node().getBBox(); diff --git a/src/app/cartography/widgets/interface-status.ts b/src/app/cartography/widgets/interface-status.ts index 7bd3e47c..6298a47a 100644 --- a/src/app/cartography/widgets/interface-status.ts +++ b/src/app/cartography/widgets/interface-status.ts @@ -10,11 +10,9 @@ import { MapSettingsService } from '../../services/mapsettings.service'; @Injectable() export class InterfaceStatusWidget implements Widget { - private mapSettingsService: MapSettingsService + private mapSettingsService: MapSettingsService; - constructor( - private _mapSettingsService: MapSettingsService - ) { + constructor(private _mapSettingsService: MapSettingsService) { this.mapSettingsService = _mapSettingsService; } @@ -22,22 +20,24 @@ export class InterfaceStatusWidget implements Widget { const self = this; let mapLinks: MapLink[] = []; - view.each(function(this: SVGGElement, l: MapLink) { + view.each(function (this: SVGGElement, l: MapLink) { mapLinks.push(l); }); - mapLinks.forEach(mapLink => { - mapLinks.forEach(n => { - if (n.nodes[0].linkId !== mapLink.nodes[0].linkId){ - if ((mapLink.nodes[0].nodeId === n.nodes[0].nodeId && mapLink.nodes[1].nodeId === n.nodes[1].nodeId) || - (mapLink.nodes[0].nodeId === n.nodes[1].nodeId && mapLink.nodes[1].nodeId === n.nodes[0].nodeId) || - (mapLink.nodes[1].nodeId === n.nodes[0].nodeId && mapLink.nodes[0].nodeId === n.nodes[1].nodeId)) { + mapLinks.forEach((mapLink) => { + mapLinks.forEach((n) => { + if (n.nodes[0].linkId !== mapLink.nodes[0].linkId) { + if ( + (mapLink.nodes[0].nodeId === n.nodes[0].nodeId && mapLink.nodes[1].nodeId === n.nodes[1].nodeId) || + (mapLink.nodes[0].nodeId === n.nodes[1].nodeId && mapLink.nodes[1].nodeId === n.nodes[0].nodeId) || + (mapLink.nodes[1].nodeId === n.nodes[0].nodeId && mapLink.nodes[0].nodeId === n.nodes[1].nodeId) + ) { mapLink.isMultiplied = true; } } }); }); - view.each(function(this: SVGGElement, l: MapLink) { + view.each(function (this: SVGGElement, l: MapLink) { const link_group = select(this); const link_path = link_group.select('path'); @@ -48,37 +48,42 @@ export class InterfaceStatusWidget implements Widget { if (link_path.node().getTotalLength() > 2 * 45 + 130) { if (l.source && l.target) { - let sourcePort = l.nodes.find(node => node.nodeId === l.source.id).label.text; - let destinationPort = l.nodes.find(node => node.nodeId === l.target.id).label.text; + let sourcePort = l.nodes.find((node) => node.nodeId === l.source.id).label.text; + let destinationPort = l.nodes.find((node) => node.nodeId === l.target.id).label.text; statuses = [ - new LinkStatus(start_point.x, start_point.y, (l.capturing && l.suspend) ? 'suspended' : l.source.status, sourcePort), - new LinkStatus(end_point.x, end_point.y, (l.capturing && l.suspend) ? 'suspended' : l.target.status, destinationPort) + new LinkStatus( + start_point.x, + start_point.y, + l.capturing && l.suspend ? 'suspended' : l.source.status, + sourcePort + ), + new LinkStatus( + end_point.x, + end_point.y, + l.capturing && l.suspend ? 'suspended' : l.target.status, + destinationPort + ), ]; } } } - link_group - .selectAll('circle.status_started').remove(); - link_group - .selectAll('circle.status_stopped').remove(); - link_group - .selectAll('circle.status_suspended').remove(); + link_group.selectAll('circle.status_started').remove(); + link_group.selectAll('circle.status_stopped').remove(); + link_group.selectAll('circle.status_suspended').remove(); - link_group - .selectAll('rect.status_started').remove(); - link_group - .selectAll('text.status_started_label').remove(); - link_group - .selectAll('rect.status_stopped').remove(); - link_group - .selectAll('text.status_stopped_label').remove(); - link_group - .selectAll('rect.status_suspended').remove(); - link_group - .selectAll('text.status_suspended_label').remove(); + link_group.selectAll('rect.status_started').remove(); + link_group.selectAll('text.status_started_label').remove(); + link_group.selectAll('rect.status_stopped').remove(); + link_group.selectAll('text.status_stopped_label').remove(); + link_group.selectAll('rect.status_suspended').remove(); + link_group.selectAll('text.status_suspended_label').remove(); - if (self.mapSettingsService.showInterfaceLabels && self.mapSettingsService.integrateLinkLabelsToLinks && !l.isMultiplied) { + if ( + self.mapSettingsService.showInterfaceLabels && + self.mapSettingsService.integrateLinkLabelsToLinks && + !l.isMultiplied + ) { const status_started = link_group .selectAll('rect.status_started') .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'started')); @@ -87,7 +92,7 @@ export class InterfaceStatusWidget implements Widget { .merge(status_started_enter) .attr('class', 'status_started') .attr('width', (ls: LinkStatus) => { - return (ls.port.length * 8) + 10; + return ls.port.length * 8 + 10; }) .attr('height', 20) .attr('x', (ls: LinkStatus) => ls.x - 30) @@ -110,7 +115,7 @@ export class InterfaceStatusWidget implements Widget { .attr('y', (ls: LinkStatus) => ls.y + 5) .attr('fill', `black`); status_started_label.exit().remove(); - + const status_stopped = link_group .selectAll('rect.status_stopped') .data(statuses.filter((link_status: LinkStatus) => link_status.status === 'stopped')); @@ -119,7 +124,7 @@ export class InterfaceStatusWidget implements Widget { .merge(status_stopped_enter) .attr('class', 'status_stopped') .attr('width', (ls: LinkStatus) => { - return (ls.port.length * 8) + 10; + return ls.port.length * 8 + 10; }) .attr('height', 20) .attr('x', (ls: LinkStatus) => ls.x - 30) @@ -151,7 +156,7 @@ export class InterfaceStatusWidget implements Widget { .merge(status_suspended_enter) .attr('class', 'status_suspended') .attr('width', (ls: LinkStatus) => { - return (ls.port.length * 8) + 10; + return ls.port.length * 8 + 10; }) .attr('height', 20) .attr('x', (ls: LinkStatus) => ls.x - 30) diff --git a/src/app/cartography/widgets/label.ts b/src/app/cartography/widgets/label.ts index ca9794ef..90d6865f 100644 --- a/src/app/cartography/widgets/label.ts +++ b/src/app/cartography/widgets/label.ts @@ -43,12 +43,10 @@ export class LabelWidget implements Widget { .attr('class', 'label_container') .attr('label_id', (label: MapLabel) => label.id); - const merge = label_view - .merge(label_enter) - .on('contextmenu', (n: MapLabel, i: number) => { - event.preventDefault(); - self.onContextMenu.emit(new LabelContextMenu(event, n)); - }); + const merge = label_view.merge(label_enter).on('contextmenu', (n: MapLabel, i: number) => { + event.preventDefault(); + self.onContextMenu.emit(new LabelContextMenu(event, n)); + }); this.drawLabel(merge); @@ -60,20 +58,16 @@ export class LabelWidget implements Widget { } private drawLabel(view: SVGSelection) { - const label_body = view.selectAll('g.label_body').data(label => [label]); + const label_body = view.selectAll('g.label_body').data((label) => [label]); - const label_body_enter = label_body - .enter() - .append('g') - .attr('class', 'label_body'); + const label_body_enter = label_body.enter().append('g').attr('class', 'label_body'); // add label of node label_body_enter.append('text').attr('class', 'label'); label_body_enter.append('rect').attr('class', 'label_selection'); - const label_body_merge = label_body - .merge(label_body_enter); + const label_body_merge = label_body.merge(label_body_enter); label_body_merge .select('text.label') @@ -93,13 +87,13 @@ export class LabelWidget implements Widget { label_body_merge .select('rect.label_selection') .attr('visibility', (l: MapLabel) => { - return (this.selectionManager.isSelected(l) ? 'visible' : 'hidden') + return this.selectionManager.isSelected(l) ? 'visible' : 'hidden'; }) .attr('stroke', 'black') .attr('stroke-dasharray', '3,3') .attr('stroke-width', '0.5') .attr('fill', 'none') - .each(function(this: SVGRectElement, label: MapLabel) { + .each(function (this: SVGRectElement, label: MapLabel) { const current = select(this); const textLabel = label_body_merge.select(`text[label_id="${label.id}"]`); const bbox = textLabel.node().getBBox(); diff --git a/src/app/cartography/widgets/layers.ts b/src/app/cartography/widgets/layers.ts index f706db96..5ab26601 100644 --- a/src/app/cartography/widgets/layers.ts +++ b/src/app/cartography/widgets/layers.ts @@ -21,10 +21,7 @@ export class LayersWidget implements Widget { return layer.index.toString(); }); - const layers_enter = layers_selection - .enter() - .append('g') - .attr('class', 'layer'); + const layers_enter = layers_selection.enter().append('g').attr('class', 'layer'); // add container for links layers_enter.append('g').attr('class', 'links'); diff --git a/src/app/cartography/widgets/link.ts b/src/app/cartography/widgets/link.ts index 6deee822..08e93abd 100644 --- a/src/app/cartography/widgets/link.ts +++ b/src/app/cartography/widgets/link.ts @@ -26,53 +26,71 @@ export class LinkWidget implements Widget { ) {} public draw(view: SVGSelection) { - const link_body = view.selectAll('g.link_body').data(l => [l]); + const link_body = view.selectAll('g.link_body').data((l) => [l]); - const link_body_enter = link_body - .enter() - .append('g') - .attr('class', 'link_body'); + const link_body_enter = link_body.enter().append('g').attr('class', 'link_body'); - const link_body_merge = link_body.merge(link_body_enter).attr('transform', link => { + const link_body_merge = link_body.merge(link_body_enter).attr('transform', (link) => { const translation = this.multiLinkCalculatorHelper.linkTranslation(link.distance, link.source, link.target); return `translate (${translation.dx}, ${translation.dy})`; }); link_body.select('.capture-icon').remove(); link_body - .filter(l => { return l.capturing && !l.suspend && !(l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .filter((l) => { + return ( + l.capturing && + !l.suspend && + !(l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss) + ); + }) .append('g') .on('contextmenu', (datum: MapLink) => { const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, datum)); }) .attr('class', 'capture-icon') - .attr('transform', link => { - return `translate (${(link.source.x + link.target.x)/2 + 24}, ${(link.source.y + link.target.y)/2 + 24}) scale(0.5)` + .attr('transform', (link) => { + return `translate (${(link.source.x + link.target.x) / 2 + 24}, ${ + (link.source.y + link.target.y) / 2 + 24 + }) scale(0.5)`; }) .attr('viewBox', '0 0 20 20') - .append('image') - .attr("xlink:href", "assets/resources/images/inspect.svg"); + .append('image') + .attr('xlink:href', 'assets/resources/images/inspect.svg'); link_body.select('.filter-capture-icon').remove(); link_body - .filter(l => { return l.capturing && !l.suspend && (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .filter((l) => { + return ( + l.capturing && + !l.suspend && + (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss) + ); + }) .append('g') .on('contextmenu', (datum: MapLink) => { const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, datum)); }) .attr('class', 'filter-capture-icon') - .attr('transform', link => { - return `translate (${(link.source.x + link.target.x)/2 + 24}, ${(link.source.y + link.target.y)/2 + 24}) scale(0.5)` + .attr('transform', (link) => { + return `translate (${(link.source.x + link.target.x) / 2 + 24}, ${ + (link.source.y + link.target.y) / 2 + 24 + }) scale(0.5)`; }) .attr('viewBox', '0 0 20 20') - .append('image') - .attr("xlink:href", "assets/resources/images/filter-capture.svg"); + .append('image') + .attr('xlink:href', 'assets/resources/images/filter-capture.svg'); link_body.select('.filter-icon').remove(); link_body - .filter(l => { return !l.capturing && (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .filter((l) => { + return ( + !l.capturing && + (l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss) + ); + }) .append('g') .on('contextmenu', (datum: MapLink) => { const evt = event; @@ -81,30 +99,40 @@ export class LinkWidget implements Widget { .attr('class', 'filter-icon') .attr('width', '48px') .attr('height', '48px') - .attr('transform', link => { - return `translate (${(link.source.x + link.target.x)/2 + 24}, ${(link.source.y + link.target.y)/2 + 24}) scale(0.5)` + .attr('transform', (link) => { + return `translate (${(link.source.x + link.target.x) / 2 + 24}, ${ + (link.source.y + link.target.y) / 2 + 24 + }) scale(0.5)`; }) .attr('viewBox', '0 0 20 20') - .append('image') - .attr('width', '48px') - .attr('height', '48px') - .attr("xlink:href", "assets/resources/images/filter.svg"); + .append('image') + .attr('width', '48px') + .attr('height', '48px') + .attr('xlink:href', 'assets/resources/images/filter.svg'); link_body.select('.pause-icon').remove(); link_body - .filter(l => { return l.capturing && l.suspend && !(l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss)}) + .filter((l) => { + return ( + l.capturing && + l.suspend && + !(l.filters.bpf || l.filters.corrupt || l.filters.delay || l.filters.frequency_drop || l.filters.packet_loss) + ); + }) .append('g') .on('contextmenu', (datum: MapLink) => { const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, datum)); }) .attr('class', 'pause-icon') - .attr('transform', link => { - return `translate (${(link.source.x + link.target.x)/2 + 24}, ${(link.source.y + link.target.y)/2 + 24}) scale(0.5)` + .attr('transform', (link) => { + return `translate (${(link.source.x + link.target.x) / 2 + 24}, ${ + (link.source.y + link.target.y) / 2 + 24 + }) scale(0.5)`; }) .attr('viewBox', '0 0 20 20') - .append('image') - .attr("xlink:href", "assets/resources/images/pause.svg"); + .append('image') + .attr('xlink:href', 'assets/resources/images/pause.svg'); this.serialLinkWidget.draw(link_body_merge); this.ethernetLinkWidget.draw(link_body_merge); diff --git a/src/app/cartography/widgets/links.spec.ts b/src/app/cartography/widgets/links.spec.ts index 1b8c3e72..9c408529 100644 --- a/src/app/cartography/widgets/links.spec.ts +++ b/src/app/cartography/widgets/links.spec.ts @@ -46,10 +46,7 @@ describe('LinksWidget', () => { const layersSelection = svg.canvas.selectAll('g.layer').data(layers); - layersEnter = layersSelection - .enter() - .append('g') - .attr('class', 'layer'); + layersEnter = layersSelection.enter().append('g').attr('class', 'layer'); layersSelection.exit().remove(); }); diff --git a/src/app/cartography/widgets/links/ethernet-link.ts b/src/app/cartography/widgets/links/ethernet-link.ts index d453b149..e841da5f 100644 --- a/src/app/cartography/widgets/links/ethernet-link.ts +++ b/src/app/cartography/widgets/links/ethernet-link.ts @@ -9,11 +9,12 @@ class EthernetLinkPath { constructor(public source: [number, number], public target: [number, number]) {} } -@Injectable() export class EthernetLinkWidget implements Widget { +@Injectable() +export class EthernetLinkWidget implements Widget { public onContextMenu = new EventEmitter(); constructor() {} - + private linktoEthernetLink(link: MapLink) { return new EthernetLinkPath( [link.source.x + link.source.width / 2, link.source.y + link.source.height / 2], @@ -22,7 +23,7 @@ class EthernetLinkPath { } public draw(view: SVGSelection) { - const link = view.selectAll('path.ethernet_link').data(l => { + const link = view.selectAll('path.ethernet_link').data((l) => { if (l.linkType === 'ethernet') { return [this.linktoEthernetLink(l)]; } @@ -34,7 +35,7 @@ class EthernetLinkPath { .append('path') .attr('class', 'ethernet_link') .on('contextmenu', (datum) => { - let link: MapLink = datum as unknown as MapLink; + let link: MapLink = (datum as unknown) as MapLink; const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, link)); }); @@ -43,14 +44,14 @@ class EthernetLinkPath { .attr('stroke', '#000') .attr('stroke-width', '2') .on('contextmenu', (datum) => { - let link: MapLink = datum as unknown as MapLink; + let link: MapLink = (datum as unknown) as MapLink; const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, link)); }); const link_merge = link.merge(link_enter); - link_merge.attr('d', ethernet => { + link_merge.attr('d', (ethernet) => { const line_generator = path(); line_generator.moveTo(ethernet.source[0], ethernet.source[1]); line_generator.lineTo(ethernet.target[0], ethernet.target[1]); diff --git a/src/app/cartography/widgets/links/serial-link.ts b/src/app/cartography/widgets/links/serial-link.ts index cd6d26c9..d87fd035 100644 --- a/src/app/cartography/widgets/links/serial-link.ts +++ b/src/app/cartography/widgets/links/serial-link.ts @@ -15,19 +15,20 @@ class SerialLinkPath { ) {} } -@Injectable() export class SerialLinkWidget implements Widget { +@Injectable() +export class SerialLinkWidget implements Widget { public onContextMenu = new EventEmitter(); constructor() {} - + private linkToSerialLink(link: MapLink) { const source = { x: link.source.x + link.source.width / 2, - y: link.source.y + link.source.height / 2 + y: link.source.y + link.source.height / 2, }; const target = { x: link.target.x + link.target.width / 2, - y: link.target.y + link.target.height / 2 + y: link.target.y + link.target.height / 2, }; const dx = target.x - source.x; @@ -39,19 +40,19 @@ class SerialLinkPath { const angle_source: [number, number] = [ source.x + dx / 2.0 + 15 * vect_rot[0], - source.y + dy / 2.0 + 15 * vect_rot[1] + source.y + dy / 2.0 + 15 * vect_rot[1], ]; const angle_target: [number, number] = [ target.x - dx / 2.0 - 15 * vect_rot[0], - target.y - dy / 2.0 - 15 * vect_rot[1] + target.y - dy / 2.0 - 15 * vect_rot[1], ]; return new SerialLinkPath([source.x, source.y], angle_source, angle_target, [target.x, target.y]); } public draw(view: SVGSelection) { - const link = view.selectAll('path.serial_link').data(l => { + const link = view.selectAll('path.serial_link').data((l) => { if (l.linkType === 'serial') { return [this.linkToSerialLink(l)]; } @@ -63,19 +64,16 @@ class SerialLinkPath { .append('path') .attr('class', 'serial_link') .on('contextmenu', (datum) => { - let link: MapLink = datum as unknown as MapLink; + let link: MapLink = (datum as unknown) as MapLink; const evt = event; this.onContextMenu.emit(new LinkContextMenu(evt, link)); }); - link_enter - .attr('stroke', '#B22222') - .attr('fill', 'none') - .attr('stroke-width', '2'); + link_enter.attr('stroke', '#B22222').attr('fill', 'none').attr('stroke-width', '2'); const link_merge = link.merge(link_enter); - link_merge.attr('d', serial => { + link_merge.attr('d', (serial) => { const line_generator = path(); line_generator.moveTo(serial.source[0], serial.source[1]); line_generator.lineTo(serial.source_angle[0], serial.source_angle[1]); diff --git a/src/app/cartography/widgets/node.spec.ts b/src/app/cartography/widgets/node.spec.ts index 2f09f543..e10cb21d 100644 --- a/src/app/cartography/widgets/node.spec.ts +++ b/src/app/cartography/widgets/node.spec.ts @@ -42,7 +42,7 @@ describe('NodesWidget', () => { relatedTarget: drewNode, screenY: 1024, screenX: 1024, - view: window + view: window, }) ); diff --git a/src/app/cartography/widgets/node.ts b/src/app/cartography/widgets/node.ts index 52aee990..aff5a477 100644 --- a/src/app/cartography/widgets/node.ts +++ b/src/app/cartography/widgets/node.ts @@ -29,12 +29,9 @@ export class NodeWidget implements Widget { public draw(view: SVGSelection) { const self = this; - const node_body = view.selectAll('g.node_body').data(n => [n]); + const node_body = view.selectAll('g.node_body').data((n) => [n]); - const node_body_enter = node_body - .enter() - .append('g') - .attr('class', 'node_body'); + const node_body_enter = node_body.enter().append('g').attr('class', 'node_body'); node_body_enter.append('image'); @@ -52,8 +49,8 @@ export class NodeWidget implements Widget { .attr('class', 'layer_label_wrapper') .attr('width', '26') .attr('height', '26') - .attr('x', (n: MapNode) => n.width/2 - 13) - .attr('y', (n: MapNode) => n.height/2 - 13) + .attr('x', (n: MapNode) => n.width / 2 - 13) + .attr('y', (n: MapNode) => n.height / 2 - 13) .attr('fill', 'red'); } @@ -62,13 +59,15 @@ export class NodeWidget implements Widget { node_body_merge .append('text') .attr('class', 'layer_label') - .text((n: MapNode) => { return n.z}) - .attr('x', function(n: MapNode) { - if(n.z >= 100 ) return n.width/2 - 13 - else if(n.z >= 10 ) return n.width/2 - 9 - else return n.width/2 - 5 + .text((n: MapNode) => { + return n.z; }) - .attr('y', (n: MapNode) => n.height/2 + 5) + .attr('x', function (n: MapNode) { + if (n.z >= 100) return n.width / 2 - 13; + else if (n.z >= 10) return n.width / 2 - 9; + else return n.width / 2 - 5; + }) + .attr('y', (n: MapNode) => n.height / 2 + 5) .attr('style', () => { const styles: string[] = []; styles.push(`font-family: "Noto Sans"`); @@ -82,11 +81,11 @@ export class NodeWidget implements Widget { // update image of node node_body_merge .select('image') - .on('contextmenu', function(n: MapNode, i: number) { + .on('contextmenu', function (n: MapNode, i: number) { event.preventDefault(); self.onContextMenu.emit(new NodeContextMenu(event, n)); }) - .on('dblclick', function(n: MapNode, i: number) { + .on('dblclick', function (n: MapNode, i: number) { event.preventDefault(); self.onContextConsoleMenu.emit(new NodeContextMenu(event, n)); }) @@ -100,20 +99,20 @@ export class NodeWidget implements Widget { return n.height; }) .attr('x', (n: MapNode) => { - return 0 + return 0; }) .attr('y', (n: MapNode) => { - return 0 + return 0; }) - .on('mouseover', function(this, n: MapNode) { + .on('mouseover', function (this, n: MapNode) { select(this).attr('class', 'over'); }) - .on('mouseout', function(this, n: MapNode) { + .on('mouseout', function (this, n: MapNode) { select(this).attr('class', ''); }); node_body_merge.attr('transform', (n: MapNode) => { - if (!n.width) return `translate(${n.x - 30},${n.y - 30})` + if (!n.width) return `translate(${n.x - 30},${n.y - 30})`; return `translate(${n.x},${n.y})`; }); diff --git a/src/app/common/error-handlers/sentry-error-handler.ts b/src/app/common/error-handlers/sentry-error-handler.ts index 4644a117..1b2410a2 100644 --- a/src/app/common/error-handlers/sentry-error-handler.ts +++ b/src/app/common/error-handlers/sentry-error-handler.ts @@ -1,15 +1,15 @@ -import { BrowserModule } from "@angular/platform-browser"; -import { NgModule, ErrorHandler, Injectable, Injector, Inject } from "@angular/core"; -import { HttpErrorResponse } from "@angular/common/http"; +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule, ErrorHandler, Injectable, Injector, Inject } from '@angular/core'; +import { HttpErrorResponse } from '@angular/common/http'; -import { environment } from "../../../environments/environment"; -import { AppComponent } from "../../app.component"; +import { environment } from '../../../environments/environment'; +import { AppComponent } from '../../app.component'; -import * as Sentry from "@sentry/browser"; +import * as Sentry from '@sentry/browser'; import { BrowserOptions, init } from '@sentry/browser'; const config = { - dsn: "https://d8be3a98530f49eb90968ff396db326c@o19455.ingest.sentry.io/842726" + dsn: 'https://d8be3a98530f49eb90968ff396db326c@o19455.ingest.sentry.io/842726', }; init(config as BrowserOptions); @@ -25,7 +25,7 @@ export class SentryErrorHandler implements ErrorHandler { } // We can handle messages and Error objects directly. - if (typeof error === "string" || error instanceof Error) { + if (typeof error === 'string' || error instanceof Error) { return error; } @@ -42,7 +42,7 @@ export class SentryErrorHandler implements ErrorHandler { } // ...or the request body itself, which we can use as a message instead. - if (typeof error.error === "string") { + if (typeof error.error === 'string') { return `Server returned code ${error.status} with body "${error.error}"`; } @@ -55,7 +55,7 @@ export class SentryErrorHandler implements ErrorHandler { } handleError(error) { - let extractedError = this.extractError(error) || "Handled unknown error"; + let extractedError = this.extractError(error) || 'Handled unknown error'; // Capture handled exception and send it to Sentry. const eventId = Sentry.captureException(extractedError); diff --git a/src/app/common/error-handlers/toaster-error-handler.spec.ts b/src/app/common/error-handlers/toaster-error-handler.spec.ts index 9876b5d2..3e4d40ee 100644 --- a/src/app/common/error-handlers/toaster-error-handler.spec.ts +++ b/src/app/common/error-handlers/toaster-error-handler.spec.ts @@ -24,8 +24,8 @@ describe('ToasterErrorHandler', () => { { provide: ToasterService, useClass: MockedToasterService }, { provide: SettingsService, useClass: MockedSettingsService }, SentryErrorHandler, - ToasterErrorHandler - ] + ToasterErrorHandler, + ], }); handler = new MockedToasterErrorHandler(TestBed.get(Injector)); diff --git a/src/app/common/error-handlers/toaster-error-handler.ts b/src/app/common/error-handlers/toaster-error-handler.ts index 2cba24e2..7f3ccae8 100644 --- a/src/app/common/error-handlers/toaster-error-handler.ts +++ b/src/app/common/error-handlers/toaster-error-handler.ts @@ -1,16 +1,20 @@ import { ToasterService } from '../../services/toaster.service'; -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { SentryErrorHandler } from './sentry-error-handler'; @Injectable() export class ToasterErrorHandler extends SentryErrorHandler { handleError(err: any): void { - if (err.error && err.error.status && !(err.error.status === 400 || err.error.status === 403 || err.error.status === 404 || err.error.status === 409)) { + if ( + err.error && + err.error.status && + !(err.error.status === 400 || err.error.status === 403 || err.error.status === 404 || err.error.status === 409) + ) { super.handleError(err); } if (!err) return; - + const toasterService = this.injector.get(ToasterService); if (err.error && err.error.message) { toasterService.error(err.error.message); diff --git a/src/app/common/progress-dialog/progress-dialog.component.spec.ts b/src/app/common/progress-dialog/progress-dialog.component.spec.ts index c1694de4..081b5f53 100644 --- a/src/app/common/progress-dialog/progress-dialog.component.spec.ts +++ b/src/app/common/progress-dialog/progress-dialog.component.spec.ts @@ -8,7 +8,7 @@ describe('ProgressDialogComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ProgressDialogComponent] + declarations: [ProgressDialogComponent], }).compileComponents(); })); diff --git a/src/app/common/progress-dialog/progress-dialog.component.ts b/src/app/common/progress-dialog/progress-dialog.component.ts index 099907c7..4852d92d 100644 --- a/src/app/common/progress-dialog/progress-dialog.component.ts +++ b/src/app/common/progress-dialog/progress-dialog.component.ts @@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; @Component({ selector: 'app-progress-dialog', templateUrl: './progress-dialog.component.html', - styleUrls: ['./progress-dialog.component.scss'] + styleUrls: ['./progress-dialog.component.scss'], }) export class ProgressDialogComponent implements OnInit { public static CANCELLED: 'canceled'; diff --git a/src/app/common/progress-dialog/progress-dialog.service.spec.ts b/src/app/common/progress-dialog/progress-dialog.service.spec.ts index 20348669..d530a49e 100644 --- a/src/app/common/progress-dialog/progress-dialog.service.spec.ts +++ b/src/app/common/progress-dialog/progress-dialog.service.spec.ts @@ -5,7 +5,7 @@ import { ProgressDialogService } from './progress-dialog.service'; describe('ProgressDialogService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ProgressDialogService] + providers: [ProgressDialogService], }); }); diff --git a/src/app/common/progress-dialog/progress-dialog.service.ts b/src/app/common/progress-dialog/progress-dialog.service.ts index 925f5217..1454cc14 100644 --- a/src/app/common/progress-dialog/progress-dialog.service.ts +++ b/src/app/common/progress-dialog/progress-dialog.service.ts @@ -10,7 +10,7 @@ export class ProgressDialogService { const ref = this.dialog.open(ProgressDialogComponent, { width: '250px', autoFocus: false, - disableClose: true + disableClose: true, }); return ref; } diff --git a/src/app/common/progress/progress.component.html b/src/app/common/progress/progress.component.html index 9f5aede6..c2e641e6 100644 --- a/src/app/common/progress/progress.component.html +++ b/src/app/common/progress/progress.component.html @@ -4,8 +4,12 @@
error_outline
Error occurred: {{ error.message }}
- - + +
diff --git a/src/app/common/progress/progress.component.spec.ts b/src/app/common/progress/progress.component.spec.ts index b56fe900..7649964c 100644 --- a/src/app/common/progress/progress.component.spec.ts +++ b/src/app/common/progress/progress.component.spec.ts @@ -28,7 +28,7 @@ describe('ProgressComponent', () => { TestBed.configureTestingModule({ imports: [RouterTestingModule, MatProgressSpinnerModule, MatIconModule], providers: [ProgressService, { provide: Router, useValue: router }], - declarations: [ProgressComponent] + declarations: [ProgressComponent], }).compileComponents(); progressService = TestBed.get(ProgressService); @@ -59,7 +59,7 @@ describe('ProgressComponent', () => { }); it('should set error state when error defined', () => { - const error = {error: 'test'}; + const error = { error: 'test' }; progressService.setError(error); expect(component.error).toEqual(error.error); }); @@ -75,7 +75,7 @@ describe('ProgressComponent', () => { expect(progressService.clear).toHaveBeenCalled(); }); - it("should reload page after clicking refresh", () => { + it('should reload page after clicking refresh', () => { spyOn(router, 'navigateByUrl'); component.refresh(); diff --git a/src/app/common/progress/progress.component.ts b/src/app/common/progress/progress.component.ts index b9ce8f91..d6fada6e 100644 --- a/src/app/common/progress/progress.component.ts +++ b/src/app/common/progress/progress.component.ts @@ -6,7 +6,7 @@ import { Subscription } from 'rxjs'; @Component({ selector: 'app-progress', templateUrl: './progress.component.html', - styleUrls: ['./progress.component.scss'] + styleUrls: ['./progress.component.scss'], }) export class ProgressComponent implements OnInit, OnDestroy { visible = false; @@ -16,7 +16,7 @@ export class ProgressComponent implements OnInit, OnDestroy { constructor(private progressService: ProgressService, private router: Router) {} ngOnInit() { - this.progressService.state.subscribe(state => { + this.progressService.state.subscribe((state) => { this.visible = state.visible; // only set error state once; ignore next "correct" states diff --git a/src/app/common/progress/progress.service.spec.ts b/src/app/common/progress/progress.service.spec.ts index 23a76f08..52a714a9 100644 --- a/src/app/common/progress/progress.service.spec.ts +++ b/src/app/common/progress/progress.service.spec.ts @@ -7,7 +7,7 @@ describe('ProgressService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ProgressService] + providers: [ProgressService], }); progressService = TestBed.get(ProgressService); @@ -30,7 +30,7 @@ describe('ProgressService', () => { }); it('should propagate event on error', () => { - const error = {error: 'Error'}; + const error = { error: 'Error' }; progressService.setError(error); expect(progressService.state.next).toHaveBeenCalledWith(new State(false, error.error)); }); diff --git a/src/app/components/adbutler/adbutler.component.html b/src/app/components/adbutler/adbutler.component.html index 709874a7..7a714376 100644 --- a/src/app/components/adbutler/adbutler.component.html +++ b/src/app/components/adbutler/adbutler.component.html @@ -1,11 +1,11 @@ -
-
- - {{ adBody }} - - -
- close +
+
+ + {{ adBody }} + + +
+ close
diff --git a/src/app/components/adbutler/adbutler.component.scss b/src/app/components/adbutler/adbutler.component.scss index cc71b0b8..932aa606 100644 --- a/src/app/components/adbutler/adbutler.component.scss +++ b/src/app/components/adbutler/adbutler.component.scss @@ -12,27 +12,27 @@ } .adInnerContainer { - margin: auto; - text-align: center; + margin: auto; + text-align: center; } .adBody { - padding-right: 16px; + padding-right: 16px; } .close-button { - position: absolute; - top: 15px; - right: 15px; - color: #000 !important; + position: absolute; + top: 15px; + right: 15px; + color: #000 !important; } .lightTheme { - background-color: #ddf9ff; + background-color: #ddf9ff; } .hidden { - visibility: hidden; + visibility: hidden; } button { diff --git a/src/app/components/adbutler/adbutler.component.spec.ts b/src/app/components/adbutler/adbutler.component.spec.ts index 1aa8070f..2e66cd83 100644 --- a/src/app/components/adbutler/adbutler.component.spec.ts +++ b/src/app/components/adbutler/adbutler.component.spec.ts @@ -8,9 +8,8 @@ xdescribe('AdbutlerComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AdbutlerComponent ] - }) - .compileComponents(); + declarations: [AdbutlerComponent], + }).compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/adbutler/adbutler.component.ts b/src/app/components/adbutler/adbutler.component.ts index f1bc7058..e2e7797d 100644 --- a/src/app/components/adbutler/adbutler.component.ts +++ b/src/app/components/adbutler/adbutler.component.ts @@ -6,62 +6,61 @@ import { AdButlerResponse } from '../../models/adbutler'; const adButlerResponseBodyRegex: RegExp = /(.*)<\/a>(.*)\s* - +

Help

+
+
+ + + + Useful shortcuts + + + ctrl + + to zoom in + ctrl + - to zoom out + ctrl + 0 to reset zoom + ctrl + h to hide toolbar + ctrl + a to select all items on map + ctrl + shift + a to deselect all items on map + ctrl + shift + s to go to preferences + + + + + Third party components + +
+ + + + Release notes + +
+ +
+ + +
diff --git a/src/app/components/help/help.component.scss b/src/app/components/help/help.component.scss index c2f6270d..d6a023a9 100644 --- a/src/app/components/help/help.component.scss +++ b/src/app/components/help/help.component.scss @@ -1,4 +1,4 @@ .full-width { - width: 50%; - margin-top: 20px; + width: 50%; + margin-top: 20px; } diff --git a/src/app/components/help/help.component.ts b/src/app/components/help/help.component.ts index 512a9d21..ceee8fea 100644 --- a/src/app/components/help/help.component.ts +++ b/src/app/components/help/help.component.ts @@ -2,32 +2,30 @@ import { Component, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http'; @Component({ -selector: 'app-help', -templateUrl: './help.component.html', -styleUrls: ['./help.component.scss'] + selector: 'app-help', + templateUrl: './help.component.html', + styleUrls: ['./help.component.scss'], }) export class HelpComponent implements OnInit { - thirdpartylicenses = ''; - releasenotes = ''; + thirdpartylicenses = ''; + releasenotes = ''; - constructor( - private httpClient: HttpClient - ) {} + constructor(private httpClient: HttpClient) {} - ngOnInit() { - this.httpClient.get(window.location.href + '/3rdpartylicenses.txt', {responseType: 'text'}) - .subscribe(data => { - this.thirdpartylicenses = data.replace(new RegExp('\n', 'g'), "
") - }, - error => { - if (error.status === 404) { - this.thirdpartylicenses = 'File not found'; - } - }); + ngOnInit() { + this.httpClient.get(window.location.href + '/3rdpartylicenses.txt', { responseType: 'text' }).subscribe( + (data) => { + this.thirdpartylicenses = data.replace(new RegExp('\n', 'g'), '
'); + }, + (error) => { + if (error.status === 404) { + this.thirdpartylicenses = 'File not found'; + } + } + ); - this.httpClient.get('ReleaseNotes.txt', {responseType: 'text'}) - .subscribe(data => { - this.releasenotes = data.replace(new RegExp('\n', 'g'), "
") - }); - } + this.httpClient.get('ReleaseNotes.txt', { responseType: 'text' }).subscribe((data) => { + this.releasenotes = data.replace(new RegExp('\n', 'g'), '
'); + }); + } } diff --git a/src/app/components/installed-software/install-software/install-software.component.html b/src/app/components/installed-software/install-software/install-software.component.html index dba60bbf..d6140ef6 100644 --- a/src/app/components/installed-software/install-software/install-software.component.html +++ b/src/app/components/installed-software/install-software/install-software.component.html @@ -1,3 +1,3 @@ \ No newline at end of file + diff --git a/src/app/components/installed-software/install-software/install-software.component.spec.ts b/src/app/components/installed-software/install-software/install-software.component.spec.ts index 33f9e4df..48dc892f 100644 --- a/src/app/components/installed-software/install-software/install-software.component.spec.ts +++ b/src/app/components/installed-software/install-software/install-software.component.spec.ts @@ -8,9 +8,8 @@ describe('InstallSoftwareComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ InstallSoftwareComponent ] - }) - .compileComponents(); + declarations: [InstallSoftwareComponent], + }).compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/installed-software/install-software/install-software.component.ts b/src/app/components/installed-software/install-software/install-software.component.ts index 88733ada..ce9da63c 100644 --- a/src/app/components/installed-software/install-software/install-software.component.ts +++ b/src/app/components/installed-software/install-software/install-software.component.ts @@ -4,7 +4,7 @@ import { ElectronService } from 'ngx-electron'; @Component({ selector: 'app-install-software', templateUrl: './install-software.component.html', - styleUrls: ['./install-software.component.scss'] + styleUrls: ['./install-software.component.scss'], }) export class InstallSoftwareComponent implements OnInit, OnDestroy, OnChanges { @Input('software') @@ -12,14 +12,12 @@ export class InstallSoftwareComponent implements OnInit, OnDestroy, OnChanges { @Output() installedChanged = new EventEmitter(); - + public disabled = false; public readyToInstall = true; public buttonText: string; - constructor( - private electronService: ElectronService - ) { } + constructor(private electronService: ElectronService) {} ngOnInit() { this.electronService.ipcRenderer.on(this.responseChannel, (event, data) => { @@ -38,7 +36,7 @@ export class InstallSoftwareComponent implements OnInit, OnDestroy, OnChanges { install() { this.disabled = true; - this.buttonText = "Installing"; + this.buttonText = 'Installing'; this.electronService.ipcRenderer.send('installed-software-install', this.software); } @@ -50,10 +48,9 @@ export class InstallSoftwareComponent implements OnInit, OnDestroy, OnChanges { this.disabled = this.software.installed; if (this.software.installed) { - this.buttonText = "Installed"; - } - else { - this.buttonText = "Install"; + this.buttonText = 'Installed'; + } else { + this.buttonText = 'Install'; } } } diff --git a/src/app/components/installed-software/installed-software.component.html b/src/app/components/installed-software/installed-software.component.html index f81d01e4..1cd1f121 100644 --- a/src/app/components/installed-software/installed-software.component.html +++ b/src/app/components/installed-software/installed-software.component.html @@ -1,36 +1,37 @@
-
-

Installed software

-
-
-
- - - - Name - - - {{ row.name }} - +
+

Installed software

+
+
+
+ + + Name + + + {{ row.name }} + - - - - - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + +
- \ No newline at end of file +
diff --git a/src/app/components/installed-software/installed-software.component.spec.ts b/src/app/components/installed-software/installed-software.component.spec.ts index c52bc58a..736df6da 100644 --- a/src/app/components/installed-software/installed-software.component.spec.ts +++ b/src/app/components/installed-software/installed-software.component.spec.ts @@ -8,9 +8,8 @@ describe('InstalledSoftwareComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ InstalledSoftwareComponent ] - }) - .compileComponents(); + declarations: [InstalledSoftwareComponent], + }).compileComponents(); })); beforeEach(() => { diff --git a/src/app/components/installed-software/installed-software.component.ts b/src/app/components/installed-software/installed-software.component.ts index 8ebdb4b0..27915788 100644 --- a/src/app/components/installed-software/installed-software.component.ts +++ b/src/app/components/installed-software/installed-software.component.ts @@ -6,7 +6,7 @@ import { Observable, of, BehaviorSubject } from 'rxjs'; @Component({ selector: 'app-installed-software', templateUrl: './installed-software.component.html', - styleUrls: ['./installed-software.component.scss'] + styleUrls: ['./installed-software.component.scss'], }) export class InstalledSoftwareComponent implements OnInit { dataSource: InstalledSoftwareDataSource; @@ -15,7 +15,7 @@ export class InstalledSoftwareComponent implements OnInit { constructor( private installedSoftwareService: InstalledSoftwareService, private changeDetectorRef: ChangeDetectorRef - ) { } + ) {} ngOnInit() { this.dataSource = new InstalledSoftwareDataSource(this.installedSoftwareService); @@ -32,7 +32,7 @@ export class InstalledSoftwareComponent implements OnInit { } } -export class InstalledSoftwareDataSource extends DataSource { +export class InstalledSoftwareDataSource extends DataSource { installed = new BehaviorSubject([]); constructor(private installedSoftwareService: InstalledSoftwareService) { @@ -49,9 +49,8 @@ export class InstalledSoftwareDataSource extends DataSource { refresh() { let installedSoftware = this.installedSoftwareService.list(); installedSoftware.push({ - type: 'adbutler' + type: 'adbutler', }); this.installed.next(installedSoftware); } - } diff --git a/src/app/components/page-not-found/page-not-found.component.html b/src/app/components/page-not-found/page-not-found.component.html index 0c777606..d4b33a2d 100644 --- a/src/app/components/page-not-found/page-not-found.component.html +++ b/src/app/components/page-not-found/page-not-found.component.html @@ -1,6 +1,7 @@
-
-

404 Page not found

- -
+
+
+

404 Page not found

+ +
diff --git a/src/app/components/page-not-found/page-not-found.component.scss b/src/app/components/page-not-found/page-not-found.component.scss index b3dfebed..cc26754b 100644 --- a/src/app/components/page-not-found/page-not-found.component.scss +++ b/src/app/components/page-not-found/page-not-found.component.scss @@ -1,3 +1,3 @@ div { - text-align: center + text-align: center; } diff --git a/src/app/components/page-not-found/page-not-found.component.ts b/src/app/components/page-not-found/page-not-found.component.ts index ec0871c7..db812fa7 100644 --- a/src/app/components/page-not-found/page-not-found.component.ts +++ b/src/app/components/page-not-found/page-not-found.component.ts @@ -1,10 +1,10 @@ import { Component } from '@angular/core'; @Component({ - selector: 'app-page-not-found', - templateUrl: './page-not-found.component.html', - styleUrls: ['./page-not-found.component.scss'] + selector: 'app-page-not-found', + templateUrl: './page-not-found.component.html', + styleUrls: ['./page-not-found.component.scss'], }) export class PageNotFoundComponent { - constructor(){} + constructor() {} } diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.html b/src/app/components/preferences/built-in/built-in-preferences.component.html index 06e03fd3..04a5bb21 100644 --- a/src/app/components/preferences/built-in/built-in-preferences.component.html +++ b/src/app/components/preferences/built-in/built-in-preferences.component.html @@ -1,23 +1,23 @@
-
-
-

Built-in preferences

- -
+
+
+

Built-in preferences

+
-
-
- - - Ethernet hubs - - - Ethernet switches - - - Cloud nodes - - -
+
+
+
+ + + Ethernet hubs + + + Ethernet switches + + Cloud nodes +
+
diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.spec.ts b/src/app/components/preferences/built-in/built-in-preferences.component.spec.ts index 13db5332..8e8e78bf 100644 --- a/src/app/components/preferences/built-in/built-in-preferences.component.spec.ts +++ b/src/app/components/preferences/built-in/built-in-preferences.component.spec.ts @@ -12,36 +12,43 @@ import { MockedActivatedRoute } from '../preferences.component.spec'; import { BuiltInPreferencesComponent } from './built-in-preferences.component'; describe('BuiltInPreferencesComponent', () => { - let component: BuiltInPreferencesComponent; - let fixture: ComponentFixture; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - } - ], - declarations: [ - BuiltInPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(BuiltInPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + let component: BuiltInPreferencesComponent; + let fixture: ComponentFixture; + let activatedRoute = new MockedActivatedRoute().get(); - it('should set correct server id', () => { - expect(component.serverId).toBe('1'); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + ], + declarations: [BuiltInPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BuiltInPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set correct server id', () => { + expect(component.serverId).toBe('1'); + }); }); diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.ts b/src/app/components/preferences/built-in/built-in-preferences.component.ts index c4701b8c..7749d54f 100644 --- a/src/app/components/preferences/built-in/built-in-preferences.component.ts +++ b/src/app/components/preferences/built-in/built-in-preferences.component.ts @@ -1,20 +1,17 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - @Component({ - selector: 'app-built-in-preferences', - templateUrl: './built-in-preferences.component.html', - styleUrls: ['./built-in-preferences.component.scss', '../preferences.component.scss'] + selector: 'app-built-in-preferences', + templateUrl: './built-in-preferences.component.html', + styleUrls: ['./built-in-preferences.component.scss', '../preferences.component.scss'], }) export class BuiltInPreferencesComponent implements OnInit { - public serverId: string = ""; + public serverId: string = ''; - constructor( - private route: ActivatedRoute - ) {} + constructor(private route: ActivatedRoute) {} - ngOnInit() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - } + ngOnInit() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + } } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html index 2b0518f9..89cf0f0c 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html @@ -1,25 +1,33 @@
-
-
-

New cloud node template

-
+
+
+

New cloud node template

-
- - - Run the cloud node locally - Run the cloud node on the GNS3 VM - +
+
+ + + Run the cloud node locally + Run the cloud node on the GNS3 VM + -
- - - -
- -
- - -
+
+ + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts index b756b06a..e9713ccb 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts @@ -21,82 +21,82 @@ import { ToasterService } from '../../../../../services/toaster.service'; import { TemplateMocksService } from '../../../../../services/template-mocks.service'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ComputeService } from '../../../../../services/compute.service'; -import {MockedComputeService} from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec' +import { MockedComputeService } from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec'; export class MockedBuiltInTemplatesService { - public addTemplate(server: Server, cloudTemplate: CloudTemplate) { - return of(cloudTemplate); - } + public addTemplate(server: Server, cloudTemplate: CloudTemplate) { + return of(cloudTemplate); + } } describe('CloudNodesAddTemplateComponent', () => { - let component: CloudNodesAddTemplateComponent; - let fixture: ComponentFixture; + let component: CloudNodesAddTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let mockedComputeService = new MockedComputeService(); - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/builtin/cloud-nodes', component: CloudNodesAddTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: ComputeService, useValue: mockedComputeService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - CloudNodesAddTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let mockedComputeService = new MockedComputeService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(CloudNodesAddTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/builtin/cloud-nodes', component: CloudNodesAddTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: ComputeService, useValue: mockedComputeService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [CloudNodesAddTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(CloudNodesAddTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); - component.templateName = "sample name"; - component.server = {id: 1} as Server; - component.formGroup.controls['templateName'].setValue('template name'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); + component.templateName = 'sample name'; + component.server = { id: 1 } as Server; + component.formGroup.controls['templateName'].setValue('template name'); - expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); - spyOn(mockedToasterService, 'error'); - component.templateName = ""; - component.server = {id: 1} as Server; + expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); + spyOn(mockedToasterService, 'error'); + component.templateName = ''; + component.server = { id: 1 } as Server; - expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts index 05a4592a..913338bc 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -11,78 +11,77 @@ import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms' import { ComputeService } from '../../../../../services/compute.service'; import { Compute } from '../../../../../models/compute'; - @Component({ - selector: 'app-cloud-nodes-add-template', - templateUrl: './cloud-nodes-add-template.component.html', - styleUrls: ['./cloud-nodes-add-template.component.scss', '../../../preferences.component.scss'] + selector: 'app-cloud-nodes-add-template', + templateUrl: './cloud-nodes-add-template.component.html', + styleUrls: ['./cloud-nodes-add-template.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesAddTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - formGroup: FormGroup; + server: Server; + templateName: string = ''; + formGroup: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private router: Router, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private formBuilder: FormBuilder, - private computeService: ComputeService - ) { - this.formGroup = this.formBuilder.group({ - templateName: new FormControl('', Validators.required) - }); + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private router: Router, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private formBuilder: FormBuilder, + private computeService: ComputeService + ) { + this.formGroup = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']); + } - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']); - } - - addTemplate() { - if (!this.formGroup.invalid) { - let cloudTemplate: CloudTemplate; - - this.templateMocksService.getCloudNodeTemplate().subscribe((template: CloudTemplate) => { - cloudTemplate = template; - }); - - cloudTemplate.template_id = uuid(); - cloudTemplate.name = this.formGroup.get('templateName').value; - cloudTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - this.builtInTemplatesService.addTemplate(this.server, cloudTemplate).subscribe((cloudNodeTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + addTemplate() { + if (!this.formGroup.invalid) { + let cloudTemplate: CloudTemplate; + + this.templateMocksService.getCloudNodeTemplate().subscribe((template: CloudTemplate) => { + cloudTemplate = template; + }); + + cloudTemplate.template_id = uuid(); + cloudTemplate.name = this.formGroup.get('templateName').value; + cloudTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + this.builtInTemplatesService.addTemplate(this.server, cloudTemplate).subscribe((cloudNodeTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html index 41c50b26..7dbf5e78 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html @@ -1,173 +1,146 @@ -
-
-
-

Cloud configuration

-
+
+
+
+

Cloud configuration

-
- - - - - General - - - - - - - - - - - -

- - - - {{category[0]}} - - - - - - - {{type}} - - - - - - - - - - - - - - - - - Ethernet interfaces - - -
-
{{port.name}}


-
- - - - {{type}} - - - - - - - - - TAP interfaces - - -
-
{{port.name}}


-
- - - - - - - - - UDP tunnels - - - - - - - - - - - - - - - - - + +
+ + + + General + + + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + {{ type }} + + + + + + + + + + + + + + + + Ethernet interfaces + +
+
{{ port.name }}
+

+
+ + + + {{ type }} + + + + + + + + TAP interfaces + +
+
{{ port.name }}
+

+
+ + + + + + + + UDP tunnels + +
Name {{element.name}} Local port {{element.rport}} Type {{element.rhost}}
+ + + + - - - - - - - -
Name{{ element.name }} Remote port {{element.lport}}
-
- - - - - - - - - - - - - - - -
- -
-
+ + Local port + {{ element.rport }} + + + + Type + {{ element.rhost }} + + + + Remote port + {{ element.lport }} + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+
- + diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts index 8e41e319..f11e70bb 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts @@ -23,59 +23,69 @@ import { BuiltInTemplatesService } from '../../../../../services/built-in-templa import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; export class MockedBuiltInTemplatesService { - public getTemplate(server: Server, template_id: string) { - return of({ports_mapping: []} as CloudTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({ ports_mapping: [] } as CloudTemplate); + } - public saveTemplate(server: Server, cloudTemplate: CloudTemplate) { - return of(cloudTemplate); - } + public saveTemplate(server: Server, cloudTemplate: CloudTemplate) { + return of(cloudTemplate); + } } describe('CloudNodesTemplateDetailsComponent', () => { - let component: CloudNodesTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: CloudNodesTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService } - ], - declarations: [ - CloudNodesTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(CloudNodesTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, + ], + declarations: [CloudNodesTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(CloudNodesTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as CloudTemplate)); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.cloudNodeTemplate = {ports_mapping: []} as CloudTemplate; - component.onSave(); + it('should call save template', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as CloudTemplate)); - expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); - }); + component.cloudNodeTemplate = { ports_mapping: [] } as CloudTemplate; + component.onSave(); + + expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts index 7705c46b..c4ec22d3 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; import { Server } from '../../../../../models/server'; @@ -8,124 +8,124 @@ import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; - @Component({ - selector: 'app-cloud-nodes-template-details', - templateUrl: './cloud-nodes-template-details.component.html', - styleUrls: ['./cloud-nodes-template-details.component.scss', '../../../preferences.component.scss'] + selector: 'app-cloud-nodes-template-details', + templateUrl: './cloud-nodes-template-details.component.html', + styleUrls: ['./cloud-nodes-template-details.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesTemplateDetailsComponent implements OnInit { - server: Server; - cloudNodeTemplate: CloudTemplate; + server: Server; + cloudNodeTemplate: CloudTemplate; - isSymbolSelectionOpened: boolean = false; + isSymbolSelectionOpened: boolean = false; - categories = []; - consoleTypes: string[] = []; + categories = []; + consoleTypes: string[] = []; - tapInterface: string = ''; - ethernetInterface: string = ''; - ethernetInterfaces: string[] = ['Ethernet 2', 'Ethernet 3']; - portsMappingEthernet: PortsMappingEntity[] = []; - portsMappingTap: PortsMappingEntity[] = []; - portsMappingUdp: PortsMappingEntity[] = []; - newPort: PortsMappingEntity; - displayedColumns: string[] = ['name', 'lport', 'rhost', 'rport']; - dataSourceUdp: PortsMappingEntity[] = []; + tapInterface: string = ''; + ethernetInterface: string = ''; + ethernetInterfaces: string[] = ['Ethernet 2', 'Ethernet 3']; + portsMappingEthernet: PortsMappingEntity[] = []; + portsMappingTap: PortsMappingEntity[] = []; + portsMappingUdp: PortsMappingEntity[] = []; + newPort: PortsMappingEntity; + displayedColumns: string[] = ['name', 'lport', 'rhost', 'rport']; + dataSourceUdp: PortsMappingEntity[] = []; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private toasterService: ToasterService, - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, - private router: Router - ) { - this.newPort = { - name: '', - port_number: 0, - }; - } + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private toasterService: ToasterService, + private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, + private router: Router + ) { + this.newPort = { + name: '', + port_number: 0, + }; + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; - this.getConfiguration(); - this.builtInTemplatesService.getTemplate(this.server, template_id).subscribe((cloudNodeTemplate: CloudTemplate) => { - this.cloudNodeTemplate = cloudNodeTemplate; + this.getConfiguration(); + this.builtInTemplatesService + .getTemplate(this.server, template_id) + .subscribe((cloudNodeTemplate: CloudTemplate) => { + this.cloudNodeTemplate = cloudNodeTemplate; - this.portsMappingEthernet = this.cloudNodeTemplate.ports_mapping - .filter((elem) => elem.type === 'ethernet'); + this.portsMappingEthernet = this.cloudNodeTemplate.ports_mapping.filter((elem) => elem.type === 'ethernet'); - this.portsMappingTap = this.cloudNodeTemplate.ports_mapping - .filter((elem) => elem.type === 'tap'); - - this.portsMappingUdp = this.cloudNodeTemplate.ports_mapping - .filter((elem) => elem.type === 'udp'); - - this.dataSourceUdp = this.portsMappingUdp; - }); + this.portsMappingTap = this.cloudNodeTemplate.ports_mapping.filter((elem) => elem.type === 'tap'); + + this.portsMappingUdp = this.cloudNodeTemplate.ports_mapping.filter((elem) => elem.type === 'udp'); + + this.dataSourceUdp = this.portsMappingUdp; }); - } + }); + } - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']); - } + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'cloud-nodes']); + } - getConfiguration() { - this.categories = this.builtInTemplatesConfigurationService.getCategoriesForCloudNodes(); - this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForCloudNodes(); - } + getConfiguration() { + this.categories = this.builtInTemplatesConfigurationService.getCategoriesForCloudNodes(); + this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForCloudNodes(); + } - onAddEthernetInterface() { - if (this.ethernetInterface) { - this.portsMappingEthernet.push({ - interface: this.ethernetInterface, - name: this.ethernetInterface, - port_number: 0, - type: "ethernet" - }); - } + onAddEthernetInterface() { + if (this.ethernetInterface) { + this.portsMappingEthernet.push({ + interface: this.ethernetInterface, + name: this.ethernetInterface, + port_number: 0, + type: 'ethernet', + }); } + } - onAddTapInterface() { - if (this.tapInterface) { - this.portsMappingTap.push({ - interface: this.tapInterface, - name: this.tapInterface, - port_number: 0, - type: "tap" - }); - } + onAddTapInterface() { + if (this.tapInterface) { + this.portsMappingTap.push({ + interface: this.tapInterface, + name: this.tapInterface, + port_number: 0, + type: 'tap', + }); } + } - onAddUdpInterface() { - this.portsMappingUdp.push(this.newPort); - this.dataSourceUdp = [...this.portsMappingUdp]; - - this.newPort = { - name: '', - port_number: 0, - }; - } + onAddUdpInterface() { + this.portsMappingUdp.push(this.newPort); + this.dataSourceUdp = [...this.portsMappingUdp]; - onSave() { - this.cloudNodeTemplate.ports_mapping = [...this.portsMappingEthernet, ...this.portsMappingTap]; + this.newPort = { + name: '', + port_number: 0, + }; + } - this.builtInTemplatesService.saveTemplate(this.server, this.cloudNodeTemplate).subscribe((cloudNodeTemplate: CloudTemplate) => { - this.toasterService.success("Changes saved"); - }); - } + onSave() { + this.cloudNodeTemplate.ports_mapping = [...this.portsMappingEthernet, ...this.portsMappingTap]; - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } + this.builtInTemplatesService + .saveTemplate(this.server, this.cloudNodeTemplate) + .subscribe((cloudNodeTemplate: CloudTemplate) => { + this.toasterService.success('Changes saved'); + }); + } - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.cloudNodeTemplate.symbol = chosenSymbol; - } + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } + + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.cloudNodeTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html index 1fa88847..22cfab26 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html @@ -1,32 +1,46 @@
-
-
-

Cloud nodes templates

- - -
+
+
+

Cloud nodes templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts index b70defc0..956e44ae 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts @@ -18,43 +18,50 @@ import { CloudNodesTemplatesComponent } from './cloud-nodes-templates.component' import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; export class MockedBuiltInTemplatesService { - public getTemplates(server: Server) { - return of([{} as CloudTemplate]); - } + public getTemplates(server: Server) { + return of([{} as CloudTemplate]); + } } describe('CloudNodesTemplatesComponent', () => { - let component: CloudNodesTemplatesComponent; - let fixture: ComponentFixture; + let component: CloudNodesTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService } - ], - declarations: [ - CloudNodesTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(CloudNodesTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + ], + declarations: [CloudNodesTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(CloudNodesTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts index 7efc602c..35c9ea78 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -6,42 +6,41 @@ import { BuiltInTemplatesService } from '../../../../../services/built-in-templa import { CloudTemplate } from '../../../../../models/templates/cloud-template'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; - @Component({ - selector: 'app-cloud-nodes-templates', - templateUrl: './cloud-nodes-templates.component.html', - styleUrls: ['./cloud-nodes-templates.component.scss', '../../../preferences.component.scss'] + selector: 'app-cloud-nodes-templates', + templateUrl: './cloud-nodes-templates.component.html', + styleUrls: ['./cloud-nodes-templates.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesTemplatesComponent implements OnInit { - server: Server; - cloudNodesTemplates: CloudTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + cloudNodesTemplates: CloudTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.builtInTemplatesService.getTemplates(this.server).subscribe((cloudNodesTemplates: CloudTemplate[]) => { - this.cloudNodesTemplates = cloudNodesTemplates.filter((elem) => elem.template_type === "cloud" && !elem.builtin); - }); - } + getTemplates() { + this.builtInTemplatesService.getTemplates(this.server).subscribe((cloudNodesTemplates: CloudTemplate[]) => { + this.cloudNodesTemplates = cloudNodesTemplates.filter((elem) => elem.template_type === 'cloud' && !elem.builtin); + }); + } - deleteTemplate(template: CloudTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: CloudTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html index 599d2221..0e90b602 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html @@ -1,28 +1,36 @@
-
-
-

New Ethernet hub template

-
+
+
+

New Ethernet hub template

-
- - - Run the Ethernet Hub locally - Run the Ethernet Hub on the GNS3 VM - +
+
+ + + Run the Ethernet Hub locally + Run the Ethernet Hub on the GNS3 VM + -
- - - - - - -
- -
- - -
+
+ + + + + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts index 9cc2d8ff..d3e74b84 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts @@ -21,97 +21,98 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { EthernetHubsAddTemplateComponent } from './ethernet-hubs-add-template.component'; import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { ComputeService } from '../../../../../services/compute.service'; -import {MockedComputeService} from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec'; +import { MockedComputeService } from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec'; export class MockedBuiltInTemplatesService { - public addTemplate(server: Server, ethernetHubTemplate: EthernetHubTemplate) { - return of(ethernetHubTemplate); - } + public addTemplate(server: Server, ethernetHubTemplate: EthernetHubTemplate) { + return of(ethernetHubTemplate); + } } describe('EthernetHubsAddTemplateComponent', () => { - let component: EthernetHubsAddTemplateComponent; - let fixture: ComponentFixture; + let component: EthernetHubsAddTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let mockedComputeService = new MockedComputeService(); - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/builtin/ethernet-hubs', component: EthernetHubsAddTemplateComponent}]) - ], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: ComputeService, useValue: mockedComputeService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - EthernetHubsAddTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let mockedComputeService = new MockedComputeService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetHubsAddTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/builtin/ethernet-hubs', component: EthernetHubsAddTemplateComponent }, + ]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: ComputeService, useValue: mockedComputeService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [EthernetHubsAddTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetHubsAddTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); - component.templateName = "sample name"; - component.server = {id: 1} as Server; - component.formGroup.controls['templateName'].setValue('template name'); - component.formGroup.controls['numberOfPorts'].setValue('1'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); + component.templateName = 'sample name'; + component.server = { id: 1 } as Server; + component.formGroup.controls['templateName'].setValue('template name'); + component.formGroup.controls['numberOfPorts'].setValue('1'); - expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); - spyOn(mockedToasterService, 'error'); - component.templateName = ""; - component.server = {id: 1} as Server; + expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); + spyOn(mockedToasterService, 'error'); + component.templateName = ''; + component.server = { id: 1 } as Server; - expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when number of ports is missing', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); - spyOn(mockedToasterService, 'error'); - component.templateName = "sample name"; - component.server = {id: 1} as Server; + expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when number of ports is missing', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); + spyOn(mockedToasterService, 'error'); + component.templateName = 'sample name'; + component.server = { id: 1 } as Server; - expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts index e9a2885a..6c9fd3d0 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -11,86 +11,85 @@ import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms' import { ComputeService } from '../../../../../services/compute.service'; import { Compute } from '../../../../../models/compute'; - @Component({ - selector: 'app-ethernet-hubs-add-template', - templateUrl: './ethernet-hubs-add-template.component.html', - styleUrls: ['./ethernet-hubs-add-template.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-hubs-add-template', + templateUrl: './ethernet-hubs-add-template.component.html', + styleUrls: ['./ethernet-hubs-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsAddTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - formGroup: FormGroup; + server: Server; + templateName: string = ''; + formGroup: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private router: Router, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private formBuilder: FormBuilder, - private computeService: ComputeService - ) { - this.formGroup = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - numberOfPorts: new FormControl(8, Validators.required) + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private router: Router, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private formBuilder: FormBuilder, + private computeService: ComputeService + ) { + this.formGroup = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + numberOfPorts: new FormControl(8, Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; + } + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']); + } + + addTemplate() { + if (!this.formGroup.invalid) { + let ethernetHubTemplate: EthernetHubTemplate; + + this.templateMocksService.getEthernetHubTemplate().subscribe((template: EthernetHubTemplate) => { + ethernetHubTemplate = template; + }); + + ethernetHubTemplate.template_id = uuid(); + ethernetHubTemplate.name = this.formGroup.get('templateName').value; + ethernetHubTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + for (let i = 0; i < this.formGroup.get('numberOfPorts').value; i++) { + ethernetHubTemplate.ports_mapping.push({ + name: `Ethernet${i}`, + port_number: i, }); + } + + this.builtInTemplatesService.addTemplate(this.server, ethernetHubTemplate).subscribe(() => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']); - } - - addTemplate() { - if (!this.formGroup.invalid) { - let ethernetHubTemplate: EthernetHubTemplate; - - this.templateMocksService.getEthernetHubTemplate().subscribe((template: EthernetHubTemplate) => { - ethernetHubTemplate = template; - }); - - ethernetHubTemplate.template_id = uuid(); - ethernetHubTemplate.name = this.formGroup.get('templateName').value; - ethernetHubTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - for(let i=0; i { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } - } + } } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html index 1a75e798..b33932f2 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html @@ -1,57 +1,71 @@ -
-
-
-

Ethernet hub settings

-
+
+
+
+

Ethernet hub settings

-
- -
- - - - - - - - - -

- - - - {{category[0]}} - - - - - - -
- -
- -
-
+
+
+ +
+ + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + +
+ +
+ +
+
- + diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts index 558001a6..dc6a1ae1 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts @@ -23,102 +23,112 @@ import { EthernetHubsTemplateDetailsComponent } from './ethernet-hubs-template-d import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; export class MockedBuiltInTemplatesService { - public getTemplate(server: Server, template_id: string) { - return of({ports_mapping: []} as EthernetHubTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({ ports_mapping: [] } as EthernetHubTemplate); + } - public saveTemplate(server: Server, cloudTemplate: EthernetHubTemplate) { - return of(cloudTemplate); - } + public saveTemplate(server: Server, cloudTemplate: EthernetHubTemplate) { + return of(cloudTemplate); + } } describe('EthernetHubsTemplateDetailsComponent', () => { - let component: EthernetHubsTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: EthernetHubsTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService } - ], - declarations: [ - EthernetHubsTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetHubsTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, + ], + declarations: [EthernetHubsTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetHubsTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); - component.numberOfPorts = 2; - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetHubTemplate = {ports_mapping: []} as EthernetHubTemplate; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); + component.numberOfPorts = 2; + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetHubTemplate = { ports_mapping: [] } as EthernetHubTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when template name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); - component.numberOfPorts = 2; - component.inputForm.controls['templateName'].setValue(''); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetHubTemplate = {ports_mapping: []} as EthernetHubTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when template name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); + component.numberOfPorts = 2; + component.inputForm.controls['templateName'].setValue(''); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetHubTemplate = { ports_mapping: [] } as EthernetHubTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when default name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); - component.numberOfPorts = 2; - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue(''); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetHubTemplate = {ports_mapping: []} as EthernetHubTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when default name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); + component.numberOfPorts = 2; + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue(''); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetHubTemplate = { ports_mapping: [] } as EthernetHubTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should call save template when symbol path is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); - component.numberOfPorts = 2; - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue(''); - component.ethernetHubTemplate = {ports_mapping: []} as EthernetHubTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should call save template when symbol path is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetHubTemplate)); + component.numberOfPorts = 2; + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue(''); + component.ethernetHubTemplate = { ports_mapping: [] } as EthernetHubTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts index cf30ac85..8e07ebca 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; import { Server } from '../../../../../models/server'; @@ -8,79 +8,82 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; - @Component({ - selector: 'app-ethernet-hubs-template-details', - templateUrl: './ethernet-hubs-template-details.component.html', - styleUrls: ['./ethernet-hubs-template-details.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-hubs-template-details', + templateUrl: './ethernet-hubs-template-details.component.html', + styleUrls: ['./ethernet-hubs-template-details.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplateDetailsComponent implements OnInit { - server: Server; - ethernetHubTemplate: EthernetHubTemplate; - numberOfPorts: number; - inputForm: FormGroup; - isSymbolSelectionOpened: boolean = false; + server: Server; + ethernetHubTemplate: EthernetHubTemplate; + numberOfPorts: number; + inputForm: FormGroup; + isSymbolSelectionOpened: boolean = false; - categories = []; + categories = []; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, - private router: Router - ) { - this.inputForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, + private router: Router + ) { + this.inputForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetHubs(); + this.builtInTemplatesService + .getTemplate(this.server, template_id) + .subscribe((ethernetHubTemplate: EthernetHubTemplate) => { + this.ethernetHubTemplate = ethernetHubTemplate; + this.numberOfPorts = this.ethernetHubTemplate.ports_mapping.length; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']); + } + + onSave() { + if (this.inputForm.invalid || !this.numberOfPorts) { + this.toasterService.error(`Fill all required fields`); + } else { + this.ethernetHubTemplate.ports_mapping = []; + for (let i = 0; i < this.numberOfPorts; i++) { + this.ethernetHubTemplate.ports_mapping.push({ + name: `Ethernet${i}`, + port_number: i, + }); + } + + this.builtInTemplatesService + .saveTemplate(this.server, this.ethernetHubTemplate) + .subscribe((ethernetHubTemplate: EthernetHubTemplate) => { + this.toasterService.success('Changes saved'); }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetHubs(); - this.builtInTemplatesService.getTemplate(this.server, template_id).subscribe((ethernetHubTemplate: EthernetHubTemplate) => { - this.ethernetHubTemplate = ethernetHubTemplate; - this.numberOfPorts = this.ethernetHubTemplate.ports_mapping.length; - }); - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-hubs']); - } - - onSave() { - if (this.inputForm.invalid || ! this.numberOfPorts) { - this.toasterService.error(`Fill all required fields`); - } else { - this.ethernetHubTemplate.ports_mapping = []; - for(let i=0; i { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.ethernetHubTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.ethernetHubTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html index d7f87d39..f83b36a4 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html @@ -1,32 +1,46 @@
-
-
-

Ethernet hubs templates

- - -
+
+
+

Ethernet hubs templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts index 7deb83f9..b663bf18 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts @@ -18,43 +18,50 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { EthernetHubsTemplatesComponent } from './ethernet-hubs-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(server: Server) { - return of([{} as EthernetHubTemplate]); - } + public getTemplates(server: Server) { + return of([{} as EthernetHubTemplate]); + } } describe('EthernetHubsTemplatesComponent', () => { - let component: EthernetHubsTemplatesComponent; - let fixture: ComponentFixture; + let component: EthernetHubsTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService } - ], - declarations: [ - EthernetHubsTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetHubsTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + ], + declarations: [EthernetHubsTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetHubsTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts index 02dfd070..c3cf7f0d 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -6,42 +6,43 @@ import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hu import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; - @Component({ - selector: 'app-ethernet-hubs-templates', - templateUrl: './ethernet-hubs-templates.component.html', - styleUrls: ['./ethernet-hubs-templates.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-hubs-templates', + templateUrl: './ethernet-hubs-templates.component.html', + styleUrls: ['./ethernet-hubs-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplatesComponent implements OnInit { - server: Server; - ethernetHubsTemplates: EthernetHubTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + ethernetHubsTemplates: EthernetHubTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.builtInTemplatesService.getTemplates(this.server).subscribe((ethernetHubsTemplates: EthernetHubTemplate[]) => { - this.ethernetHubsTemplates = ethernetHubsTemplates.filter((elem) => elem.template_type === "ethernet_hub" && !elem.builtin); - }); - } - - deleteTemplate(template: EthernetHubTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + getTemplates() { + this.builtInTemplatesService.getTemplates(this.server).subscribe((ethernetHubsTemplates: EthernetHubTemplate[]) => { + this.ethernetHubsTemplates = ethernetHubsTemplates.filter( + (elem) => elem.template_type === 'ethernet_hub' && !elem.builtin + ); + }); + } - onDeleteEvent() { - this.getTemplates(); - } + deleteTemplate(template: EthernetHubTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } + + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html index 1620b6f2..ca42cf47 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html @@ -1,28 +1,36 @@
-
-
-

New Ethernet switch template

-
+
+
+

New Ethernet switch template

-
- - - Run the Ethernet switch locally - Run the Ethernet switch on the GNS3 VM - +
+
+ + + Run the Ethernet switch locally + Run the Ethernet switch on the GNS3 VM + -
- - - - - - -
- -
- - -
+
+ + + + + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts index c11f2fe7..30677e16 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts @@ -21,97 +21,98 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet import { EthernetSwitchesAddTemplateComponent } from './ethernet-switches-add-template.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ComputeService } from '../../../../../services/compute.service'; -import {MockedComputeService} from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec'; +import { MockedComputeService } from '../../../../preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec'; export class MockedBuiltInTemplatesService { - public addTemplate(server: Server, ethernetHubTemplate: EthernetSwitchTemplate) { - return of(ethernetHubTemplate); - } + public addTemplate(server: Server, ethernetHubTemplate: EthernetSwitchTemplate) { + return of(ethernetHubTemplate); + } } describe('EthernetSwitchesAddTemplateComponent', () => { - let component: EthernetSwitchesAddTemplateComponent; - let fixture: ComponentFixture; + let component: EthernetSwitchesAddTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let mockedComputeService = new MockedComputeService(); - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/builtin/ethernet-switches', component: EthernetSwitchesAddTemplateComponent}]) - ], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: ComputeService, useValue: mockedComputeService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - EthernetSwitchesAddTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let mockedComputeService = new MockedComputeService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetSwitchesAddTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/builtin/ethernet-switches', component: EthernetSwitchesAddTemplateComponent }, + ]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: ComputeService, useValue: mockedComputeService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [EthernetSwitchesAddTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetSwitchesAddTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - component.templateName = "sample name"; - component.server = {id: 1} as Server; - component.formGroup.controls['templateName'].setValue('template name'); - component.formGroup.controls['numberOfPorts'].setValue('1'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + component.templateName = 'sample name'; + component.server = { id: 1 } as Server; + component.formGroup.controls['templateName'].setValue('template name'); + component.formGroup.controls['numberOfPorts'].setValue('1'); - expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - spyOn(mockedToasterService, 'error'); - component.formGroup.controls['numberOfPorts'].setValue('1'); - component.server = {id: 1} as Server; + expect(mockedBuiltInTemplatesService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + spyOn(mockedToasterService, 'error'); + component.formGroup.controls['numberOfPorts'].setValue('1'); + component.server = { id: 1 } as Server; - expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); - xit('should not call add template when number of ports is missing', () => { - spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - spyOn(mockedToasterService, 'error'); - component.formGroup.controls['templateName'].setValue('template name'); - component.server = {id: 1} as Server; + expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); - component.addTemplate(); + xit('should not call add template when number of ports is missing', () => { + spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + spyOn(mockedToasterService, 'error'); + component.formGroup.controls['templateName'].setValue('template name'); + component.server = { id: 1 } as Server; - expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedBuiltInTemplatesService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts index 9ea693c3..97f31a00 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -11,89 +11,90 @@ import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms' import { ComputeService } from '../../../../../services/compute.service'; import { Compute } from '../../../../../models/compute'; - @Component({ - selector: 'app-ethernet-switches-add-template', - templateUrl: './ethernet-switches-add-template.component.html', - styleUrls: ['./ethernet-switches-add-template.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-switches-add-template', + templateUrl: './ethernet-switches-add-template.component.html', + styleUrls: ['./ethernet-switches-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesAddTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - formGroup: FormGroup; + server: Server; + templateName: string = ''; + formGroup: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private router: Router, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private formBuilder: FormBuilder, - private computeService: ComputeService - ) { - this.formGroup = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - numberOfPorts: new FormControl(8, Validators.required) + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private router: Router, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private formBuilder: FormBuilder, + private computeService: ComputeService + ) { + this.formGroup = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + numberOfPorts: new FormControl(8, Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; + } + } + + addTemplate() { + if (!this.formGroup.invalid) { + let ethernetSwitchTemplate: EthernetSwitchTemplate; + + this.templateMocksService.getEthernetSwitchTemplate().subscribe((template: EthernetSwitchTemplate) => { + ethernetSwitchTemplate = template; + }); + + ethernetSwitchTemplate.template_id = uuid(); + ethernetSwitchTemplate.name = this.formGroup.get('templateName').value; + ethernetSwitchTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + for (let i = 0; i < this.formGroup.get('numberOfPorts').value; i++) { + ethernetSwitchTemplate.ports_mapping.push({ + ethertype: '', + name: `Ethernet${i}`, + port_number: i, + type: 'access', + vlan: 1, }); - } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); + this.builtInTemplatesService + .addTemplate(this.server, ethernetSwitchTemplate) + .subscribe((ethernetSwitchTemplate) => { + this.goBack(); }); + } else { + this.toasterService.error(`Fill all required fields`); } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - addTemplate() { - if (!this.formGroup.invalid) { - let ethernetSwitchTemplate: EthernetSwitchTemplate; - - this.templateMocksService.getEthernetSwitchTemplate().subscribe((template: EthernetSwitchTemplate) => { - ethernetSwitchTemplate = template; - }); - - ethernetSwitchTemplate.template_id = uuid(); - ethernetSwitchTemplate.name = this.formGroup.get('templateName').value; - ethernetSwitchTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - for(let i=0; i { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } - } + } } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html index 8089383b..1de6293c 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html @@ -1,75 +1,84 @@ -
-
-
-

Ethernet switch configuration

-
+
+
+
+

Ethernet switch configuration

-
- - - - - General settings - - -
- - - - - - - - - -

- - - - {{category[0]}} - - - - - - - {{type}} - - - -
- - - - - Port settings - - - - - -
- - -
+
+
+ + + + General settings + +
+ + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + {{ type }} + + + +
+ + + + Port settings + + + + +
+ +
+
- + diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts index 3c8162c7..ccc17bb0 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts @@ -24,99 +24,109 @@ import { BuiltInTemplatesConfigurationService } from '../../../../../services/bu import { PortsComponent } from '../../../common/ports/ports.component'; export class MockedBuiltInTemplatesService { - public getTemplate(server: Server, template_id: string) { - return of({ports_mapping: []} as EthernetSwitchTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({ ports_mapping: [] } as EthernetSwitchTemplate); + } - public saveTemplate(server: Server, cloudTemplate: EthernetSwitchTemplate) { - return of(cloudTemplate); - } + public saveTemplate(server: Server, cloudTemplate: EthernetSwitchTemplate) { + return of(cloudTemplate); + } } describe('EthernetSwitchesTemplateDetailsComponent', () => { - let component: EthernetSwitchesTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: EthernetSwitchesTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService } - ], - declarations: [ - EthernetSwitchesTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetSwitchesTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: BuiltInTemplatesConfigurationService, useClass: BuiltInTemplatesConfigurationService }, + ], + declarations: [EthernetSwitchesTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetSwitchesTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - component.portsComponent = {ethernetPorts: []} as PortsComponent; - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetSwitchTemplate = {ports_mapping: []} as EthernetSwitchTemplate; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + component.portsComponent = { ethernetPorts: [] } as PortsComponent; + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetSwitchTemplate = { ports_mapping: [] } as EthernetSwitchTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when template name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - component.inputForm.controls['templateName'].setValue(''); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetSwitchTemplate = {ports_mapping: []} as EthernetSwitchTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when template name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + component.inputForm.controls['templateName'].setValue(''); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetSwitchTemplate = { ports_mapping: [] } as EthernetSwitchTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when default name is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue(''); - component.inputForm.controls['symbol'].setValue('symbol'); - component.ethernetSwitchTemplate = {ports_mapping: []} as EthernetSwitchTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when default name is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue(''); + component.inputForm.controls['symbol'].setValue('symbol'); + component.ethernetSwitchTemplate = { ports_mapping: [] } as EthernetSwitchTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when symbol path is empty', () => { - spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['symbol'].setValue(''); - component.ethernetSwitchTemplate = {ports_mapping: []} as EthernetSwitchTemplate; + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when symbol path is empty', () => { + spyOn(mockedBuiltInTemplatesService, 'saveTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['symbol'].setValue(''); + component.ethernetSwitchTemplate = { ports_mapping: [] } as EthernetSwitchTemplate; - expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedBuiltInTemplatesService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts index 290da59f..65555a32 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; import { Server } from '../../../../../models/server'; @@ -9,76 +9,79 @@ import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { PortsComponent } from '../../../common/ports/ports.component'; - @Component({ - selector: 'app-ethernet-switches-template-details', - templateUrl: './ethernet-switches-template-details.component.html', - styleUrls: ['./ethernet-switches-template-details.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-switches-template-details', + templateUrl: './ethernet-switches-template-details.component.html', + styleUrls: ['./ethernet-switches-template-details.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesTemplateDetailsComponent implements OnInit { - @ViewChild(PortsComponent) portsComponent: PortsComponent; - server: Server; - ethernetSwitchTemplate: EthernetSwitchTemplate; - inputForm: FormGroup; - isSymbolSelectionOpened: boolean = false; - categories = []; - consoleTypes: string[] = []; + @ViewChild(PortsComponent) portsComponent: PortsComponent; + server: Server; + ethernetSwitchTemplate: EthernetSwitchTemplate; + inputForm: FormGroup; + isSymbolSelectionOpened: boolean = false; + categories = []; + consoleTypes: string[] = []; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, - private router: Router - ){ - this.inputForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, + private router: Router + ) { + this.inputForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.builtInTemplatesService + .getTemplate(this.server, template_id) + .subscribe((ethernetSwitchTemplate: EthernetSwitchTemplate) => { + this.ethernetSwitchTemplate = ethernetSwitchTemplate; + }); + }); + } + + getConfiguration() { + this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetSwitches(); + this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForEthernetSwitches(); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']); + } + + onSave() { + if (this.inputForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.ethernetSwitchTemplate.ports_mapping = this.portsComponent.ethernetPorts; + this.builtInTemplatesService + .saveTemplate(this.server, this.ethernetSwitchTemplate) + .subscribe((ethernetSwitchTemplate: EthernetSwitchTemplate) => { + this.toasterService.success('Changes saved'); }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.getConfiguration(); - this.builtInTemplatesService.getTemplate(this.server, template_id).subscribe((ethernetSwitchTemplate: EthernetSwitchTemplate) => { - this.ethernetSwitchTemplate = ethernetSwitchTemplate; - }); - }); - } - - getConfiguration() { - this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetSwitches(); - this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForEthernetSwitches(); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'builtin', 'ethernet-switches']); - } - - onSave() { - if (this.inputForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.ethernetSwitchTemplate.ports_mapping = this.portsComponent.ethernetPorts; - this.builtInTemplatesService.saveTemplate(this.server, this.ethernetSwitchTemplate).subscribe((ethernetSwitchTemplate: EthernetSwitchTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.ethernetSwitchTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.ethernetSwitchTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html index 9b59ddc5..73017e63 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html @@ -1,32 +1,46 @@
-
-
-

Ethernet switches templates

- - -
+
+
+

Ethernet switches templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts index f6a088ad..c05d3ab9 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts @@ -18,43 +18,50 @@ import { EthernetSwitchesTemplatesComponent } from './ethernet-switches-template import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; export class MockedBuiltInTemplatesService { - public getTemplates(server: Server) { - return of([{} as EthernetSwitchTemplate]); - } + public getTemplates(server: Server) { + return of([{} as EthernetSwitchTemplate]); + } } describe('EthernetSwitchesTemplatesComponent', () => { - let component: EthernetSwitchesTemplatesComponent; - let fixture: ComponentFixture; + let component: EthernetSwitchesTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService } - ], - declarations: [ - EthernetSwitchesTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(EthernetSwitchesTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: BuiltInTemplatesService, useValue: mockedBuiltInTemplatesService }, + ], + declarations: [EthernetSwitchesTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(EthernetSwitchesTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts index b29092b3..cf8fe249 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../../services/server.service'; @@ -6,42 +6,45 @@ import { BuiltInTemplatesService } from '../../../../../services/built-in-templa import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template'; import { DeleteTemplateComponent } from '../../../common/delete-template-component/delete-template.component'; - @Component({ - selector: 'app-ethernet-switches-templates', - templateUrl: './ethernet-switches-templates.component.html', - styleUrls: ['./ethernet-switches-templates.component.scss', '../../../preferences.component.scss'] + selector: 'app-ethernet-switches-templates', + templateUrl: './ethernet-switches-templates.component.html', + styleUrls: ['./ethernet-switches-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesTemplatesComponent implements OnInit { - server: Server; - ethernetSwitchesTemplates: EthernetSwitchTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + ethernetSwitchesTemplates: EthernetSwitchTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private builtInTemplatesService: BuiltInTemplatesService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private builtInTemplatesService: BuiltInTemplatesService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.builtInTemplatesService.getTemplates(this.server).subscribe((ethernetSwitchesTemplates: EthernetSwitchTemplate[]) => { - this.ethernetSwitchesTemplates = ethernetSwitchesTemplates.filter((elem) => elem.template_type === "ethernet_switch" && !elem.builtin); - }); - } - - deleteTemplate(template: EthernetSwitchTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + getTemplates() { + this.builtInTemplatesService + .getTemplates(this.server) + .subscribe((ethernetSwitchesTemplates: EthernetSwitchTemplate[]) => { + this.ethernetSwitchesTemplates = ethernetSwitchesTemplates.filter( + (elem) => elem.template_type === 'ethernet_switch' && !elem.builtin + ); + }); + } - onDeleteEvent() { - this.getTemplates(); - } + deleteTemplate(template: EthernetSwitchTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } + + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html index 1a782d13..7fecbe05 100644 --- a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html +++ b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.html @@ -1,35 +1,35 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + +
Adapter number Adapter {{element.adapter_number}} Adapter numberAdapter {{ element.adapter_number }} Port name Ethernet {{element.adapter_number}} Port nameEthernet {{ element.adapter_number }} Adapter type - - - {{type}} - - - Adapter type + + + {{ type }} + + + Actions - -
Actions + +
diff --git a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.ts b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.ts index f9ad5452..a1d2aa25 100644 --- a/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.ts +++ b/src/app/components/preferences/common/custom-adapters-table/custom-adapters-table.component.ts @@ -1,28 +1,27 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; - @Component({ - selector: 'app-custom-adapters-table', - templateUrl: './custom-adapters-table.component.html', - styleUrls: ['../../preferences.component.scss'] + selector: 'app-custom-adapters-table', + templateUrl: './custom-adapters-table.component.html', + styleUrls: ['../../preferences.component.scss'], }) export class CustomAdaptersTableComponent { - @Input() networkTypes = []; - @Input() displayedColumns: string[] = []; - @Input() adapters: CustomAdapter[] = []; + @Input() networkTypes = []; + @Input() displayedColumns: string[] = []; + @Input() adapters: CustomAdapter[] = []; - public numberOfAdapters: number; + public numberOfAdapters: number; - onAdd() { - let adapter: CustomAdapter = { - adapter_number: this.adapters.length, - adapter_type: this.networkTypes[0] - } - this.adapters = this.adapters.concat([adapter]); - } + onAdd() { + let adapter: CustomAdapter = { + adapter_number: this.adapters.length, + adapter_type: this.networkTypes[0], + }; + this.adapters = this.adapters.concat([adapter]); + } - delete(adapter: CustomAdapter) { - this.adapters = this.adapters.filter(elem => elem!== adapter); - } + delete(adapter: CustomAdapter) { + this.adapters = this.adapters.filter((elem) => elem !== adapter); + } } diff --git a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.html b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.html index 53e1855b..be5e47c5 100644 --- a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.html +++ b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.html @@ -1,21 +1,21 @@
-
-
-

Custom adapters configuration

-
+
+
+

Custom adapters configuration

-
-
- -
-
- -
-
+
+
+
+
+
+ +
+
+
diff --git a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.spec.ts b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.spec.ts index 85edc7ee..f81b9248 100644 --- a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.spec.ts +++ b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.spec.ts @@ -11,43 +11,49 @@ import { CustomAdaptersComponent } from './custom-adapters.component'; import { CustomAdaptersTableComponent } from '../custom-adapters-table/custom-adapters-table.component'; describe('Custom adapters component', () => { - let component: CustomAdaptersComponent; - let fixture: ComponentFixture; + let component: CustomAdaptersComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], - declarations: [ - CustomAdaptersComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CustomAdaptersComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + ], + declarations: [CustomAdaptersComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should emit event when apply clicked', () => { - spyOn(component.saveConfigurationEmitter, 'emit'); - component.customAdapters = {adapters: []} as CustomAdaptersTableComponent; + beforeEach(() => { + fixture = TestBed.createComponent(CustomAdaptersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - component.configureCustomAdapters(); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.saveConfigurationEmitter.emit).toHaveBeenCalled(); - }); + it('should emit event when apply clicked', () => { + spyOn(component.saveConfigurationEmitter, 'emit'); + component.customAdapters = { adapters: [] } as CustomAdaptersTableComponent; - it('should emit event when cancel clicked', () => { - spyOn(component.closeConfiguratorEmitter, 'emit'); + component.configureCustomAdapters(); - component.cancelConfigureCustomAdapters(); + expect(component.saveConfigurationEmitter.emit).toHaveBeenCalled(); + }); - expect(component.closeConfiguratorEmitter.emit).toHaveBeenCalled(); - }); + it('should emit event when cancel clicked', () => { + spyOn(component.closeConfiguratorEmitter, 'emit'); + + component.cancelConfigureCustomAdapters(); + + expect(component.closeConfiguratorEmitter.emit).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts index 9eac1689..59b1045d 100644 --- a/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts +++ b/src/app/components/preferences/common/custom-adapters/custom-adapters.component.ts @@ -2,42 +2,41 @@ import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; import { CustomAdaptersTableComponent } from '../custom-adapters-table/custom-adapters-table.component'; - @Component({ - selector: 'app-custom-adapters', - templateUrl: './custom-adapters.component.html', - styleUrls: ['./custom-adapters.component.scss', '../../preferences.component.scss'] + selector: 'app-custom-adapters', + templateUrl: './custom-adapters.component.html', + styleUrls: ['./custom-adapters.component.scss', '../../preferences.component.scss'], }) export class CustomAdaptersComponent { - @Input() networkTypes = []; - @Input() displayedColumns: string[] = []; - @Output() closeConfiguratorEmitter = new EventEmitter(); - @Output() saveConfigurationEmitter = new EventEmitter(); + @Input() networkTypes = []; + @Input() displayedColumns: string[] = []; + @Output() closeConfiguratorEmitter = new EventEmitter(); + @Output() saveConfigurationEmitter = new EventEmitter(); - @ViewChild("customAdapters") customAdapters: CustomAdaptersTableComponent; + @ViewChild('customAdapters') customAdapters: CustomAdaptersTableComponent; - public adapters: CustomAdapter[]; - public numberOfAdapters: number; + public adapters: CustomAdapter[]; + public numberOfAdapters: number; - constructor() { - console.log(this.networkTypes); - } + constructor() { + console.log(this.networkTypes); + } - cancelConfigureCustomAdapters(){ - this.closeConfiguratorEmitter.emit(false); - } + cancelConfigureCustomAdapters() { + this.closeConfiguratorEmitter.emit(false); + } - configureCustomAdapters(){ - this.adapters = []; - console.log(this.customAdapters); - - this.customAdapters.adapters.forEach(n => { - this.adapters.push({ - adapter_number: n.adapter_number, - adapter_type: n.adapter_type - }) - }); + configureCustomAdapters() { + this.adapters = []; + console.log(this.customAdapters); - this.saveConfigurationEmitter.emit(this.adapters); - } + this.customAdapters.adapters.forEach((n) => { + this.adapters.push({ + adapter_number: n.adapter_number, + adapter_type: n.adapter_type, + }); + }); + + this.saveConfigurationEmitter.emit(this.adapters); + } } diff --git a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.html b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.html index 398d83de..9406945f 100644 --- a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.html +++ b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.html @@ -1,15 +1,13 @@
-

Delete template

-
Are you sure you want to delete template {{templateName}}?
+

Delete template

+
Are you sure you want to delete template {{ templateName }}?
-
+
-
- - -
+
+ + +
diff --git a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.scss b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.scss index 9f3d3c71..fe8a2a82 100644 --- a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.scss +++ b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.scss @@ -1,9 +1,9 @@ .dialogcontainer { - height: 100%; - display: flex; - flex-direction: column; + height: 100%; + display: flex; + flex-direction: column; } .spacer { - flex-grow: 1; + flex-grow: 1; } diff --git a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts index 011d2b67..3beacce1 100644 --- a/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts +++ b/src/app/components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component.ts @@ -1,29 +1,28 @@ import { Component, OnInit, Inject } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; - @Component({ - selector: 'app-delete-confirmation-dialog', - templateUrl: './delete-confirmation-dialog.component.html', - styleUrls: ['./delete-confirmation-dialog.component.scss'] + selector: 'app-delete-confirmation-dialog', + templateUrl: './delete-confirmation-dialog.component.html', + styleUrls: ['./delete-confirmation-dialog.component.scss'], }) export class DeleteConfirmationDialogComponent implements OnInit { - templateName: string = ''; + templateName: string = ''; - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any - ) { - this.templateName = data['templateName']; - } + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) { + this.templateName = data['templateName']; + } - ngOnInit() {} + ngOnInit() {} - onNoClick(): void { - this.dialogRef.close(false); - } - - onYesClick(): void { - this.dialogRef.close(true); - } + onNoClick(): void { + this.dialogRef.close(false); + } + + onYesClick(): void { + this.dialogRef.close(true); + } } diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts index 20965394..ae5d3198 100644 --- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts +++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from "@angular/core"; +import { Component, Input, Output, EventEmitter } from '@angular/core'; import { TemplateService } from '../../../../services/template.service'; import { MatDialog } from '@angular/material/dialog'; import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog/delete-confirmation-dialog.component'; @@ -6,38 +6,38 @@ import { ToasterService } from '../../../../services/toaster.service'; import { Server } from '../../../../models/server'; @Component({ - selector: 'app-delete-template', - templateUrl: './delete-template.component.html', - styleUrls: ['./delete-template.component.scss'] + selector: 'app-delete-template', + templateUrl: './delete-template.component.html', + styleUrls: ['./delete-template.component.scss'], }) export class DeleteTemplateComponent { - @Input() server: Server; - @Output() deleteEvent = new EventEmitter(); - - constructor( - private templateService: TemplateService, - private dialog: MatDialog, - private toasterService: ToasterService - ) {} + @Input() server: Server; + @Output() deleteEvent = new EventEmitter(); - deleteItem(templateName, templateId) { - const dialogRef = this.dialog.open(DeleteConfirmationDialogComponent, { - width: '300px', - height: '250px', - data: { - templateName: templateName - }, - autoFocus: false, - disableClose: true + constructor( + private templateService: TemplateService, + private dialog: MatDialog, + private toasterService: ToasterService + ) {} + + deleteItem(templateName, templateId) { + const dialogRef = this.dialog.open(DeleteConfirmationDialogComponent, { + width: '300px', + height: '250px', + data: { + templateName: templateName, + }, + autoFocus: false, + disableClose: true, + }); + + dialogRef.afterClosed().subscribe((answer: boolean) => { + if (answer) { + this.templateService.deleteTemplate(this.server, templateId).subscribe((answer) => { + this.deleteEvent.emit(templateId); + this.toasterService.success(`Template ${templateName} deleted.`); }); - - dialogRef.afterClosed().subscribe((answer: boolean) => { - if (answer) { - this.templateService.deleteTemplate(this.server, templateId).subscribe((answer) => { - this.deleteEvent.emit(templateId); - this.toasterService.success(`Template ${templateName} deleted.`); - }); - } - }); - } + } + }); + } } diff --git a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.html b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.html index 3d523072..28073ce9 100644 --- a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.html +++ b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.html @@ -1,7 +1,7 @@
- -
- {{emptyTemplatesListMessage}} -
- + +
+ {{ emptyTemplatesListMessage }} +
+
diff --git a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.scss b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.scss index f867b0c4..f28eabf5 100644 --- a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.scss +++ b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.scss @@ -1,4 +1,4 @@ .header { - text-align: center; - color: darkgray; + text-align: center; + color: darkgray; } diff --git a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.ts b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.ts index c8bec4d1..7a321184 100644 --- a/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.ts +++ b/src/app/components/preferences/common/empty-templates-list/empty-templates-list.component.ts @@ -1,18 +1,17 @@ -import { Component, Input } from "@angular/core"; - +import { Component, Input } from '@angular/core'; @Component({ - selector: 'app-empty-templates-list', - templateUrl: './empty-templates-list.component.html', - styleUrls: ['./empty-templates-list.component.scss'] + selector: 'app-empty-templates-list', + templateUrl: './empty-templates-list.component.html', + styleUrls: ['./empty-templates-list.component.scss'], }) export class EmptyTemplatesListComponent { - @Input() textMessage: string; - emptyTemplatesListMessage: string = 'Empty templates list'; + @Input() textMessage: string; + emptyTemplatesListMessage: string = 'Empty templates list'; - constructor(){ - if (this.textMessage) { - this.emptyTemplatesListMessage = this.textMessage; - } + constructor() { + if (this.textMessage) { + this.emptyTemplatesListMessage = this.textMessage; } + } } diff --git a/src/app/components/preferences/common/ports/ports.component.html b/src/app/components/preferences/common/ports/ports.component.html index e7b0a8ba..8caa33d3 100644 --- a/src/app/components/preferences/common/ports/ports.component.html +++ b/src/app/components/preferences/common/ports/ports.component.html @@ -1,66 +1,55 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - -
Port number {{element.port_number}} Port number{{ element.port_number }} VLAN {{element.vlan}} VLAN{{ element.vlan }} Type {{element.type}} Type{{ element.type }} EtherType {{element.ethertype}} EtherType{{ element.ethertype }} Actions - -

+ + Actions + + + + + + + + +
- + - + - - - {{type}} - - + + + {{ type }} + + - - - {{type}} - - + + + {{ type }} + + diff --git a/src/app/components/preferences/common/ports/ports.component.ts b/src/app/components/preferences/common/ports/ports.component.ts index efc2d393..41bd0713 100644 --- a/src/app/components/preferences/common/ports/ports.component.ts +++ b/src/app/components/preferences/common/ports/ports.component.ts @@ -1,48 +1,45 @@ -import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core"; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Server } from '../../../../models/server'; import { PortsMappingEntity } from '../../../../models/ethernetHub/ports-mapping-enity'; import { BuiltInTemplatesConfigurationService } from '../../../../services/built-in-templates-configuration.service'; - @Component({ - selector: 'app-ports', - templateUrl: './ports.component.html', - styleUrls: ['../../preferences.component.scss'] + selector: 'app-ports', + templateUrl: './ports.component.html', + styleUrls: ['../../preferences.component.scss'], }) export class PortsComponent implements OnInit { - @Input() ethernetPorts: PortsMappingEntity[] = []; - newPort: PortsMappingEntity = { - name: '', - port_number: 0, + @Input() ethernetPorts: PortsMappingEntity[] = []; + newPort: PortsMappingEntity = { + name: '', + port_number: 0, + }; + + portTypes: string[] = []; + etherTypes: string[] = []; + displayedColumns: string[] = ['port_number', 'vlan', 'type', 'ethertype', 'action']; + + constructor(private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService) {} + + ngOnInit() { + this.getConfiguration(); + } + + getConfiguration() { + this.etherTypes = this.builtInTemplatesConfigurationService.getEtherTypesForEthernetSwitches(); + this.portTypes = this.builtInTemplatesConfigurationService.getPortTypesForEthernetSwitches(); + } + + onAdd() { + this.ethernetPorts.push(this.newPort); + + this.newPort = { + name: '', + port_number: 0, }; + } - portTypes: string[] = []; - etherTypes: string[] = []; - displayedColumns: string[] = ['port_number', 'vlan', 'type', 'ethertype', 'action']; - - constructor( - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService - ) {} - - ngOnInit() { - this.getConfiguration(); - } - - getConfiguration() { - this.etherTypes = this.builtInTemplatesConfigurationService.getEtherTypesForEthernetSwitches(); - this.portTypes = this.builtInTemplatesConfigurationService.getPortTypesForEthernetSwitches(); - } - - onAdd() { - this.ethernetPorts.push(this.newPort); - - this.newPort = { - name: '', - port_number: 0, - }; - } - - delete(port: PortsMappingEntity) { - this.ethernetPorts = this.ethernetPorts.filter(n => n !== port); - } + delete(port: PortsMappingEntity) { + this.ethernetPorts = this.ethernetPorts.filter((n) => n !== port); + } } diff --git a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.html b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.html index 4bd37758..b727fa15 100644 --- a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.html +++ b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.html @@ -1,12 +1,12 @@
-
-
-

Symbol selection

- - -
-
-
- +
+
+

Symbol selection

+ +
+
+
+ +
diff --git a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts index 0b01fc92..815dc7f7 100644 --- a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts +++ b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts @@ -1,28 +1,27 @@ -import { Component, Input, Output, EventEmitter } from "@angular/core"; +import { Component, Input, Output, EventEmitter } from '@angular/core'; import { Server } from '../../../../models/server'; - @Component({ - selector: 'app-symbols-menu', - templateUrl: './symbols-menu.component.html', - styleUrls: ['./symbols-menu.component.scss', '../../preferences.component.scss'] + selector: 'app-symbols-menu', + templateUrl: './symbols-menu.component.html', + styleUrls: ['./symbols-menu.component.scss', '../../preferences.component.scss'], }) export class SymbolsMenuComponent { - @Input() server: Server; - @Input() symbol: string; - @Output() symbolChangedEmitter = new EventEmitter(); - - chosenSymbol: string = ''; + @Input() server: Server; + @Input() symbol: string; + @Output() symbolChangedEmitter = new EventEmitter(); - symbolChanged(chosenSymbol: string) { - this.chosenSymbol = chosenSymbol; - } + chosenSymbol: string = ''; - chooseSymbol() { - this.symbolChangedEmitter.emit(this.chosenSymbol); - } + symbolChanged(chosenSymbol: string) { + this.chosenSymbol = chosenSymbol; + } - cancelChooseSymbol() { - this.symbolChangedEmitter.emit(this.symbol); - } + chooseSymbol() { + this.symbolChangedEmitter.emit(this.chosenSymbol); + } + + cancelChooseSymbol() { + this.symbolChangedEmitter.emit(this.symbol); + } } diff --git a/src/app/components/preferences/common/symbols/symbols.component.html b/src/app/components/preferences/common/symbols/symbols.component.html index 2b2e0cec..c9c11bd4 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.html +++ b/src/app/components/preferences/common/symbols/symbols.component.html @@ -1,32 +1,39 @@
- - All symbols - Built-in symbols - Custom symbols - - - + + All symbols + Built-in symbols + Custom symbols + + +
- - - + + +
-
- -
+
+ +
diff --git a/src/app/components/preferences/common/symbols/symbols.component.scss b/src/app/components/preferences/common/symbols/symbols.component.scss index b149705f..608fc79d 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.scss +++ b/src/app/components/preferences/common/symbols/symbols.component.scss @@ -1,60 +1,60 @@ .buttonWrapper { - width: 85px; - height: 85px; - display: flex; - align-items: center; - margin-left: auto; - margin-right: auto; - outline: none; + width: 85px; + height: 85px; + display: flex; + align-items: center; + margin-left: auto; + margin-right: auto; + outline: none; } .menu { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } .button { - background: border-box; - border-width: 0px; - outline: none; + background: border-box; + border-width: 0px; + outline: none; } .buttonSelected { - border-width: 3px; - background: #0097a7!important; + border-width: 3px; + background: #0097a7 !important; } .image { - width: 65px; - height: 65px; - filter: invert(0); - --webkit-filter: invert(0)!important; + width: 65px; + height: 65px; + filter: invert(0); + --webkit-filter: invert(0) !important; } .imageSelected { - margin-left: 0px; + margin-left: 0px; } .wrapper { - display: grid; - grid-template-rows: auto; - grid-template-columns: repeat(7, 1fr); - grid-row-gap: 3em; - grid-column-gap: 1em; + display: grid; + grid-template-rows: auto; + grid-template-columns: repeat(7, 1fr); + grid-row-gap: 3em; + grid-column-gap: 1em; } .radio-selection { - width: 90%; + width: 90%; } .mat-radio-button ~ .mat-radio-button { - margin-left: 16px; + margin-left: 16px; } .non-visible { - display: none; + display: none; } .example-full-width { - width: 100%; + width: 100%; } diff --git a/src/app/components/preferences/common/symbols/symbols.component.spec.ts b/src/app/components/preferences/common/symbols/symbols.component.spec.ts index 90e24452..284fac22 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.spec.ts +++ b/src/app/components/preferences/common/symbols/symbols.component.spec.ts @@ -14,52 +14,59 @@ import { HttpClientModule } from '@angular/common/http'; import { SearchFilter } from '../../../../filters/searchFilter.pipe'; export class MockedSymbolService { - public list() { - return of([]); - } + public list() { + return of([]); + } - public raw() { - return of('') - } + public raw() { + return of(''); + } } describe('Symbols component', () => { - let component: SymbolsComponent; - let fixture: ComponentFixture; - let mockedSymbolsService = new MockedSymbolService; + let component: SymbolsComponent; + let fixture: ComponentFixture; + let mockedSymbolsService = new MockedSymbolService(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [HttpClientModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: SymbolService, useValue: mockedSymbolsService - } - ], - declarations: [ - SymbolsComponent, - SearchFilter - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SymbolsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: SymbolService, + useValue: mockedSymbolsService, + }, + ], + declarations: [SymbolsComponent, SearchFilter], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should emit event when symbol selected', () => { - spyOn(component.symbolChanged, 'emit'); + beforeEach(() => { + fixture = TestBed.createComponent(SymbolsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - component.setSelected('id'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.symbolChanged.emit).toHaveBeenCalled(); - expect(component.isSelected).toBe('id'); - }); + it('should emit event when symbol selected', () => { + spyOn(component.symbolChanged, 'emit'); + + component.setSelected('id'); + + expect(component.symbolChanged.emit).toHaveBeenCalled(); + expect(component.isSelected).toBe('id'); + }); }); diff --git a/src/app/components/preferences/common/symbols/symbols.component.ts b/src/app/components/preferences/common/symbols/symbols.component.ts index 98728b33..e1ea0277 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.ts +++ b/src/app/components/preferences/common/symbols/symbols.component.ts @@ -1,83 +1,82 @@ -import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core"; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { SymbolService } from '../../../../services/symbol.service'; import { Server } from '../../../../models/server'; import { Symbol } from '../../../../models/symbol'; - @Component({ - selector: 'app-symbols', - templateUrl: './symbols.component.html', - styleUrls: ['./symbols.component.scss'] + selector: 'app-symbols', + templateUrl: './symbols.component.html', + styleUrls: ['./symbols.component.scss'], }) export class SymbolsComponent implements OnInit { - @Input() server: Server; - @Input() symbol: string; - @Output() symbolChanged = new EventEmitter(); - - symbols: Symbol[] = []; - filteredSymbols: Symbol[] = []; - isSelected: string = ''; - searchText: string = ''; + @Input() server: Server; + @Input() symbol: string; + @Output() symbolChanged = new EventEmitter(); - constructor( - private symbolService: SymbolService - ) {} + symbols: Symbol[] = []; + filteredSymbols: Symbol[] = []; + isSelected: string = ''; + searchText: string = ''; - ngOnInit() { - this.isSelected = this.symbol; + constructor(private symbolService: SymbolService) {} + + ngOnInit() { + this.isSelected = this.symbol; + this.loadSymbols(); + } + + setFilter(filter: string) { + if (filter === 'all') { + this.filteredSymbols = this.symbols; + } else if (filter === 'builtin') { + this.filteredSymbols = this.symbols.filter((elem) => elem.builtin); + } else { + this.filteredSymbols = this.symbols.filter((elem) => !elem.builtin); + } + } + + setSelected(symbol_id: string) { + this.isSelected = symbol_id; + this.symbolChanged.emit(this.isSelected); + } + + loadSymbols() { + this.symbolService.list(this.server).subscribe((symbols: Symbol[]) => { + this.symbols = symbols; + this.filteredSymbols = symbols; + }); + } + + public uploadSymbolFile(event) { + this.readSymbolFile(event.target); + } + + private readSymbolFile(symbolInput) { + let file: File = symbolInput.files[0]; + let fileName = symbolInput.files[0].name; + let fileReader: FileReader = new FileReader(); + let imageToUpload = new Image(); + + fileReader.onloadend = () => { + let image = fileReader.result; + let svg = this.createSvgFileForImage(image, imageToUpload); + this.symbolService.add(this.server, fileName, svg).subscribe(() => { this.loadSymbols(); - } + }); + }; - setFilter(filter: string) { - if (filter === 'all') { - this.filteredSymbols = this.symbols; - } else if (filter === 'builtin') { - this.filteredSymbols = this.symbols.filter(elem => elem.builtin); - } else { - this.filteredSymbols = this.symbols.filter(elem => !elem.builtin); - } - } + imageToUpload.onload = () => { + fileReader.readAsDataURL(file); + }; + imageToUpload.src = window.URL.createObjectURL(file); + } - setSelected(symbol_id: string) { - this.isSelected = symbol_id; - this.symbolChanged.emit(this.isSelected); - } + private createSvgFileForImage(image: string | ArrayBuffer, imageToUpload: HTMLImageElement) { + return `\n\n`; + } - loadSymbols() { - this.symbolService.list(this.server).subscribe((symbols: Symbol[]) => { - this.symbols = symbols; - this.filteredSymbols = symbols; - }); - } - - public uploadSymbolFile(event) { - this.readSymbolFile(event.target); - } - - private readSymbolFile(symbolInput) { - let file: File = symbolInput.files[0]; - let fileName = symbolInput.files[0].name; - let fileReader: FileReader = new FileReader(); - let imageToUpload = new Image(); - - fileReader.onloadend = () => { - let image = fileReader.result; - let svg = this.createSvgFileForImage(image, imageToUpload); - this.symbolService.add(this.server, fileName, svg).subscribe(() => { - this.loadSymbols(); - }); - } - - imageToUpload.onload = () => { fileReader.readAsDataURL(file) }; - imageToUpload.src = window.URL.createObjectURL(file); - } - - private createSvgFileForImage(image: string|ArrayBuffer, imageToUpload: HTMLImageElement) { - return `\n\n` - } - - getImageSourceForTemplate(symbol: string) { - return `${this.server.protocol}//${this.server.host}:${this.server.port}/v2/symbols/${symbol}/raw`; - } + getImageSourceForTemplate(symbol: string) { + return `${this.server.protocol}//${this.server.host}:${this.server.port}/v2/symbols/${symbol}/raw`; + } } diff --git a/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.html b/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.html index 4c319918..5778607a 100644 --- a/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.html +++ b/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.html @@ -1,59 +1,47 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + +
Name {{element.name}} Name{{ element.name }} Local port {{element.rport}} Local port{{ element.rport }} Type {{element.rhost}} Type{{ element.rhost }} Remote port {{element.lport}} Remote port{{ element.lport }} Actions - -
Actions + +
-
+
- + - + - + - + diff --git a/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.ts b/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.ts index 6052b28c..b7b313b7 100644 --- a/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.ts +++ b/src/app/components/preferences/common/udp-tunnels/udp-tunnels.component.ts @@ -1,47 +1,44 @@ -import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core"; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Server } from '../../../../models/server'; import { PortsMappingEntity } from '../../../../models/ethernetHub/ports-mapping-enity'; import { BuiltInTemplatesConfigurationService } from '../../../../services/built-in-templates-configuration.service'; - @Component({ - selector: 'app-udp-tunnels', - templateUrl: './udp-tunnels.component.html', - styleUrls: ['../../preferences.component.scss'] + selector: 'app-udp-tunnels', + templateUrl: './udp-tunnels.component.html', + styleUrls: ['../../preferences.component.scss'], }) export class UdpTunnelsComponent implements OnInit { - @Input() dataSourceUdp: PortsMappingEntity[] = []; - displayedColumns: string[] = ['name', 'lport', 'rhost', 'rport', 'action']; - newPort: PortsMappingEntity = { - name: '', - port_number: 0, + @Input() dataSourceUdp: PortsMappingEntity[] = []; + displayedColumns: string[] = ['name', 'lport', 'rhost', 'rport', 'action']; + newPort: PortsMappingEntity = { + name: '', + port_number: 0, + }; + portTypes: string[] = []; + etherTypes: string[] = []; + + constructor(private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService) {} + + ngOnInit() { + this.getConfiguration(); + } + + getConfiguration() { + this.etherTypes = this.builtInTemplatesConfigurationService.getEtherTypesForEthernetSwitches(); + this.portTypes = this.builtInTemplatesConfigurationService.getPortTypesForEthernetSwitches(); + } + + onAddUdpInterface() { + this.dataSourceUdp = this.dataSourceUdp.concat([this.newPort]); + + this.newPort = { + name: '', + port_number: 0, }; - portTypes: string[] = []; - etherTypes: string[] = []; + } - constructor( - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService - ) {} - - ngOnInit() { - this.getConfiguration(); - } - - getConfiguration() { - this.etherTypes = this.builtInTemplatesConfigurationService.getEtherTypesForEthernetSwitches(); - this.portTypes = this.builtInTemplatesConfigurationService.getPortTypesForEthernetSwitches(); - } - - onAddUdpInterface() { - this.dataSourceUdp = this.dataSourceUdp.concat([this.newPort]); - - this.newPort = { - name: '', - port_number: 0, - }; - } - - delete(port: PortsMappingEntity) { - this.dataSourceUdp = this.dataSourceUdp.filter(n => n !== port); - } + delete(port: PortsMappingEntity) { + this.dataSourceUdp = this.dataSourceUdp.filter((n) => n !== port); + } } diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html index b4cd79c2..6742275e 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html @@ -1,105 +1,109 @@
-
-
-

New Docker container template

-
+
+
+

New Docker container template

-
-
- - - - - Run this Docker container locally - Run this Docker container on the GNS3 VM - - +
+
+
+ + + + + Run this Docker container locally + Run this Docker container on the GNS3 VM + + - -
- - Existing image - New image - - - - {{image.image}} - - -
- - - -
-
- + +
+ + Existing image + New image + + + + {{ image.image }} + + +
+ + + +
+
+ - -
- - - -
- + +
+ + + +
+ - -
- - - -
- + +
+ + + +
+ - - - - - + + + + + - - - - {{type}} - - - + + + + {{ type }} + + + - - - - - - -
-
- - -
+ + + + + +
+
+ + +
+
diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts index 1f206fce..e6a29c6f 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts @@ -33,182 +33,171 @@ import { StepperOrientation, STEPPER_GLOBAL_OPTIONS, STEP_STATE, CdkStep } from import { By } from '@angular/platform-browser'; export class MockedDockerService { - public addTemplate(server: Server, dockerTemplate: DockerTemplate) { - return of(dockerTemplate); - } + public addTemplate(server: Server, dockerTemplate: DockerTemplate) { + return of(dockerTemplate); + } } //Tests disabled due to instability xdescribe('AddDockerTemplateComponent', () => { - let component: AddDockerTemplateComponent; - let fixture: ComponentFixture; + let component: AddDockerTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedDockerService = new MockedDockerService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - MatStepperModule, - MatAutocompleteModule, - MatCommonModule, - MatRadioModule, - FormsModule, - MatTableModule, - MatAutocompleteModule, - MatFormFieldModule, - MatInputModule, - ReactiveFormsModule, - MatSelectModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/docker/templates', component: AddDockerTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: DockerService, useValue: mockedDockerService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: TemplateMocksService, useClass: TemplateMocksService }, - { provide: DockerConfigurationService, useClass: DockerConfigurationService }, - { provide: AbstractControlDirective, useExisting: FormControl, useMulti: true }, - ], - declarations: [ - AddDockerTemplateComponent - ] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedDockerService = new MockedDockerService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(AddDockerTemplateComponent); - component = fixture.componentInstance; + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatStepperModule, + MatAutocompleteModule, + MatCommonModule, + MatRadioModule, + FormsModule, + MatTableModule, + MatAutocompleteModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, + MatSelectModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/docker/templates', component: AddDockerTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: DockerService, useValue: mockedDockerService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + { provide: DockerConfigurationService, useClass: DockerConfigurationService }, + { provide: AbstractControlDirective, useExisting: FormControl, useMulti: true }, + ], + declarations: [AddDockerTemplateComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AddDockerTemplateComponent); + component = fixture.componentInstance; + }); + + afterEach(() => { + fixture.destroy(); + }); + + it('should open first step at start', async(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + let stepperComponent = fixture.debugElement.query(By.css('mat-vertical-stepper')).componentInstance; + + expect(stepperComponent.selectedIndex).toBe(0); }); + })); - afterEach(() => { - fixture.destroy(); + it('should display correct label at start', async(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]'); + + expect(selectedLabel.textContent).toMatch('Server type'); }); + })); - it('should open first step at start', async(() => { + it('should not call add template when required fields are empty', async(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + let addButton = fixture.debugElement.nativeElement.querySelector('.add-button'); + spyOn(mockedDockerService, 'addTemplate').and.returnValue(of({} as DockerTemplate)); + + addButton.click(); + + expect(component.virtualMachineForm.invalid).toBe(true); + expect(component.containerNameForm.invalid).toBe(true); + expect(component.networkAdaptersForm.invalid).toBe(true); + + expect(mockedDockerService.addTemplate).not.toHaveBeenCalled(); + }); + })); + + it('should call add template when required fields are filled', async(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + let stepperComponent = fixture.debugElement.query(By.css('mat-vertical-stepper')).componentInstance; + stepperComponent.selectedIndex = 1; + component.newImageSelected = true; + + fixture.detectChanges(); + fixture.whenStable().then(() => { + let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]'); + + expect(selectedLabel.textContent).toMatch('Docker Virtual Machine'); + + let filenameInput = fixture.debugElement.nativeElement.querySelector('.filename'); + filenameInput.value = 'sample filename'; + filenameInput.dispatchEvent(new Event('input')); fixture.detectChanges(); fixture.whenStable().then(() => { - let stepperComponent = fixture.debugElement - .query(By.css('mat-vertical-stepper')).componentInstance; + expect(component.dockerTemplate.image).toBe('sample filename'); - expect(stepperComponent.selectedIndex).toBe(0); - }); - })); + expect(component.virtualMachineForm.invalid).toBe(false); + expect(component.containerNameForm.invalid).toBe(true); - it('should display correct label at start', async(() => { - fixture.detectChanges(); - fixture.whenStable().then(() => { - let selectedLabel = fixture.nativeElement - .querySelector('[aria-selected="true"]'); + stepperComponent.selectedIndex = 2; + fixture.detectChanges(); + fixture.whenStable().then(() => { + selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]'); - expect(selectedLabel.textContent).toMatch('Server type'); - }); - })); - - it('should not call add template when required fields are empty', async(() => { - fixture.detectChanges(); - fixture.whenStable().then(() => { - let addButton = fixture.debugElement.nativeElement - .querySelector('.add-button'); - spyOn(mockedDockerService, 'addTemplate').and.returnValue(of({} as DockerTemplate)); - - addButton.click(); - - expect(component.virtualMachineForm.invalid).toBe(true); - expect(component.containerNameForm.invalid).toBe(true); - expect(component.networkAdaptersForm.invalid).toBe(true); - - expect(mockedDockerService.addTemplate).not.toHaveBeenCalled(); - }); - })); - - it('should call add template when required fields are filled', async(() => { - fixture.detectChanges(); - fixture.whenStable().then(() => { - let stepperComponent = fixture.debugElement - .query(By.css('mat-vertical-stepper')).componentInstance; - stepperComponent.selectedIndex = 1; - component.newImageSelected = true; + expect(selectedLabel.textContent).toMatch('Container name'); + let templatenameInput = fixture.debugElement.nativeElement.querySelector('.templatename'); + templatenameInput.value = 'sample templatename'; + templatenameInput.dispatchEvent(new Event('input')); fixture.detectChanges(); fixture.whenStable().then(() => { - let selectedLabel = fixture.nativeElement - .querySelector('[aria-selected="true"]'); + expect(component.dockerTemplate.name).toBe('sample templatename'); - expect(selectedLabel.textContent).toMatch('Docker Virtual Machine'); + expect(component.virtualMachineForm.invalid).toBe(false); + expect(component.containerNameForm.invalid).toBe(false); - let filenameInput = fixture.debugElement.nativeElement - .querySelector('.filename'); - filenameInput.value = 'sample filename'; - filenameInput.dispatchEvent(new Event('input')); + stepperComponent.selectedIndex = 3; + fixture.detectChanges(); + fixture.whenStable().then(() => { + selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]'); + + expect(selectedLabel.textContent).toMatch('Network adapters'); + + let networkadapterInput = fixture.debugElement.nativeElement.querySelector('.networkadapter'); + networkadapterInput.value = 2; + networkadapterInput.dispatchEvent(new Event('input')); fixture.detectChanges(); fixture.whenStable().then(() => { - expect(component.dockerTemplate.image).toBe('sample filename'); + expect(component.dockerTemplate.adapters).toBe(2); - expect(component.virtualMachineForm.invalid).toBe(false); - expect(component.containerNameForm.invalid).toBe(true); + expect(component.virtualMachineForm.invalid).toBe(false); + expect(component.containerNameForm.invalid).toBe(false); + expect(component.networkAdaptersForm.invalid).toBe(false); - stepperComponent.selectedIndex = 2; - fixture.detectChanges(); - fixture.whenStable().then(() => { - selectedLabel = fixture.nativeElement - .querySelector('[aria-selected="true"]'); + let addButton = fixture.debugElement.nativeElement.querySelector('.add-button'); + spyOn(mockedDockerService, 'addTemplate').and.returnValue(of({} as DockerTemplate)); - expect(selectedLabel.textContent).toMatch('Container name'); + addButton.click(); - let templatenameInput = fixture.debugElement.nativeElement - .querySelector('.templatename'); - templatenameInput.value = 'sample templatename'; - templatenameInput.dispatchEvent(new Event('input')); - fixture.detectChanges(); - fixture.whenStable().then(() => { - expect(component.dockerTemplate.name).toBe('sample templatename'); - - expect(component.virtualMachineForm.invalid).toBe(false); - expect(component.containerNameForm.invalid).toBe(false); - - stepperComponent.selectedIndex = 3; - fixture.detectChanges(); - fixture.whenStable().then(() => { - selectedLabel = fixture.nativeElement - .querySelector('[aria-selected="true"]'); - - expect(selectedLabel.textContent).toMatch('Network adapters'); - - let networkadapterInput = fixture.debugElement.nativeElement - .querySelector('.networkadapter'); - networkadapterInput.value = 2; - networkadapterInput.dispatchEvent(new Event('input')); - fixture.detectChanges(); - fixture.whenStable().then(() => { - expect(component.dockerTemplate.adapters).toBe(2); - - expect(component.virtualMachineForm.invalid).toBe(false); - expect(component.containerNameForm.invalid).toBe(false); - expect(component.networkAdaptersForm.invalid).toBe(false); - - let addButton = fixture.debugElement.nativeElement - .querySelector('.add-button'); - spyOn(mockedDockerService, 'addTemplate').and.returnValue(of({} as DockerTemplate)); - - addButton.click(); - - expect(mockedDockerService.addTemplate).toHaveBeenCalled(); - }); - }); - }); - }); + expect(mockedDockerService.addTemplate).toHaveBeenCalled(); }); + }); }); - }); - })); + }); + }); + }); + }); + })); }); diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts index daad9e05..0d555d2b 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -13,113 +13,116 @@ import { DockerImage } from '../../../../models/docker/docker-image'; import { ComputeService } from '../../../../services/compute.service'; import { Compute } from '../../../../models/compute'; - @Component({ - selector: 'app-add-docker-template', - templateUrl: './add-docker-template.component.html', - styleUrls: ['./add-docker-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-docker-template', + templateUrl: './add-docker-template.component.html', + styleUrls: ['./add-docker-template.component.scss', '../../preferences.component.scss'], }) export class AddDockerTemplateComponent implements OnInit { - server: Server; - dockerTemplate: DockerTemplate; - consoleTypes: string[] = []; - isRemoteComputerChosen: boolean = false; - dockerImages: DockerImage[] = []; - selectedImage: DockerImage; - newImageSelected: boolean = false; + server: Server; + dockerTemplate: DockerTemplate; + consoleTypes: string[] = []; + isRemoteComputerChosen: boolean = false; + dockerImages: DockerImage[] = []; + selectedImage: DockerImage; + newImageSelected: boolean = false; - virtualMachineForm: FormGroup; - containerNameForm: FormGroup; - networkAdaptersForm: FormGroup; + virtualMachineForm: FormGroup; + containerNameForm: FormGroup; + networkAdaptersForm: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private dockerService: DockerService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder, - private templateMocksService: TemplateMocksService, - private configurationService: DockerConfigurationService, - private computeService: ComputeService + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private dockerService: DockerService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder, + private templateMocksService: TemplateMocksService, + private configurationService: DockerConfigurationService, + private computeService: ComputeService + ) { + this.dockerTemplate = new DockerTemplate(); + + this.virtualMachineForm = this.formBuilder.group({ + filename: new FormControl(null, Validators.required), + }); + + this.containerNameForm = this.formBuilder.group({ + templateName: new FormControl(null, Validators.required), + }); + + this.networkAdaptersForm = this.formBuilder.group({ + adapters: new FormControl('1', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.consoleTypes = this.configurationService.getConsoleTypes(); + + this.templateMocksService.getDockerTemplate().subscribe((dockerTemplate: DockerTemplate) => { + this.dockerTemplate = dockerTemplate; + }); + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + + this.dockerService.getImages(server).subscribe((images) => { + this.dockerImages = images; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; + } + } + + setDiskImage(value: string) { + this.newImageSelected = value === 'newImage'; + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); + } + + addTemplate() { + if ( + (!this.virtualMachineForm.invalid || (!this.newImageSelected && this.selectedImage)) && + !this.containerNameForm.invalid && + !this.networkAdaptersForm.invalid ) { - this.dockerTemplate = new DockerTemplate(); + this.dockerTemplate.template_id = uuid(); - this.virtualMachineForm = this.formBuilder.group({ - filename: new FormControl(null, Validators.required) - }); + if (this.newImageSelected) { + this.dockerTemplate.image = this.virtualMachineForm.get('filename').value; + } else { + this.dockerTemplate.image = this.selectedImage.image; + } - this.containerNameForm = this.formBuilder.group({ - templateName: new FormControl(null, Validators.required) - }); + this.dockerTemplate.name = this.containerNameForm.get('templateName').value; + this.dockerTemplate.adapters = +this.networkAdaptersForm.get('adapters').value; + this.dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - this.networkAdaptersForm = this.formBuilder.group({ - adapters: new FormControl('1', Validators.required) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.consoleTypes = this.configurationService.getConsoleTypes(); - - this.templateMocksService.getDockerTemplate().subscribe((dockerTemplate: DockerTemplate) => { - this.dockerTemplate = dockerTemplate; - }) - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - - this.dockerService.getImages(server).subscribe((images) => { - this.dockerImages = images; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - setDiskImage(value: string) { - this.newImageSelected = value === "newImage"; - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); - } - - addTemplate() { - if ((!this.virtualMachineForm.invalid || (!this.newImageSelected && this.selectedImage)) && !this.containerNameForm.invalid && !this.networkAdaptersForm.invalid) { - this.dockerTemplate.template_id = uuid(); - - if (this.newImageSelected) { - this.dockerTemplate.image = this.virtualMachineForm.get('filename').value; - } else { - this.dockerTemplate.image = this.selectedImage.image; - } - - this.dockerTemplate.name = this.containerNameForm.get('templateName').value; - this.dockerTemplate.adapters = +this.networkAdaptersForm.get('adapters').value; - this.dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html index 6cea160e..3b2f0f93 100644 --- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html +++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html @@ -1,24 +1,20 @@
-
-
-

Copy Docker container template

-
+
+
+

Copy Docker container template

-
-
-
- - - -
-
-
- - -
+
+
+
+
+ + + +
+
+ + +
+
diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts index e2e32b84..104bd4e8 100644 --- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts +++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -8,59 +8,57 @@ import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-copy-docker-template', - templateUrl: './copy-docker-template.component.html', - styleUrls: ['./copy-docker-template.component.scss', '../../preferences.component.scss'] + selector: 'app-copy-docker-template', + templateUrl: './copy-docker-template.component.html', + styleUrls: ['./copy-docker-template.component.scss', '../../preferences.component.scss'], }) export class CopyDockerTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - dockerTemplate: DockerTemplate; - templateNameForm: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private dockerService: DockerService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.dockerService.getTemplate(this.server, template_id).subscribe((dockerTemplate: DockerTemplate) => { - this.dockerTemplate = dockerTemplate; - this.templateName = `Copy of ${this.dockerTemplate.name}`; - }) - - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid) { - this.dockerTemplate.template_id = uuid(); - this.dockerTemplate.name = this.templateName; - - this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + server: Server; + templateName: string = ''; + dockerTemplate: DockerTemplate; + templateNameForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private dockerService: DockerService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.dockerService.getTemplate(this.server, template_id).subscribe((dockerTemplate: DockerTemplate) => { + this.dockerTemplate = dockerTemplate; + this.templateName = `Copy of ${this.dockerTemplate.name}`; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); + } + + addTemplate() { + if (!this.templateNameForm.invalid) { + this.dockerTemplate.template_id = uuid(); + this.dockerTemplate.name = this.templateName; + + this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html index d603fb36..e36dccf0 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html @@ -1,96 +1,149 @@ -
-
-
-

Docker image configuration

-
+
+
+
+

Docker image configuration

-
- - - - - General settings - - -
- - - - - - - - - - {{category[0]}} - - - - - - -

- - - - - - - - - - {{type}} - - - - - Auto start console - - - - - {{resolution}} - - - - - - - - - -
-
Environment
- - - - - - - - Advanced - - -
Extra hosts
- - - - - - - - Usage - - - - - - - -
- - -
+
+
+ + + + General settings + +
+ + + + + + + + + + {{ category[0] }} + + + + + + +

+ + + + + + + + + + {{ type }} + + + + + Auto start console + + + + + {{ resolution }} + + + + + + + + + +
+
Environment
+ + + + + + + Advanced + +
Extra hosts
+ + + + + + + Usage + + + + + + +
+ +
+
- + diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts index 4b55dc92..7223c5b3 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts @@ -22,62 +22,71 @@ import { DockerService } from '../../../../services/docker.service'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; export class MockedDockerService { - public getTemplate(server: Server, template_id: string) { - return of({} as DockerTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as DockerTemplate); + } - public saveTemplate(server: Server, dockerTemplate: DockerTemplate) { - return of(dockerTemplate); - } + public saveTemplate(server: Server, dockerTemplate: DockerTemplate) { + return of(dockerTemplate); + } } describe('DockerTemplateDetailsComponent', () => { - let component: DockerTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: DockerTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedDockerService = new MockedDockerService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: DockerService, useValue: mockedDockerService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: DockerConfigurationService, useClass: DockerConfigurationService } - ], - declarations: [ - DockerTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedDockerService = new MockedDockerService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(DockerTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: DockerService, useValue: mockedDockerService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: DockerConfigurationService, useClass: DockerConfigurationService }, + ], + declarations: [DockerTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DockerTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedDockerService, 'saveTemplate').and.returnValue(of({} as DockerTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['adapter'].setValue(1); - component.generalSettingsForm.controls['symbol'].setValue('symbol path'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedDockerService, 'saveTemplate').and.returnValue(of({} as DockerTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['adapter'].setValue(1); + component.generalSettingsForm.controls['symbol'].setValue('symbol path'); - expect(mockedDockerService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedDockerService.saveTemplate).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts index 18ffaa61..a16b2746 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -9,81 +9,80 @@ import { DockerService } from '../../../../services/docker.service'; import { DockerConfigurationService } from '../../../../services/docker-configuration.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-docker-template-details', - templateUrl: './docker-template-details.component.html', - styleUrls: ['./docker-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-docker-template-details', + templateUrl: './docker-template-details.component.html', + styleUrls: ['./docker-template-details.component.scss', '../../preferences.component.scss'], }) export class DockerTemplateDetailsComponent implements OnInit { - server: Server; - dockerTemplate: DockerTemplate; + server: Server; + dockerTemplate: DockerTemplate; - isSymbolSelectionOpened: boolean = false; + isSymbolSelectionOpened: boolean = false; - consoleTypes: string[] = []; - consoleResolutions: string[] = []; - categories = []; - adapters: CustomAdapter[] = []; - displayedColumns: string[] = ['adapter_number', 'port_name']; + consoleTypes: string[] = []; + consoleResolutions: string[] = []; + categories = []; + adapters: CustomAdapter[] = []; + displayedColumns: string[] = ['adapter_number', 'port_name']; - generalSettingsForm: FormGroup; + generalSettingsForm: FormGroup; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private dockerService: DockerService, - private toasterService: ToasterService, - private configurationService: DockerConfigurationService, - private formBuilder: FormBuilder, - private router: Router - ){ - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - adapter: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) - }); + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private dockerService: DockerService, + private toasterService: ToasterService, + private configurationService: DockerConfigurationService, + private formBuilder: FormBuilder, + private router: Router + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + adapter: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.dockerService.getTemplate(this.server, template_id).subscribe((dockerTemplate: DockerTemplate) => { + this.dockerTemplate = dockerTemplate; + }); + }); + } + + getConfiguration() { + this.consoleTypes = this.configurationService.getConsoleTypes(); + this.categories = this.configurationService.getCategories(); + this.consoleResolutions = this.configurationService.getConsoleResolutions(); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); + } + + onSave() { + if (this.generalSettingsForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.dockerService.saveTemplate(this.server, this.dockerTemplate).subscribe((savedTemplate: DockerTemplate) => { + this.toasterService.success('Changes saved'); + }); } + } - ngOnInit(){ - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.getConfiguration(); - this.dockerService.getTemplate(this.server, template_id).subscribe((dockerTemplate: DockerTemplate) => { - this.dockerTemplate = dockerTemplate; - }); - }); - } + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - getConfiguration(){ - this.consoleTypes = this.configurationService.getConsoleTypes(); - this.categories = this.configurationService.getCategories(); - this.consoleResolutions = this.configurationService.getConsoleResolutions(); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates']); - } - - onSave(){ - if (this.generalSettingsForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.dockerService.saveTemplate(this.server, this.dockerTemplate).subscribe((savedTemplate: DockerTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.dockerTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.dockerTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.html b/src/app/components/preferences/docker/docker-templates/docker-templates.component.html index b732ad1e..72227b93 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.html +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.html @@ -1,35 +1,49 @@
-
-
-

Docker container templates

- - -
+
+
+

Docker container templates

+ +
- -
-
- -
- {{template.name}} - - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + + +
+
+
- - + diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts index 245aaf08..fb42de08 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts @@ -18,41 +18,47 @@ import { DockerTemplatesComponent } from './docker-templates.component'; import { DockerService } from '../../../../services/docker.service'; export class MockedDockerService { - public getTemplates(server: Server) { - return of([{} as DockerTemplate]); - } + public getTemplates(server: Server) { + return of([{} as DockerTemplate]); + } } describe('DockerTemplatesComponent', () => { - let component: DockerTemplatesComponent; - let fixture: ComponentFixture; + let component: DockerTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedDockerService = new MockedDockerService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: DockerService, useValue: mockedDockerService } - ], - declarations: [ - DockerTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedDockerService = new MockedDockerService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(DockerTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: DockerService, useValue: mockedDockerService }, + ], + declarations: [DockerTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DockerTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts index 1fe7f1c6..45fa8351 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -6,47 +6,54 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ import { DockerTemplate } from '../../../../models/templates/docker-template'; import { DockerService } from '../../../../services/docker.service'; - @Component({ - selector: 'app-docker-templates', - templateUrl: './docker-templates.component.html', - styleUrls: ['./docker-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-docker-templates', + templateUrl: './docker-templates.component.html', + styleUrls: ['./docker-templates.component.scss', '../../preferences.component.scss'], }) export class DockerTemplatesComponent implements OnInit { - server: Server; - dockerTemplates: DockerTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + dockerTemplates: DockerTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private dockerService: DockerService, - private router: Router - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private dockerService: DockerService, + private router: Router + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.dockerService.getTemplates(this.server).subscribe((dockerTemplates: DockerTemplate[]) => { - this.dockerTemplates = dockerTemplates.filter((elem) => elem.template_type === 'docker' && !elem.builtin); - }); - } + getTemplates() { + this.dockerService.getTemplates(this.server).subscribe((dockerTemplates: DockerTemplate[]) => { + this.dockerTemplates = dockerTemplates.filter((elem) => elem.template_type === 'docker' && !elem.builtin); + }); + } - deleteTemplate(template: DockerTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: DockerTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } - copyTemplate(template: DockerTemplate) { - this.router.navigate(['/server', this.server.id, 'preferences', 'docker', 'templates', template.template_id, 'copy']); - } + copyTemplate(template: DockerTemplate) { + this.router.navigate([ + '/server', + this.server.id, + 'preferences', + 'docker', + 'templates', + template.template_id, + 'copy', + ]); + } } diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html index 6a4b913a..1b41b969 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html @@ -1,99 +1,109 @@
-
-
-

New IOS router template

-
+
+
+

New IOS router template

-
-
- - - - Run this IOS router locally - Run this IOS router on the GNS3 VM - - +
+
+
+ + + + Run this IOS router locally + Run this IOS router on the GNS3 VM + + - - - or create from existing one -
- - - - {{image.filename}} - - - -
- + + + or create from + existing one +
+ + + + {{ image.filename }} + + + +
+ - -
- - - - - - - {{platform}} - - - - - - - {{chassis}} - - - -
- - This is an EtherSwitch router - - + +
+ + + + + + + {{ platform }} + + + + + + + {{ chassis }} + + + +
+ + This is an EtherSwitch router + + - -
- - - MB - - - Check for minimum and maximum RAM requirement - -
- + +
+ + + MB + + + Check for minimum and maximum RAM requirement + +
+ - - -
-
- - - {{option}} - - -
-
- +
+
+ + + {{ option }} + + +
+
+ - -
-
- - - {{option}} - - -
-
- + +
+
+ + + {{ option }} + + +
+
+ - - - - - - -
-
- - -
+ + + + + +
+
+ + +
+
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.scss b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.scss index 0f602793..f4d855b4 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.scss +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.scss @@ -1,3 +1,3 @@ .non-visible { - display: none; + display: none; } diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts index 45df3039..41d14fd8 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts @@ -29,116 +29,116 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; export class MockedIosService { - public addTemplate(server: Server, iosTemplate: IosTemplate) { - return of(iosTemplate); - } + public addTemplate(server: Server, iosTemplate: IosTemplate) { + return of(iosTemplate); + } } //Tests disabled due to instability xdescribe('AddIosTemplateComponent', () => { - let component: AddIosTemplateComponent; - let fixture: ComponentFixture; + let component: AddIosTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIosService = new MockedIosService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - MatStepperModule, - FormsModule, - MatTableModule, - MatAutocompleteModule, - MatFormFieldModule, - MatInputModule, - ReactiveFormsModule, - MatSelectModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/dynamips/templates', component: AddIosTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IosService, useValue: mockedIosService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: TemplateMocksService, useClass: TemplateMocksService }, - { provide: IosConfigurationService, useClass: IosConfigurationService } - ], - declarations: [ - AddIosTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIosService = new MockedIosService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(AddIosTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatStepperModule, + FormsModule, + MatTableModule, + MatAutocompleteModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, + MatSelectModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/dynamips/templates', component: AddIosTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IosService, useValue: mockedIosService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + { provide: IosConfigurationService, useClass: IosConfigurationService }, + ], + declarations: [AddIosTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddIosTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); - component.iosImageForm.controls['imageName'].setValue('image name'); - component.iosNameForm.controls['templateName'].setValue('template name'); - component.iosNameForm.controls['platform'].setValue('platform'); - component.iosNameForm.controls['chassis'].setValue('chassis'); - component.iosMemoryForm.controls['memory'].setValue(0); - component.server = {id: 1} as Server; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); + component.iosImageForm.controls['imageName'].setValue('image name'); + component.iosNameForm.controls['templateName'].setValue('template name'); + component.iosNameForm.controls['platform'].setValue('platform'); + component.iosNameForm.controls['chassis'].setValue('chassis'); + component.iosMemoryForm.controls['memory'].setValue(0); + component.server = { id: 1 } as Server; - expect(mockedIosService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is not defined', () => { - spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); - component.iosImageForm.controls['imageName'].setValue('image name'); - component.iosNameForm.controls['templateName'].setValue(''); - component.iosNameForm.controls['platform'].setValue('platform'); - component.iosNameForm.controls['chassis'].setValue('chassis'); - component.iosMemoryForm.controls['memory'].setValue(0); - component.server = {id: 1} as Server; + expect(mockedIosService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is not defined', () => { + spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); + component.iosImageForm.controls['imageName'].setValue('image name'); + component.iosNameForm.controls['templateName'].setValue(''); + component.iosNameForm.controls['platform'].setValue('platform'); + component.iosNameForm.controls['chassis'].setValue('chassis'); + component.iosMemoryForm.controls['memory'].setValue(0); + component.server = { id: 1 } as Server; - expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when image name is not defined', () => { - spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); - component.iosNameForm.controls['templateName'].setValue('template name'); - component.iosNameForm.controls['platform'].setValue('platform'); - component.iosNameForm.controls['chassis'].setValue('chassis'); - component.iosMemoryForm.controls['memory'].setValue(0); - component.server = {id: 1} as Server; + expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when image name is not defined', () => { + spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); + component.iosNameForm.controls['templateName'].setValue('template name'); + component.iosNameForm.controls['platform'].setValue('platform'); + component.iosNameForm.controls['chassis'].setValue('chassis'); + component.iosMemoryForm.controls['memory'].setValue(0); + component.server = { id: 1 } as Server; - expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when memory is not defined', () => { - spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); - component.iosImageForm.controls['imageName'].setValue('image name'); - component.iosNameForm.controls['templateName'].setValue('template name'); - component.iosNameForm.controls['platform'].setValue('platform'); - component.iosNameForm.controls['chassis'].setValue('chassis'); - component.server = {id: 1} as Server; + expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when memory is not defined', () => { + spyOn(mockedIosService, 'addTemplate').and.returnValue(of({} as IosTemplate)); + component.iosImageForm.controls['imageName'].setValue('image name'); + component.iosNameForm.controls['templateName'].setValue('template name'); + component.iosNameForm.controls['platform'].setValue('platform'); + component.iosNameForm.controls['chassis'].setValue('chassis'); + component.server = { id: 1 } as Server; - expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedIosService.addTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts index 5447f498..fef62882 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -16,241 +16,251 @@ import { ComputeService } from '../../../../services/compute.service'; import { Compute } from '../../../../models/compute'; @Component({ - selector: 'app-add-ios-template', - templateUrl: './add-ios-template.component.html', - styleUrls: ['./add-ios-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-ios-template', + templateUrl: './add-ios-template.component.html', + styleUrls: ['./add-ios-template.component.scss', '../../preferences.component.scss'], }) export class AddIosTemplateComponent implements OnInit { - server: Server; - iosTemplate: IosTemplate; - isEtherSwitchRouter: boolean = false; + server: Server; + iosTemplate: IosTemplate; + isEtherSwitchRouter: boolean = false; - iosImageForm: FormGroup; - iosNameForm: FormGroup; - iosMemoryForm: FormGroup; - selectedPlatform: string; + iosImageForm: FormGroup; + iosNameForm: FormGroup; + iosMemoryForm: FormGroup; + selectedPlatform: string; - networkAdaptersForTemplate: string[] = []; - networkModulesForTemplate: string[] = []; + networkAdaptersForTemplate: string[] = []; + networkModulesForTemplate: string[] = []; - iosImages: IosImage[] = []; - platforms: string[] = []; - platformsWithEtherSwitchRouterOption = {}; - platformsWithChassis = {}; - chassis = {}; - defaultRam = {}; - defaultNvram = {}; - networkAdapters = {}; - networkAdaptersForPlatform = {}; - networkModules = {}; + iosImages: IosImage[] = []; + platforms: string[] = []; + platformsWithEtherSwitchRouterOption = {}; + platformsWithChassis = {}; + chassis = {}; + defaultRam = {}; + defaultNvram = {}; + networkAdapters = {}; + networkAdaptersForPlatform = {}; + networkModules = {}; - ciscoUrl: string = "https://cfn.cloudapps.cisco.com/ITDIT/CFN/jsp/SearchBySoftware.jsp"; - uploader: FileUploader; + ciscoUrl: string = 'https://cfn.cloudapps.cisco.com/ITDIT/CFN/jsp/SearchBySoftware.jsp'; + uploader: FileUploader; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iosService: IosService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private router: Router, - private templateMocksService: TemplateMocksService, - private iosConfigurationService: IosConfigurationService, - private computeService: ComputeService + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iosService: IosService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private router: Router, + private templateMocksService: TemplateMocksService, + private iosConfigurationService: IosConfigurationService, + private computeService: ComputeService + ) { + this.iosTemplate = new IosTemplate(); + + this.iosImageForm = this.formBuilder.group({ + imageName: new FormControl(null, [Validators.required]), + }); + + this.iosNameForm = this.formBuilder.group({ + templateName: new FormControl(null, [Validators.required]), + platform: new FormControl(null, [Validators.required]), + chassis: new FormControl(null, [Validators.required]), + }); + + this.iosMemoryForm = this.formBuilder.group({ + memory: new FormControl(null, [Validators.required]), + }); + } + + ngOnInit() { + this.uploader = new FileUploader({}); + this.uploader.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; + this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { + this.toasterService.error('An error occured: ' + response); + }; + this.uploader.onSuccessItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.getImages(); + this.toasterService.success('Image uploaded'); + }; + + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getImages(); + + this.templateMocksService.getIosTemplate().subscribe((iosTemplate: IosTemplate) => { + this.iosTemplate = iosTemplate; + + this.networkModules = this.iosConfigurationService.getNetworkModules(); + this.networkAdaptersForPlatform = this.iosConfigurationService.getNetworkAdaptersForPlatform(); + this.networkAdapters = this.iosConfigurationService.getNetworkAdapters(); + this.platforms = this.iosConfigurationService.getAvailablePlatforms(); + this.platformsWithEtherSwitchRouterOption = this.iosConfigurationService.getPlatformsWithEtherSwitchRouterOption(); + this.platformsWithChassis = this.iosConfigurationService.getPlatformsWithChassis(); + this.chassis = this.iosConfigurationService.getChassis(); + this.defaultRam = this.iosConfigurationService.getDefaultRamSettings(); + }); + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; + } + } + + getImages() { + this.iosService.getImages(this.server).subscribe((images: IosImage[]) => { + this.iosImages = images; + }); + } + + addImage(event): void { + let name = event.target.files[0].name.split('-')[0]; + this.iosNameForm.controls['templateName'].setValue(name); + let fileName = event.target.files[0].name; + + const url = this.iosService.getImagePath(this.server, fileName); + this.uploader.queue.forEach((elem) => (elem.url = url)); + + const itemToUpload = this.uploader.queue[0]; + (itemToUpload as any).options.disableMultipart = true; + + this.uploader.uploadItem(itemToUpload); + } + + addTemplate() { + if ( + !this.iosImageForm.invalid && + !this.iosMemoryForm.invalid && + this.iosNameForm.get('templateName').value && + this.iosNameForm.get('platform').value ) { - this.iosTemplate = new IosTemplate(); + this.iosTemplate.template_id = uuid(); + this.iosTemplate.image = this.iosImageForm.get('imageName').value; + this.iosTemplate.name = this.iosNameForm.get('templateName').value; + this.iosTemplate.platform = this.iosNameForm.get('platform').value; - this.iosImageForm = this.formBuilder.group({ - imageName: new FormControl(null, [Validators.required]) - }); + if (this.chassis[this.iosNameForm.get('platform').value]) + this.iosTemplate.chassis = this.iosNameForm.get('chassis').value; + this.iosTemplate.ram = this.iosMemoryForm.get('memory').value; - this.iosNameForm = this.formBuilder.group({ - templateName: new FormControl(null, [Validators.required]), - platform: new FormControl(null, [Validators.required]), - chassis: new FormControl(null, [Validators.required]) - }); + if (this.isEtherSwitchRouter) { + this.iosTemplate.symbol = ':/symbols/multilayer_switch.svg'; + this.iosTemplate.category = 'switch'; + } - this.iosMemoryForm = this.formBuilder.group({ - memory: new FormControl(null, [Validators.required]) - }); + if (this.networkAdaptersForTemplate.length > 0) this.completeAdaptersData(); + if (this.networkModulesForTemplate.length > 0) this.completeModulesData(); + + this.iosTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + this.iosService.addTemplate(this.server, this.iosTemplate).subscribe((template: IosTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } - ngOnInit() { - this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { - file.withCredentials = false; - }; - this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error occured: ' + response); - }; - this.uploader.onSuccessItem = ( - item: FileItem, - response: string, - status: number, - headers: ParsedResponseHeaders - ) => { - this.getImages(); - this.toasterService.success('Image uploaded'); - }; - - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.getImages(); - - this.templateMocksService.getIosTemplate().subscribe((iosTemplate: IosTemplate) => { - this.iosTemplate = iosTemplate; - - this.networkModules = this.iosConfigurationService.getNetworkModules(); - this.networkAdaptersForPlatform = this.iosConfigurationService.getNetworkAdaptersForPlatform(); - this.networkAdapters = this.iosConfigurationService.getNetworkAdapters(); - this.platforms = this.iosConfigurationService.getAvailablePlatforms(); - this.platformsWithEtherSwitchRouterOption = this.iosConfigurationService.getPlatformsWithEtherSwitchRouterOption(); - this.platformsWithChassis = this.iosConfigurationService.getPlatformsWithChassis(); - this.chassis = this.iosConfigurationService.getChassis(); - this.defaultRam = this.iosConfigurationService.getDefaultRamSettings(); - }); - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; + completeAdaptersData() { + if (this.chassis[this.iosTemplate.platform]) { + if (Object.keys(this.networkAdapters[this.iosTemplate.chassis])) { + for (let i = 0; i < Object.keys(this.networkAdapters[this.iosTemplate.chassis]).length; i++) { + if (!this.networkAdaptersForTemplate[i]) this.networkAdaptersForTemplate[i] = ''; } - } - - getImages() { - this.iosService.getImages(this.server).subscribe((images: IosImage[]) => { - this.iosImages = images; - }); - } - - addImage(event): void { - let name = event.target.files[0].name.split('-')[0]; - this.iosNameForm.controls['templateName'].setValue(name); - let fileName = event.target.files[0].name; - - const url = this.iosService.getImagePath(this.server, fileName); - this.uploader.queue.forEach(elem => (elem.url = url)); - - const itemToUpload = this.uploader.queue[0]; - (itemToUpload as any).options.disableMultipart = true; - - this.uploader.uploadItem(itemToUpload); - } - - addTemplate() { - if (!this.iosImageForm.invalid && !this.iosMemoryForm.invalid && this.iosNameForm.get('templateName').value && this.iosNameForm.get('platform').value) { - this.iosTemplate.template_id = uuid(); - this.iosTemplate.image = this.iosImageForm.get("imageName").value; - this.iosTemplate.name = this.iosNameForm.get('templateName').value; - this.iosTemplate.platform = this.iosNameForm.get('platform').value; - - if (this.chassis[this.iosNameForm.get('platform').value]) this.iosTemplate.chassis = this.iosNameForm.get('chassis').value; - this.iosTemplate.ram = this.iosMemoryForm.get('memory').value; - - if (this.isEtherSwitchRouter) { - this.iosTemplate.symbol = ":/symbols/multilayer_switch.svg"; - this.iosTemplate.category = "switch"; - } - - if (this.networkAdaptersForTemplate.length>0) this.completeAdaptersData(); - if (this.networkModulesForTemplate.length>0) this.completeModulesData(); - - this.iosTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - this.iosService.addTemplate(this.server, this.iosTemplate).subscribe((template: IosTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); + } + } else { + if (this.networkAdaptersForPlatform[this.iosNameForm.get('platform').value]) { + for ( + let i = 0; + i < Object.keys(this.networkAdaptersForPlatform[this.iosNameForm.get('platform').value]).length; + i++ + ) { + if (!this.networkAdaptersForTemplate[i]) this.networkAdaptersForTemplate[i] = ''; } + } } - completeAdaptersData() { - if (this.chassis[this.iosTemplate.platform]) { - if(Object.keys(this.networkAdapters[this.iosTemplate.chassis])){ - for(let i=0; i -
-
-

Copy IOS router template

-
+
+
+

Copy IOS router template

-
- -
- - - -
- -
- - -
+
+
+ +
+ + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts index f400eb41..86d268e3 100644 --- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -8,59 +8,57 @@ import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosService } from '../../../../services/ios.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-copy-ios-template', - templateUrl: './copy-ios-template.component.html', - styleUrls: ['./copy-ios-template.component.scss', '../../preferences.component.scss'] + selector: 'app-copy-ios-template', + templateUrl: './copy-ios-template.component.html', + styleUrls: ['./copy-ios-template.component.scss', '../../preferences.component.scss'], }) export class CopyIosTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - iosTemplate: IosTemplate; - formGroup: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iosService: IosService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.formGroup = this.formBuilder.group({ - templateName: new FormControl('', Validators.required) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.iosService.getTemplate(this.server, template_id).subscribe((iosTemplate: IosTemplate) => { - this.iosTemplate = iosTemplate; - this.templateName = `Copy of ${this.iosTemplate.name}`; - }) - - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']); - } - - addTemplate() { - if (!this.formGroup.invalid) { - this.iosTemplate.template_id = uuid(); - this.iosTemplate.name = this.templateName; - - this.iosService.addTemplate(this.server, this.iosTemplate).subscribe((template: IosTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + server: Server; + templateName: string = ''; + iosTemplate: IosTemplate; + formGroup: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iosService: IosService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.formGroup = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.iosService.getTemplate(this.server, template_id).subscribe((iosTemplate: IosTemplate) => { + this.iosTemplate = iosTemplate; + this.templateName = `Copy of ${this.iosTemplate.name}`; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']); + } + + addTemplate() { + if (!this.formGroup.invalid) { + this.iosTemplate.template_id = uuid(); + this.iosTemplate.name = this.templateName; + + this.iosService.addTemplate(this.server, this.iosTemplate).subscribe((template: IosTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.html b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.html index 2864366e..e1a11bb7 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.html +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.html @@ -1,12 +1,12 @@
-
-
-

Dynamips preferences

-
-
-
- - - +
+
+

Dynamips preferences

+
+
+ + + +
diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.scss b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.scss index 93342be4..9800a50e 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.scss +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.scss @@ -1,8 +1,8 @@ .top-button { - height: 36px; - margin-top: 22px + height: 36px; + margin-top: 22px; } .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts index 1a191bf6..4db227d5 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.spec.ts @@ -19,46 +19,54 @@ import { ToasterService } from '../../../../services/toaster.service'; import { DynamipsPreferencesComponent } from './dynamips-preferences.component'; describe('DynamipsPreferencesComponent', () => { - let component: DynamipsPreferencesComponent; - let fixture: ComponentFixture; + let component: DynamipsPreferencesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let activatedRoute = new MockedActivatedRoute().get(); - let mockedServerSettingsService = new MockedServerSettingsService(); - let mockedToasterService = new MockedToasterService(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [HttpClientModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: ServerSettingsService, useValue: mockedServerSettingsService }, - { provide: ToasterService, useValue: mockedToasterService } - ], - declarations: [ - DynamipsPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let activatedRoute = new MockedActivatedRoute().get(); + let mockedServerSettingsService = new MockedServerSettingsService(); + let mockedToasterService = new MockedToasterService(); - beforeEach(() => { - fixture = TestBed.createComponent(DynamipsPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: ServerSettingsService, useValue: mockedServerSettingsService }, + { provide: ToasterService, useValue: mockedToasterService }, + ], + declarations: [DynamipsPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DynamipsPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should clear path when restore defaults called', () => { - component.dynamipsPath = 'Non empty'; - component.restoreDefaults(); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.dynamipsPath).toBe(''); - }); + it('should clear path when restore defaults called', () => { + component.dynamipsPath = 'Non empty'; + component.restoreDefaults(); + + expect(component.dynamipsPath).toBe(''); + }); }); diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts index b6c92fdb..0644283a 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts @@ -1,33 +1,32 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ServerSettingsService } from '../../../../services/server-settings.service'; import { ActivatedRoute } from '@angular/router'; import { Server } from '../../../../models/server'; import { ServerService } from '../../../../services/server.service'; - @Component({ - selector: 'app-dynamips-preferences', - templateUrl: './dynamips-preferences.component.html', - styleUrls: ['./dynamips-preferences.component.scss'] + selector: 'app-dynamips-preferences', + templateUrl: './dynamips-preferences.component.html', + styleUrls: ['./dynamips-preferences.component.scss'], }) export class DynamipsPreferencesComponent implements OnInit { - server: Server; - dynamipsPath: string; + server: Server; + dynamipsPath: string; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private serverSettingsService: ServerSettingsService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private serverSettingsService: ServerSettingsService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } - restoreDefaults() { - this.dynamipsPath = ''; - } + restoreDefaults() { + this.dynamipsPath = ''; + } } diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html index b4470c3f..8c3f8c83 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html @@ -1,200 +1,288 @@
-
-
-

Dynamips IOS Router configuration

-
+
+
+

Dynamips IOS Router configuration

-
- - - - - General settings - - -
- - - - - - - Platform - {{iosTemplate.platform}}

- Chassis - {{iosTemplate.chassis}}

- - - -

- - - - {{category[0]}} - - - - - - - - - - - - -
- - - - {{type}} - - - - - Auto start console - - - - - - Memories and disks - - -
- - - MB - - - - MB - - - - - - - - - - -
- - Automatically delete NVRAM and disk files - - - - - - Slots - - -
Adapters
-
-
- - - {{option}} - - -
-
-
-
- - - {{option}} - - -
-


-
WICs
-
- - - {{option}} - - -
-
- - - {{option}} - - -
-
- - - {{option}} - - -
- - - - - Advanced - - -
- - - - - - - - - - - - - - - - - - -
- - Enable mmap support -

- - Enable sparse memory supoport - - - - - - Usage - - - - - - - -
- - +
+
+ + + + General settings + +
+ + + + + + + Platform - {{ iosTemplate.platform }}

+ Chassis - {{ iosTemplate.chassis }}

+ + + +

+ + + + {{ category[0] }} + + + + + + + + + + + + +
+ + + + {{ type }} + + + + Auto start console + + + + Memories and disks + +
+ + + MB + + + + MB + + + + + + + + + + +
+ + Automatically delete NVRAM and disk files + + + + + Slots + +
Adapters
+
+
+ + + {{ option }} + + +
+
+
+ + + {{ option }} + + +
+
+

+
WICs
+
+ + + {{ option }} + + +
+
+ + + {{ option }} + + +
+
+ + + {{ option }} + + +
+ + + + Advanced + +
+ + + + + + + + + + + + + + + + + + +
+ Enable mmap support

+ Enable sparse memory supoport + + + + Usage + + + + + + +
+ +
+
- + diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts index 0670d519..b87bb74e 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts @@ -22,72 +22,81 @@ import { IosService } from '../../../../services/ios.service'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; export class MockedIosService { - public getTemplate(server: Server, template_id: string) { - return of({} as IosTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as IosTemplate); + } - public saveTemplate(server: Server, iosTemplate: IosTemplate) { - return of(iosTemplate); - } + public saveTemplate(server: Server, iosTemplate: IosTemplate) { + return of(iosTemplate); + } } describe('IosTemplateDetailsComponent', () => { - let component: IosTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: IosTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIosService = new MockedIosService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IosService, useValue: mockedIosService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: IosConfigurationService, useClass: IosConfigurationService } - ], - declarations: [ - IosTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIosService = new MockedIosService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(IosTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IosService, useValue: mockedIosService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: IosConfigurationService, useClass: IosConfigurationService }, + ], + declarations: [IosTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(IosTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedIosService, 'saveTemplate').and.returnValue(of({} as IosTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.generalSettingsForm.controls['path'].setValue('path'); - component.generalSettingsForm.controls['initialConfig'].setValue('txt'); - component.memoryForm.controls['ram'].setValue('0'); - component.memoryForm.controls['nvram'].setValue('0'); - component.memoryForm.controls['iomemory'].setValue('0'); - component.memoryForm.controls['disk0'].setValue('0'); - component.memoryForm.controls['disk1'].setValue('0'); - component.advancedForm.controls['systemId'].setValue('0'); - component.advancedForm.controls['idlemax'].setValue('0'); - component.advancedForm.controls['idlesleep'].setValue('0'); - component.advancedForm.controls['execarea'].setValue('0'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedIosService, 'saveTemplate').and.returnValue(of({} as IosTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.generalSettingsForm.controls['path'].setValue('path'); + component.generalSettingsForm.controls['initialConfig'].setValue('txt'); + component.memoryForm.controls['ram'].setValue('0'); + component.memoryForm.controls['nvram'].setValue('0'); + component.memoryForm.controls['iomemory'].setValue('0'); + component.memoryForm.controls['disk0'].setValue('0'); + component.memoryForm.controls['disk1'].setValue('0'); + component.advancedForm.controls['systemId'].setValue('0'); + component.advancedForm.controls['idlemax'].setValue('0'); + component.advancedForm.controls['idlesleep'].setValue('0'); + component.advancedForm.controls['execarea'].setValue('0'); - expect(mockedIosService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedIosService.saveTemplate).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts index 22be26da..80fc5e7e 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -8,138 +8,137 @@ import { IosTemplate } from '../../../../models/templates/ios-template'; import { IosService } from '../../../../services/ios.service'; import { IosConfigurationService } from '../../../../services/ios-configuration.service'; - @Component({ - selector: 'app-ios-template-details', - templateUrl: './ios-template-details.component.html', - styleUrls: ['./ios-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-ios-template-details', + templateUrl: './ios-template-details.component.html', + styleUrls: ['./ios-template-details.component.scss', '../../preferences.component.scss'], }) export class IosTemplateDetailsComponent implements OnInit { - server: Server; - iosTemplate: IosTemplate; + server: Server; + iosTemplate: IosTemplate; - isSymbolSelectionOpened: boolean = false; + isSymbolSelectionOpened: boolean = false; - networkAdaptersForTemplate: string[] = []; - platforms: string[] = []; - consoleTypes: string[] = []; - platformsWithEtherSwitchRouterOption = {}; - platformsWithChassis = {}; - chassis = {}; - defaultRam = {}; - defaultNvram = {}; - networkAdapters = {}; - networkAdaptersForPlatform = {}; - networkModules = {}; + networkAdaptersForTemplate: string[] = []; + platforms: string[] = []; + consoleTypes: string[] = []; + platformsWithEtherSwitchRouterOption = {}; + platformsWithChassis = {}; + chassis = {}; + defaultRam = {}; + defaultNvram = {}; + networkAdapters = {}; + networkAdaptersForPlatform = {}; + networkModules = {}; - generalSettingsForm: FormGroup; - memoryForm: FormGroup; - advancedForm: FormGroup; + generalSettingsForm: FormGroup; + memoryForm: FormGroup; + advancedForm: FormGroup; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iosService: IosService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private iosConfigurationService: IosConfigurationService, - private router: Router - ) { - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required), - path: new FormControl('', Validators.required), - initialConfig: new FormControl('', Validators.required) - }); + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iosService: IosService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private iosConfigurationService: IosConfigurationService, + private router: Router + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + path: new FormControl('', Validators.required), + initialConfig: new FormControl('', Validators.required), + }); - this.memoryForm = this.formBuilder.group({ - ram: new FormControl('', Validators.required), - nvram: new FormControl('', Validators.required), - iomemory: new FormControl('', Validators.required), - disk0: new FormControl('', Validators.required), - disk1: new FormControl('', Validators.required), - }); + this.memoryForm = this.formBuilder.group({ + ram: new FormControl('', Validators.required), + nvram: new FormControl('', Validators.required), + iomemory: new FormControl('', Validators.required), + disk0: new FormControl('', Validators.required), + disk1: new FormControl('', Validators.required), + }); - this.advancedForm = this.formBuilder.group({ - systemId: new FormControl('', Validators.required), - idlemax: new FormControl('', Validators.required), - idlesleep: new FormControl('', Validators.required), - execarea: new FormControl('', Validators.required), - }); + this.advancedForm = this.formBuilder.group({ + systemId: new FormControl('', Validators.required), + idlemax: new FormControl('', Validators.required), + idlesleep: new FormControl('', Validators.required), + execarea: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.iosService.getTemplate(this.server, template_id).subscribe((iosTemplate: IosTemplate) => { + this.iosTemplate = iosTemplate; + + this.fillAdaptersData(); + }); + }); + } + + getConfiguration() { + this.networkModules = this.iosConfigurationService.getNetworkModules(); + this.networkAdaptersForPlatform = this.iosConfigurationService.getNetworkAdaptersForPlatform(); + this.networkAdapters = this.iosConfigurationService.getNetworkAdapters(); + this.platforms = this.iosConfigurationService.getAvailablePlatforms(); + this.platformsWithEtherSwitchRouterOption = this.iosConfigurationService.getPlatformsWithEtherSwitchRouterOption(); + this.platformsWithChassis = this.iosConfigurationService.getPlatformsWithChassis(); + this.chassis = this.iosConfigurationService.getChassis(); + this.defaultRam = this.iosConfigurationService.getDefaultRamSettings(); + this.consoleTypes = this.iosConfigurationService.getConsoleTypes(); + } + + fillAdaptersData() { + if (this.iosTemplate.slot0) this.networkAdaptersForTemplate[0] = this.iosTemplate.slot0; + if (this.iosTemplate.slot1) this.networkAdaptersForTemplate[1] = this.iosTemplate.slot1; + if (this.iosTemplate.slot2) this.networkAdaptersForTemplate[2] = this.iosTemplate.slot2; + if (this.iosTemplate.slot3) this.networkAdaptersForTemplate[3] = this.iosTemplate.slot3; + if (this.iosTemplate.slot4) this.networkAdaptersForTemplate[4] = this.iosTemplate.slot4; + if (this.iosTemplate.slot5) this.networkAdaptersForTemplate[5] = this.iosTemplate.slot5; + if (this.iosTemplate.slot6) this.networkAdaptersForTemplate[6] = this.iosTemplate.slot6; + if (this.iosTemplate.slot7) this.networkAdaptersForTemplate[7] = this.iosTemplate.slot7; + } + + completeAdaptersData() { + if (this.networkAdaptersForTemplate[0]) this.iosTemplate.slot0 = this.networkAdaptersForTemplate[0]; + if (this.networkAdaptersForTemplate[1]) this.iosTemplate.slot1 = this.networkAdaptersForTemplate[1]; + if (this.networkAdaptersForTemplate[2]) this.iosTemplate.slot2 = this.networkAdaptersForTemplate[2]; + if (this.networkAdaptersForTemplate[3]) this.iosTemplate.slot3 = this.networkAdaptersForTemplate[3]; + if (this.networkAdaptersForTemplate[4]) this.iosTemplate.slot4 = this.networkAdaptersForTemplate[4]; + if (this.networkAdaptersForTemplate[5]) this.iosTemplate.slot5 = this.networkAdaptersForTemplate[5]; + if (this.networkAdaptersForTemplate[6]) this.iosTemplate.slot6 = this.networkAdaptersForTemplate[6]; + if (this.networkAdaptersForTemplate[7]) this.iosTemplate.slot7 = this.networkAdaptersForTemplate[7]; + } + + onSave() { + if (this.generalSettingsForm.invalid || this.memoryForm.invalid || this.advancedForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.completeAdaptersData(); + + this.iosService.saveTemplate(this.server, this.iosTemplate).subscribe((iosTemplate: IosTemplate) => { + this.toasterService.success('Changes saved'); + }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']); + } - this.getConfiguration(); - this.iosService.getTemplate(this.server, template_id).subscribe((iosTemplate: IosTemplate) => { - this.iosTemplate = iosTemplate; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.fillAdaptersData(); - }); - }); - } - - getConfiguration() { - this.networkModules = this.iosConfigurationService.getNetworkModules(); - this.networkAdaptersForPlatform = this.iosConfigurationService.getNetworkAdaptersForPlatform(); - this.networkAdapters = this.iosConfigurationService.getNetworkAdapters(); - this.platforms = this.iosConfigurationService.getAvailablePlatforms(); - this.platformsWithEtherSwitchRouterOption = this.iosConfigurationService.getPlatformsWithEtherSwitchRouterOption(); - this.platformsWithChassis = this.iosConfigurationService.getPlatformsWithChassis(); - this.chassis = this.iosConfigurationService.getChassis(); - this.defaultRam = this.iosConfigurationService.getDefaultRamSettings(); - this.consoleTypes = this.iosConfigurationService.getConsoleTypes(); - } - - fillAdaptersData() { - if (this.iosTemplate.slot0) this.networkAdaptersForTemplate[0] = this.iosTemplate.slot0; - if (this.iosTemplate.slot1) this.networkAdaptersForTemplate[1] = this.iosTemplate.slot1; - if (this.iosTemplate.slot2) this.networkAdaptersForTemplate[2] = this.iosTemplate.slot2; - if (this.iosTemplate.slot3) this.networkAdaptersForTemplate[3] = this.iosTemplate.slot3; - if (this.iosTemplate.slot4) this.networkAdaptersForTemplate[4] = this.iosTemplate.slot4; - if (this.iosTemplate.slot5) this.networkAdaptersForTemplate[5] = this.iosTemplate.slot5; - if (this.iosTemplate.slot6) this.networkAdaptersForTemplate[6] = this.iosTemplate.slot6; - if (this.iosTemplate.slot7) this.networkAdaptersForTemplate[7] = this.iosTemplate.slot7; - } - - completeAdaptersData() { - if (this.networkAdaptersForTemplate[0]) this.iosTemplate.slot0 = this.networkAdaptersForTemplate[0]; - if (this.networkAdaptersForTemplate[1]) this.iosTemplate.slot1 = this.networkAdaptersForTemplate[1]; - if (this.networkAdaptersForTemplate[2]) this.iosTemplate.slot2 = this.networkAdaptersForTemplate[2]; - if (this.networkAdaptersForTemplate[3]) this.iosTemplate.slot3 = this.networkAdaptersForTemplate[3]; - if (this.networkAdaptersForTemplate[4]) this.iosTemplate.slot4 = this.networkAdaptersForTemplate[4]; - if (this.networkAdaptersForTemplate[5]) this.iosTemplate.slot5 = this.networkAdaptersForTemplate[5]; - if (this.networkAdaptersForTemplate[6]) this.iosTemplate.slot6 = this.networkAdaptersForTemplate[6]; - if (this.networkAdaptersForTemplate[7]) this.iosTemplate.slot7 = this.networkAdaptersForTemplate[7]; - } - - onSave() { - if (this.generalSettingsForm.invalid || this.memoryForm.invalid || this.advancedForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.completeAdaptersData(); - - this.iosService.saveTemplate(this.server, this.iosTemplate).subscribe((iosTemplate: IosTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates']); - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.iosTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.iosTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html index 9a573ad3..d522abb8 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html @@ -1,35 +1,49 @@
-
-
-

IOS router templates

- - -
+
+
+

IOS router templates

+ +
- -
-
- -
- {{template.name}} - - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + + +
+
+
- - + diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts index 18b42cb1..bbeabbfc 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts @@ -18,43 +18,50 @@ import { IosTemplatesComponent } from './ios-templates.component'; import { IosService } from '../../../../services/ios.service'; export class MockedIosService { - public getTemplates(server: Server) { - return of([{} as IosTemplate]); - } + public getTemplates(server: Server) { + return of([{} as IosTemplate]); + } } describe('IosTemplatesComponent', () => { - let component: IosTemplatesComponent; - let fixture: ComponentFixture; + let component: IosTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIosService = new MockedIosService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IosService, useValue: mockedIosService } - ], - declarations: [ - IosTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIosService = new MockedIosService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(IosTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IosService, useValue: mockedIosService }, + ], + declarations: [IosTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(IosTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts index d8536d8f..28d8b717 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -7,47 +7,54 @@ import { IosTemplate } from '../../../../models/templates/ios-template'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; - @Component({ - selector: 'app-ios-templates', - templateUrl: './ios-templates.component.html', - styleUrls: ['./ios-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-ios-templates', + templateUrl: './ios-templates.component.html', + styleUrls: ['./ios-templates.component.scss', '../../preferences.component.scss'], }) export class IosTemplatesComponent implements OnInit { - server: Server; - iosTemplates: IosTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + iosTemplates: IosTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iosService: IosService, - private router: Router - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iosService: IosService, + private router: Router + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.iosService.getTemplates(this.server).subscribe((templates: IosTemplate[]) => { - this.iosTemplates = templates.filter((elem) => elem.template_type === 'dynamips' && !elem.builtin); - }); - } - - deleteTemplate(template: VpcsTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + getTemplates() { + this.iosService.getTemplates(this.server).subscribe((templates: IosTemplate[]) => { + this.iosTemplates = templates.filter((elem) => elem.template_type === 'dynamips' && !elem.builtin); + }); + } - onDeleteEvent() { - this.getTemplates(); - } + deleteTemplate(template: VpcsTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - copyTemplate(template: IosTemplate) { - this.router.navigate(['/server', this.server.id, 'preferences', 'dynamips', 'templates', template.template_id, 'copy']); - } + onDeleteEvent() { + this.getTemplates(); + } + + copyTemplate(template: IosTemplate) { + this.router.navigate([ + '/server', + this.server.id, + 'preferences', + 'dynamips', + 'templates', + template.template_id, + 'copy', + ]); + } } diff --git a/src/app/components/preferences/general/general-preferences.component.html b/src/app/components/preferences/general/general-preferences.component.html index 86867d4d..a521a9ac 100644 --- a/src/app/components/preferences/general/general-preferences.component.html +++ b/src/app/components/preferences/general/general-preferences.component.html @@ -1,10 +1,10 @@
-
-
-

General preferences

-
-
-
-
+
+
+

General preferences

+
+
+
+
diff --git a/src/app/components/preferences/general/general-preferences.component.spec.ts b/src/app/components/preferences/general/general-preferences.component.spec.ts index 7b678c20..06eb5f4a 100644 --- a/src/app/components/preferences/general/general-preferences.component.spec.ts +++ b/src/app/components/preferences/general/general-preferences.component.spec.ts @@ -12,36 +12,43 @@ import { GeneralPreferencesComponent } from './general-preferences.component'; import { MockedActivatedRoute } from '../preferences.component.spec'; describe('GeneralPreferencesComponent', () => { - let component: GeneralPreferencesComponent; - let fixture: ComponentFixture; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - } - ], - declarations: [ - GeneralPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(GeneralPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + let component: GeneralPreferencesComponent; + let fixture: ComponentFixture; + let activatedRoute = new MockedActivatedRoute().get(); - it('should set correct server id', () => { - expect(component.serverId).toBe('1'); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + ], + declarations: [GeneralPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(GeneralPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set correct server id', () => { + expect(component.serverId).toBe('1'); + }); }); diff --git a/src/app/components/preferences/general/general-preferences.component.ts b/src/app/components/preferences/general/general-preferences.component.ts index 0863e2fe..e9f24013 100644 --- a/src/app/components/preferences/general/general-preferences.component.ts +++ b/src/app/components/preferences/general/general-preferences.component.ts @@ -1,20 +1,17 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - @Component({ - selector: 'app-general-preferences', - templateUrl: './general-preferences.component.html', - styleUrls: ['./general-preferences.component.scss'] + selector: 'app-general-preferences', + templateUrl: './general-preferences.component.html', + styleUrls: ['./general-preferences.component.scss'], }) export class GeneralPreferencesComponent implements OnInit { - public serverId: string = ""; + public serverId: string = ''; - constructor( - private route: ActivatedRoute - ) {} + constructor(private route: ActivatedRoute) {} - ngOnInit() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - } + ngOnInit() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + } } diff --git a/src/app/components/preferences/gns3vm/gns3vm.component.html b/src/app/components/preferences/gns3vm/gns3vm.component.html index 3e249db6..8f14cd4f 100644 --- a/src/app/components/preferences/gns3vm/gns3vm.component.html +++ b/src/app/components/preferences/gns3vm/gns3vm.component.html @@ -1,52 +1,66 @@
-
-
-

GNS3 VM preferences

-
+
+
+

GNS3 VM preferences

-
- - - Enable the GNS3 VM - - - - - {{engine.name}} - - - - - - - {{vm.vmname}} - - - - - Run the VM in headless mode - -
- - - - - - MB - - - - -
- - keep the GNS3 VM running - suspend the GNS3 VM - stop the GNS3 VM - - -
- - -
+
+
+ + + Enable the GNS3 VM + + + + + {{ engine.name }} + + + + + + + {{ vm.vmname }} + + + + + Run the VM in headless mode + +
+ + + + + + MB + + + + +
+ + keep the GNS3 VM running + suspend the GNS3 VM + stop the GNS3 VM + + +
+ +
+
diff --git a/src/app/components/preferences/gns3vm/gns3vm.component.scss b/src/app/components/preferences/gns3vm/gns3vm.component.scss index 98ba27a0..d1ec18bf 100644 --- a/src/app/components/preferences/gns3vm/gns3vm.component.scss +++ b/src/app/components/preferences/gns3vm/gns3vm.component.scss @@ -1,12 +1,12 @@ .form-field { - width: 100%; + width: 100%; } .select { - width: 100%; + width: 100%; } .radio-selection { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } diff --git a/src/app/components/preferences/gns3vm/gns3vm.component.ts b/src/app/components/preferences/gns3vm/gns3vm.component.ts index b49ba281..06d983e1 100644 --- a/src/app/components/preferences/gns3vm/gns3vm.component.ts +++ b/src/app/components/preferences/gns3vm/gns3vm.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Gns3vmService } from '../../../services/gns3vm.service'; import { Gns3vm } from '../../../models/gns3vm/gns3vm'; @@ -9,82 +9,81 @@ import { FormBuilder, FormControl, Validators, FormGroup } from '@angular/forms' import { ToasterService } from '../../../services/toaster.service'; import { VM } from '../../../models/gns3vm/vm'; - @Component({ - selector: 'app-gns3vm', - templateUrl: './gns3vm.component.html', - styleUrls: ['./gns3vm.component.scss'] + selector: 'app-gns3vm', + templateUrl: './gns3vm.component.html', + styleUrls: ['./gns3vm.component.scss'], }) export class Gns3vmComponent implements OnInit { - public server: Server; - public gns3vm: Gns3vm; - public vmEngines: Gns3vmEngine[]; - public vms: VM[] = []; - public vmForm: FormGroup; - public port: number; + public server: Server; + public gns3vm: Gns3vm; + public vmEngines: Gns3vmEngine[]; + public vms: VM[] = []; + public vmForm: FormGroup; + public port: number; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private gns3vmService: Gns3vmService, - private router: Router, - private formBuilder: FormBuilder, - private toasterService: ToasterService - ) { - this.vmForm = this.formBuilder.group({ - ram: new FormControl(null, [Validators.required]), - vcpus: new FormControl(null, [Validators.required]) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private gns3vmService: Gns3vmService, + private router: Router, + private formBuilder: FormBuilder, + private toasterService: ToasterService + ) { + this.vmForm = this.formBuilder.group({ + ram: new FormControl(null, [Validators.required]), + vcpus: new FormControl(null, [Validators.required]), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.gns3vmService.getGns3vm(this.server).subscribe((vm: Gns3vm) => { + this.gns3vm = vm; + this.vmForm.controls['ram'].setValue(this.gns3vm.ram); + this.vmForm.controls['vcpus'].setValue(this.gns3vm.vcpus); + if (this.gns3vm.port) this.port = this.gns3vm.port; + this.gns3vmService.getGns3vmEngines(this.server).subscribe((vmEngines: Gns3vmEngine[]) => { + this.vmEngines = vmEngines; }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.gns3vmService.getGns3vm(this.server).subscribe((vm: Gns3vm) => { - this.gns3vm = vm; - this.vmForm.controls['ram'].setValue(this.gns3vm.ram); - this.vmForm.controls['vcpus'].setValue(this.gns3vm.vcpus); - if (this.gns3vm.port) this.port = this.gns3vm.port; - this.gns3vmService.getGns3vmEngines(this.server).subscribe((vmEngines: Gns3vmEngine[]) => { - this.vmEngines = vmEngines; - }); - this.gns3vmService.getVms(this.server, this.gns3vm.engine).subscribe((vms: VM[]) => { - this.vms = vms; - }); - }); + this.gns3vmService.getVms(this.server, this.gns3vm.engine).subscribe((vms: VM[]) => { + this.vms = vms; }); - } + }); + }); + } - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences']); - } + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences']); + } - setCloseAction(action: string) { - this.gns3vm.when_exit = action; - } + setCloseAction(action: string) { + this.gns3vm.when_exit = action; + } - changeVmEngine(event) { - this.gns3vmService.getVms(this.server, event.value).subscribe( - (vms: VM[]) => { - this.vms = vms; - }, - error => {} - ); - } + changeVmEngine(event) { + this.gns3vmService.getVms(this.server, event.value).subscribe( + (vms: VM[]) => { + this.vms = vms; + }, + (error) => {} + ); + } - save() { - if ((this.vmForm.valid && this.gns3vm.vmname) || (this.gns3vm.engine==='remote' && this.gns3vm.vmname)) { - this.gns3vm.ram = this.vmForm.get('ram').value; - this.gns3vm.vcpus= this.vmForm.get('vcpus').value; - if (this.port) this.gns3vm.port = this.port; + save() { + if ((this.vmForm.valid && this.gns3vm.vmname) || (this.gns3vm.engine === 'remote' && this.gns3vm.vmname)) { + this.gns3vm.ram = this.vmForm.get('ram').value; + this.gns3vm.vcpus = this.vmForm.get('vcpus').value; + if (this.port) this.gns3vm.port = this.port; - this.gns3vmService.updateGns3vm(this.server, this.gns3vm).subscribe(() => { - this.toasterService.success('GNS3 VM updated.'); - }); - this.goBack(); - } else { - this.toasterService.error('Fill all required fields with correct values.'); - } + this.gns3vmService.updateGns3vm(this.server, this.gns3vm).subscribe(() => { + this.toasterService.success('GNS3 VM updated.'); + }); + this.goBack(); + } else { + this.toasterService.error('Fill all required fields with correct values.'); } + } } diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html index 021bdd78..28c73807 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html @@ -1,78 +1,85 @@
-
-
-

New IOU device template

-
+
+
+

New IOU device template

-
-
- - - - Run this IOU device locally - Run this IOU device on the GNS3 VM - - +
+
+
+ + + + Run this IOU device locally + Run this IOU device on the GNS3 VM + + - -
- - - -
- + +
+ + + +
+ - -
- - Existing image - New image - - - - - {{type}} - - - - - - - {{image.path}} - - - -
- - - - - -
-
- - -
-
- - -
+ +
+ + Existing image + New image + + + + + {{ type }} + + + + + + + {{ image.path }} + + + +
+ + + + + +
+
+ +
+
+ + +
+
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts index a2e52326..7d65bcde 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts @@ -29,96 +29,96 @@ import { IouService } from '../../../../services/iou.service'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; export class MockedIouService { - public addTemplate(server: Server, iouTemplate: IouTemplate) { - return of(iouTemplate); - } + public addTemplate(server: Server, iouTemplate: IouTemplate) { + return of(iouTemplate); + } } //Tests disabled due to instability xdescribe('AddIouTemplateComponent', () => { - let component: AddIouTemplateComponent; - let fixture: ComponentFixture; + let component: AddIouTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIouService = new MockedIouService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - MatStepperModule, - FormsModule, - MatTableModule, - MatAutocompleteModule, - MatFormFieldModule, - MatInputModule, - ReactiveFormsModule, - MatSelectModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/iou/templates', component: AddIouTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IouService, useValue: mockedIouService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: TemplateMocksService, useClass: TemplateMocksService }, - { provide: IouConfigurationService, useClass: IouConfigurationService } - ], - declarations: [ - AddIouTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIouService = new MockedIouService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(AddIouTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatStepperModule, + FormsModule, + MatTableModule, + MatAutocompleteModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, + MatSelectModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/iou/templates', component: AddIouTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IouService, useValue: mockedIouService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + { provide: IouConfigurationService, useClass: IouConfigurationService }, + ], + declarations: [AddIouTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddIouTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); - component.templateNameForm.controls['templateName'].setValue('sample name'); - component.imageForm.controls['imageName'].setValue('sample name'); - component.newImageSelected = true; - component.server = {id: 1} as Server; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); + component.templateNameForm.controls['templateName'].setValue('sample name'); + component.imageForm.controls['imageName'].setValue('sample name'); + component.newImageSelected = true; + component.server = { id: 1 } as Server; - expect(mockedIouService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is empty', () => { - spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); - component.imageForm.controls['imageName'].setValue('sample name'); - component.newImageSelected = true; - component.server = {id: 1} as Server; + expect(mockedIouService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is empty', () => { + spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); + component.imageForm.controls['imageName'].setValue('sample name'); + component.newImageSelected = true; + component.server = { id: 1 } as Server; - expect(mockedIouService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when image is not entered', () => { - spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); - component.templateNameForm.controls['templateName'].setValue('sample name'); - component.newImageSelected = true; - component.server = {id: 1} as Server; + expect(mockedIouService.addTemplate).not.toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when image is not entered', () => { + spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); + component.templateNameForm.controls['templateName'].setValue('sample name'); + component.newImageSelected = true; + component.server = { id: 1 } as Server; - expect(mockedIouService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedIouService.addTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts index 0927724d..14478b0a 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -13,140 +13,142 @@ import { Compute } from '../../../../models/compute'; import { FileUploader, FileItem, ParsedResponseHeaders } from 'ng2-file-upload'; import { IouImage } from '../../../../models/iou/iou-image'; - @Component({ - selector: 'app-add-iou-template', - templateUrl: './add-iou-template.component.html', - styleUrls: ['./add-iou-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-iou-template', + templateUrl: './add-iou-template.component.html', + styleUrls: ['./add-iou-template.component.scss', '../../preferences.component.scss'], }) export class AddIouTemplateComponent implements OnInit { - server: Server; - iouTemplate: IouTemplate; - isRemoteComputerChosen: boolean = false; - newImageSelected: boolean = false; - types: string[] = ['L2 image', 'L3 image']; - selectedType: string; - iouImages: IouImage[] = []; - uploader: FileUploader; + server: Server; + iouTemplate: IouTemplate; + isRemoteComputerChosen: boolean = false; + newImageSelected: boolean = false; + types: string[] = ['L2 image', 'L3 image']; + selectedType: string; + iouImages: IouImage[] = []; + uploader: FileUploader; - templateNameForm: FormGroup; - imageForm: FormGroup; + templateNameForm: FormGroup; + imageForm: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iouService: IouService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder, - private templateMocksService: TemplateMocksService, - private computeService: ComputeService + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iouService: IouService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder, + private templateMocksService: TemplateMocksService, + private computeService: ComputeService + ) { + this.iouTemplate = new IouTemplate(); + + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl(null, Validators.required), + }); + + this.imageForm = this.formBuilder.group({ + imageName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.uploader = new FileUploader({}); + this.uploader.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; + this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { + this.toasterService.error('An error occured: ' + response); + }; + this.uploader.onSuccessItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.getImages(); + this.toasterService.success('Image uploaded'); + }; + + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getImages(); + + this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => { + this.iouTemplate = iouTemplate; + }); + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + getImages() { + this.iouService.getImages(this.server).subscribe((images: IouImage[]) => { + this.iouImages = images; + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; + } + } + + setDiskImage(value: string) { + this.newImageSelected = value === 'newImage'; + } + + uploadImageFile(event): void { + let name = event.target.files[0].name; + this.imageForm.controls['imageName'].setValue(name); + + const url = this.iouService.getImagePath(this.server, name); + this.uploader.queue.forEach((elem) => (elem.url = url)); + + const itemToUpload = this.uploader.queue[0]; + (itemToUpload as any).options.disableMultipart = true; + + this.uploader.uploadItem(itemToUpload); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); + } + + addTemplate() { + if ( + !this.templateNameForm.invalid && + ((this.newImageSelected && !this.imageForm.invalid) || (!this.newImageSelected && this.iouTemplate.path)) ) { - this.iouTemplate = new IouTemplate(); + this.iouTemplate.template_id = uuid(); + this.iouTemplate.name = this.templateNameForm.get('templateName').value; + if (this.newImageSelected) this.iouTemplate.path = this.imageForm.get('imageName').value; + this.iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl(null, Validators.required) - }); + if (this.selectedType === 'L2 image') { + this.iouTemplate.ethernet_adapters = 4; + this.iouTemplate.serial_adapters = 0; + } else if (this.selectedType === 'L3 image') { + this.iouTemplate.ethernet_adapters = 2; + this.iouTemplate.serial_adapters = 2; + } - this.imageForm = this.formBuilder.group({ - imageName: new FormControl('', Validators.required) - }); - } - - ngOnInit() { - this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { - file.withCredentials = false; - }; - this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error occured: ' + response); - }; - this.uploader.onSuccessItem = ( - item: FileItem, - response: string, - status: number, - headers: ParsedResponseHeaders - ) => { - this.getImages(); - this.toasterService.success('Image uploaded'); - }; - - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getImages(); - - this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => { - this.iouTemplate = iouTemplate; - }) - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - getImages() { - this.iouService.getImages(this.server).subscribe((images: IouImage[]) => { - this.iouImages = images; - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - setDiskImage(value: string) { - this.newImageSelected = value === "newImage"; - } - - uploadImageFile(event): void { - let name = event.target.files[0].name; - this.imageForm.controls['imageName'].setValue(name); - - const url = this.iouService.getImagePath(this.server, name); - this.uploader.queue.forEach(elem => (elem.url = url)); - - const itemToUpload = this.uploader.queue[0]; - (itemToUpload as any).options.disableMultipart = true; - - this.uploader.uploadItem(itemToUpload); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid && ((this.newImageSelected && !this.imageForm.invalid) || (!this.newImageSelected && this.iouTemplate.path))) { - this.iouTemplate.template_id = uuid(); - this.iouTemplate.name = this.templateNameForm.get("templateName").value; - if (this.newImageSelected) this.iouTemplate.path = this.imageForm.get("imageName").value; - this.iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - if (this.selectedType === 'L2 image') { - this.iouTemplate.ethernet_adapters = 4; - this.iouTemplate.serial_adapters = 0; - } else if (this.selectedType === 'L3 image') { - this.iouTemplate.ethernet_adapters = 2; - this.iouTemplate.serial_adapters = 2; - } - - this.iouService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + this.iouService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html index 2c9a0908..b9ca4669 100644 --- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html +++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html @@ -1,24 +1,20 @@
-
-
-

Copy IOU device template

-
+
+
+

Copy IOU device template

-
- -
- - - -
- -
- - -
+
+
+ +
+ + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts index a430d34a..b65640d6 100644 --- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -8,59 +8,57 @@ import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-copy-iou-template', - templateUrl: './copy-iou-template.component.html', - styleUrls: ['./copy-iou-template.component.scss', '../../preferences.component.scss'] + selector: 'app-copy-iou-template', + templateUrl: './copy-iou-template.component.html', + styleUrls: ['./copy-iou-template.component.scss', '../../preferences.component.scss'], }) export class CopyIouTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - iouTemplate: IouTemplate; - templateNameForm: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private qemuService: IouService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.qemuService.getTemplate(this.server, template_id).subscribe((iouTemplate: IouTemplate) => { - this.iouTemplate = iouTemplate; - this.templateName = `Copy of ${this.iouTemplate.name}`; - }) - - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid) { - this.iouTemplate.template_id = uuid(); - this.iouTemplate.name = this.templateName; - - this.qemuService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + server: Server; + templateName: string = ''; + iouTemplate: IouTemplate; + templateNameForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private qemuService: IouService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.qemuService.getTemplate(this.server, template_id).subscribe((iouTemplate: IouTemplate) => { + this.iouTemplate = iouTemplate; + this.templateName = `Copy of ${this.iouTemplate.name}`; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); + } + + addTemplate() { + if (!this.templateNameForm.invalid) { + this.iouTemplate.template_id = uuid(); + this.iouTemplate.name = this.templateName; + + this.qemuService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html index f72a597a..6d8cc52b 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html @@ -1,113 +1,156 @@ -
-
-
-

IOU device configuration

-
+
+
+
+

IOU device configuration

-
- - - - - General settings - - -
- - - - - - - - - -

- - - - {{category[0]}} - - - - - - - - - - - - - - -
- - - - {{type}} - - - - - Auto start console -
- - Enable layer 1 keepalive messages (non-functional) -
- - Use default IOU values for memories - - - - MB - - - - MB - - - - - - Network - - -
- - - - - - -
- - - - - Usage - - - - - - - -
- - -
+
+
+ + + + General settings + +
+ + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + + + + + + + + +
+ + + + {{ type }} + + + + Auto start console
+ + Enable layer 1 keepalive messages (non-functional)
+ Use default IOU values for memories + + + MB + + + + MB + + + + + Network + +
+ + + + + + +
+ + + + Usage + + + + + + +
+ +
+
- + diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts index 29d7983b..e5acaf1c 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts @@ -22,63 +22,71 @@ import { IouService } from '../../../../services/iou.service'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; export class MockedIouService { - public getTemplate(server: Server, template_id: string) { - return of({} as IouTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as IouTemplate); + } - public saveTemplate(server: Server, iouTemplate: IouTemplate) { - return of(iouTemplate); - } + public saveTemplate(server: Server, iouTemplate: IouTemplate) { + return of(iouTemplate); + } } describe('IouTemplateDetailsComponent', () => { - let component: IouTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: IouTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIouService = new MockedIouService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IouService, useValue: mockedIouService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: IouConfigurationService, useClass: IouConfigurationService } - ], - declarations: [ - IouTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIouService = new MockedIouService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(IouTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IouService, useValue: mockedIouService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: IouConfigurationService, useClass: IouConfigurationService }, + ], + declarations: [IouTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(IouTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedIouService, 'saveTemplate').and.returnValue(of({} as IouTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.generalSettingsForm.controls['path'].setValue('path'); - component.generalSettingsForm.controls['initialConfig'].setValue('txt'); - component.networkForm.controls['ethernetAdapters'].setValue('1'); - component.networkForm.controls['serialAdapters'].setValue('1'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedIouService, 'saveTemplate').and.returnValue(of({} as IouTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.generalSettingsForm.controls['path'].setValue('path'); + component.generalSettingsForm.controls['initialConfig'].setValue('txt'); + component.networkForm.controls['ethernetAdapters'].setValue('1'); + component.networkForm.controls['serialAdapters'].setValue('1'); - expect(mockedIouService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedIouService.saveTemplate).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts index 3427591b..bc9ff34c 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -8,91 +8,90 @@ import { IouService } from '../../../../services/iou.service'; import { IouConfigurationService } from '../../../../services/iou-configuration.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-iou-template-details', - templateUrl: './iou-template-details.component.html', - styleUrls: ['./iou-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-iou-template-details', + templateUrl: './iou-template-details.component.html', + styleUrls: ['./iou-template-details.component.scss', '../../preferences.component.scss'], }) export class IouTemplateDetailsComponent implements OnInit { - server: Server; - iouTemplate: IouTemplate; + server: Server; + iouTemplate: IouTemplate; - isSymbolSelectionOpened: boolean = false; - defaultSettings: boolean = true; + isSymbolSelectionOpened: boolean = false; + defaultSettings: boolean = true; - consoleTypes: string[] = []; - consoleResolutions: string[] = []; - categories = []; + consoleTypes: string[] = []; + consoleResolutions: string[] = []; + categories = []; - generalSettingsForm: FormGroup; - networkForm: FormGroup; + generalSettingsForm: FormGroup; + networkForm: FormGroup; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iouService: IouService, - private toasterService: ToasterService, - private configurationService: IouConfigurationService, - private router: Router, - private formBuilder: FormBuilder - ){ - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required), - path: new FormControl('', Validators.required), - initialConfig: new FormControl('', Validators.required) - }); + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iouService: IouService, + private toasterService: ToasterService, + private configurationService: IouConfigurationService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + path: new FormControl('', Validators.required), + initialConfig: new FormControl('', Validators.required), + }); - this.networkForm = this.formBuilder.group({ - ethernetAdapters: new FormControl('', Validators.required), - serialAdapters: new FormControl('', Validators.required) - }); + this.networkForm = this.formBuilder.group({ + ethernetAdapters: new FormControl('', Validators.required), + serialAdapters: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.iouService.getTemplate(this.server, template_id).subscribe((iouTemplate: IouTemplate) => { + this.iouTemplate = iouTemplate; + }); + }); + } + + getConfiguration() { + this.consoleTypes = this.configurationService.getConsoleTypes(); + this.categories = this.configurationService.getCategories(); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); + } + + onSave() { + if (this.generalSettingsForm.invalid || this.networkForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.iouService.saveTemplate(this.server, this.iouTemplate).subscribe(() => { + this.toasterService.success('Changes saved'); + }); } + } - ngOnInit(){ - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.getConfiguration(); - this.iouService.getTemplate(this.server, template_id).subscribe((iouTemplate: IouTemplate) => { - this.iouTemplate = iouTemplate; - }); - }); - } + uploadImageFile(event) { + this.iouTemplate.path = event.target.files[0].name; + } - getConfiguration(){ - this.consoleTypes = this.configurationService.getConsoleTypes(); - this.categories = this.configurationService.getCategories(); - } + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates']); - } - - onSave(){ - if (this.generalSettingsForm.invalid || this.networkForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.iouService.saveTemplate(this.server, this.iouTemplate).subscribe(() => { - this.toasterService.success("Changes saved"); - }); - } - } - - uploadImageFile(event) { - this.iouTemplate.path = event.target.files[0].name; - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.iouTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.iouTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html index 617cc70c..72d55104 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html @@ -1,35 +1,49 @@
-
-
-

IOU device templates

- - -
+
+
+

IOU device templates

+ +
- -
-
- -
- {{template.name}} - - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + + +
+
+
- - + diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts index 1541fb77..0ef88418 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts @@ -18,41 +18,47 @@ import { IouTemplatesComponent } from './iou-templates.component'; import { IouService } from '../../../../services/iou.service'; export class MockedIouService { - public getTemplates(server: Server) { - return of([{} as IouTemplate]); - } + public getTemplates(server: Server) { + return of([{} as IouTemplate]); + } } describe('IouTemplatesComponent', () => { - let component: IouTemplatesComponent; - let fixture: ComponentFixture; + let component: IouTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedIouService = new MockedIouService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: IouService, useValue: mockedIouService } - ], - declarations: [ - IouTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedIouService = new MockedIouService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(IouTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: IouService, useValue: mockedIouService }, + ], + declarations: [IouTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(IouTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts index 4abb3203..668ecea9 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts @@ -1,52 +1,51 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; import { IouTemplate } from '../../../../models/templates/iou-template'; import { IouService } from '../../../../services/iou.service'; - @Component({ - selector: 'app-iou-templates', - templateUrl: './iou-templates.component.html', - styleUrls: ['./iou-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-iou-templates', + templateUrl: './iou-templates.component.html', + styleUrls: ['./iou-templates.component.scss', '../../preferences.component.scss'], }) export class IouTemplatesComponent implements OnInit { - server: Server; - iouTemplates: IouTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + iouTemplates: IouTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private iouService: IouService, - private router: Router - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private iouService: IouService, + private router: Router + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.iouService.getTemplates(this.server).subscribe((iouTemplates: IouTemplate[]) => { - this.iouTemplates = iouTemplates.filter((elem) => elem.template_type === 'iou' && !elem.builtin); - }); - } + getTemplates() { + this.iouService.getTemplates(this.server).subscribe((iouTemplates: IouTemplate[]) => { + this.iouTemplates = iouTemplates.filter((elem) => elem.template_type === 'iou' && !elem.builtin); + }); + } - deleteTemplate(template: IouTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: IouTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } - copyTemplate(template: IouTemplate) { - this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates', template.template_id, 'copy']); - } + copyTemplate(template: IouTemplate) { + this.router.navigate(['/server', this.server.id, 'preferences', 'iou', 'templates', template.template_id, 'copy']); + } } diff --git a/src/app/components/preferences/preferences.component.html b/src/app/components/preferences/preferences.component.html index f3000cf1..8ca23a4b 100644 --- a/src/app/components/preferences/preferences.component.html +++ b/src/app/components/preferences/preferences.component.html @@ -1,43 +1,25 @@
-
-
-

Preferences

-
+
+
+

Preferences

-
-
- - - GNS3 VM - - - Built-in - - - Dynamips - - - IOS on Unix - - - VPCS - - - QEMU - - - VirtualBox - - - VMware - - - Docker - - - -
+
+
diff --git a/src/app/components/preferences/preferences.component.scss b/src/app/components/preferences/preferences.component.scss index 1b12e960..4f0f84a4 100644 --- a/src/app/components/preferences/preferences.component.scss +++ b/src/app/components/preferences/preferences.component.scss @@ -1,99 +1,99 @@ .listcontainer { - padding-left: 0px!important; - padding-right: 0px!important; + padding-left: 0px !important; + padding-right: 0px !important; } .top-button { - height: 36px; - margin-top: 22px + height: 36px; + margin-top: 22px; } .choose-symbol-button { - height: 36px; - margin-top: 22px; + height: 36px; + margin-top: 22px; } .cancel-button { - height: 36px; - margin-top: 22px; - margin-right: 10px; + height: 36px; + margin-top: 22px; + margin-right: 10px; } .form-field { - width: 100%; + width: 100%; } .select { - width: 100%; + width: 100%; } .shadowed { - display: none; - transition: 0.25s; + display: none; + transition: 0.25s; } .nonvisible { - display: none; + display: none; } .configButton { - width: 100%; + width: 100%; } .configHideButton { - margin-left: 80%; - width: 20%; - margin-bottom: 10px; + margin-left: 80%; + width: 20%; + margin-bottom: 10px; } .symbolSelectionButton { - width: 100%; + width: 100%; } .list-item { - display: flex; + display: flex; } .template-name { - width: 95%; + width: 95%; } .delete-button { - width: 10%; - outline: none; + width: 10%; + outline: none; } .menu-button { - width: 5%; - outline: none!important; + width: 5%; + outline: none !important; } th { - border: 0px!important; + border: 0px !important; } th.mat-header-cell { - padding-bottom: 15px; + padding-bottom: 15px; } td.mat-cell { - padding-top: 15px; + padding-top: 15px; } .radio-button { - width: 50%; - padding-top: 20px; + width: 50%; + padding-top: 20px; } .radio-group { - margin-bottom: 20px; + margin-bottom: 20px; } .file-button { - width: 18%; + width: 18%; } .file-name-form-field { - padding-left: 2%; - width: 80%; + padding-left: 2%; + width: 80%; } diff --git a/src/app/components/preferences/preferences.component.spec.ts b/src/app/components/preferences/preferences.component.spec.ts index 9d88d062..38b7170b 100644 --- a/src/app/components/preferences/preferences.component.spec.ts +++ b/src/app/components/preferences/preferences.component.spec.ts @@ -12,56 +12,63 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; export class MockedActivatedRoute { - get() { - return { - params: of({ id: 3 }), - snapshot: { - parent: { - params: { - id: 1 - } - }, - paramMap: { - get(name: string): string { - return '1'; - } - } - }, - }; - } + get() { + return { + params: of({ id: 3 }), + snapshot: { + parent: { + params: { + id: 1, + }, + }, + paramMap: { + get(name: string): string { + return '1'; + }, + }, + }, + }; + } } describe('PreferencesComponent', () => { - let component: PreferencesComponent; - let fixture: ComponentFixture; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - } - ], - declarations: [ - PreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + let component: PreferencesComponent; + let fixture: ComponentFixture; + let activatedRoute = new MockedActivatedRoute().get(); - it('should save correct server id', () => { - expect(component.serverId).toBe('1'); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + ], + declarations: [PreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should save correct server id', () => { + expect(component.serverId).toBe('1'); + }); }); diff --git a/src/app/components/preferences/preferences.component.ts b/src/app/components/preferences/preferences.component.ts index 78ecb2f8..42de52ba 100644 --- a/src/app/components/preferences/preferences.component.ts +++ b/src/app/components/preferences/preferences.component.ts @@ -1,20 +1,17 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - @Component({ - selector: 'app-preferences', - templateUrl: './preferences.component.html', - styleUrls: ['./preferences.component.scss'] + selector: 'app-preferences', + templateUrl: './preferences.component.html', + styleUrls: ['./preferences.component.scss'], }) export class PreferencesComponent implements OnInit { - public serverId: string = ""; + public serverId: string = ''; - constructor( - private route: ActivatedRoute - ) {} + constructor(private route: ActivatedRoute) {} - ngOnInit() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - } + ngOnInit() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + } } diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html index fa33755f..3620769c 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html @@ -1,108 +1,123 @@
-
-
-

New QEMU VM template

-
+
+
+

New QEMU VM template

-
-
- - - - Run this QEMU VM locally - Run this QEMU VM on the GNS3 VM - - +
+
+
+ + + + Run this QEMU VM locally + Run this QEMU VM on the GNS3 VM + + - -
- - -
-
- + +
+ +
+
+ - -
- - - - {{binary.path}} - - -
- - - MB - -
- + +
+ + + + {{ binary.path }} + +
+ + + MB + +
+ - - - - - {{type}} - - - - + + + + + {{ type }} + + + + - -
- - Existing image - New image -

- - - {{image.filename}} - - -
- - - - - -
-
- - -
-
- - -
+ +
+ + Existing image + New image

+ + + {{ image.filename }} + + +
+ + + + + +
+
+ +
+
+ + +
+
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts index c075c4bb..7e2f0205 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts @@ -28,129 +28,129 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; export class MockedQemuService { - public addTemplate(server: Server, qemuTemplate: QemuTemplate) { - return of(qemuTemplate); - } + public addTemplate(server: Server, qemuTemplate: QemuTemplate) { + return of(qemuTemplate); + } - public getBinaries(server: Server) { - return of([]); - } + public getBinaries(server: Server) { + return of([]); + } - public getImages(server: Server) { - return of([]); - } + public getImages(server: Server) { + return of([]); + } } //Tests disabled due to instability xdescribe('AddQemuVmTemplateComponent', () => { - let component: AddQemuVmTemplateComponent; - let fixture: ComponentFixture; + let component: AddQemuVmTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedQemuService = new MockedQemuService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - let router = { - navigate: jasmine.createSpy('navigate') + let mockedServerService = new MockedServerService(); + let mockedQemuService = new MockedQemuService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); + let router = { + navigate: jasmine.createSpy('navigate'), + }; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatStepperModule, + FormsModule, + ReactiveFormsModule, + MatSelectModule, + MatAutocompleteModule, + MatIconModule, + MatFormFieldModule, + MatInputModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/qemu/templates', component: AddQemuVmTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: Router, useValue: router }, + { provide: ServerService, useValue: mockedServerService }, + { provide: QemuService, useValue: mockedQemuService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + { provide: QemuConfigurationService, useClass: QemuConfigurationService }, + ], + declarations: [AddQemuVmTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AddQemuVmTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call add template', () => { + spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); + component.nameForm.controls['templateName'].setValue('template name'); + component.memoryForm.controls['binary'].setValue('binary'); + component.memoryForm.controls['ramMemory'].setValue(0); + component.diskForm.controls['fileName'].setValue('file name'); + component.chosenImage = 'path'; + component.selectedBinary = { + path: 'path', + version: 'version', }; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - MatStepperModule, - FormsModule, - ReactiveFormsModule, - MatSelectModule, - MatAutocompleteModule, - MatIconModule, - MatFormFieldModule, - MatInputModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/qemu/templates', component: AddQemuVmTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: Router, useValue: router }, - { provide: ServerService, useValue: mockedServerService }, - { provide: QemuService, useValue: mockedQemuService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: TemplateMocksService, useClass: TemplateMocksService }, - { provide: QemuConfigurationService, useClass: QemuConfigurationService } - ], - declarations: [ - AddQemuVmTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + component.newImageSelected = true; + component.server = { id: 1 } as Server; - beforeEach(() => { - fixture = TestBed.createComponent(AddQemuVmTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + component.addTemplate(); - it('should create', () => { - expect(component).toBeTruthy(); - }); + expect(mockedQemuService.addTemplate).toHaveBeenCalled(); + }); - it('should call add template', () => { - spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); - component.nameForm.controls['templateName'].setValue('template name'); - component.memoryForm.controls['binary'].setValue('binary'); - component.memoryForm.controls['ramMemory'].setValue(0); - component.diskForm.controls['fileName'].setValue('file name'); - component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version' - }; - component.newImageSelected = true; - component.server = {id: 1} as Server; + it('should not call add template when template name is empty', () => { + spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); + component.nameForm.controls['templateName'].setValue(''); + component.memoryForm.controls['binary'].setValue('binary'); + component.memoryForm.controls['ramMemory'].setValue(0); + component.diskForm.controls['fileName'].setValue('file name'); + component.chosenImage = 'path'; + component.selectedBinary = { + path: 'path', + version: 'version', + }; + component.newImageSelected = true; + component.server = { id: 1 } as Server; - component.addTemplate(); + component.addTemplate(); - expect(mockedQemuService.addTemplate).toHaveBeenCalled(); - }); + expect(mockedQemuService.addTemplate).not.toHaveBeenCalled(); + }); - it('should not call add template when template name is empty', () => { - spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); - component.nameForm.controls['templateName'].setValue(''); - component.memoryForm.controls['binary'].setValue('binary'); - component.memoryForm.controls['ramMemory'].setValue(0); - component.diskForm.controls['fileName'].setValue('file name'); - component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version' - }; - component.newImageSelected = true; - component.server = {id: 1} as Server; + it('should not call add template when ram is not set', () => { + spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); + component.nameForm.controls['templateName'].setValue('template name'); + component.memoryForm.controls['binary'].setValue('binary'); + component.diskForm.controls['fileName'].setValue('file name'); + component.chosenImage = 'path'; + component.selectedBinary = { + path: 'path', + version: 'version', + }; + component.newImageSelected = true; + component.server = { id: 1 } as Server; - component.addTemplate(); + component.addTemplate(); - expect(mockedQemuService.addTemplate).not.toHaveBeenCalled(); - }); - - it('should not call add template when ram is not set', () => { - spyOn(mockedQemuService, 'addTemplate').and.returnValue(of({} as QemuTemplate)); - component.nameForm.controls['templateName'].setValue('template name'); - component.memoryForm.controls['binary'].setValue('binary'); - component.diskForm.controls['fileName'].setValue('file name'); - component.chosenImage = 'path'; - component.selectedBinary = { - path: 'path', - version: 'version' - }; - component.newImageSelected = true; - component.server = {id: 1} as Server; - - component.addTemplate(); - - expect(mockedQemuService.addTemplate).not.toHaveBeenCalled(); - }); + expect(mockedQemuService.addTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts index 9d1f8583..784af3b1 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -15,153 +15,152 @@ import { ComputeService } from '../../../../services/compute.service'; import { Compute } from '../../../../models/compute'; import { FileUploader, FileItem, ParsedResponseHeaders } from 'ng2-file-upload'; - @Component({ - selector: 'app-add-qemu-virtual-machine-template', - templateUrl: './add-qemu-vm-template.component.html', - styleUrls: ['./add-qemu-vm-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-qemu-virtual-machine-template', + templateUrl: './add-qemu-vm-template.component.html', + styleUrls: ['./add-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class AddQemuVmTemplateComponent implements OnInit { - server: Server; - qemuBinaries: QemuBinary[] = []; - selectedBinary: QemuBinary; - ramMemory: number; - consoleTypes: string[] = []; - newImageSelected: boolean = false;; - qemuImages: QemuImage[] = []; - selectedImage: QemuImage; - chosenImage: string = ''; - qemuTemplate: QemuTemplate; - uploader: FileUploader; + server: Server; + qemuBinaries: QemuBinary[] = []; + selectedBinary: QemuBinary; + ramMemory: number; + consoleTypes: string[] = []; + newImageSelected: boolean = false; + qemuImages: QemuImage[] = []; + selectedImage: QemuImage; + chosenImage: string = ''; + qemuTemplate: QemuTemplate; + uploader: FileUploader; - nameForm: FormGroup; - memoryForm: FormGroup; - diskForm: FormGroup; + nameForm: FormGroup; + memoryForm: FormGroup; + diskForm: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private qemuService: QemuService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder, - private templateMocksService: TemplateMocksService, - private configurationService: QemuConfigurationService, - private computeService: ComputeService - ) { - this.qemuTemplate = new QemuTemplate(); + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; - this.nameForm = this.formBuilder.group({ - templateName: new FormControl(null, Validators.required) - }); + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private qemuService: QemuService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder, + private templateMocksService: TemplateMocksService, + private configurationService: QemuConfigurationService, + private computeService: ComputeService + ) { + this.qemuTemplate = new QemuTemplate(); - this.memoryForm = this.formBuilder.group({ - ramMemory: new FormControl('256', Validators.required) - }); + this.nameForm = this.formBuilder.group({ + templateName: new FormControl(null, Validators.required), + }); - this.diskForm = this.formBuilder.group({ - fileName: new FormControl('', Validators.required) - }); + this.memoryForm = this.formBuilder.group({ + ramMemory: new FormControl('256', Validators.required), + }); + + this.diskForm = this.formBuilder.group({ + fileName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.uploader = new FileUploader({}); + this.uploader.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; + this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { + this.toasterService.error('An error occured: ' + response); + }; + this.uploader.onSuccessItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.qemuService.getImages(this.server).subscribe((qemuImages: QemuImage[]) => { + this.qemuImages = qemuImages; + }); + this.toasterService.success('Image uploaded'); + }; + + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.templateMocksService.getQemuTemplate().subscribe((qemuTemplate: QemuTemplate) => { + this.qemuTemplate = qemuTemplate; + }); + + this.qemuService.getBinaries(server).subscribe((qemuBinaries: QemuBinary[]) => { + this.qemuBinaries = qemuBinaries; + if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0]; + }); + + this.qemuService.getImages(server).subscribe((qemuImages: QemuImage[]) => { + this.qemuImages = qemuImages; + }); + + this.consoleTypes = this.configurationService.getConsoleTypes(); + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; } + } - ngOnInit() { - this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { - file.withCredentials = false; - }; - this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error occured: ' + response); - }; - this.uploader.onSuccessItem = ( - item: FileItem, - response: string, - status: number, - headers: ParsedResponseHeaders - ) => { - this.qemuService.getImages(this.server).subscribe((qemuImages: QemuImage[]) => { - this.qemuImages = qemuImages; - }); - this.toasterService.success('Image uploaded'); - }; - - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + setDiskImage(value: string) { + this.newImageSelected = value === 'newImage'; + } - this.templateMocksService.getQemuTemplate().subscribe((qemuTemplate: QemuTemplate) => { - this.qemuTemplate = qemuTemplate; - }) + uploadImageFile(event) { + let name = event.target.files[0].name; + this.diskForm.controls['fileName'].setValue(name); - this.qemuService.getBinaries(server).subscribe((qemuBinaries: QemuBinary[]) => { - this.qemuBinaries = qemuBinaries; - if (this.qemuBinaries[0]) this.selectedBinary = this.qemuBinaries[0]; - }); + const url = this.qemuService.getImagePath(this.server, name); + this.uploader.queue.forEach((elem) => (elem.url = url)); - this.qemuService.getImages(server).subscribe((qemuImages: QemuImage[]) => { - this.qemuImages = qemuImages; - }); + const itemToUpload = this.uploader.queue[0]; + if ((itemToUpload as any).options) (itemToUpload as any).options.disableMultipart = true; - this.consoleTypes = this.configurationService.getConsoleTypes(); + this.uploader.uploadItem(itemToUpload); + } - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - setDiskImage(value: string) { - this.newImageSelected = value === "newImage"; - } - - uploadImageFile(event) { - let name = event.target.files[0].name; - this.diskForm.controls['fileName'].setValue(name); - - const url = this.qemuService.getImagePath(this.server, name); - this.uploader.queue.forEach(elem => (elem.url = url)); - - const itemToUpload = this.uploader.queue[0]; - if ((itemToUpload as any).options) (itemToUpload as any).options.disableMultipart = true; - - this.uploader.uploadItem(itemToUpload); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); - } - - addTemplate() { - if (!this.nameForm.invalid && !this.memoryForm.invalid && (this.selectedImage || this.chosenImage)) { - this.qemuTemplate.ram = +this.memoryForm.get("ramMemory").value; - this.qemuTemplate.qemu_path = this.selectedBinary.path; - if (this.newImageSelected) { - this.qemuTemplate.hda_disk_image = this.diskForm.get("fileName").value; - } else { - this.qemuTemplate.hda_disk_image = this.selectedImage.path; - } - this.qemuTemplate.template_id = uuid(); - this.qemuTemplate.name = this.nameForm.get("templateName").value; - this.qemuTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); + } + + addTemplate() { + if (!this.nameForm.invalid && !this.memoryForm.invalid && (this.selectedImage || this.chosenImage)) { + this.qemuTemplate.ram = +this.memoryForm.get('ramMemory').value; + this.qemuTemplate.qemu_path = this.selectedBinary.path; + if (this.newImageSelected) { + this.qemuTemplate.hda_disk_image = this.diskForm.get('fileName').value; + } else { + this.qemuTemplate.hda_disk_image = this.selectedImage.path; + } + this.qemuTemplate.template_id = uuid(); + this.qemuTemplate.name = this.nameForm.get('templateName').value; + this.qemuTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + + this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html index c1c8866d..6661ecaa 100644 --- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html +++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html @@ -1,24 +1,20 @@
-
-
-

Copy QEMU VM template

-
+
+
+

Copy QEMU VM template

-
- -
- - - -
- -
- - -
+
+
+ +
+ + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts index 2327f843..e8ede9b0 100644 --- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -9,60 +9,58 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { v4 as uuid } from 'uuid'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-copy-qemu-virtual-machine-template', - templateUrl: './copy-qemu-vm-template.component.html', - styleUrls: ['./copy-qemu-vm-template.component.scss', '../../preferences.component.scss'] + selector: 'app-copy-qemu-virtual-machine-template', + templateUrl: './copy-qemu-vm-template.component.html', + styleUrls: ['./copy-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class CopyQemuVmTemplateComponent implements OnInit { - server: Server; - qemuBinaries: QemuBinary[] = []; - templateName: string = ''; - qemuTemplate: QemuTemplate; - nameForm: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private qemuService: QemuService, - private toasterService: ToasterService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.nameForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.qemuService.getTemplate(this.server, template_id).subscribe((qemuTemplate: QemuTemplate) => { - this.qemuTemplate = qemuTemplate; - this.templateName = `Copy of ${this.qemuTemplate.name}`; - }) - - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); - } - - addTemplate() { - if (!this.nameForm.invalid) { - this.qemuTemplate.template_id = uuid(); - this.qemuTemplate.name = this.templateName; - - this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + server: Server; + qemuBinaries: QemuBinary[] = []; + templateName: string = ''; + qemuTemplate: QemuTemplate; + nameForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private qemuService: QemuService, + private toasterService: ToasterService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.nameForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.qemuService.getTemplate(this.server, template_id).subscribe((qemuTemplate: QemuTemplate) => { + this.qemuTemplate = qemuTemplate; + this.templateName = `Copy of ${this.qemuTemplate.name}`; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); + } + + addTemplate() { + if (!this.nameForm.invalid) { + this.qemuTemplate.template_id = uuid(); + this.qemuTemplate.name = this.templateName; + + this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.html b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.html index 8c9f27ec..cfc27c66 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.html +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.html @@ -1,29 +1,37 @@
-
-
-

QEMU preferences

- -
+
+
+

QEMU preferences

+ +
+
+
+
+ + + + Enable Hardware Acceleration (KVM/HAXM) + + + + + Require Hardware Acceleration (KVM/HAXM) + + +
-
-
- - - - Enable Hardware Acceleration (KVM/HAXM) - - - - - Require Hardware Acceleration (KVM/HAXM) - - - -
-
- - -
+
+ +
+
diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.scss b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.scss index 98f47574..36636d07 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.scss +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.scss @@ -1,4 +1,4 @@ .top-button { - height: 36px; - margin-top: 22px + height: 36px; + margin-top: 22px; } diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts index ea43ad2a..873b34e7 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts @@ -20,47 +20,55 @@ import { ToasterService } from '../../../../services/toaster.service'; import { of } from 'rxjs'; describe('QemuPreferencesComponent', () => { - let component: QemuPreferencesComponent; - let fixture: ComponentFixture; + let component: QemuPreferencesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let activatedRoute = new MockedActivatedRoute().get(); - let mockedServerSettingsService = new MockedServerSettingsService(); - let mockedToasterService = new MockedToasterService(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [HttpClientModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: ServerSettingsService, useValue: mockedServerSettingsService }, - { provide: ToasterService, useValue: mockedToasterService } - ], - declarations: [ - QemuPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let activatedRoute = new MockedActivatedRoute().get(); + let mockedServerSettingsService = new MockedServerSettingsService(); + let mockedToasterService = new MockedToasterService(); - beforeEach(() => { - fixture = TestBed.createComponent(QemuPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: ServerSettingsService, useValue: mockedServerSettingsService }, + { provide: ToasterService, useValue: mockedToasterService }, + ], + declarations: [QemuPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(QemuPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call update settings when restore defaults chosen', () => { - spyOn(mockedServerSettingsService, 'updateSettingsForQemu').and.returnValue(of([])); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.restoreDefaults(); + it('should call update settings when restore defaults chosen', () => { + spyOn(mockedServerSettingsService, 'updateSettingsForQemu').and.returnValue(of([])); - expect(mockedServerSettingsService.updateSettingsForQemu).toHaveBeenCalled(); - }); + component.restoreDefaults(); + + expect(mockedServerSettingsService.updateSettingsForQemu).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts index 68580110..de7c9f83 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ServerSettingsService } from '../../../../services/server-settings.service'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { Server } from '../../../../models/server'; @@ -7,55 +7,56 @@ import { ServerService } from '../../../../services/server.service'; import { ToasterService } from '../../../../services/toaster.service'; import { QemuSettings } from '../../../../models/settings/qemu-settings'; - @Component({ - selector: 'app-qemu-preferences', - templateUrl: './qemu-preferences.component.html', - styleUrls: ['./qemu-preferences.component.scss'] + selector: 'app-qemu-preferences', + templateUrl: './qemu-preferences.component.html', + styleUrls: ['./qemu-preferences.component.scss'], }) export class QemuPreferencesComponent implements OnInit { - server: Server; - settings: QemuSettings; + server: Server; + settings: QemuSettings; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private serverSettingsService: ServerSettingsService, - private toasterService: ToasterService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private serverSettingsService: ServerSettingsService, + private toasterService: ToasterService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; - this.serverSettingsService.getSettingsForQemu(this.server).subscribe((settings: QemuSettings) => { - this.settings = settings; - }); - }); + this.serverSettingsService.getSettingsForQemu(this.server).subscribe((settings: QemuSettings) => { + this.settings = settings; + }); + }); + } + + apply() { + if (!this.settings.enable_hardware_acceleration) { + this.settings.require_hardware_acceleration = false; } - apply(){ - if(!this.settings.enable_hardware_acceleration){ - this.settings.require_hardware_acceleration = false; - } + this.serverSettingsService + .updateSettingsForQemu(this.server, this.settings) + .subscribe((qemuSettings: QemuSettings) => { + this.toasterService.success(`Changes applied`); + }); + } - this.serverSettingsService.updateSettingsForQemu(this.server, this.settings) - .subscribe((qemuSettings: QemuSettings) => { - this.toasterService.success(`Changes applied`); - }); - } + restoreDefaults() { + let defaultSettings: QemuSettings = { + enable_hardware_acceleration: true, + require_hardware_acceleration: true, + }; - restoreDefaults(){ - let defaultSettings : QemuSettings = { - enable_hardware_acceleration: true, - require_hardware_acceleration: true - }; - - this.serverSettingsService.updateSettingsForQemu(this.server, defaultSettings) - .subscribe((qemuSettings: QemuSettings) => { - this.settings = qemuSettings; - this.toasterService.success(`Restored to default settings`); - }); - } + this.serverSettingsService + .updateSettingsForQemu(this.server, defaultSettings) + .subscribe((qemuSettings: QemuSettings) => { + this.settings = qemuSettings; + this.toasterService.success(`Restored to default settings`); + }); + } } diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html index 23c88609..a53f2b4e 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html @@ -1,343 +1,305 @@ -
-
-
-

QEMU VM configuration

-
+
+
+
+

QEMU VM configuration

-
- - - - - General settings - - -
- - - - - - - - - -
-

- - - - {{category[0]}} - - - - - - MB - - - - - - - - {{binary.path}} - - - - - - - {{priority[0]}} - - - - - - - {{option[0]}} - - - - - - - {{type}} - - - - - Auto start console - - - - - - HDD - - - - - - HDA (Primary Master) - - - - - - - - - {{interface}} - - - - - - - - - HDB (Primary Slave) - - - - - - - - - {{interface}} - - - - - - - - - HDC (Secondary Master) - - - - - - - - - {{interface}} - - - - - - - - - HDD (Secondary Slave) - - - - - - - - - {{interface}} - - - - - - - - - - CD/DVD - - -
- - - - - -
- - - - - Network - - - - - - - - - - - - - - - - - - - - - {{type[1]}} ({{type[0]}}) - - - -
- - Use the legacy networking mode - - - - - - Advanced - - - - - - Linux boot specific settings - - -
- - - - - -
-
- - - - - -
- - - - - - - - - Bios - - -
- - - - - -
- - - - - - Optimization - - - - Activate CPU throttling - - - - - - - - {{priority}} - - - - - - - - - Additional settings - - - - - - - Use as a linked base VM - - - - - - - - Usage - - - - - - - -
- - +
+
+ + + + General settings + +
+ + + + + + + + + +
+

+ + + + {{ category[0] }} + + + + + + MB + + + + + + + + {{ binary.path }} + + + + + + + {{ priority[0] }} + + + + + + + {{ option[0] }} + + + + + + + {{ type }} + + + + Auto start console + + + + HDD + + + + HDA (Primary Master) + + + + + + + + {{ interface }} + + + + + + + + HDB (Primary Slave) + + + + + + + + {{ interface }} + + + + + + + + HDC (Secondary Master) + + + + + + + + {{ interface }} + + + + + + + + HDD (Secondary Slave) + + + + + + + + {{ interface }} + + + + + + + + + CD/DVD + +
+ + + + +
+ + + + Network + + + + + + + + + + + + + + + + + + + {{ type[1] }} ({{ type[0] }}) + + +
+ Use the legacy networking mode + + + + Advanced + + + + Linux boot specific settings + +
+ + + + + +
+
+ + + + + +
+ + + + + + + + Bios + +
+ + + + + +
+ + + + + Optimization + + Activate CPU throttling + + + + + + + {{ priority }} + + + + + + + + Additional settings + + + + + Use as a linked base VM + + + + + + Usage + + + + + + +
+ +
+
- - diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts index af687554..f68defa5 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts @@ -23,118 +23,126 @@ import { QemuService } from '../../../../services/qemu.service'; import { QemuConfigurationService } from '../../../../services/qemu-configuration.service'; export class MockedQemuService { - public getTemplate(server: Server, template_id: string) { - return of({} as QemuTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as QemuTemplate); + } - public saveTemplate(server: Server, qemuTemplate: QemuTemplate) { - return of(qemuTemplate); - } + public saveTemplate(server: Server, qemuTemplate: QemuTemplate) { + return of(qemuTemplate); + } - public getBinaries(server: Server) { - return of([]); - } + public getBinaries(server: Server) { + return of([]); + } - public getImages(server: Server) { - return of([]); - } + public getImages(server: Server) { + return of([]); + } } describe('QemuVmTemplateDetailsComponent', () => { - let component: QemuVmTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: QemuVmTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedQemuService = new MockedQemuService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: QemuService, useValue: mockedQemuService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: QemuConfigurationService, useClass: QemuConfigurationService }, - { provide: AbstractControlDirective, useExisting: FormControl, useMulti: true } - ], - declarations: [ - QemuVmTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedQemuService = new MockedQemuService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(QemuVmTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: QemuService, useValue: mockedQemuService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: QemuConfigurationService, useClass: QemuConfigurationService }, + { provide: AbstractControlDirective, useExisting: FormControl, useMulti: true }, + ], + declarations: [QemuVmTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(QemuVmTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.qemuTemplate = { - adapters: 0, - custom_adapters: [] - } as QemuTemplate; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.qemuTemplate = { + adapters: 0, + custom_adapters: [], + } as QemuTemplate; - expect(mockedQemuService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when template name is empty', () => { - spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); - component.generalSettingsForm.controls['templateName'].setValue(''); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.qemuTemplate = { - adapters: 0, - custom_adapters: [] - } as QemuTemplate; + expect(mockedQemuService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when template name is empty', () => { + spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); + component.generalSettingsForm.controls['templateName'].setValue(''); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.qemuTemplate = { + adapters: 0, + custom_adapters: [], + } as QemuTemplate; - expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); + }); - it('should not call save template when default name is empty', () => { - spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue(''); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.qemuTemplate = { - adapters: 0, - custom_adapters: [] - } as QemuTemplate; + it('should not call save template when default name is empty', () => { + spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue(''); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.qemuTemplate = { + adapters: 0, + custom_adapters: [], + } as QemuTemplate; - component.onSave(); + component.onSave(); - expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); - }); + expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); + }); - it('should call save template when symbol is empty', () => { - spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue(''); - component.qemuTemplate = { - adapters: 0, - custom_adapters: [] - } as QemuTemplate; + it('should call save template when symbol is empty', () => { + spyOn(mockedQemuService, 'saveTemplate').and.returnValue(of({} as QemuTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue(''); + component.qemuTemplate = { + adapters: 0, + custom_adapters: [], + } as QemuTemplate; - component.onSave(); + component.onSave(); - expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); - }); + expect(mockedQemuService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts index 7fc7d285..3f8e693e 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChildren, ViewChild, QueryList } from "@angular/core"; +import { Component, OnInit, ViewChildren, ViewChild, QueryList } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { QemuService } from '../../../../services/qemu.service'; @@ -11,154 +11,153 @@ import { QemuConfigurationService } from '../../../../services/qemu-configuratio import { FormGroup, FormControl, Validators, FormBuilder } from '@angular/forms'; import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-adapters.component'; - @Component({ - selector: 'app-qemu-virtual-machine-template-details', - templateUrl: './qemu-vm-template-details.component.html', - styleUrls: ['./qemu-vm-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-qemu-virtual-machine-template-details', + templateUrl: './qemu-vm-template-details.component.html', + styleUrls: ['./qemu-vm-template-details.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplateDetailsComponent implements OnInit { - server: Server; - qemuTemplate: QemuTemplate; - isSymbolSelectionOpened: boolean = false; - consoleTypes: string[] = []; - diskInterfaces: string[] = []; - networkTypes = []; - bootPriorities = []; - onCloseOptions = []; - categories = []; - priorities: string[] = []; - binaries: QemuBinary[] = []; - activateCpuThrottling: boolean = true; - isConfiguratorOpened: boolean = false; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - generalSettingsForm: FormGroup; + server: Server; + qemuTemplate: QemuTemplate; + isSymbolSelectionOpened: boolean = false; + consoleTypes: string[] = []; + diskInterfaces: string[] = []; + networkTypes = []; + bootPriorities = []; + onCloseOptions = []; + categories = []; + priorities: string[] = []; + binaries: QemuBinary[] = []; + activateCpuThrottling: boolean = true; + isConfiguratorOpened: boolean = false; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + generalSettingsForm: FormGroup; - @ViewChild("customAdaptersConfigurator") - customAdaptersConfigurator: CustomAdaptersComponent; + @ViewChild('customAdaptersConfigurator') + customAdaptersConfigurator: CustomAdaptersComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private qemuService: QemuService, - private toasterService: ToasterService, - private configurationService: QemuConfigurationService, - private formBuilder: FormBuilder, - private router: Router - ){ - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private qemuService: QemuService, + private toasterService: ToasterService, + private configurationService: QemuConfigurationService, + private formBuilder: FormBuilder, + private router: Router + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.qemuService.getTemplate(this.server, template_id).subscribe((qemuTemplate: QemuTemplate) => { + this.qemuTemplate = qemuTemplate; + this.fillCustomAdapters(); + + this.qemuService.getBinaries(server).subscribe((qemuBinaries: QemuBinary[]) => { + this.binaries = qemuBinaries; }); - } + }); + }); + } - ngOnInit(){ - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.getConfiguration(); - this.qemuService.getTemplate(this.server, template_id).subscribe((qemuTemplate: QemuTemplate) => { - this.qemuTemplate = qemuTemplate; - this.fillCustomAdapters(); + getConfiguration() { + this.consoleTypes = this.configurationService.getConsoleTypes(); + this.diskInterfaces = this.configurationService.getDiskInterfaces(); + this.networkTypes = this.configurationService.getNetworkTypes(); + this.bootPriorities = this.configurationService.getBootPriorities(); + this.onCloseOptions = this.configurationService.getOnCloseOptions(); + this.categories = this.configurationService.getCategories(); + this.priorities = this.configurationService.getPriorities(); + } - this.qemuService.getBinaries(server).subscribe((qemuBinaries: QemuBinary[]) => { - this.binaries = qemuBinaries; - }); - }); + uploadCdromImageFile(event) { + this.qemuTemplate.cdrom_image = event.target.files[0].name; + } + + uploadInitrdFile(event) { + this.qemuTemplate.initrd = event.target.files[0].name; + } + + uploadKernelImageFile(event) { + this.qemuTemplate.kernel_image = event.target.files[0].name; + } + + uploadBiosFile(event) { + this.qemuTemplate.bios_image = event.target.files[0].name; + } + + setCustomAdaptersConfiguratorState(state: boolean) { + this.isConfiguratorOpened = state; + + if (state) { + this.fillCustomAdapters(); + this.customAdaptersConfigurator.numberOfAdapters = this.qemuTemplate.adapters; + this.customAdaptersConfigurator.adapters = []; + this.qemuTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { + this.customAdaptersConfigurator.adapters.push({ + adapter_number: adapter.adapter_number, + adapter_type: adapter.adapter_type, }); + }); } + } - getConfiguration(){ - this.consoleTypes = this.configurationService.getConsoleTypes(); - this.diskInterfaces = this.configurationService.getDiskInterfaces(); - this.networkTypes = this.configurationService.getNetworkTypes(); - this.bootPriorities = this.configurationService.getBootPriorities(); - this.onCloseOptions = this.configurationService.getOnCloseOptions(); - this.categories = this.configurationService.getCategories(); - this.priorities = this.configurationService.getPriorities(); + saveCustomAdapters(adapters: CustomAdapter[]) { + this.setCustomAdaptersConfiguratorState(false); + this.qemuTemplate.custom_adapters = adapters; + } + + fillCustomAdapters() { + let copyOfAdapters = this.qemuTemplate.custom_adapters ? this.qemuTemplate.custom_adapters : []; + this.qemuTemplate.custom_adapters = []; + + for (let i = 0; i < this.qemuTemplate.adapters; i++) { + if (copyOfAdapters[i]) { + this.qemuTemplate.custom_adapters.push(copyOfAdapters[i]); + } else { + this.qemuTemplate.custom_adapters.push({ + adapter_number: i, + adapter_type: 'e1000', + }); + } } + } - uploadCdromImageFile(event){ - this.qemuTemplate.cdrom_image = event.target.files[0].name; + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates']); + } + + onSave() { + if (this.generalSettingsForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + if (!this.activateCpuThrottling) { + this.qemuTemplate.cpu_throttling = 0; + } + this.fillCustomAdapters(); + + this.qemuService.saveTemplate(this.server, this.qemuTemplate).subscribe((savedTemplate: QemuTemplate) => { + this.toasterService.success('Changes saved'); + }); } + } - uploadInitrdFile(event){ - this.qemuTemplate.initrd = event.target.files[0].name; - } + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - uploadKernelImageFile(event){ - this.qemuTemplate.kernel_image = event.target.files[0].name; - } - - uploadBiosFile(event){ - this.qemuTemplate.bios_image = event.target.files[0].name; - } - - setCustomAdaptersConfiguratorState(state: boolean) { - this.isConfiguratorOpened = state; - - if (state) { - this.fillCustomAdapters(); - this.customAdaptersConfigurator.numberOfAdapters = this.qemuTemplate.adapters; - this.customAdaptersConfigurator.adapters = []; - this.qemuTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { - this.customAdaptersConfigurator.adapters.push({ - adapter_number: adapter.adapter_number, - adapter_type: adapter.adapter_type - }); - }); - } - } - - saveCustomAdapters(adapters: CustomAdapter[]){ - this.setCustomAdaptersConfiguratorState(false); - this.qemuTemplate.custom_adapters = adapters; - } - - fillCustomAdapters() { - let copyOfAdapters = this.qemuTemplate.custom_adapters ? this.qemuTemplate.custom_adapters : []; - this.qemuTemplate.custom_adapters = []; - - for(let i=0; i { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.qemuTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.qemuTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html index cf79bba7..98e610e0 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html @@ -1,35 +1,49 @@
-
-
-

QEMU VM templates

- - -
+
+
+

QEMU VM templates

+ +
- -
-
- -
- {{template.name}} - - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + + +
+
+
- - + diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts index 0a16c4f2..56f0fb25 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts @@ -18,43 +18,50 @@ import { QemuVmTemplatesComponent } from './qemu-vm-templates.component'; import { QemuService } from '../../../../services/qemu.service'; export class MockedQemuService { - public getTemplates(server: Server) { - return of([{} as QemuTemplate]); - } + public getTemplates(server: Server) { + return of([{} as QemuTemplate]); + } } describe('QemuTemplatesComponent', () => { - let component: QemuVmTemplatesComponent; - let fixture: ComponentFixture; + let component: QemuVmTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedQemuService = new MockedQemuService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: QemuService, useValue: mockedQemuService } - ], - declarations: [ - QemuVmTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedQemuService = new MockedQemuService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(QemuVmTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: QemuService, useValue: mockedQemuService }, + ], + declarations: [QemuVmTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(QemuVmTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts index cadc97e8..3b8234dd 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -6,47 +6,46 @@ import { QemuTemplate } from '../../../../models/templates/qemu-template'; import { QemuService } from '../../../../services/qemu.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; - @Component({ - selector: 'app-qemu-virtual-machines-templates', - templateUrl: './qemu-vm-templates.component.html', - styleUrls: ['./qemu-vm-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-qemu-virtual-machines-templates', + templateUrl: './qemu-vm-templates.component.html', + styleUrls: ['./qemu-vm-templates.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplatesComponent implements OnInit { - server: Server; - qemuTemplates: QemuTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + qemuTemplates: QemuTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private qemuService: QemuService, - private router: Router - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private qemuService: QemuService, + private router: Router + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.qemuService.getTemplates(this.server).subscribe((qemuTemplates: QemuTemplate[]) => { - this.qemuTemplates = qemuTemplates.filter((elem) => elem.template_type === 'qemu' && !elem.builtin); - }); - } + getTemplates() { + this.qemuService.getTemplates(this.server).subscribe((qemuTemplates: QemuTemplate[]) => { + this.qemuTemplates = qemuTemplates.filter((elem) => elem.template_type === 'qemu' && !elem.builtin); + }); + } - deleteTemplate(template: QemuTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: QemuTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } - copyTemplate(template: QemuTemplate) { - this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates', template.template_id, 'copy']); - } + copyTemplate(template: QemuTemplate) { + this.router.navigate(['/server', this.server.id, 'preferences', 'qemu', 'templates', template.template_id, 'copy']); + } } diff --git a/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.html b/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.html index 96359baa..4c7a9b2e 100644 --- a/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.html +++ b/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.html @@ -1,23 +1,23 @@
-
-
-

New VPCS node template

-
+
+
+

New VPCS node template

-
- -
- - - - - - -
- -
- - -
+
+
+ +
+ + + + + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.ts b/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.ts index 70fd2a10..b53d0b91 100644 --- a/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.ts +++ b/src/app/components/preferences/traceng/add-traceng/add-traceng-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -9,59 +9,58 @@ import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms' import { TracengService } from '../../../../services/traceng.service'; import { TracengTemplate } from '../../../../models/templates/traceng-template'; - @Component({ - selector: 'app-add-traceng-template', - templateUrl: './add-traceng-template.component.html', - styleUrls: ['./add-traceng-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-traceng-template', + templateUrl: './add-traceng-template.component.html', + styleUrls: ['./add-traceng-template.component.scss', '../../preferences.component.scss'], }) export class AddTracengTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - ipAddress: string = ''; - templateNameForm: FormGroup - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private tracengService: TracengService, - private router: Router, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private formBuilder: FormBuilder - ) { - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl(null, [Validators.required]), - ipAddress: new FormControl(null, [Validators.required]) - }); - } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'traceng', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid) { - this.templateName = this.templateNameForm.get('templateName').value; - this.ipAddress = this.templateNameForm.get('ipAddress').value; - let tracengTemplate: TracengTemplate = this.templateMocksService.getTracengTemplate(); - - tracengTemplate.template_id = uuid(); - tracengTemplate.name = this.templateName; - tracengTemplate.ip_address = this.ipAddress; - - this.tracengService.addTemplate(this.server, tracengTemplate).subscribe(() => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + server: Server; + templateName: string = ''; + ipAddress: string = ''; + templateNameForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private tracengService: TracengService, + private router: Router, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private formBuilder: FormBuilder + ) { + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl(null, [Validators.required]), + ipAddress: new FormControl(null, [Validators.required]), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'traceng', 'templates']); + } + + addTemplate() { + if (!this.templateNameForm.invalid) { + this.templateName = this.templateNameForm.get('templateName').value; + this.ipAddress = this.templateNameForm.get('ipAddress').value; + let tracengTemplate: TracengTemplate = this.templateMocksService.getTracengTemplate(); + + tracengTemplate.template_id = uuid(); + tracengTemplate.name = this.templateName; + tracengTemplate.ip_address = this.ipAddress; + + this.tracengService.addTemplate(this.server, tracengTemplate).subscribe(() => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.html b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.html index 4e94dbb2..20b26241 100644 --- a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.html +++ b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.html @@ -1,12 +1,12 @@
-
-
-

TraceNG preferences

-
-
-
- - - +
+
+

TraceNG preferences

+
+
+ + + +
diff --git a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.scss b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.scss index 9c2173c2..8aff6f5a 100644 --- a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.scss +++ b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.scss @@ -1,3 +1,3 @@ .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.ts b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.ts index a698d8af..d33bb9ea 100644 --- a/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.ts +++ b/src/app/components/preferences/traceng/traceng-preferences/traceng-preferences.component.ts @@ -1,32 +1,28 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Server } from '../../../../models/server'; import { ServerService } from '../../../../services/server.service'; - @Component({ - selector: 'app-traceng-preferences', - templateUrl: './traceng-preferences.component.html', - styleUrls: ['./traceng-preferences.component.scss'] + selector: 'app-traceng-preferences', + templateUrl: './traceng-preferences.component.html', + styleUrls: ['./traceng-preferences.component.scss'], }) export class TracengPreferencesComponent implements OnInit { - server: Server; - tracengExecutable: string; + server: Server; + tracengExecutable: string; - constructor( - private route: ActivatedRoute, - private serverService: ServerService - ) {} + constructor(private route: ActivatedRoute, private serverService: ServerService) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } - restoreDefaults(){ - this.tracengExecutable = ''; - } + restoreDefaults() { + this.tracengExecutable = ''; + } } diff --git a/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.html b/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.html index 01e1acdc..2bd43929 100644 --- a/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.html +++ b/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.html @@ -1,40 +1,51 @@
-
-
-

TraceNG device configuration

-
+
+
+

TraceNG device configuration

-
- -
- - - - - - - - - -

-
- -
- - -
+
+
+ +
+ + + + + + + + + +

+
+ +
+ +
+
- + diff --git a/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.ts b/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.ts index 3042bfce..a1b289cd 100644 --- a/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.ts +++ b/src/app/components/preferences/traceng/traceng-template-details/traceng-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -7,65 +7,66 @@ import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms' import { TracengService } from '../../../../services/traceng.service'; import { TracengTemplate } from '../../../../models/templates/traceng-template'; - @Component({ - selector: 'app-traceng-template-details', - templateUrl: './traceng-template-details.component.html', - styleUrls: ['./traceng-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-traceng-template-details', + templateUrl: './traceng-template-details.component.html', + styleUrls: ['./traceng-template-details.component.scss', '../../preferences.component.scss'], }) export class TracengTemplateDetailsComponent implements OnInit { - server: Server; - tracengTemplate: TracengTemplate; - inputForm: FormGroup; - isSymbolSelectionOpened: boolean = false; + server: Server; + tracengTemplate: TracengTemplate; + inputForm: FormGroup; + isSymbolSelectionOpened: boolean = false; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private tracengService: TracengService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private router: Router - ) { - this.inputForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private tracengService: TracengService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private router: Router + ) { + this.inputForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.tracengService.getTemplate(this.server, template_id).subscribe((tracengTemplate: TracengTemplate) => { + this.tracengTemplate = tracengTemplate; + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'traceng', 'templates']); + } + + onSave() { + if (this.inputForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.tracengService + .saveTemplate(this.server, this.tracengTemplate) + .subscribe((tracengTemplate: TracengTemplate) => { + this.toasterService.success('Changes saved'); }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.tracengService.getTemplate(this.server, template_id).subscribe((tracengTemplate: TracengTemplate) => { - this.tracengTemplate = tracengTemplate; - }); - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'traceng', 'templates']); - } - - onSave() { - if (this.inputForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.tracengService.saveTemplate(this.server, this.tracengTemplate).subscribe((tracengTemplate: TracengTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.tracengTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.tracengTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.html b/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.html index af922d9f..0932bb84 100644 --- a/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.html +++ b/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.html @@ -1,32 +1,46 @@
-
-
-

TraceNG node templates

- - -
+
+
+

TraceNG node templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.ts b/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.ts index ad7ef307..f1e5a881 100644 --- a/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.ts +++ b/src/app/components/preferences/traceng/traceng-templates/traceng-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -7,40 +7,40 @@ import { TracengTemplate } from '../../../../models/templates/traceng-template'; import { TracengService } from '../../../../services/traceng.service'; @Component({ - selector: 'app-traceng-templates', - templateUrl: './traceng-templates.component.html', - styleUrls: ['./traceng-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-traceng-templates', + templateUrl: './traceng-templates.component.html', + styleUrls: ['./traceng-templates.component.scss', '../../preferences.component.scss'], }) export class TracengTemplatesComponent implements OnInit { - server: Server; - tracengTemplates: TracengTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + tracengTemplates: TracengTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private tracengService: TracengService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private tracengService: TracengService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.tracengService.getTemplates(this.server).subscribe((tracengTemplates: TracengTemplate[]) => { - this.tracengTemplates = tracengTemplates.filter((elem) => elem.template_type === 'traceng' && !elem.builtin); - }); - } + getTemplates() { + this.tracengService.getTemplates(this.server).subscribe((tracengTemplates: TracengTemplate[]) => { + this.tracengTemplates = tracengTemplates.filter((elem) => elem.template_type === 'traceng' && !elem.builtin); + }); + } - deleteTemplate(template: TracengTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: TracengTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html index ca621a17..9e53678d 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html @@ -1,30 +1,27 @@
-
-
-

New VirtualBox VM template

-
+
+
+

New VirtualBox VM template

-
- -
- - - - {{vm.vmname}} - - - -
- - Use as a linked base VM (experimental) - - -
- - -
+
+
+ +
+ + + + {{ vm.vmname }} + + + +
+ + Use as a linked base VM (experimental) + + +
+ +
+
diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts index dd55daf8..5703d756 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts @@ -22,104 +22,104 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; export class MockedVirtualBoxService { - public addTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate) { - return of(virtualBoxTemplate); - } + public addTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate) { + return of(virtualBoxTemplate); + } - public getVirtualMachines(server: Server) { - return of([]); - } + public getVirtualMachines(server: Server) { + return of([]); + } } describe('AddVirtualBoxTemplateComponent', () => { - let component: AddVirtualBoxTemplateComponent; - let fixture: ComponentFixture; + let component: AddVirtualBoxTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVirtualBoxService = new MockedVirtualBoxService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/virtualbox/templates', component: AddVirtualBoxTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - AddVirtualBoxTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVirtualBoxService = new MockedVirtualBoxService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(AddVirtualBoxTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/virtualbox/templates', component: AddVirtualBoxTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [AddVirtualBoxTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddVirtualBoxTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - let template: VirtualBoxTemplate = { - adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power_off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - ram: 0, - symbol: ':/symbols/vbox_guest.svg', - template_id: '', - template_type: 'virtualbox', - usage: '', - use_any_adapter: false, - vmname: '' - } - component.virtualBoxTemplate = {} as VirtualBoxTemplate; - component.selectedVM = template; - component.server = {id: 1} as Server; - component.vmForm.controls['vm'].setValue('virtual machine'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call save template', () => { + spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); + let template: VirtualBoxTemplate = { + adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power_off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + ram: 0, + symbol: ':/symbols/vbox_guest.svg', + template_id: '', + template_type: 'virtualbox', + usage: '', + use_any_adapter: false, + vmname: '', + }; + component.virtualBoxTemplate = {} as VirtualBoxTemplate; + component.selectedVM = template; + component.server = { id: 1 } as Server; + component.vmForm.controls['vm'].setValue('virtual machine'); - expect(mockedVirtualBoxService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call save template when virtual machine is not selected', () => { - spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.server = {id: 1} as Server; + expect(mockedVirtualBoxService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call save template when virtual machine is not selected', () => { + spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); + component.server = { id: 1 } as Server; - expect(mockedVirtualBoxService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedVirtualBoxService.addTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts index aa48d497..5043df7d 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -10,64 +10,63 @@ import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-temp import { v4 as uuid } from 'uuid'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-add-virtual-box-template', - templateUrl: './add-virtual-box-template.component.html', - styleUrls: ['./add-virtual-box-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-virtual-box-template', + templateUrl: './add-virtual-box-template.component.html', + styleUrls: ['./add-virtual-box-template.component.scss', '../../preferences.component.scss'], }) export class AddVirtualBoxTemplateComponent implements OnInit { - server: Server; - virtualMachines: VirtualBoxVm[]; - selectedVM: VirtualBoxVm; - virtualBoxTemplate: VirtualBoxTemplate; - vmForm: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private virtualBoxService: VirtualBoxService, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.vmForm = this.formBuilder.group({ - vm: new FormControl('', Validators.required) + server: Server; + virtualMachines: VirtualBoxVm[]; + selectedVM: VirtualBoxVm; + virtualBoxTemplate: VirtualBoxTemplate; + vmForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private virtualBoxService: VirtualBoxService, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.vmForm = this.formBuilder.group({ + vm: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.virtualBoxService.getVirtualMachines(this.server).subscribe((virtualMachines: VirtualBoxVm[]) => { + this.virtualMachines = virtualMachines; + + this.templateMocksService.getVirtualBoxTemplate().subscribe((template: VirtualBoxTemplate) => { + this.virtualBoxTemplate = template; }); + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'virtualbox', 'templates']); + } + + addTemplate() { + if (!this.vmForm.invalid) { + this.virtualBoxTemplate.name = this.selectedVM.vmname; + this.virtualBoxTemplate.vmname = this.selectedVM.vmname; + this.virtualBoxTemplate.ram = this.selectedVM.ram; + this.virtualBoxTemplate.template_id = uuid(); + + this.virtualBoxService.addTemplate(this.server, this.virtualBoxTemplate).subscribe(() => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.virtualBoxService.getVirtualMachines(this.server).subscribe((virtualMachines: VirtualBoxVm[]) => { - this.virtualMachines = virtualMachines; - - this.templateMocksService.getVirtualBoxTemplate().subscribe((template: VirtualBoxTemplate) => { - this.virtualBoxTemplate = template; - }); - }) - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'virtualbox', 'templates']); - } - - addTemplate() { - if (!this.vmForm.invalid) { - this.virtualBoxTemplate.name = this.selectedVM.vmname; - this.virtualBoxTemplate.vmname = this.selectedVM.vmname; - this.virtualBoxTemplate.ram = this.selectedVM.ram; - this.virtualBoxTemplate.template_id = uuid(); - - this.virtualBoxService.addTemplate(this.server, this.virtualBoxTemplate).subscribe(() => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } - } + } } diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.html b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.html index a5e28de9..5933408b 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.html +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.html @@ -1,12 +1,12 @@
-
-
-

VirtualBox preferences

-
-
-
- - - +
+
+

VirtualBox preferences

+
+
+ + + +
diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts index 7fe26828..74992f5f 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts @@ -1,32 +1,28 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { Server } from '../../../../models/server'; import { switchMap } from 'rxjs/operators'; import { ServerService } from '../../../../services/server.service'; - @Component({ - selector: 'app-virtual-box-preferences', - templateUrl: './virtual-box-preferences.component.html', - styleUrls: ['./virtual-box-preferences.component.scss'] + selector: 'app-virtual-box-preferences', + templateUrl: './virtual-box-preferences.component.html', + styleUrls: ['./virtual-box-preferences.component.scss'], }) export class VirtualBoxPreferencesComponent implements OnInit { - server: Server; - vboxManagePath: string; + server: Server; + vboxManagePath: string; - constructor( - private route: ActivatedRoute, - private serverService: ServerService - ) {} + constructor(private route: ActivatedRoute, private serverService: ServerService) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } - restoreDefaults(){ - this.vboxManagePath = ''; - } + restoreDefaults() { + this.vboxManagePath = ''; + } } diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts index 1529e7de..575b98d1 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts @@ -14,41 +14,48 @@ import { VirtualBoxPreferencesComponent } from './virtual-box-preferences.compon import { MockedActivatedRoute } from '../../preferences.component.spec'; describe('VirtualBoxPreferencesComponent', () => { - let component: VirtualBoxPreferencesComponent; - let fixture: ComponentFixture; + let component: VirtualBoxPreferencesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService } - ], - declarations: [ - VirtualBoxPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VirtualBoxPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + ], + declarations: [VirtualBoxPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VirtualBoxPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should clear path to virtual box manage', () => { - component.restoreDefaults(); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.vboxManagePath).toBe(''); - }); + it('should clear path to virtual box manage', () => { + component.restoreDefaults(); + + expect(component.vboxManagePath).toBe(''); + }); }); diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html index 4b19c3d8..7f0f6e19 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html @@ -1,124 +1,182 @@
-
-
-

VirtualBox VM configuration

-
+
+
+

VirtualBox VM configuration

-
- - - - - General settings - - -
- - - - - - - - - -

- - - - {{category[0]}} - - - - - - - {{type}} - - - - - Auto start console - - - - MB - - - - - {{option[0]}} - - - -
- - Start VM in headless mode -
- - Use as a linked base VM (experimental) - - - - - - Network - - -
- - - - - - - - - - - - - - - - {{type}} - - - -
-
- - Allow GNS3 to use any configured VirtualBox adapter - - - - - - Usage - - - - - - - -
- - -
+
+
+ + + + General settings + +
+ + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + {{ type }} + + + + + Auto start console + + + + MB + + + + + {{ option[0] }} + + + +
+ Start VM in headless mode
+ + Use as a linked base VM (experimental) + + + + + Network + +
+ + + + + + + + + + + + + + + + {{ type }} + + + +
+
+ + Allow GNS3 to use any configured VirtualBox adapter + + + + + Usage + + + + + + +
+ +
+
- - diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts index 21c56211..f59747d7 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts @@ -23,107 +23,117 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxConfigurationService } from '../../../../services/virtual-box-configuration.service'; export class MockedVirtualBoxService { - public getTemplate(server: Server, template_id: string) { - return of({} as VirtualBoxTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as VirtualBoxTemplate); + } - public saveTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate) { - return of(virtualBoxTemplate); - } + public saveTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate) { + return of(virtualBoxTemplate); + } } describe('VirtualBoxTemplateDetailsComponent', () => { - let component: VirtualBoxTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: VirtualBoxTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVirtualBoxService = new MockedVirtualBoxService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule , MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: VirtualBoxConfigurationService, useClass: VirtualBoxConfigurationService } - ], - declarations: [ - VirtualBoxTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVirtualBoxService = new MockedVirtualBoxService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VirtualBoxTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: VirtualBoxConfigurationService, useClass: VirtualBoxConfigurationService }, + ], + declarations: [VirtualBoxTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VirtualBoxTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.generalSettingsForm.controls['ram'].setValue('256'); - component.networkForm.controls['adapters'].setValue('1'); - component.networkForm.controls['nameFormat'].setValue('{}'); - component.networkForm.controls['size'].setValue('256'); - component.virtualBoxTemplate = { - adapters: 0, - custom_adapters: [] - } as VirtualBoxTemplate; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.generalSettingsForm.controls['ram'].setValue('256'); + component.networkForm.controls['adapters'].setValue('1'); + component.networkForm.controls['nameFormat'].setValue('{}'); + component.networkForm.controls['size'].setValue('256'); + component.virtualBoxTemplate = { + adapters: 0, + custom_adapters: [], + } as VirtualBoxTemplate; - expect(mockedVirtualBoxService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when general settings are not filled', () => { - spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.generalSettingsForm.controls['templateName'].setValue(''); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.generalSettingsForm.controls['ram'].setValue('256'); - component.networkForm.controls['adapters'].setValue('1'); - component.networkForm.controls['nameFormat'].setValue('{}'); - component.networkForm.controls['size'].setValue('256'); - component.virtualBoxTemplate = { - adapters: 0, - custom_adapters: [] - } as VirtualBoxTemplate; + expect(mockedVirtualBoxService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when general settings are not filled', () => { + spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); + component.generalSettingsForm.controls['templateName'].setValue(''); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.generalSettingsForm.controls['ram'].setValue('256'); + component.networkForm.controls['adapters'].setValue('1'); + component.networkForm.controls['nameFormat'].setValue('{}'); + component.networkForm.controls['size'].setValue('256'); + component.virtualBoxTemplate = { + adapters: 0, + custom_adapters: [], + } as VirtualBoxTemplate; - expect(mockedVirtualBoxService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when network settings are not filled', () => { - spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.generalSettingsForm.controls['ram'].setValue('256'); - component.networkForm.controls['adapters'].setValue(''); - component.networkForm.controls['nameFormat'].setValue('{}'); - component.networkForm.controls['size'].setValue('256'); - component.virtualBoxTemplate = { - adapters: 0, - custom_adapters: [] - } as VirtualBoxTemplate; + expect(mockedVirtualBoxService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when network settings are not filled', () => { + spyOn(mockedVirtualBoxService, 'saveTemplate').and.returnValue(of({} as VirtualBoxTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.generalSettingsForm.controls['ram'].setValue('256'); + component.networkForm.controls['adapters'].setValue(''); + component.networkForm.controls['nameFormat'].setValue('{}'); + component.networkForm.controls['size'].setValue('256'); + component.virtualBoxTemplate = { + adapters: 0, + custom_adapters: [], + } as VirtualBoxTemplate; - expect(mockedVirtualBoxService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedVirtualBoxService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts index 13fe3164..7a1cb5ff 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -10,131 +10,134 @@ import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; import { VirtualBoxConfigurationService } from '../../../../services/virtual-box-configuration.service'; import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-adapters.component'; - @Component({ - selector: 'app-virtual-box-template-details', - templateUrl: './virtual-box-template-details.component.html', - styleUrls: ['./virtual-box-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-virtual-box-template-details', + templateUrl: './virtual-box-template-details.component.html', + styleUrls: ['./virtual-box-template-details.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplateDetailsComponent implements OnInit { - server: Server; - virtualBoxTemplate: VirtualBoxTemplate; - isSymbolSelectionOpened: boolean = false; - consoleTypes: string[] = []; - onCloseOptions = []; - categories = []; - networkTypes = []; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - isConfiguratorOpened: boolean = false; - generalSettingsForm: FormGroup; - networkForm: FormGroup + server: Server; + virtualBoxTemplate: VirtualBoxTemplate; + isSymbolSelectionOpened: boolean = false; + consoleTypes: string[] = []; + onCloseOptions = []; + categories = []; + networkTypes = []; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + isConfiguratorOpened: boolean = false; + generalSettingsForm: FormGroup; + networkForm: FormGroup; - @ViewChild("customAdaptersConfigurator") - customAdaptersConfigurator: CustomAdaptersComponent; + @ViewChild('customAdaptersConfigurator') + customAdaptersConfigurator: CustomAdaptersComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private virtualBoxService: VirtualBoxService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private virtualBoxConfigurationService: VirtualBoxConfigurationService, - private router: Router - ) { - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required), - ram: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private virtualBoxService: VirtualBoxService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private virtualBoxConfigurationService: VirtualBoxConfigurationService, + private router: Router + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + ram: new FormControl('', Validators.required), + }); + + this.networkForm = this.formBuilder.group({ + adapters: new FormControl('', Validators.required), + nameFormat: new FormControl('', Validators.required), + size: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.virtualBoxService + .getTemplate(this.server, template_id) + .subscribe((virtualBoxTemplate: VirtualBoxTemplate) => { + this.virtualBoxTemplate = virtualBoxTemplate; + this.fillCustomAdapters(); }); + }); + } - this.networkForm = this.formBuilder.group({ - adapters: new FormControl('', Validators.required), - nameFormat: new FormControl('', Validators.required), - size: new FormControl('', Validators.required) + getConfiguration() { + this.consoleTypes = this.virtualBoxConfigurationService.getConsoleTypes(); + this.onCloseOptions = this.virtualBoxConfigurationService.getOnCloseoptions(); + this.categories = this.virtualBoxConfigurationService.getCategories(); + this.networkTypes = this.virtualBoxConfigurationService.getNetworkTypes(); + } + + setCustomAdaptersConfiguratorState(state: boolean) { + this.isConfiguratorOpened = state; + + if (state) { + this.fillCustomAdapters(); + this.customAdaptersConfigurator.numberOfAdapters = this.virtualBoxTemplate.adapters; + this.customAdaptersConfigurator.adapters = []; + this.virtualBoxTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { + this.customAdaptersConfigurator.adapters.push({ + adapter_number: adapter.adapter_number, + adapter_type: adapter.adapter_type, + }); + }); + } + } + + saveCustomAdapters(adapters: CustomAdapter[]) { + this.setCustomAdaptersConfiguratorState(false); + this.virtualBoxTemplate.custom_adapters = adapters; + } + + fillCustomAdapters() { + let copyOfAdapters = this.virtualBoxTemplate.custom_adapters ? this.virtualBoxTemplate.custom_adapters : []; + this.virtualBoxTemplate.custom_adapters = []; + + for (let i = 0; i < this.virtualBoxTemplate.adapters; i++) { + if (copyOfAdapters[i]) { + this.virtualBoxTemplate.custom_adapters.push(copyOfAdapters[i]); + } else { + this.virtualBoxTemplate.custom_adapters.push({ + adapter_number: i, + adapter_type: 'e1000', + }); + } + } + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'virtualbox', 'templates']); + } + + onSave() { + if (this.generalSettingsForm.invalid || this.networkForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.fillCustomAdapters(); + + this.virtualBoxService + .saveTemplate(this.server, this.virtualBoxTemplate) + .subscribe((virtualBoxTemplate: VirtualBoxTemplate) => { + this.toasterService.success('Changes saved'); }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.getConfiguration(); - this.virtualBoxService.getTemplate(this.server, template_id).subscribe((virtualBoxTemplate: VirtualBoxTemplate) => { - this.virtualBoxTemplate = virtualBoxTemplate; - this.fillCustomAdapters(); - }); - }); - } - - getConfiguration(){ - this.consoleTypes = this.virtualBoxConfigurationService.getConsoleTypes(); - this.onCloseOptions = this.virtualBoxConfigurationService.getOnCloseoptions(); - this.categories = this.virtualBoxConfigurationService.getCategories(); - this.networkTypes = this.virtualBoxConfigurationService.getNetworkTypes(); - } - - setCustomAdaptersConfiguratorState(state: boolean) { - this.isConfiguratorOpened = state; - - if (state) { - this.fillCustomAdapters(); - this.customAdaptersConfigurator.numberOfAdapters = this.virtualBoxTemplate.adapters; - this.customAdaptersConfigurator.adapters = []; - this.virtualBoxTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { - this.customAdaptersConfigurator.adapters.push({ - adapter_number: adapter.adapter_number, - adapter_type: adapter.adapter_type - }); - }); - } - } - - saveCustomAdapters(adapters: CustomAdapter[]){ - this.setCustomAdaptersConfiguratorState(false); - this.virtualBoxTemplate.custom_adapters = adapters; - } - - fillCustomAdapters() { - let copyOfAdapters = this.virtualBoxTemplate.custom_adapters ? this.virtualBoxTemplate.custom_adapters : []; - this.virtualBoxTemplate.custom_adapters = []; - - for(let i=0; i { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.virtualBoxTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.virtualBoxTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html index bb8f19b7..e7018d18 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html @@ -1,32 +1,46 @@
-
-
-

VirtualBox VM templates

- - -
+
+
+

VirtualBox VM templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts index 6ae23965..93d5dd04 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts @@ -18,43 +18,50 @@ import { VirtualBoxService } from '../../../../services/virtual-box.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; export class MockedVirtualBoxService { - public getTemplates(server: Server) { - return of([{} as VirtualBoxTemplate]); - } + public getTemplates(server: Server) { + return of([{} as VirtualBoxTemplate]); + } } describe('VirtualBoxTemplatesComponent', () => { - let component: VirtualBoxTemplatesComponent; - let fixture: ComponentFixture; + let component: VirtualBoxTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVirtualBoxService = new MockedVirtualBoxService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VirtualBoxService, useValue: mockedVirtualBoxService } - ], - declarations: [ - VirtualBoxTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVirtualBoxService = new MockedVirtualBoxService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VirtualBoxTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VirtualBoxService, useValue: mockedVirtualBoxService }, + ], + declarations: [VirtualBoxTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VirtualBoxTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts index 357f254c..8aea48cb 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -7,42 +7,43 @@ import { VirtualBoxService } from '../../../../services/virtual-box.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; - @Component({ - selector: 'app-virtual-box-templates', - templateUrl: './virtual-box-templates.component.html', - styleUrls: ['./virtual-box-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-virtual-box-templates', + templateUrl: './virtual-box-templates.component.html', + styleUrls: ['./virtual-box-templates.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplatesComponent implements OnInit { - server: Server; - virtualBoxTemplates: VirtualBoxTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + virtualBoxTemplates: VirtualBoxTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private virtualBoxService: VirtualBoxService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private virtualBoxService: VirtualBoxService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates(){ - this.virtualBoxService.getTemplates(this.server).subscribe((virtualBoxTemplates: VirtualBoxTemplate[]) => { - this.virtualBoxTemplates = virtualBoxTemplates.filter((elem) => elem.template_type === 'virtualbox' && !elem.builtin); - }); - } + getTemplates() { + this.virtualBoxService.getTemplates(this.server).subscribe((virtualBoxTemplates: VirtualBoxTemplate[]) => { + this.virtualBoxTemplates = virtualBoxTemplates.filter( + (elem) => elem.template_type === 'virtualbox' && !elem.builtin + ); + }); + } - deleteTemplate(template: VpcsTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: VpcsTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html index 6fea2574..40261c2d 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html @@ -1,30 +1,27 @@
-
-
-

New VMware VM template

-
+
+
+

New VMware VM template

-
- -
- - - - {{vm.vmname}} - - -
- - Use as a linked base VM (experimental) - -
- -
- - -
+
+
+ +
+ + + + {{ vm.vmname }} + +
+ + Use as a linked base VM (experimental) + +
+ +
+ +
+
diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts index dd2ccabe..ea3f22f4 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -10,63 +10,62 @@ import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { VmwareService } from '../../../../services/vmware.service'; import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; - @Component({ - selector: 'app-add-vmware-template', - templateUrl: './add-vmware-template.component.html', - styleUrls: ['./add-vmware-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-vmware-template', + templateUrl: './add-vmware-template.component.html', + styleUrls: ['./add-vmware-template.component.scss', '../../preferences.component.scss'], }) export class AddVmwareTemplateComponent implements OnInit { - server: Server; - virtualMachines: VmwareVm[]; - selectedVM: VmwareVm; - vmwareTemplate: VmwareTemplate; - templateNameForm: FormGroup; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vmwareService: VmwareService, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private router: Router, - private formBuilder: FormBuilder - ) { - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl(null, [Validators.required]) + server: Server; + virtualMachines: VmwareVm[]; + selectedVM: VmwareVm; + vmwareTemplate: VmwareTemplate; + templateNameForm: FormGroup; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private vmwareService: VmwareService, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private router: Router, + private formBuilder: FormBuilder + ) { + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl(null, [Validators.required]), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.vmwareService.getVirtualMachines(this.server).subscribe((virtualMachines: VmwareVm[]) => { + this.virtualMachines = virtualMachines; + + this.templateMocksService.getVmwareTemplate().subscribe((template: VmwareTemplate) => { + this.vmwareTemplate = template; }); + }); + }); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']); + } + + addTemplate() { + if (!this.templateNameForm.invalid) { + this.vmwareTemplate.name = this.selectedVM.vmname; + this.vmwareTemplate.vmx_path = this.selectedVM.vmx_path; + this.vmwareTemplate.template_id = uuid(); + + this.vmwareService.addTemplate(this.server, this.vmwareTemplate).subscribe(() => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } - - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - - this.vmwareService.getVirtualMachines(this.server).subscribe((virtualMachines: VmwareVm[]) => { - this.virtualMachines = virtualMachines; - - this.templateMocksService.getVmwareTemplate().subscribe((template: VmwareTemplate) => { - this.vmwareTemplate = template; - }); - }) - }); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid) { - this.vmwareTemplate.name = this.selectedVM.vmname; - this.vmwareTemplate.vmx_path = this.selectedVM.vmx_path; - this.vmwareTemplate.template_id = uuid(); - - this.vmwareService.addTemplate(this.server, this.vmwareTemplate).subscribe(() => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } - } + } } diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts index 5a3b65c2..d191969d 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts @@ -23,84 +23,84 @@ import { VmwareVm } from '../../../../models/vmware/vmware-vm'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; export class MockedVmwareService { - public addTemplate(server: Server, vmwareTemplate: VmwareTemplate) { - return of(vmwareTemplate); - } + public addTemplate(server: Server, vmwareTemplate: VmwareTemplate) { + return of(vmwareTemplate); + } - public getVirtualMachines(server: Server) { - return of([]); - } + public getVirtualMachines(server: Server) { + return of([]); + } } describe('AddVmwareTemplateComponent', () => { - let component: AddVmwareTemplateComponent; - let fixture: ComponentFixture; + let component: AddVmwareTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVmwareService = new MockedVmwareService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/vmware/templates', component: AddVmwareTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VmwareService, useValue: mockedVmwareService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - AddVmwareTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVmwareService = new MockedVmwareService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(AddVmwareTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/vmware/templates', component: AddVmwareTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VmwareService, useValue: mockedVmwareService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [AddVmwareTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddVmwareTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); - let template: VmwareVm = { - vmname: 'test', - vmx_path: '' - }; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.vmwareTemplate = {} as VmwareTemplate; - component.selectedVM = template; - component.server = {id: 1} as Server; - component.templateNameForm.controls['templateName'].setValue('template name'); + it('should call save template', () => { + spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); + let template: VmwareVm = { + vmname: 'test', + vmx_path: '', + }; - component.addTemplate(); + component.vmwareTemplate = {} as VmwareTemplate; + component.selectedVM = template; + component.server = { id: 1 } as Server; + component.templateNameForm.controls['templateName'].setValue('template name'); - expect(mockedVmwareService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call save template when virtual machine is not selected', () => { - spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); - component.server = {id: 1} as Server; + expect(mockedVmwareService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call save template when virtual machine is not selected', () => { + spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); + component.server = { id: 1 } as Server; - expect(mockedVmwareService.addTemplate).not.toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedVmwareService.addTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.html b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.html index 2f7bc390..1effcbab 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.html +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.html @@ -1,12 +1,12 @@
-
-
-

VMware preferences

-
-
-
- - - +
+
+

VMware preferences

+
+
+ + + +
diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.scss b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.scss index 9c2173c2..8aff6f5a 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.scss +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.scss @@ -1,3 +1,3 @@ .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts index 60cb6ab1..49675a36 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.spec.ts @@ -15,41 +15,48 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwarePreferencesComponent } from './vmware-preferences.component'; describe('VmwarePreferencesComponent', () => { - let component: VmwarePreferencesComponent; - let fixture: ComponentFixture; + let component: VmwarePreferencesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService } - ], - declarations: [ - VmwarePreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VmwarePreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + ], + declarations: [VmwarePreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VmwarePreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should clear path to executable', () => { - component.restoreDefaults(); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.vmrunPath).toBe(''); - }); + it('should clear path to executable', () => { + component.restoreDefaults(); + + expect(component.vmrunPath).toBe(''); + }); }); diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts index c8da405f..746d242e 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts @@ -1,33 +1,29 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { Server } from '../../../../models/server'; import { switchMap } from 'rxjs/operators'; import { ServerService } from '../../../../services/server.service'; - @Component({ - selector: 'app-vmware-preferences', - templateUrl: './vmware-preferences.component.html', - styleUrls: ['./vmware-preferences.component.scss'] + selector: 'app-vmware-preferences', + templateUrl: './vmware-preferences.component.html', + styleUrls: ['./vmware-preferences.component.scss'], }) export class VmwarePreferencesComponent implements OnInit { - server: Server; - vmrunPath: string; + server: Server; + vmrunPath: string; - constructor( - private route: ActivatedRoute, - private serverService: ServerService - ) {} + constructor(private route: ActivatedRoute, private serverService: ServerService) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } - restoreDefaults(){ - this.vmrunPath = ''; - } + restoreDefaults() { + this.vmrunPath = ''; + } } diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html index 44a6de61..a7b1b2d3 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html @@ -1,145 +1,144 @@
-
-
-

VMware VM configuration

-
+
+
+

VMware VM configuration

-
- - - - - General settings - - -
- - - - - - - - - -

- - - - {{category[0]}} - - - - - - - {{type}} - - - - - Auto start console - - - - - {{option[0]}} - - - - - Start VM in headless mode -

- - Use as a linked base VM (experimental) - -
- - - - - Network - - - - - - - - - - - - - - - - - - {{type}} - - - -
- - Allow GNS3 to override non custom VMware adapter - - - - - - Usage - - - - - - - -
- - -
+
+
+ + + + General settings + +
+ + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + {{ type }} + + + + + Auto start console + + + + + {{ option[0] }} + + + + + Start VM in headless mode

+ + Use as a linked base VM (experimental) + +
+ + + + Network + + + + + + + + + + + + + + + + + {{ type }} + + + +
+ + Allow GNS3 to override non custom VMware adapter + + + + + Usage + + + + + + +
+ +
+
- - diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts index 40d23067..ff0c4c5d 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts @@ -23,110 +23,120 @@ import { VmwareService } from '../../../../services/vmware.service'; import { VmwareConfigurationService } from '../../../../services/vmware-configuration.service'; export class MockedVmwareService { - public getTemplate(server: Server, template_id: string) { - return of({} as VmwareTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as VmwareTemplate); + } - public saveTemplate(server: Server, vmwareTemplate: VmwareTemplate) { - return of(vmwareTemplate); - } + public saveTemplate(server: Server, vmwareTemplate: VmwareTemplate) { + return of(vmwareTemplate); + } } describe('VmwareTemplateDetailsComponent', () => { - let component: VmwareTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: VmwareTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVmwareService = new MockedVmwareService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatTableModule , MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VmwareService, useValue: mockedVmwareService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: VmwareConfigurationService, useClass: VmwareConfigurationService } - ], - declarations: [ - VmwareTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVmwareService = new MockedVmwareService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VmwareTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VmwareService, useValue: mockedVmwareService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: VmwareConfigurationService, useClass: VmwareConfigurationService }, + ], + declarations: [VmwareTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VmwareTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.vmwareTemplate = { - adapters: 0, - custom_adapters: [] - } as VmwareTemplate; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.vmwareTemplate = { + adapters: 0, + custom_adapters: [], + } as VmwareTemplate; - expect(mockedVmwareService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when template name is empty', () => { - spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); - component.generalSettingsForm.controls['templateName'].setValue(''); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.vmwareTemplate = { - adapters: 0, - custom_adapters: [] - } as VmwareTemplate; + expect(mockedVmwareService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when template name is empty', () => { + spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); + component.generalSettingsForm.controls['templateName'].setValue(''); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.vmwareTemplate = { + adapters: 0, + custom_adapters: [], + } as VmwareTemplate; - expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when default name is empty', () => { - spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue(''); - component.generalSettingsForm.controls['symbol'].setValue('symbol'); - component.vmwareTemplate = { - adapters: 0, - custom_adapters: [] - } as VmwareTemplate; + expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when default name is empty', () => { + spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue(''); + component.generalSettingsForm.controls['symbol'].setValue('symbol'); + component.vmwareTemplate = { + adapters: 0, + custom_adapters: [], + } as VmwareTemplate; - expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when symbol path is empty', () => { - spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); - component.generalSettingsForm.controls['templateName'].setValue('template name'); - component.generalSettingsForm.controls['defaultName'].setValue('default name'); - component.generalSettingsForm.controls['symbol'].setValue(''); - component.vmwareTemplate = { - adapters: 0, - custom_adapters: [] - } as VmwareTemplate; + expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when symbol path is empty', () => { + spyOn(mockedVmwareService, 'saveTemplate').and.returnValue(of({} as VmwareTemplate)); + component.generalSettingsForm.controls['templateName'].setValue('template name'); + component.generalSettingsForm.controls['defaultName'].setValue('default name'); + component.generalSettingsForm.controls['symbol'].setValue(''); + component.vmwareTemplate = { + adapters: 0, + custom_adapters: [], + } as VmwareTemplate; - expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedVmwareService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts index ff451779..48739131 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -10,122 +10,121 @@ import { VmwareConfigurationService } from '../../../../services/vmware-configur import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter'; import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-adapters.component'; - @Component({ - selector: 'app-vmware-template-details', - templateUrl: './vmware-template-details.component.html', - styleUrls: ['./vmware-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-vmware-template-details', + templateUrl: './vmware-template-details.component.html', + styleUrls: ['./vmware-template-details.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplateDetailsComponent implements OnInit { - server: Server; - vmwareTemplate: VmwareTemplate; - generalSettingsForm: FormGroup; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - isConfiguratorOpened: boolean = false; - isSymbolSelectionOpened: boolean = false; - consoleTypes: string[] = []; - categories = []; - onCloseOptions = []; - networkTypes = []; + server: Server; + vmwareTemplate: VmwareTemplate; + generalSettingsForm: FormGroup; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + isConfiguratorOpened: boolean = false; + isSymbolSelectionOpened: boolean = false; + consoleTypes: string[] = []; + categories = []; + onCloseOptions = []; + networkTypes = []; - @ViewChild("customAdaptersConfigurator") - customAdaptersConfigurator: CustomAdaptersComponent; + @ViewChild('customAdaptersConfigurator') + customAdaptersConfigurator: CustomAdaptersComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vmwareService: VmwareService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private vmwareConfigurationService: VmwareConfigurationService, - private router: Router - ) { - this.generalSettingsForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private vmwareService: VmwareService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private vmwareConfigurationService: VmwareConfigurationService, + private router: Router + ) { + this.generalSettingsForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.vmwareService.getTemplate(this.server, template_id).subscribe((vmwareTemplate: VmwareTemplate) => { + this.vmwareTemplate = vmwareTemplate; + this.fillCustomAdapters(); + }); + }); + } + + getConfiguration() { + this.consoleTypes = this.vmwareConfigurationService.getConsoleTypes(); + this.categories = this.vmwareConfigurationService.getCategories(); + this.onCloseOptions = this.vmwareConfigurationService.getOnCloseoptions(); + this.networkTypes = this.vmwareConfigurationService.getNetworkTypes(); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']); + } + + onSave() { + if (this.generalSettingsForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.fillCustomAdapters(); + + this.vmwareService.saveTemplate(this.server, this.vmwareTemplate).subscribe((vmwareTemplate: VmwareTemplate) => { + this.toasterService.success('Changes saved'); + }); + } + } + + setCustomAdaptersConfiguratorState(state: boolean) { + this.isConfiguratorOpened = state; + + if (state) { + this.fillCustomAdapters(); + this.customAdaptersConfigurator.numberOfAdapters = this.vmwareTemplate.adapters; + this.customAdaptersConfigurator.adapters = []; + this.vmwareTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { + this.customAdaptersConfigurator.adapters.push({ + adapter_number: adapter.adapter_number, + adapter_type: adapter.adapter_type, }); + }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + saveCustomAdapters(adapters: CustomAdapter[]) { + this.setCustomAdaptersConfiguratorState(false); + this.vmwareTemplate.custom_adapters = adapters; + } - this.getConfiguration(); - this.vmwareService.getTemplate(this.server, template_id).subscribe((vmwareTemplate: VmwareTemplate) => { - this.vmwareTemplate = vmwareTemplate; - this.fillCustomAdapters(); - }); + fillCustomAdapters() { + let copyOfAdapters = this.vmwareTemplate.custom_adapters ? this.vmwareTemplate.custom_adapters : []; + this.vmwareTemplate.custom_adapters = []; + + for (let i = 0; i < this.vmwareTemplate.adapters; i++) { + if (copyOfAdapters[i]) { + this.vmwareTemplate.custom_adapters.push(copyOfAdapters[i]); + } else { + this.vmwareTemplate.custom_adapters.push({ + adapter_number: i, + adapter_type: 'e1000', }); + } } + } - getConfiguration() { - this.consoleTypes = this.vmwareConfigurationService.getConsoleTypes(); - this.categories = this.vmwareConfigurationService.getCategories(); - this.onCloseOptions = this.vmwareConfigurationService.getOnCloseoptions(); - this.networkTypes = this.vmwareConfigurationService.getNetworkTypes(); - } + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'vmware', 'templates']); - } - - onSave() { - if (this.generalSettingsForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.fillCustomAdapters(); - - this.vmwareService.saveTemplate(this.server, this.vmwareTemplate).subscribe((vmwareTemplate: VmwareTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - setCustomAdaptersConfiguratorState(state: boolean) { - this.isConfiguratorOpened = state; - - if (state) { - this.fillCustomAdapters(); - this.customAdaptersConfigurator.numberOfAdapters = this.vmwareTemplate.adapters; - this.customAdaptersConfigurator.adapters = []; - this.vmwareTemplate.custom_adapters.forEach((adapter: CustomAdapter) => { - this.customAdaptersConfigurator.adapters.push({ - adapter_number: adapter.adapter_number, - adapter_type: adapter.adapter_type - }); - }); - } - } - - saveCustomAdapters(adapters: CustomAdapter[]){ - this.setCustomAdaptersConfiguratorState(false); - this.vmwareTemplate.custom_adapters = adapters; - } - - fillCustomAdapters() { - let copyOfAdapters = this.vmwareTemplate.custom_adapters ? this.vmwareTemplate.custom_adapters : []; - this.vmwareTemplate.custom_adapters = []; - - for(let i=0; i -
-
-

VMware VM templates

- - -
+
+
+

VMware VM templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts index 4ff8efcc..61b4cd68 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts @@ -18,43 +18,50 @@ import { VmwareTemplatesComponent } from './vmware-templates.component'; import { VmwareService } from '../../../../services/vmware.service'; export class MockedVmwareService { - public getTemplates(server: Server) { - return of([{} as VmwareTemplate]); - } + public getTemplates(server: Server) { + return of([{} as VmwareTemplate]); + } } describe('VmwareTemplatesComponent', () => { - let component: VmwareTemplatesComponent; - let fixture: ComponentFixture; + let component: VmwareTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVmwareService = new MockedVmwareService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VmwareService, useValue: mockedVmwareService } - ], - declarations: [ - VmwareTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVmwareService = new MockedVmwareService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VmwareTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VmwareService, useValue: mockedVmwareService }, + ], + declarations: [VmwareTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VmwareTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts index 5f1a941e..528ae671 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -6,42 +6,41 @@ import { VmwareTemplate } from '../../../../models/templates/vmware-template'; import { VmwareService } from '../../../../services/vmware.service'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; - @Component({ - selector: 'app-vmware-templates', - templateUrl: './vmware-templates.component.html', - styleUrls: ['./vmware-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-vmware-templates', + templateUrl: './vmware-templates.component.html', + styleUrls: ['./vmware-templates.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplatesComponent implements OnInit { - server: Server; - vmwareTemplates: VmwareTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + vmwareTemplates: VmwareTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vmwareService: VmwareService - ) {} + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private vmwareService: VmwareService + ) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.vmwareService.getTemplates(this.server).subscribe((vmwareTemplates: VmwareTemplate[]) => { - this.vmwareTemplates = vmwareTemplates.filter((elem) => elem.template_type === 'vmware' && !elem.builtin); - }); - } + getTemplates() { + this.vmwareService.getTemplates(this.server).subscribe((vmwareTemplates: VmwareTemplate[]) => { + this.vmwareTemplates = vmwareTemplates.filter((elem) => elem.template_type === 'vmware' && !elem.builtin); + }); + } - deleteTemplate(template: VmwareTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: VmwareTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html index 17a5f6d1..f650eb76 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html @@ -1,25 +1,33 @@
-
-
-

New VPCS node template

-
+
+
+

New VPCS node template

-
- - - Run the VPCS node locally - Run the VPCS node on the GNS3 VM - +
+
+ + + Run the VPCS node locally + Run the VPCS node on the GNS3 VM + -
- - - -
- -
- - -
+
+ + + +
+ +
+ +
+
diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts index 86e3bcfc..2e34f8ec 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts @@ -23,85 +23,85 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ComputeService } from '../../../../services/compute.service'; export class MockedComputeService { - getComputes(server: Server) { - return of([]); - } + getComputes(server: Server) { + return of([]); + } } export class MockedVpcsService { - public addTemplate(server: Server, vpcsTemplate: VpcsTemplate) { - return of(vpcsTemplate); - } + public addTemplate(server: Server, vpcsTemplate: VpcsTemplate) { + return of(vpcsTemplate); + } } describe('AddVpcsTemplateComponent', () => { - let component: AddVpcsTemplateComponent; - let fixture: ComponentFixture; + let component: AddVpcsTemplateComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVpcsService = new MockedVpcsService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - let mockedComputeService = new MockedComputeService(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([{path: 'server/1/preferences/vpcs/templates', component: AddVpcsTemplateComponent}]) - ], - providers: [ - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VpcsService, useValue: mockedVpcsService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: ComputeService, useValue: mockedComputeService }, - { provide: TemplateMocksService, useClass: TemplateMocksService } - ], - declarations: [ - AddVpcsTemplateComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVpcsService = new MockedVpcsService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); + let mockedComputeService = new MockedComputeService(); - beforeEach(() => { - fixture = TestBed.createComponent(AddVpcsTemplateComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { path: 'server/1/preferences/vpcs/templates', component: AddVpcsTemplateComponent }, + ]), + ], + providers: [ + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VpcsService, useValue: mockedVpcsService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: ComputeService, useValue: mockedComputeService }, + { provide: TemplateMocksService, useClass: TemplateMocksService }, + ], + declarations: [AddVpcsTemplateComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AddVpcsTemplateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call add template', () => { - spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); - component.templateName = "sample name"; - component.templateNameForm.controls['templateName'].setValue('template name'); - component.server = {id: 1} as Server; + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.addTemplate(); + it('should call add template', () => { + spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); + component.templateName = 'sample name'; + component.templateNameForm.controls['templateName'].setValue('template name'); + component.server = { id: 1 } as Server; - expect(mockedVpcsService.addTemplate).toHaveBeenCalled(); - }); + component.addTemplate(); - it('should not call add template when template name is empty', () => { - spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); - spyOn(mockedToasterService, 'error'); - component.templateName = ""; - component.server = {id: 1} as Server; + expect(mockedVpcsService.addTemplate).toHaveBeenCalled(); + }); - component.addTemplate(); + it('should not call add template when template name is empty', () => { + spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); + spyOn(mockedToasterService, 'error'); + component.templateName = ''; + component.server = { id: 1 } as Server; - expect(mockedVpcsService.addTemplate).not.toHaveBeenCalled(); - expect(mockedToasterService.error).toHaveBeenCalled(); - }); + component.addTemplate(); + + expect(mockedVpcsService.addTemplate).not.toHaveBeenCalled(); + expect(mockedToasterService.error).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts index 3253ad95..7907fecc 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -11,80 +11,79 @@ import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms' import { ComputeService } from '../../../../services/compute.service'; import { Compute } from '../../../../models/compute'; - @Component({ - selector: 'app-add-vpcs-template', - templateUrl: './add-vpcs-template.component.html', - styleUrls: ['./add-vpcs-template.component.scss', '../../preferences.component.scss'] + selector: 'app-add-vpcs-template', + templateUrl: './add-vpcs-template.component.html', + styleUrls: ['./add-vpcs-template.component.scss', '../../preferences.component.scss'], }) export class AddVpcsTemplateComponent implements OnInit { - server: Server; - templateName: string = ''; - templateNameForm: FormGroup + server: Server; + templateName: string = ''; + templateNameForm: FormGroup; - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; - isLocalComputerChosen: boolean = true; - - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vpcsService: VpcsService, - private router: Router, - private toasterService: ToasterService, - private templateMocksService: TemplateMocksService, - private formBuilder: FormBuilder, - private computeService: ComputeService - ) { - this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl(null, [Validators.required]) - }); + isGns3VmAvailable: boolean = false; + isGns3VmChosen: boolean = false; + isLocalComputerChosen: boolean = true; + + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private vpcsService: VpcsService, + private router: Router, + private toasterService: ToasterService, + private templateMocksService: TemplateMocksService, + private formBuilder: FormBuilder, + private computeService: ComputeService + ) { + this.templateNameForm = this.formBuilder.group({ + templateName: new FormControl(null, [Validators.required]), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.computeService.getComputes(server).subscribe((computes: Compute[]) => { + if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; + }); + }); + } + + setServerType(serverType: string) { + if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']); + } - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter(compute => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - }); - } - - setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']); - } - - addTemplate() { - if (!this.templateNameForm.invalid) { - this.templateName = this.templateNameForm.get('templateName').value; - - let vpcsTemplate: VpcsTemplate; - - this.templateMocksService.getVpcsTemplate().subscribe((template: VpcsTemplate) => { - vpcsTemplate = template; - }); - - vpcsTemplate.template_id = uuid(), - vpcsTemplate.name = this.templateName, - vpcsTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - - this.vpcsService.addTemplate(this.server, vpcsTemplate).subscribe(() => { - this.goBack(); - }); - } else { - this.toasterService.error(`Fill all required fields`); - } + addTemplate() { + if (!this.templateNameForm.invalid) { + this.templateName = this.templateNameForm.get('templateName').value; + + let vpcsTemplate: VpcsTemplate; + + this.templateMocksService.getVpcsTemplate().subscribe((template: VpcsTemplate) => { + vpcsTemplate = template; + }); + + (vpcsTemplate.template_id = uuid()), + (vpcsTemplate.name = this.templateName), + (vpcsTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'); + + this.vpcsService.addTemplate(this.server, vpcsTemplate).subscribe(() => { + this.goBack(); + }); + } else { + this.toasterService.error(`Fill all required fields`); } + } } diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.html b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.html index 33c19621..58b89cb9 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.html +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.html @@ -1,12 +1,12 @@
-
-
-

VPCS preferences

-
-
-
- - - +
+
+

VPCS preferences

+
+
+ + + +
diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.scss b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.scss index 9c2173c2..8aff6f5a 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.scss +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.scss @@ -1,3 +1,3 @@ .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts index a9658f98..50c406a0 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts @@ -1,4 +1,4 @@ -import { VpcsPreferencesComponent } from "./vpcs-preferences.component"; +import { VpcsPreferencesComponent } from './vpcs-preferences.component'; import { ComponentFixture, async, TestBed } from '@angular/core/testing'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatIconModule } from '@angular/material/icon'; @@ -15,41 +15,48 @@ import { ServerService } from '../../../../services/server.service'; import { MockedActivatedRoute } from '../../preferences.component.spec'; describe('VpcsPreferencesComponent', () => { - let component: VpcsPreferencesComponent; - let fixture: ComponentFixture; + let component: VpcsPreferencesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService } - ], - declarations: [ - VpcsPreferencesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VpcsPreferencesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + ], + declarations: [VpcsPreferencesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VpcsPreferencesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should clear path to executable', () => { - component.restoreDefaults(); + it('should create', () => { + expect(component).toBeTruthy(); + }); - expect(component.vpcsExecutable).toBe(''); - }); + it('should clear path to executable', () => { + component.restoreDefaults(); + + expect(component.vpcsExecutable).toBe(''); + }); }); diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts index 641746b1..9d5fa383 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts @@ -1,32 +1,28 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Server } from '../../../../models/server'; import { ServerService } from '../../../../services/server.service'; - @Component({ - selector: 'app-vpcs-preferences', - templateUrl: './vpcs-preferences.component.html', - styleUrls: ['./vpcs-preferences.component.scss'] + selector: 'app-vpcs-preferences', + templateUrl: './vpcs-preferences.component.html', + styleUrls: ['./vpcs-preferences.component.scss'], }) export class VpcsPreferencesComponent implements OnInit { - server: Server; - vpcsExecutable: string; + server: Server; + vpcsExecutable: string; - constructor( - private route: ActivatedRoute, - private serverService: ServerService - ) {} + constructor(private route: ActivatedRoute, private serverService: ServerService) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - }); - } + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + }); + } - restoreDefaults(){ - this.vpcsExecutable = ''; - } + restoreDefaults() { + this.vpcsExecutable = ''; + } } diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html index fa2601a3..922e88c2 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html @@ -1,72 +1,79 @@
-
-
-

VPCS device configuration

-
+
+
+

VPCS device configuration

-
- -
- - - - - - - - - - - - -

- - - - {{category[0]}} - - - - - - - {{type}} - - - - - Auto start console - -
- -
- - -
+
+
+ +
+ + + + + + + + + + + + +

+ + + + {{ category[0] }} + + + + + + + {{ type }} + + + + + Auto start console + +
+ +
+ +
+
- + diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts index 18d9963c..c68b55a9 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts @@ -22,110 +22,119 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsConfigurationService } from '../../../../services/vpcs-configuration.service'; export class MockedVpcsService { - public getTemplate(server: Server, template_id: string) { - return of({} as VpcsTemplate); - } + public getTemplate(server: Server, template_id: string) { + return of({} as VpcsTemplate); + } - public saveTemplate(server: Server, vpcsTemplate: VpcsTemplate) { - return of(vpcsTemplate); - } + public saveTemplate(server: Server, vpcsTemplate: VpcsTemplate) { + return of(vpcsTemplate); + } } describe('VpcsTemplateDetailsComponent', () => { - let component: VpcsTemplateDetailsComponent; - let fixture: ComponentFixture; + let component: VpcsTemplateDetailsComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVpcsService = new MockedVpcsService; - let mockedToasterService = new MockedToasterService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VpcsService, useValue: mockedVpcsService }, - { provide: ToasterService, useValue: mockedToasterService}, - { provide: VpcsConfigurationService, useClass: VpcsConfigurationService } - ], - declarations: [ - VpcsTemplateDetailsComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVpcsService = new MockedVpcsService(); + let mockedToasterService = new MockedToasterService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VpcsTemplateDetailsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VpcsService, useValue: mockedVpcsService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: VpcsConfigurationService, useClass: VpcsConfigurationService }, + ], + declarations: [VpcsTemplateDetailsComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VpcsTemplateDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should call save template', () => { - spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['scriptFile'].setValue('script file'); - component.inputForm.controls['symbol'].setValue('symbol'); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onSave(); + it('should call save template', () => { + spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['scriptFile'].setValue('script file'); + component.inputForm.controls['symbol'].setValue('symbol'); - expect(mockedVpcsService.saveTemplate).toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when template name is empty', () => { - spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); - component.inputForm.controls['templateName'].setValue(''); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['scriptFile'].setValue('script file'); - component.inputForm.controls['symbol'].setValue('symbol'); + expect(mockedVpcsService.saveTemplate).toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when template name is empty', () => { + spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); + component.inputForm.controls['templateName'].setValue(''); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['scriptFile'].setValue('script file'); + component.inputForm.controls['symbol'].setValue('symbol'); - expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when default name is empty', () => { - spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue(''); - component.inputForm.controls['scriptFile'].setValue('script file'); - component.inputForm.controls['symbol'].setValue('symbol'); + expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when default name is empty', () => { + spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue(''); + component.inputForm.controls['scriptFile'].setValue('script file'); + component.inputForm.controls['symbol'].setValue('symbol'); - expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when script file is empty', () => { - spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['scriptFile'].setValue(''); - component.inputForm.controls['symbol'].setValue('symbol'); + expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when script file is empty', () => { + spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['scriptFile'].setValue(''); + component.inputForm.controls['symbol'].setValue('symbol'); - expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); - it('should not call save template when symbol path is empty', () => { - spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); - component.inputForm.controls['templateName'].setValue('template name'); - component.inputForm.controls['defaultName'].setValue('default name'); - component.inputForm.controls['scriptFile'].setValue('script file'); - component.inputForm.controls['symbol'].setValue(''); + expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); + }); - component.onSave(); + it('should not call save template when symbol path is empty', () => { + spyOn(mockedVpcsService, 'saveTemplate').and.returnValue(of({} as VpcsTemplate)); + component.inputForm.controls['templateName'].setValue('template name'); + component.inputForm.controls['defaultName'].setValue('default name'); + component.inputForm.controls['scriptFile'].setValue('script file'); + component.inputForm.controls['symbol'].setValue(''); - expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); - }); + component.onSave(); + + expect(mockedVpcsService.saveTemplate).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts index 6b23a04b..033584f2 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; import { Server } from '../../../../models/server'; @@ -8,75 +8,74 @@ import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { VpcsConfigurationService } from '../../../../services/vpcs-configuration.service'; - @Component({ - selector: 'app-vpcs-template-details', - templateUrl: './vpcs-template-details.component.html', - styleUrls: ['./vpcs-template-details.component.scss', '../../preferences.component.scss'] + selector: 'app-vpcs-template-details', + templateUrl: './vpcs-template-details.component.html', + styleUrls: ['./vpcs-template-details.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplateDetailsComponent implements OnInit { - server: Server; - vpcsTemplate: VpcsTemplate; - inputForm: FormGroup; - isSymbolSelectionOpened: boolean = false; - consoleTypes: string[] = []; - categories = []; + server: Server; + vpcsTemplate: VpcsTemplate; + inputForm: FormGroup; + isSymbolSelectionOpened: boolean = false; + consoleTypes: string[] = []; + categories = []; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vpcsService: VpcsService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private vpcsConfigurationService: VpcsConfigurationService, - private router: Router - ) { - this.inputForm = this.formBuilder.group({ - templateName: new FormControl('', Validators.required), - defaultName: new FormControl('', Validators.required), - scriptFile: new FormControl('', Validators.required), - symbol: new FormControl('', Validators.required) - }); + constructor( + private route: ActivatedRoute, + private serverService: ServerService, + private vpcsService: VpcsService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private vpcsConfigurationService: VpcsConfigurationService, + private router: Router + ) { + this.inputForm = this.formBuilder.group({ + templateName: new FormControl('', Validators.required), + defaultName: new FormControl('', Validators.required), + scriptFile: new FormControl('', Validators.required), + symbol: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + const template_id = this.route.snapshot.paramMap.get('template_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + + this.getConfiguration(); + this.vpcsService.getTemplate(this.server, template_id).subscribe((vpcsTemplate: VpcsTemplate) => { + this.vpcsTemplate = vpcsTemplate; + }); + }); + } + + getConfiguration() { + this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); + this.categories = this.vpcsConfigurationService.getCategories(); + } + + goBack() { + this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']); + } + + onSave() { + if (this.inputForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + this.vpcsService.saveTemplate(this.server, this.vpcsTemplate).subscribe((vpcsTemplate: VpcsTemplate) => { + this.toasterService.success('Changes saved'); + }); } + } - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - const template_id = this.route.snapshot.paramMap.get("template_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; + chooseSymbol() { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + } - this.getConfiguration(); - this.vpcsService.getTemplate(this.server, template_id).subscribe((vpcsTemplate: VpcsTemplate) => { - this.vpcsTemplate = vpcsTemplate; - }); - }); - } - - getConfiguration() { - this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); - this.categories = this.vpcsConfigurationService.getCategories(); - } - - goBack() { - this.router.navigate(['/server', this.server.id, 'preferences', 'vpcs', 'templates']); - } - - onSave() { - if (this.inputForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - this.vpcsService.saveTemplate(this.server, this.vpcsTemplate).subscribe((vpcsTemplate: VpcsTemplate) => { - this.toasterService.success("Changes saved"); - }); - } - } - - chooseSymbol() { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - } - - symbolChanged(chosenSymbol: string) { - this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; - this.vpcsTemplate.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.isSymbolSelectionOpened = !this.isSymbolSelectionOpened; + this.vpcsTemplate.symbol = chosenSymbol; + } } diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html index 1d789d34..3f957137 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html @@ -1,32 +1,46 @@
-
-
-

VPCS node templates

- - -
+
+
+

VPCS node templates

+ +
- -
-
- -
- {{template.name}} - - - - -
- +
+ +
+
+ +
+ {{ + template.name + }} + + + +
+
+
- - + diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts index bcf15acf..40deea8d 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts @@ -18,43 +18,50 @@ import { VpcsTemplatesComponent } from './vpcs-templates.component'; import { MockedActivatedRoute } from '../../preferences.component.spec'; export class MockedVpcsService { - public getTemplates(server: Server) { - return of([{} as VpcsTemplate]); - } + public getTemplates(server: Server) { + return of([{} as VpcsTemplate]); + } } describe('VpcsTemplatesComponent', () => { - let component: VpcsTemplatesComponent; - let fixture: ComponentFixture; + let component: VpcsTemplatesComponent; + let fixture: ComponentFixture; - let mockedServerService = new MockedServerService; - let mockedVpcsService = new MockedVpcsService; - let activatedRoute = new MockedActivatedRoute().get(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule, RouterTestingModule.withRoutes([])], - providers: [ - { - provide: ActivatedRoute, useValue: activatedRoute - }, - { provide: ServerService, useValue: mockedServerService }, - { provide: VpcsService, useValue: mockedVpcsService } - ], - declarations: [ - VpcsTemplatesComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedServerService = new MockedServerService(); + let mockedVpcsService = new MockedVpcsService(); + let activatedRoute = new MockedActivatedRoute().get(); - beforeEach(() => { - fixture = TestBed.createComponent(VpcsTemplatesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { + provide: ActivatedRoute, + useValue: activatedRoute, + }, + { provide: ServerService, useValue: mockedServerService }, + { provide: VpcsService, useValue: mockedVpcsService }, + ], + declarations: [VpcsTemplatesComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(VpcsTemplatesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts index a2e570d8..06eaf652 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from "@angular/core"; +import { Component, OnInit, ViewChild } from '@angular/core'; import { Server } from '../../../../models/server'; import { ActivatedRoute } from '@angular/router'; import { ServerService } from '../../../../services/server.service'; @@ -7,40 +7,36 @@ import { VpcsTemplate } from '../../../../models/templates/vpcs-template'; import { DeleteTemplateComponent } from '../../common/delete-template-component/delete-template.component'; @Component({ - selector: 'app-vpcs-templates', - templateUrl: './vpcs-templates.component.html', - styleUrls: ['./vpcs-templates.component.scss', '../../preferences.component.scss'] + selector: 'app-vpcs-templates', + templateUrl: './vpcs-templates.component.html', + styleUrls: ['./vpcs-templates.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplatesComponent implements OnInit { - server: Server; - vpcsTemplates: VpcsTemplate[] = []; - @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; + server: Server; + vpcsTemplates: VpcsTemplate[] = []; + @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; - constructor( - private route: ActivatedRoute, - private serverService: ServerService, - private vpcsService: VpcsService - ) {} + constructor(private route: ActivatedRoute, private serverService: ServerService, private vpcsService: VpcsService) {} - ngOnInit() { - const server_id = this.route.snapshot.paramMap.get("server_id"); - this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { - this.server = server; - this.getTemplates(); - }); - } + ngOnInit() { + const server_id = this.route.snapshot.paramMap.get('server_id'); + this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { + this.server = server; + this.getTemplates(); + }); + } - getTemplates() { - this.vpcsService.getTemplates(this.server).subscribe((vpcsTemplates: VpcsTemplate[]) => { - this.vpcsTemplates = vpcsTemplates.filter((elem) => elem.template_type === 'vpcs' && !elem.builtin); - }); - } + getTemplates() { + this.vpcsService.getTemplates(this.server).subscribe((vpcsTemplates: VpcsTemplate[]) => { + this.vpcsTemplates = vpcsTemplates.filter((elem) => elem.template_type === 'vpcs' && !elem.builtin); + }); + } - deleteTemplate(template: VpcsTemplate) { - this.deleteComponent.deleteItem(template.name, template.template_id); - } + deleteTemplate(template: VpcsTemplate) { + this.deleteComponent.deleteItem(template.name, template.template_id); + } - onDeleteEvent() { - this.getTemplates(); - } + onDeleteEvent() { + this.getTemplates(); + } } diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.html b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.html index d668cfe2..8a903956 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.html +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.html @@ -1,21 +1,17 @@ -

Change hostname for node {{name}}

+

Change hostname for node {{ name }}

-
-
- -
- - - -
- -
+
+
+ +
+ + + +
+
+
diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.scss b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.scss index 9c2173c2..8aff6f5a 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.scss +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.scss @@ -1,3 +1,3 @@ .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts index 65b42935..b5793e16 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../cartography/models/node'; import { Server } from '../../../models/server'; @@ -6,48 +6,47 @@ import { NodeService } from '../../../services/node.service'; import { ToasterService } from '../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-change-hostname-dialog-component', - templateUrl: './change-hostname-dialog.component.html', - styleUrls: ['./change-hostname-dialog.component.scss'] + selector: 'app-change-hostname-dialog-component', + templateUrl: './change-hostname-dialog.component.html', + styleUrls: ['./change-hostname-dialog.component.scss'], }) export class ChangeHostnameDialogComponent implements OnInit { - server: Server; - node: Node; - inputForm: FormGroup; - name: string; + server: Server; + node: Node; + inputForm: FormGroup; + name: string; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder - ) { - this.inputForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder + ) { + this.inputForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = this.node.name; - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = this.node.name; + }); + } - onSaveClick() { - if (this.inputForm.valid) { - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.inputForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.html b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.html index 8f1b40bf..e9cd084c 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.html +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.html @@ -1,12 +1,12 @@ -

Change symbol for node: {{node.name}}

+

Change symbol for node: {{ node.name }}

-
- -
+
+ +
- - + +
diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.scss b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.scss index 6deef2c4..17731aff 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.scss +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.scss @@ -1,18 +1,18 @@ .symbolsWrapper { - height: 350px; - overflow-y: scroll; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + height: 350px; + overflow-y: scroll; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } - + ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + ::-webkit-scrollbar-thumb { background-color: darkgrey; outline: 1px solid #263238; diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts index e3ebfc93..1f257240 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts @@ -7,35 +7,32 @@ import { Symbol } from '../../../models/symbol'; import { NodeService } from '../../../services/node.service'; @Component({ - selector: 'app-change-symbol-dialog', - templateUrl: './change-symbol-dialog.component.html', - styleUrls: ['./change-symbol-dialog.component.scss'] + selector: 'app-change-symbol-dialog', + templateUrl: './change-symbol-dialog.component.html', + styleUrls: ['./change-symbol-dialog.component.scss'], }) export class ChangeSymbolDialogComponent implements OnInit { - @Input() server: Server; - @Input() node: Node; - symbol: string; + @Input() server: Server; + @Input() node: Node; + symbol: string; - constructor( - public dialogRef: MatDialogRef, - private nodeService: NodeService - ) {} + constructor(public dialogRef: MatDialogRef, private nodeService: NodeService) {} - ngOnInit() { - this.symbol = this.node.symbol; - } + ngOnInit() { + this.symbol = this.node.symbol; + } - symbolChanged(chosenSymbol: string) { - this.symbol = chosenSymbol; - } + symbolChanged(chosenSymbol: string) { + this.symbol = chosenSymbol; + } - onCloseClick() { - this.dialogRef.close(); - } + onCloseClick() { + this.dialogRef.close(); + } - onSelectClick() { - this.nodeService.updateSymbol(this.server, this.node, this.symbol).subscribe(() => { - this.onCloseClick() - }); - } + onSelectClick() { + this.nodeService.updateSymbol(this.server, this.node, this.symbol).subscribe(() => { + this.onCloseClick(); + }); + } } diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.html b/src/app/components/project-map/console-wrapper/console-wrapper.component.html index fc68a9c9..35dd3bac 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.html +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.html @@ -1,59 +1,95 @@
-
+ *ngIf="isDraggingEnabled" + (document:mousemove)="dragWidget($event)" + (document:mouseup)="toggleDragging(false)" +>
-
- -
- - - -
GNS3 console
- - - - - -
{{node.name}}
- - - - - +
+ + + +
GNS3 console
+ + - - - -
+ + + + - + + + +
-
- -
+ + +
+ +
diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.scss b/src/app/components/project-map/console-wrapper/console-wrapper.component.scss index 3f64f51f..3ba88248 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.scss +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.scss @@ -1,131 +1,131 @@ @media screen and (max-width: 700px) { - .consoleWrapper { - visibility: hidden; - } + .consoleWrapper { + visibility: hidden; + } } .consoleWrapper { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - position: fixed; - bottom: 20px; - left: 20px; - height: 180px; - width: 600px; - background: #000000!important; - color: white; - overflow: hidden; - font-size: 12px; - border-radius: 8px + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + position: fixed; + bottom: 20px; + left: 20px; + height: 180px; + width: 600px; + background: #000000 !important; + color: white; + overflow: hidden; + font-size: 12px; + border-radius: 8px; } .lightTheme { - background: white!important; - color: black; + background: white !important; + color: black; } .filterButton { - background: transparent; - color: white; - border: none; - margin-top: 0px; - outline: none; - color: #dbd5d5; - font-weight: bold; - padding: 0px; + background: transparent; + color: white; + border: none; + margin-top: 0px; + outline: none; + color: #dbd5d5; + font-weight: bold; + padding: 0px; } .consoleFiltering { - display: flex; + display: flex; } .consoleHeader { - width: 100%; - font-size: 12px; - overflow: hidden; - display: flex; - padding: 2px; - justify-content: space-between; - background: #263238!important; + width: 100%; + font-size: 12px; + overflow: hidden; + display: flex; + padding: 2px; + justify-content: space-between; + background: #263238 !important; } .lightThemeConsoleHeader { - background: white!important; - color: black!important; + background: white !important; + color: black !important; } :host ::ng-deep .mat-tab-label { - height: 3rem !important; - min-width: 8rem !important; + height: 3rem !important; + min-width: 8rem !important; } :host ::ng-deep .mat-tab-label.mat-tab-label-active { - border-bottom: 2px solid #0097a7; - box-sizing: border-box; - font-weight: 1200; + border-bottom: 2px solid #0097a7; + box-sizing: border-box; + font-weight: 1200; } :host ::ng-deep .mat-ink-bar { - display: none !important; + display: none !important; } .tabs { - width: 80%; + width: 80%; } .console { - width: 596px; - height: 120px; - overflow-y: scroll; - padding: 2px; - color: #dbd5d5; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + width: 596px; + height: 120px; + overflow-y: scroll; + padding: 2px; + color: #dbd5d5; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } .xterm-console { - background: black; + background: black; } .consoleInput { - width: 100%; - height: 30px; - padding: 2px; - display: flex; + width: 100%; + height: 30px; + padding: 2px; + display: flex; } .commandLine { - background-color: transparent; - color: white; - border: none; + background-color: transparent; + color: white; + border: none; } .inputIcon { - margin-top: 2px; + margin-top: 2px; } mat-icon { - font-size: 20px; - width: 20px; - height: 20px; + font-size: 20px; + width: 20px; + height: 20px; } -input:focus{ - outline: none; +input:focus { + outline: none; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } - + ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + ::-webkit-scrollbar-thumb { background-color: darkgrey; outline: 1px solid #263238; } .closeButton { - cursor: pointer; + cursor: pointer; } diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.spec.ts b/src/app/components/project-map/console-wrapper/console-wrapper.component.spec.ts index 3092f0e6..e3f3c99c 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.spec.ts +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.spec.ts @@ -1,22 +1,22 @@ -import { ConsoleWrapperComponent } from "./console-wrapper.component"; +import { ConsoleWrapperComponent } from './console-wrapper.component'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ThemeService } from '../../../services/theme.service'; import { MapSettingsService } from '../../../services/mapsettings.service'; describe('ConsoleWrapperComponent', () => { - it('should get actual theme', () => { - const consoleService = new NodeConsoleService(); + it('should get actual theme', () => { + const consoleService = new NodeConsoleService(); - const themeService = autoSpy(ThemeService); - themeService.getActualTheme.and.returnValue('light'); - - const mapSettingsService = autoSpy(MapSettingsService); - const component = new ConsoleWrapperComponent(consoleService, themeService, mapSettingsService); + const themeService = autoSpy(ThemeService); + themeService.getActualTheme.and.returnValue('light'); - component.ngOnInit(); + const mapSettingsService = autoSpy(MapSettingsService); + const component = new ConsoleWrapperComponent(consoleService, themeService, mapSettingsService); - expect(component.isLightThemeEnabled).toBe(true); - }); + component.ngOnInit(); + + expect(component.isLightThemeEnabled).toBe(true); + }); }); export type SpyOf = T & { [k in keyof T]: jasmine.Spy }; @@ -24,10 +24,10 @@ export type SpyOf = T & { [k in keyof T]: jasmine.Spy }; export function autoSpy(obj: new (...args: any[]) => T): SpyOf { const res: SpyOf = {} as any; - const keys = Object.getOwnPropertyNames(obj.prototype); - keys.forEach((key) => { - res[key] = jasmine.createSpy(key); - }); + const keys = Object.getOwnPropertyNames(obj.prototype); + keys.forEach((key) => { + res[key] = jasmine.createSpy(key); + }); - return res; + return res; } diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts index e04da1bd..5d5a8ed8 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts @@ -9,153 +9,153 @@ import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { Node } from '../../../cartography/models/node'; import { MapSettingsService } from '../../../services/mapsettings.service'; - @Component({ - selector: 'app-console-wrapper', - templateUrl: './console-wrapper.component.html', - styleUrls: ['./console-wrapper.component.scss'] + selector: 'app-console-wrapper', + templateUrl: './console-wrapper.component.html', + styleUrls: ['./console-wrapper.component.scss'], }) export class ConsoleWrapperComponent implements OnInit { - @Input() server: Server; - @Input() project: Project; - @Output() closeConsole = new EventEmitter(); + @Input() server: Server; + @Input() project: Project; + @Output() closeConsole = new EventEmitter(); - filters: string[] = ['all', 'errors', 'warnings', 'info', 'map updates', 'server requests']; - selectedFilter: string = 'all'; + filters: string[] = ['all', 'errors', 'warnings', 'info', 'map updates', 'server requests']; + selectedFilter: string = 'all'; - public style: object = {}; - public styleInside: object = { height: `120px` }; - public isDraggingEnabled: boolean = false; - public isLightThemeEnabled: boolean = false; - public isMinimized: boolean = false; + public style: object = {}; + public styleInside: object = { height: `120px` }; + public isDraggingEnabled: boolean = false; + public isLightThemeEnabled: boolean = false; + public isMinimized: boolean = false; - public resizedWidth: number = 720; - public resizedHeight: number = 480; + public resizedWidth: number = 720; + public resizedHeight: number = 480; - constructor( - private consoleService: NodeConsoleService, - private themeService: ThemeService, - private mapSettingsService: MapSettingsService - ) {} + constructor( + private consoleService: NodeConsoleService, + private themeService: ThemeService, + private mapSettingsService: MapSettingsService + ) {} - nodes: Node[] = []; - selected = new FormControl(0); - - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; - this.style = { bottom: '20px', left: '20px', width: '720px', height: '460px'}; + nodes: Node[] = []; + selected = new FormControl(0); - this.consoleService.nodeConsoleTrigger.subscribe((node) => { - this.addTab(node, true); - }); + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + this.style = { bottom: '20px', left: '20px', width: '720px', height: '460px' }; - this.consoleService.closeNodeConsoleTrigger.subscribe((node) => { - let index = this.nodes.findIndex(n => n.node_id === node.node_id) - this.removeTab(index); - }); + this.consoleService.nodeConsoleTrigger.subscribe((node) => { + this.addTab(node, true); + }); + + this.consoleService.closeNodeConsoleTrigger.subscribe((node) => { + let index = this.nodes.findIndex((n) => n.node_id === node.node_id); + this.removeTab(index); + }); + } + + minimize(value: boolean) { + this.isMinimized = value; + if (!value) { + this.style = { bottom: '20px', left: '20px', width: `${this.resizedWidth}px`, height: `${this.resizedHeight}px` }; + } else { + this.style = { bottom: '20px', left: '20px', width: `${this.resizedWidth}px`, height: '56px' }; + } + } + + addTab(node: Node, selectAfterAdding: boolean) { + this.minimize(false); + this.nodes.push(node); + + if (selectAfterAdding) { + this.selected.setValue(this.nodes.length); } - minimize(value: boolean) { - this.isMinimized = value; - if (!value) { - this.style = { bottom: '20px', left: '20px', width: `${this.resizedWidth}px`, height: `${this.resizedHeight}px`} - } else { - this.style = { bottom: '20px', left: '20px', width: `${this.resizedWidth}px`, height: '56px'}; - } + this.consoleService.openConsoles++; + } + + removeTab(index: number) { + this.nodes.splice(index, 1); + this.consoleService.openConsoles--; + } + + toggleDragging(value: boolean) { + this.isDraggingEnabled = value; + } + + dragWidget(event) { + let x: number = Number(event.movementX); + let y: number = Number(event.movementY); + + let width: number = Number(this.style['width'].split('px')[0]); + let height: number = Number(this.style['height'].split('px')[0]); + let left: number = Number(this.style['left'].split('px')[0]) + x; + if (this.style['top']) { + let top: number = Number(this.style['top'].split('px')[0]) + y; + this.style = { + position: 'fixed', + left: `${left}px`, + top: `${top}px`, + width: `${width}px`, + height: `${height}px`, + }; + } else { + let bottom: number = Number(this.style['bottom'].split('px')[0]) - y; + this.style = { + position: 'fixed', + left: `${left}px`, + bottom: `${bottom}px`, + width: `${width}px`, + height: `${height}px`, + }; } + } - addTab(node: Node, selectAfterAdding: boolean) { - this.minimize(false); - this.nodes.push(node); - - if (selectAfterAdding) { - this.selected.setValue(this.nodes.length); - } - - this.consoleService.openConsoles++; + validate(event: ResizeEvent): boolean { + if ( + event.rectangle.width && + event.rectangle.height && + (event.rectangle.width < 500 || event.rectangle.height < 100) + ) { + return false; } + return true; + } - removeTab(index: number) { - this.nodes.splice(index, 1); - this.consoleService.openConsoles--; - } + onResizeEnd(event: ResizeEvent): void { + this.style = { + position: 'fixed', + left: `${event.rectangle.left}px`, + top: `${event.rectangle.top}px`, + width: `${event.rectangle.width}px`, + height: `${event.rectangle.height}px`, + }; - toggleDragging(value: boolean) { - this.isDraggingEnabled = value; - } + this.styleInside = { + height: `${event.rectangle.height - 60}px`, + width: `${event.rectangle.width}px`, + }; - dragWidget(event) { - let x: number = Number(event.movementX); - let y: number = Number(event.movementY); + this.consoleService.consoleResized.next({ + width: event.rectangle.width, + height: event.rectangle.height - 53, + }); - let width: number = Number(this.style['width'].split('px')[0]); - let height: number = Number(this.style['height'].split('px')[0]); - let left: number = Number(this.style['left'].split('px')[0]) + x; - if (this.style['top']) { - let top: number = Number(this.style['top'].split('px')[0]) + y; - this.style = { - position: 'fixed', - left: `${left}px`, - top: `${top}px`, - width: `${width}px`, - height: `${height}px` - }; - } else { - let bottom: number = Number(this.style['bottom'].split('px')[0]) - y; - this.style = { - position: 'fixed', - left: `${left}px`, - bottom: `${bottom}px`, - width: `${width}px`, - height: `${height}px` - }; - } - } + this.resizedWidth = event.rectangle.width; + this.resizedHeight = event.rectangle.height; + } - validate(event: ResizeEvent): boolean { - if ( - event.rectangle.width && - event.rectangle.height && - (event.rectangle.width < 500 || - event.rectangle.height < 100) - ) { - return false; - } - return true; - } + close() { + this.closeConsole.emit(false); + } - onResizeEnd(event: ResizeEvent): void { - this.style = { - position: 'fixed', - left: `${event.rectangle.left}px`, - top: `${event.rectangle.top}px`, - width: `${event.rectangle.width}px`, - height: `${event.rectangle.height}px` - }; + enableScroll(e) { + this.mapSettingsService.isScrollDisabled.next(false); + } - this.styleInside = { - height: `${event.rectangle.height - 60}px`, - width: `${event.rectangle.width}px` - }; - - this.consoleService.consoleResized.next({ - width: event.rectangle.width, - height: event.rectangle.height - 53 - }); - - this.resizedWidth = event.rectangle.width; - this.resizedHeight = event.rectangle.height; - } - - close() { - this.closeConsole.emit(false); - } - - enableScroll(e) { - this.mapSettingsService.isScrollDisabled.next(false); - } - - disableScroll(e) { - this.mapSettingsService.isScrollDisabled.next(true); - } + disableScroll(e) { + this.mapSettingsService.isScrollDisabled.next(true); + } } diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.html b/src/app/components/project-map/context-console-menu/context-console-menu.component.html index 51d98b61..ed97c083 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.html +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.html @@ -1,22 +1,20 @@
- - - - Choose default behavior for double click on node - - - - - + + + Choose default behavior for double click on node + + + +
- \ No newline at end of file + diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.scss b/src/app/components/project-map/context-console-menu/context-console-menu.component.scss index d84da4fb..02ea0151 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.scss +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.scss @@ -1,12 +1,20 @@ .context-menu { - position: absolute; - min-height: 0px; + position: absolute; + min-height: 0px; } -.mat-menu-panel ng-trigger ng-trigger-transformMenu ng-tns-c7-5 context-menu-items mat-menu-after mat-menu-below ng-star-inserted mat-elevation-z4 { - min-height: 0px!important; +.mat-menu-panel + ng-trigger + ng-trigger-transformMenu + ng-tns-c7-5 + context-menu-items + mat-menu-after + mat-menu-below + ng-star-inserted + mat-elevation-z4 { + min-height: 0px !important; } .title { - margin: 10px; -} \ No newline at end of file + margin: 10px; +} diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts index a6628824..7b66205c 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts @@ -23,43 +23,39 @@ describe('ContextConsoleMenuComponent', () => { let toasterService: MockedToasterService = new MockedToasterService(); let router = { url: '', - navigate: jasmine.createSpy('navigate') + navigate: jasmine.createSpy('navigate'), }; let node = { - status: 'started' + status: 'started', }; let mapSettingsService = new MapSettingsService(); beforeEach(async(() => { const electronMock = { - isElectronApp: true + isElectronApp: true, }; TestBed.configureTestingModule({ imports: [MatMenuModule, BrowserModule], providers: [ - { provide: ChangeDetectorRef }, + { provide: ChangeDetectorRef }, { provide: ProjectService, useClass: MockedProjectService }, { provide: ElectronService, useValue: electronMock }, { provide: MapSettingsService, useValue: mapSettingsService }, { provide: NodeConsoleService }, { provide: ConsoleService }, { provide: ToasterService, useValue: toasterService }, - { provide: Router, useValue: router } + { provide: Router, useValue: router }, ], - declarations: [ - ContextConsoleMenuComponent, - ConsoleDeviceActionComponent, - ConsoleDeviceActionBrowserComponent - ], - schemas: [NO_ERRORS_SCHEMA] + declarations: [ContextConsoleMenuComponent, ConsoleDeviceActionComponent, ConsoleDeviceActionBrowserComponent], + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(ContextConsoleMenuComponent); component = fixture.componentInstance; - component.server = {location: 'local'} as Server; + component.server = { location: 'local' } as Server; fixture.detectChanges(); }); @@ -75,7 +71,7 @@ describe('ContextConsoleMenuComponent', () => { let spy = spyOn(component.contextConsoleMenu, 'openMenu'); localStorage.removeItem('consoleContextMenu'); - component.openMenu(node as unknown as Node, 0, 0); + component.openMenu((node as unknown) as Node, 0, 0); expect(spy.calls.any()).toBeTruthy(); }); @@ -84,7 +80,7 @@ describe('ContextConsoleMenuComponent', () => { let spy = spyOn(component, 'openWebConsole'); mapSettingsService.setConsoleContextMenuAction('web console'); - component.openMenu(node as unknown as Node, 0, 0); + component.openMenu((node as unknown) as Node, 0, 0); expect(spy.calls.any()).toBeTruthy(); }); @@ -93,7 +89,7 @@ describe('ContextConsoleMenuComponent', () => { let spy = spyOn(component, 'openWebConsoleInNewTab'); mapSettingsService.setConsoleContextMenuAction('web console in new tab'); - component.openMenu(node as unknown as Node, 0, 0); + component.openMenu((node as unknown) as Node, 0, 0); expect(spy.calls.any()).toBeTruthy(); }); @@ -102,8 +98,8 @@ describe('ContextConsoleMenuComponent', () => { let spy = spyOn(component, 'openConsole'); mapSettingsService.setConsoleContextMenuAction('console'); - component.openMenu(node as unknown as Node, 0, 0); + component.openMenu((node as unknown) as Node, 0, 0); expect(spy.calls.any()).toBeTruthy(); }); -}); \ No newline at end of file +}); diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts index fd7539cd..d1b24658 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts @@ -1,4 +1,13 @@ -import { ChangeDetectorRef, Component, ComponentFactory, ComponentRef, Input, OnInit, ViewChild, ViewContainerRef } from '@angular/core'; +import { + ChangeDetectorRef, + Component, + ComponentFactory, + ComponentRef, + Input, + OnInit, + ViewChild, + ViewContainerRef, +} from '@angular/core'; import { MatMenuTrigger } from '@angular/material/menu'; import { DomSanitizer } from '@angular/platform-browser'; import { Node } from '../../../cartography/models/node'; @@ -16,20 +25,20 @@ import { ConsoleDeviceActionBrowserComponent } from '../context-menu/actions/con @Component({ selector: 'app-context-console-menu', templateUrl: './context-console-menu.component.html', - styleUrls: ['./context-console-menu.component.scss'] + styleUrls: ['./context-console-menu.component.scss'], }) export class ContextConsoleMenuComponent implements OnInit { @Input() project: Project; @Input() server: Server; @ViewChild(MatMenuTrigger) contextConsoleMenu: MatMenuTrigger; - @ViewChild("container", { read: ViewContainerRef }) container; + @ViewChild('container', { read: ViewContainerRef }) container; componentRef: ComponentRef; componentBrowserRef: ComponentRef; topPosition; leftPosition; isElectronApp = false; - node: Node;; + node: Node; constructor( private sanitizer: DomSanitizer, @@ -57,56 +66,60 @@ export class ContextConsoleMenuComponent implements OnInit { this.node = node; let action = this.mapSettingsService.getConsoleContextManuAction(); if (action) { - if (action === 'web console') { - this.openWebConsole(); - } else if (action === 'web console in new tab') { - this.openWebConsoleInNewTab(); - } else if (action === 'console') { - this.openConsole(); - } + if (action === 'web console') { + this.openWebConsole(); + } else if (action === 'web console in new tab') { + this.openWebConsoleInNewTab(); + } else if (action === 'console') { + this.openConsole(); + } } else { - this.setPosition(top, left); - this.contextConsoleMenu.openMenu(); + this.setPosition(top, left); + this.contextConsoleMenu.openMenu(); } } openConsole() { - this.mapSettingsService.setConsoleContextMenuAction('console'); - if (this.isElectronApp) { - const factory: ComponentFactory = this.resolver.resolveComponentFactory(ConsoleDeviceActionComponent); - this.componentRef = this.container.createComponent(factory); - this.componentRef.instance.server = this.server; - this.componentRef.instance.nodes = [this.node]; + this.mapSettingsService.setConsoleContextMenuAction('console'); + if (this.isElectronApp) { + const factory: ComponentFactory = this.resolver.resolveComponentFactory( + ConsoleDeviceActionComponent + ); + this.componentRef = this.container.createComponent(factory); + this.componentRef.instance.server = this.server; + this.componentRef.instance.nodes = [this.node]; - this.componentRef.instance.console(); - } else { - const factory: ComponentFactory = this.resolver.resolveComponentFactory(ConsoleDeviceActionBrowserComponent); - this.componentBrowserRef = this.container.createComponent(factory); - this.componentBrowserRef.instance.server = this.server; - this.componentBrowserRef.instance.node = this.node; + this.componentRef.instance.console(); + } else { + const factory: ComponentFactory = this.resolver.resolveComponentFactory( + ConsoleDeviceActionBrowserComponent + ); + this.componentBrowserRef = this.container.createComponent(factory); + this.componentBrowserRef.instance.server = this.server; + this.componentBrowserRef.instance.node = this.node; - this.componentBrowserRef.instance.openConsole(); - } + this.componentBrowserRef.instance.openConsole(); + } } openWebConsole() { this.mapSettingsService.setConsoleContextMenuAction('web console'); if (this.node.status === 'started') { - this.mapSettingsService.logConsoleSubject.next(true); - this.consoleService.openConsoleForNode(this.node); + this.mapSettingsService.logConsoleSubject.next(true); + this.consoleService.openConsoleForNode(this.node); } else { - this.toasterService.error('To open console please start the node'); + this.toasterService.error('To open console please start the node'); } } openWebConsoleInNewTab() { this.mapSettingsService.setConsoleContextMenuAction('web console in new tab'); if (this.node.status === 'started') { - let url = this.router.url.split('/'); - let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${this.node.node_id}` - window.open(urlString); + let url = this.router.url.split('/'); + let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${this.node.node_id}`; + window.open(urlString); } else { - this.toasterService.error('To open console please start the node'); + this.toasterService.error('To open console please start the node'); } } -} \ No newline at end of file +} diff --git a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.html b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.html index 92cd8c3e..c3cd6026 100644 --- a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.html +++ b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts index 6f0aeb63..d21027e0 100644 --- a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts +++ b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts @@ -6,31 +6,28 @@ import { NodeService } from '../../../../../services/node.service'; @Component({ selector: 'app-align-horizontally-action', - templateUrl: './align-horizontally.component.html' + templateUrl: './align-horizontally.component.html', }) export class AlignHorizontallyActionComponent implements OnInit { @Input() server: Server; @Input() nodes: Node[]; - constructor( - private nodesDataSource: NodesDataSource, - private nodeService: NodeService - ) {} + constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} ngOnInit() {} alignHorizontally() { let averageY: number = 0; this.nodes.forEach((node) => { - averageY += node.y; + averageY += node.y; }); - averageY = averageY/this.nodes.length; - - this.nodes.forEach((node) => { - node.y = averageY; - this.nodesDataSource.update(node); + averageY = averageY / this.nodes.length; - this.nodeService.update(this.server, node).subscribe((node: Node) => {}); + this.nodes.forEach((node) => { + node.y = averageY; + this.nodesDataSource.update(node); + + this.nodeService.update(this.server, node).subscribe((node: Node) => {}); }); } } diff --git a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.html b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.html index 8ee5e162..33f1806a 100644 --- a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.html +++ b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts index 2633f783..8fbcb38f 100644 --- a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts +++ b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts @@ -6,31 +6,28 @@ import { NodeService } from '../../../../../services/node.service'; @Component({ selector: 'app-align-vertically-action', - templateUrl: './align-vertically.component.html' + templateUrl: './align-vertically.component.html', }) export class AlignVerticallyActionComponent implements OnInit { @Input() server: Server; @Input() nodes: Node[]; - constructor( - private nodesDataSource: NodesDataSource, - private nodeService: NodeService - ) {} + constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} ngOnInit() {} alignVertically() { let averageX: number = 0; this.nodes.forEach((node) => { - averageX += node.x; + averageX += node.x; }); - averageX = averageX/this.nodes.length; - - this.nodes.forEach((node) => { - node.x = averageX; - this.nodesDataSource.update(node); + averageX = averageX / this.nodes.length; - this.nodeService.update(this.server, node).subscribe((node: Node) => {}); + this.nodes.forEach((node) => { + node.x = averageX; + this.nodesDataSource.update(node); + + this.nodeService.update(this.server, node).subscribe((node: Node) => {}); }); } } diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.html b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.html index 2a3518ab..b9fe3fb2 100644 --- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.html +++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.spec.ts index 8825e8a8..2b82ccd1 100644 --- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.spec.ts @@ -6,7 +6,12 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { CommonModule } from '@angular/common'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MockedDrawingService, MockedDrawingsDataSource, MockedNodesDataSource, MockedNodeService } from '../../../project-map.component.spec'; +import { + MockedDrawingService, + MockedDrawingsDataSource, + MockedNodesDataSource, + MockedNodeService, +} from '../../../project-map.component.spec'; import { DrawingService } from '../../../../../services/drawing.service'; import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource'; import { DrawingsDataSource } from '../../../../../cartography/datasources/drawings-datasource'; @@ -21,19 +26,19 @@ describe('BringToFrontActionComponent', () => { let fixture: ComponentFixture; let drawingService = new MockedDrawingService(); let drawingsDataSource = new MockedDrawingsDataSource(); - let nodeService = new MockedNodeService(); + let nodeService = new MockedNodeService(); let nodesDataSource = new MockedNodesDataSource(); beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], - providers: [ - { provide: DrawingService, useValue: drawingService }, - { provide: DrawingsDataSource, useValue: drawingsDataSource }, - { provide: NodeService, useValue: nodeService }, - { provide: NodesDataSource, useValue: nodesDataSource }, - ], - declarations: [BringToFrontActionComponent] + imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], + providers: [ + { provide: DrawingService, useValue: drawingService }, + { provide: DrawingsDataSource, useValue: drawingsDataSource }, + { provide: NodeService, useValue: nodeService }, + { provide: NodesDataSource, useValue: nodesDataSource }, + ], + declarations: [BringToFrontActionComponent], }).compileComponents(); })); @@ -49,7 +54,7 @@ describe('BringToFrontActionComponent', () => { it('should call node service when bring to front action called', () => { spyOn(nodeService, 'update').and.returnValue(of()); - component.nodes = [{z: 0} as Node]; + component.nodes = [{ z: 0 } as Node]; component.drawings = []; component.bringToFront(); @@ -60,7 +65,7 @@ describe('BringToFrontActionComponent', () => { it('should call drawing service when bring to front action called', () => { spyOn(drawingService, 'update').and.returnValue(of()); component.nodes = []; - component.drawings = [{z: 0} as Drawing]; + component.drawings = [{ z: 0 } as Drawing]; component.bringToFront(); diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts index 37b07b6b..b375c7e9 100644 --- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts @@ -9,7 +9,7 @@ import { DrawingService } from '../../../../../services/drawing.service'; @Component({ selector: 'app-bring-to-front-action', - templateUrl: './bring-to-front-action.component.html' + templateUrl: './bring-to-front-action.component.html', }) export class BringToFrontActionComponent implements OnInit { @Input() server: Server; @@ -26,8 +26,8 @@ export class BringToFrontActionComponent implements OnInit { ngOnInit() {} bringToFront() { - let maxZValueForNodes = Math.max(...this.nodes.map(n => n.z)); - let maxZValueForDrawings = Math.max(...this.drawings.map(n => n.z)); + let maxZValueForNodes = Math.max(...this.nodes.map((n) => n.z)); + let maxZValueForDrawings = Math.max(...this.drawings.map((n) => n.z)); let maxZValue = Math.max(maxZValueForNodes, maxZValueForDrawings); if (maxZValue < 100) maxZValue++; diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.html b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.html index 1ffb2bb9..d141de65 100644 --- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.html +++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts index 23e92371..ad3a885a 100644 --- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts @@ -6,7 +6,7 @@ import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/c @Component({ selector: 'app-change-hostname-action', - templateUrl: './change-hostname-action.component.html' + templateUrl: './change-hostname-action.component.html', }) export class ChangeHostnameActionComponent implements OnInit { @Input() server: Server; @@ -18,11 +18,11 @@ export class ChangeHostnameActionComponent implements OnInit { changeHostname() { const dialogRef = this.dialog.open(ChangeHostnameDialogComponent, { - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - instance.server = this.server; - instance.node = this.node; + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.server = this.server; + instance.node = this.node; } } diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.html b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.html index b17302ad..b3e08925 100644 --- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.html +++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts index 207f888e..1bc65b0b 100644 --- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts @@ -6,7 +6,7 @@ import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/chang @Component({ selector: 'app-change-symbol-action', - templateUrl: './change-symbol-action.component.html' + templateUrl: './change-symbol-action.component.html', }) export class ChangeSymbolActionComponent implements OnInit { @Input() server: Server; @@ -18,13 +18,13 @@ export class ChangeSymbolActionComponent implements OnInit { changeSymbol() { const dialogRef = this.dialog.open(ChangeSymbolDialogComponent, { - width: '1000px', - height: '500px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - instance.server = this.server; - instance.node = this.node; + width: '1000px', + height: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.server = this.server; + instance.node = this.node; } } diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.html b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.html index 3290ba3a..fdfba96a 100644 --- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.html +++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts index a4f73e13..c8866048 100644 --- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts @@ -17,10 +17,9 @@ import { ConfiguratorDialogDockerComponent } from '../../../node-editors/configu import { ConfiguratorDialogNatComponent } from '../../../node-editors/configurator/nat/configurator-nat.component'; import { ConfiguratorDialogTracengComponent } from '../../../node-editors/configurator/traceng/configurator-traceng.component'; - @Component({ selector: 'app-config-node-action', - templateUrl: './config-action.component.html' + templateUrl: './config-action.component.html', }) export class ConfigActionComponent { @Input() server: Server; @@ -28,7 +27,7 @@ export class ConfigActionComponent { private conf = { autoFocus: false, width: '800px', - disableClose: true + disableClose: true, }; dialogRef; diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html index 48f51b4f..15f3f924 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html +++ b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts index c540fbcb..3f41c71a 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts @@ -4,44 +4,50 @@ import { ToasterService } from '../../../../../services/toaster.service'; import { NodeService } from '../../../../../services/node.service'; import { Server } from '../../../../../models/server'; - @Component({ - selector: 'app-console-device-action-browser', - templateUrl: './console-device-action-browser.component.html' + selector: 'app-console-device-action-browser', + templateUrl: './console-device-action-browser.component.html', }) export class ConsoleDeviceActionBrowserComponent { - @Input() server: Server; - @Input() node: Node; + @Input() server: Server; + @Input() node: Node; - constructor( - private toasterService: ToasterService, - private nodeService: NodeService - ) {} + constructor(private toasterService: ToasterService, private nodeService: NodeService) {} - openConsole() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.startConsole(); - }); - } + openConsole() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.startConsole(); + }); + } - startConsole() { - if (this.node.status !== "started") { - this.toasterService.error("This node must be started before a console can be opened"); - } else { - if (this.node.console_host === '0.0.0.0' || this.node.console_host === '0:0:0:0:0:0:0:0' || this.node.console_host === '::') { - this.node.console_host = this.server.host; - } + startConsole() { + if (this.node.status !== 'started') { + this.toasterService.error('This node must be started before a console can be opened'); + } else { + if ( + this.node.console_host === '0.0.0.0' || + this.node.console_host === '0:0:0:0:0:0:0:0' || + this.node.console_host === '::' + ) { + this.node.console_host = this.server.host; + } - if (this.node.console_type === "telnet" || this.node.console_type === "vnc" || this.node.console_type === "spice") { - try { - location.assign(`gns3+${this.node.console_type}://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}`); - } catch (e) { - this.toasterService.error(e); - } - } else { - this.toasterService.error("Supported console types: telnet, vnc, spice."); - } + if ( + this.node.console_type === 'telnet' || + this.node.console_type === 'vnc' || + this.node.console_type === 'spice' + ) { + try { + location.assign( + `gns3+${this.node.console_type}://${this.node.console_host}:${this.node.console}?name=${this.node.name}&project_id=${this.node.project_id}&node_id=${this.node.node_id}` + ); + } catch (e) { + this.toasterService.error(e); } + } else { + this.toasterService.error('Supported console types: telnet, vnc, spice.'); + } } + } } diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts index ba89a64d..10e14f0b 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts @@ -14,7 +14,6 @@ import { Server } from '../../../../../models/server'; import { MockedNodeService } from '../../../project-map.component.spec'; import { NodeService } from '../../../../../services/node.service'; - describe('ConsoleDeviceActionComponent', () => { let component: ConsoleDeviceActionComponent; let fixture: ComponentFixture; @@ -31,18 +30,18 @@ describe('ConsoleDeviceActionComponent', () => { remote: { require: (file) => { return { - openConsole() {} - } - } - } + openConsole() {}, + }; + }, + }, }; mockedSettingsService = new MockedSettingsService(); mockedServerService = new MockedServerService(); mockedToaster = new MockedToasterService(); - server = { host: 'localhost', 'port': 222} as Server; - }) + server = { host: 'localhost', port: 222 } as Server; + }); beforeEach(async(() => { TestBed.configureTestingModule({ @@ -51,14 +50,11 @@ describe('ConsoleDeviceActionComponent', () => { { provide: ServerService, useValue: mockedServerService }, { provide: SettingsService, useValue: mockedSettingsService }, { provide: ToasterService, useValue: mockedToaster }, - { provide: NodeService, useValue: mockedNodeService } + { provide: NodeService, useValue: mockedNodeService }, ], - imports: [ - MatIconModule - ], - declarations: [ ConsoleDeviceActionComponent ] - }) - .compileComponents(); + imports: [MatIconModule], + declarations: [ConsoleDeviceActionComponent], + }).compileComponents(); })); beforeEach(() => { @@ -73,18 +69,20 @@ describe('ConsoleDeviceActionComponent', () => { describe('console to nodes', () => { let nodes: Node[]; - + beforeEach(() => { - nodes = [{ - status: 'started', - console_type: 'telnet', - console_host: 'host', - console: 999, - name: 'Node 1', - project_id: '1111', - node_id: '2222', - } as Node]; - + nodes = [ + { + status: 'started', + console_type: 'telnet', + console_host: 'host', + console: 999, + name: 'Node 1', + project_id: '1111', + node_id: '2222', + } as Node, + ]; + component.nodes = nodes; component.server = server; @@ -103,7 +101,7 @@ describe('ConsoleDeviceActionComponent', () => { name: 'Node 1', project_id: '1111', node_id: '2222', - server_url: 'localhost:222' + server_url: 'localhost:222', }); }); @@ -121,7 +119,7 @@ describe('ConsoleDeviceActionComponent', () => { it('should only start running nodes', async () => { nodes.push({ - status: 'stopped' + status: 'stopped', } as Node); await component.console(); expect(component.openConsole).toHaveBeenCalledTimes(1); diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts index b4c0a39b..d6ff36be 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts @@ -9,7 +9,7 @@ import { NodeService } from '../../../../../services/node.service'; @Component({ selector: 'app-console-device-action', - templateUrl: './console-device-action.component.html' + templateUrl: './console-device-action.component.html', }) export class ConsoleDeviceActionComponent implements OnInit { @Input() server: Server; @@ -21,21 +21,23 @@ export class ConsoleDeviceActionComponent implements OnInit { private settingsService: SettingsService, private toasterService: ToasterService, private nodeService: NodeService - ) { } + ) {} ngOnInit() {} async console() { - let consoleCommand = this.settingsService.get('console_command') ? this.settingsService.get('console_command') : this.nodeService.getDefaultCommand(); - const startedNodes = this.nodes.filter(node => node.status === 'started'); + let consoleCommand = this.settingsService.get('console_command') + ? this.settingsService.get('console_command') + : this.nodeService.getDefaultCommand(); + const startedNodes = this.nodes.filter((node) => node.status === 'started'); - if(startedNodes.length === 0) { + if (startedNodes.length === 0) { this.toasterService.error('Device needs to be started in order to console to it.'); return; } - for(var node of this.nodes) { - if(node.status !== 'started') { + for (var node of this.nodes) { + if (node.status !== 'started') { continue; } @@ -47,7 +49,7 @@ export class ConsoleDeviceActionComponent implements OnInit { name: node.name, project_id: node.project_id, node_id: node.node_id, - server_url: this.serverService.getServerUrl(this.server) + server_url: this.serverService.getServerUrl(this.server), }; await this.openConsole(consoleRequest); } diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.html b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.html index a0819a60..2d9d42fc 100644 --- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.html +++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.spec.ts index 9a27cdcd..7e846ba1 100644 --- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.spec.ts @@ -16,72 +16,72 @@ import { LinkService } from '../../../../../services/link.service'; import { Link } from '../../../../../models/link'; describe('DeleteActionComponent', () => { - let component: DeleteActionComponent; - let fixture: ComponentFixture; - let mockedNodeService: MockedNodeService = new MockedNodeService(); - let mockedDrawingService: MockedDrawingService = new MockedDrawingService(); - let mockedLinkService: MockedLinkService = new MockedLinkService(); + let component: DeleteActionComponent; + let fixture: ComponentFixture; + let mockedNodeService: MockedNodeService = new MockedNodeService(); + let mockedDrawingService: MockedDrawingService = new MockedDrawingService(); + let mockedLinkService: MockedLinkService = new MockedLinkService(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatMenuModule, NoopAnimationsModule], - providers: [ - { provide: NodesDataSource, useClass: NodesDataSource }, - { provide: DrawingsDataSource, useClass: DrawingsDataSource }, - { provide: LinksDataSource, useClass: LinksDataSource }, - { provide: NodeService, useValue: mockedNodeService }, - { provide: DrawingService, useValue: mockedDrawingService }, - { provide: LinkService, useValue: mockedLinkService } - ], - declarations: [DeleteActionComponent] - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [MatIconModule, MatMenuModule, NoopAnimationsModule], + providers: [ + { provide: NodesDataSource, useClass: NodesDataSource }, + { provide: DrawingsDataSource, useClass: DrawingsDataSource }, + { provide: LinksDataSource, useClass: LinksDataSource }, + { provide: NodeService, useValue: mockedNodeService }, + { provide: DrawingService, useValue: mockedDrawingService }, + { provide: LinkService, useValue: mockedLinkService }, + ], + declarations: [DeleteActionComponent], + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(DeleteActionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DeleteActionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should call delete action in drawing service', () => { - let node = { node_id: '1' } as Node; - component.nodes = [node]; - let drawing = { drawing_id: '1' } as Drawing; - component.drawings = [drawing]; - component.links = []; - spyOn(mockedDrawingService, 'delete').and.returnValue(of()); + it('should call delete action in drawing service', () => { + let node = { node_id: '1' } as Node; + component.nodes = [node]; + let drawing = { drawing_id: '1' } as Drawing; + component.drawings = [drawing]; + component.links = []; + spyOn(mockedDrawingService, 'delete').and.returnValue(of()); - component.delete(); + component.delete(); - expect(mockedDrawingService.delete).toHaveBeenCalled(); - }); + expect(mockedDrawingService.delete).toHaveBeenCalled(); + }); - it('should call delete action in node service', () => { - let node = { node_id: '1' } as Node; - component.nodes = [node]; - let drawing = { drawing_id: '1' } as Drawing; - component.drawings = [drawing]; - component.links = []; - spyOn(mockedNodeService, 'delete').and.returnValue(of()); + it('should call delete action in node service', () => { + let node = { node_id: '1' } as Node; + component.nodes = [node]; + let drawing = { drawing_id: '1' } as Drawing; + component.drawings = [drawing]; + component.links = []; + spyOn(mockedNodeService, 'delete').and.returnValue(of()); - component.delete(); + component.delete(); - expect(mockedNodeService.delete).toHaveBeenCalled(); - }); + expect(mockedNodeService.delete).toHaveBeenCalled(); + }); - it('should call delete action in link service', () => { - component.nodes = []; - component.drawings = []; - let link = { link_id: '1', project_id: '1' } as Link; - component.links = [link]; - spyOn(mockedLinkService, 'deleteLink').and.returnValue(of()); + it('should call delete action in link service', () => { + component.nodes = []; + component.drawings = []; + let link = { link_id: '1', project_id: '1' } as Link; + component.links = [link]; + spyOn(mockedLinkService, 'deleteLink').and.returnValue(of()); - component.delete(); + component.delete(); - expect(mockedLinkService.deleteLink).toHaveBeenCalled(); - }); + expect(mockedLinkService.deleteLink).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts index 26629dfc..4ea57b19 100644 --- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts @@ -12,7 +12,7 @@ import { LinksDataSource } from '../../../../../cartography/datasources/links-da @Component({ selector: 'app-delete-action', - templateUrl: './delete-action.component.html' + templateUrl: './delete-action.component.html', }) export class DeleteActionComponent implements OnInit { @Input() server: Server; @@ -33,21 +33,21 @@ export class DeleteActionComponent implements OnInit { delete() { this.nodes.forEach((node) => { - this.nodesDataSource.remove(node); + this.nodesDataSource.remove(node); - this.nodeService.delete(this.server, node).subscribe((node: Node) => {}); + this.nodeService.delete(this.server, node).subscribe((node: Node) => {}); }); this.drawings.forEach((drawing) => { - this.drawingsDataSource.remove(drawing); + this.drawingsDataSource.remove(drawing); - this.drawingService.delete(this.server, drawing).subscribe((drawing: Drawing) => {}); + this.drawingService.delete(this.server, drawing).subscribe((drawing: Drawing) => {}); }); this.links.forEach((link) => { - this.linksDataSource.remove(link); + this.linksDataSource.remove(link); - this.linkService.deleteLink(this.server, link).subscribe(() => {}); + this.linkService.deleteLink(this.server, link).subscribe(() => {}); }); } } diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.html b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.html index a07e95df..2ad95224 100644 --- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.html +++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts index 4ae321ef..8242b3ca 100644 --- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts @@ -15,69 +15,69 @@ import { ToasterService } from '../../../../../services/toaster.service'; import { MockedToasterService } from '../../../../../services/toaster.service.spec'; describe('DuplicateActionComponent', () => { - let component: DuplicateActionComponent; - let fixture: ComponentFixture; - let mockedNodeService: MockedNodeService = new MockedNodeService(); - let mockedDrawingService: MockedDrawingService = new MockedDrawingService(); - let mockedToasterService = new MockedToasterService; + let component: DuplicateActionComponent; + let fixture: ComponentFixture; + let mockedNodeService: MockedNodeService = new MockedNodeService(); + let mockedDrawingService: MockedDrawingService = new MockedDrawingService(); + let mockedToasterService = new MockedToasterService(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatMenuModule, NoopAnimationsModule], - providers: [ - { provide: NodesDataSource, useClass: NodesDataSource }, - { provide: DrawingsDataSource, useClass: DrawingsDataSource }, - { provide: NodeService, useValue: mockedNodeService }, - { provide: DrawingService, useValue: mockedDrawingService }, - { provide: ToasterService, useValue: mockedToasterService } - ], - declarations: [DuplicateActionComponent] - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [MatIconModule, MatMenuModule, NoopAnimationsModule], + providers: [ + { provide: NodesDataSource, useClass: NodesDataSource }, + { provide: DrawingsDataSource, useClass: DrawingsDataSource }, + { provide: NodeService, useValue: mockedNodeService }, + { provide: DrawingService, useValue: mockedDrawingService }, + { provide: ToasterService, useValue: mockedToasterService }, + ], + declarations: [DuplicateActionComponent], + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(DuplicateActionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DuplicateActionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should call duplicate action in drawing service', () => { - let drawing = { drawing_id: '1' } as Drawing; - component.drawings = [drawing]; - component.nodes = []; - spyOn(mockedDrawingService, 'duplicate').and.returnValue(of()); + it('should call duplicate action in drawing service', () => { + let drawing = { drawing_id: '1' } as Drawing; + component.drawings = [drawing]; + component.nodes = []; + spyOn(mockedDrawingService, 'duplicate').and.returnValue(of()); - component.duplicate(); + component.duplicate(); - expect(mockedDrawingService.duplicate).toHaveBeenCalled(); - }); + expect(mockedDrawingService.duplicate).toHaveBeenCalled(); + }); - it('should call duplicate action in node service', () => { - let node = { node_id: '1', status: 'stopped'} as Node; - component.nodes = [node]; - component.drawings = []; - spyOn(mockedNodeService, 'duplicate').and.returnValue(of()); + it('should call duplicate action in node service', () => { + let node = { node_id: '1', status: 'stopped' } as Node; + component.nodes = [node]; + component.drawings = []; + spyOn(mockedNodeService, 'duplicate').and.returnValue(of()); - component.duplicate(); + component.duplicate(); - expect(mockedNodeService.duplicate).toHaveBeenCalled(); - }); + expect(mockedNodeService.duplicate).toHaveBeenCalled(); + }); - it('should call duplicate action in both services', () => { - let drawing = { drawing_id: '1' } as Drawing; - component.drawings = [drawing]; - let node = { node_id: '1', status: 'stopped' } as Node; - component.nodes = [node]; - spyOn(mockedDrawingService, 'duplicate').and.returnValue(of()); - spyOn(mockedNodeService, 'duplicate').and.returnValue(of()); + it('should call duplicate action in both services', () => { + let drawing = { drawing_id: '1' } as Drawing; + component.drawings = [drawing]; + let node = { node_id: '1', status: 'stopped' } as Node; + component.nodes = [node]; + spyOn(mockedDrawingService, 'duplicate').and.returnValue(of()); + spyOn(mockedNodeService, 'duplicate').and.returnValue(of()); - component.duplicate(); + component.duplicate(); - expect(mockedDrawingService.duplicate).toHaveBeenCalled(); - expect(mockedNodeService.duplicate).toHaveBeenCalled(); - }); + expect(mockedDrawingService.duplicate).toHaveBeenCalled(); + expect(mockedNodeService.duplicate).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts index ac055ffe..3529f8ea 100644 --- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts @@ -10,44 +10,44 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi import { ToasterService } from '../../../../../services/toaster.service'; @Component({ -selector: 'app-duplicate-action', -templateUrl: './duplicate-action.component.html' + selector: 'app-duplicate-action', + templateUrl: './duplicate-action.component.html', }) export class DuplicateActionComponent { - @Input() server: Server; - @Input() project: Project; - @Input() drawings: Drawing[]; - @Input() nodes: Node[]; - - constructor( - private nodeService: NodeService, - private nodesDataSource: NodesDataSource, - private drawingService: DrawingService, - private drawingsDataSource: DrawingsDataSource, - private toasterService: ToasterService - ) {} + @Input() server: Server; + @Input() project: Project; + @Input() drawings: Drawing[]; + @Input() nodes: Node[]; - duplicate() { - let runningNodes: string = ''; - for(let node of this.nodes) { - if (node.status === 'stopped') { - this.nodeService.duplicate(this.server, node).subscribe((node: Node) => { - this.nodesDataSource.add(node); - }); - } else { - runningNodes += `${node.name}, `; - } - } + constructor( + private nodeService: NodeService, + private nodesDataSource: NodesDataSource, + private drawingService: DrawingService, + private drawingsDataSource: DrawingsDataSource, + private toasterService: ToasterService + ) {} - for(let drawing of this.drawings) { - this.drawingService.duplicate(this.server, drawing.project_id, drawing).subscribe((drawing: Drawing) => { - this.drawingsDataSource.add(drawing); - }) - } - - if (runningNodes.length > 0) { - runningNodes = runningNodes.substring(0, runningNodes.length-2); - this.toasterService.error(`Cannot duplicate node data for nodes: ${runningNodes}`); - } + duplicate() { + let runningNodes: string = ''; + for (let node of this.nodes) { + if (node.status === 'stopped') { + this.nodeService.duplicate(this.server, node).subscribe((node: Node) => { + this.nodesDataSource.add(node); + }); + } else { + runningNodes += `${node.name}, `; + } } + + for (let drawing of this.drawings) { + this.drawingService.duplicate(this.server, drawing.project_id, drawing).subscribe((drawing: Drawing) => { + this.drawingsDataSource.add(drawing); + }); + } + + if (runningNodes.length > 0) { + runningNodes = runningNodes.substring(0, runningNodes.length - 2); + this.toasterService.error(`Cannot duplicate node data for nodes: ${runningNodes}`); + } + } } diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.html b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.html index d3dc8ef0..e7ef9592 100644 --- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.html +++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.html @@ -1,6 +1,8 @@ - diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts index 6f61809b..58c1e178 100644 --- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts @@ -6,26 +6,26 @@ import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor import { MatDialog } from '@angular/material/dialog'; @Component({ - selector: 'app-edit-config-action', - templateUrl: './edit-config-action.component.html' + selector: 'app-edit-config-action', + templateUrl: './edit-config-action.component.html', }) export class EditConfigActionComponent { - @Input() server: Server; - @Input() project: Project; - @Input() node: Node; + @Input() server: Server; + @Input() project: Project; + @Input() node: Node; - constructor(private dialog: MatDialog) {} + constructor(private dialog: MatDialog) {} - editConfig() { - const dialogRef = this.dialog.open(ConfigEditorDialogComponent, { - width: '600px', - height: '500px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - instance.server = this.server; - instance.project = this.project; - instance.node = this.node; - } + editConfig() { + const dialogRef = this.dialog.open(ConfigEditorDialogComponent, { + width: '600px', + height: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.server = this.server; + instance.project = this.project; + instance.node = this.node; + } } diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts index e08754e4..39c6c03d 100644 --- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts @@ -8,7 +8,7 @@ import { ImageElement } from '../../../../../cartography/models/drawings/image-e @Component({ selector: 'app-edit-style-action', - templateUrl: './edit-style-action.component.html' + templateUrl: './edit-style-action.component.html', }) export class EditStyleActionComponent implements OnChanges { @Input() server: Server; @@ -26,7 +26,7 @@ export class EditStyleActionComponent implements OnChanges { const dialogRef = this.dialog.open(StyleEditorDialogComponent, { width: '800px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts index 1efa051e..3375ffbb 100644 --- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts @@ -11,7 +11,7 @@ import { LinkNode } from '../../../../../models/link-node'; @Component({ selector: 'app-edit-text-action', - templateUrl: './edit-text-action.component.html' + templateUrl: './edit-text-action.component.html', }) export class EditTextActionComponent implements OnInit { @Input() server: Server; @@ -30,7 +30,7 @@ export class EditTextActionComponent implements OnInit { const dialogRef = this.dialog.open(TextEditorDialogComponent, { width: '300px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.html b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.html index 70843579..d5a46de6 100644 --- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.html +++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.html @@ -1,6 +1,8 @@ - diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts index f54842f1..1e37b26e 100644 --- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts @@ -6,55 +6,52 @@ import { MatDialog } from '@angular/material/dialog'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @Component({ - selector: 'app-export-config-action', - templateUrl: './export-config-action.component.html' + selector: 'app-export-config-action', + templateUrl: './export-config-action.component.html', }) export class ExportConfigActionComponent { - @Input() server: Server; - @Input() node: Node; + @Input() server: Server; + @Input() node: Node; - constructor( - private nodeService: NodeService, - private dialog: MatDialog - ) {} + constructor(private nodeService: NodeService, private dialog: MatDialog) {} - exportConfig() { - if (this.node.node_type === 'vpcs') { - this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { - this.downloadByHtmlTag(config); - }); - } else { - const dialogRef = this.dialog.open(ConfigDialogComponent, { - width: '500px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - dialogRef.afterClosed().subscribe((configType: string) => { - if (configType === 'startup-config') { - this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { - this.downloadByHtmlTag(config); - }); - } else if (configType === 'private-config') { - this.nodeService.getPrivateConfiguration(this.server, this.node).subscribe((config: any) => { - this.downloadByHtmlTag(config); - }); - } - }); + exportConfig() { + if (this.node.node_type === 'vpcs') { + this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { + this.downloadByHtmlTag(config); + }); + } else { + const dialogRef = this.dialog.open(ConfigDialogComponent, { + width: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + dialogRef.afterClosed().subscribe((configType: string) => { + if (configType === 'startup-config') { + this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { + this.downloadByHtmlTag(config); + }); + } else if (configType === 'private-config') { + this.nodeService.getPrivateConfiguration(this.server, this.node).subscribe((config: any) => { + this.downloadByHtmlTag(config); + }); } + }); + } + } + + private downloadByHtmlTag(config: string) { + const element = document.createElement('a'); + const fileType = 'text/plain'; + element.setAttribute('href', `data:${fileType};charset=utf-8,${encodeURIComponent(config)}`); + if (this.node.node_type === 'vpcs') { + element.setAttribute('download', `${this.node.name}_startup.vpc`); + } else if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { + element.setAttribute('download', `${this.node.name}_startup.cfg`); } - private downloadByHtmlTag(config: string) { - const element = document.createElement('a'); - const fileType = 'text/plain'; - element.setAttribute('href', `data:${fileType};charset=utf-8,${encodeURIComponent(config)}`); - if (this.node.node_type === 'vpcs') { - element.setAttribute('download', `${this.node.name}_startup.vpc`); - } else if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { - element.setAttribute('download', `${this.node.name}_startup.cfg`); - } - - var event = new MouseEvent("click"); - element.dispatchEvent(event); - } + var event = new MouseEvent('click'); + element.dispatchEvent(event); + } } diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.html b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.html index 229bda01..5a6c0c30 100644 --- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.html +++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts index fdcdde6e..9d163f4a 100644 --- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts @@ -4,27 +4,23 @@ import { Server } from '../../../../../models/server'; import { ToasterService } from '../../../../../services/toaster.service'; import { Router } from '@angular/router'; - @Component({ selector: 'app-http-console-new-tab-action', - templateUrl: './http-console-new-tab-action.component.html' + templateUrl: './http-console-new-tab-action.component.html', }) export class HttpConsoleNewTabActionComponent implements OnInit { @Input() server: Server; @Input() nodes: Node[]; - constructor( - private toasterService: ToasterService, - private router: Router - ) { } + constructor(private toasterService: ToasterService, private router: Router) {} ngOnInit() {} openConsole() { - this.nodes.forEach(n => { + this.nodes.forEach((n) => { if (n.status === 'started') { let url = this.router.url.split('/'); - let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${n.node_id}` + let urlString = `/static/web-ui/${url[1]}/${url[2]}/${url[3]}/${url[4]}/nodes/${n.node_id}`; window.open(urlString); } else { this.toasterService.error('To open console please start the node'); diff --git a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.html b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.html index 55f6dcce..e8ca3aad 100644 --- a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.html +++ b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts index 33c23941..7ae9a6cd 100644 --- a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts @@ -5,10 +5,9 @@ import { NodeConsoleService } from '../../../../../services/nodeConsole.service' import { ToasterService } from '../../../../../services/toaster.service'; import { MapSettingsService } from '../../../../../services/mapsettings.service'; - @Component({ selector: 'app-http-console-action', - templateUrl: './http-console-action.component.html' + templateUrl: './http-console-action.component.html', }) export class HttpConsoleActionComponent implements OnInit { @Input() server: Server; @@ -18,12 +17,12 @@ export class HttpConsoleActionComponent implements OnInit { private consoleService: NodeConsoleService, private toasterService: ToasterService, private mapSettingsService: MapSettingsService - ) { } + ) {} ngOnInit() {} openConsole() { - this.nodes.forEach(n => { + this.nodes.forEach((n) => { if (n.status === 'started') { this.mapSettingsService.logConsoleSubject.next(true); this.consoleService.openConsoleForNode(n); diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.html b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.html index 6325dabc..76bef675 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.html +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.html @@ -1,10 +1,5 @@ - + diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.scss b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.scss index 0f602793..f4d855b4 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.scss +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.scss @@ -1,3 +1,3 @@ .non-visible { - display: none; + display: none; } diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts index 59866b58..8ef5b9c1 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts @@ -7,59 +7,55 @@ import { MatDialog } from '@angular/material/dialog'; import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component'; @Component({ - selector: 'app-import-config-action', - templateUrl: './import-config-action.component.html', - styleUrls: ['./import-config-action.component.scss'] + selector: 'app-import-config-action', + templateUrl: './import-config-action.component.html', + styleUrls: ['./import-config-action.component.scss'], }) export class ImportConfigActionComponent { - @Input() server: Server; - @Input() node: Node; - @ViewChild('fileInput') fileInput: ElementRef; - configType: string; + @Input() server: Server; + @Input() node: Node; + @ViewChild('fileInput') fileInput: ElementRef; + configType: string; - constructor( - private nodeService: NodeService, - private toasterService: ToasterService, - private dialog: MatDialog - ) {} + constructor(private nodeService: NodeService, private toasterService: ToasterService, private dialog: MatDialog) {} - triggerClick() { - if (this.node.node_type !== 'vpcs') { - const dialogRef = this.dialog.open(ConfigDialogComponent, { - width: '500px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - dialogRef.afterClosed().subscribe((configType: string) => { - this.configType = configType; - this.fileInput.nativeElement.click(); - }); - } else { - this.configType = 'startup-config'; - this.fileInput.nativeElement.click(); - } + triggerClick() { + if (this.node.node_type !== 'vpcs') { + const dialogRef = this.dialog.open(ConfigDialogComponent, { + width: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + dialogRef.afterClosed().subscribe((configType: string) => { + this.configType = configType; + this.fileInput.nativeElement.click(); + }); + } else { + this.configType = 'startup-config'; + this.fileInput.nativeElement.click(); } + } - importConfig(event) { - let file: File = event.target.files[0]; - let fileReader: FileReader = new FileReader(); - fileReader.onload = (e) => { - let content: string | ArrayBuffer = fileReader.result; - if (typeof content !== 'string'){ - content = content.toString(); - } + importConfig(event) { + let file: File = event.target.files[0]; + let fileReader: FileReader = new FileReader(); + fileReader.onload = (e) => { + let content: string | ArrayBuffer = fileReader.result; + if (typeof content !== 'string') { + content = content.toString(); + } - if (this.configType === 'startup-config') { - this.nodeService.saveConfiguration(this.server, this.node, content).subscribe(() => { - this.toasterService.success(`Configuration for node ${this.node.name} imported.`); - }); - } else if (this.configType === 'private-config') { - this.nodeService.savePrivateConfiguration(this.server, this.node, content).subscribe(() => { - this.toasterService.success(`Configuration for node ${this.node.name} imported.`); - }); - } - }; - fileReader.readAsText(file); - } + if (this.configType === 'startup-config') { + this.nodeService.saveConfiguration(this.server, this.node, content).subscribe(() => { + this.toasterService.success(`Configuration for node ${this.node.name} imported.`); + }); + } else if (this.configType === 'private-config') { + this.nodeService.savePrivateConfiguration(this.server, this.node, content).subscribe(() => { + this.toasterService.success(`Configuration for node ${this.node.name} imported.`); + }); + } + }; + fileReader.readAsText(file); + } } diff --git a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.html b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.html index 451af511..25edc3c3 100644 --- a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.html +++ b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts index 8557917e..f1165758 100644 --- a/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/lock-action/lock-action.component.ts @@ -9,40 +9,44 @@ import { DrawingService } from '../../../../../services/drawing.service'; @Component({ selector: 'app-lock-action', - templateUrl: './lock-action.component.html' + templateUrl: './lock-action.component.html', }) export class LockActionComponent implements OnChanges { - @Input() server: Server; - @Input() nodes: Node[]; - @Input() drawings: Drawing[]; - command: string; + @Input() server: Server; + @Input() nodes: Node[]; + @Input() drawings: Drawing[]; + command: string; - constructor( - private nodesDataSource: NodesDataSource, - private drawingsDataSource: DrawingsDataSource, - private nodeService: NodeService, - private drawingService: DrawingService - ) {} + constructor( + private nodesDataSource: NodesDataSource, + private drawingsDataSource: DrawingsDataSource, + private nodeService: NodeService, + private drawingService: DrawingService + ) {} - ngOnChanges() { - if (this.nodes.length === 1 && this.drawings.length === 0) { - this.command = this.nodes[0].locked ? 'Unlock item' : 'Lock item'; - } else if (this.nodes.length === 0 && this.drawings.length === 1) { - this.command = this.drawings[0].locked ? 'Unlock item' : 'Lock item'; - } else { - this.command = 'Lock/unlock items'; - } + ngOnChanges() { + if (this.nodes.length === 1 && this.drawings.length === 0) { + this.command = this.nodes[0].locked ? 'Unlock item' : 'Lock item'; + } else if (this.nodes.length === 0 && this.drawings.length === 1) { + this.command = this.drawings[0].locked ? 'Unlock item' : 'Lock item'; + } else { + this.command = 'Lock/unlock items'; } + } - lock() { - this.nodes.forEach((node) => { - node.locked = !node.locked; - this.nodeService.updateNode(this.server, node).subscribe((node) => { this.nodesDataSource.update(node) }); - }); + lock() { + this.nodes.forEach((node) => { + node.locked = !node.locked; + this.nodeService.updateNode(this.server, node).subscribe((node) => { + this.nodesDataSource.update(node); + }); + }); - this.drawings.forEach((drawing) => { - drawing.locked = ! drawing.locked; - this.drawingService.update(this.server, drawing).subscribe((drawing) => { this.drawingsDataSource.update(drawing) }); - }); - } + this.drawings.forEach((drawing) => { + drawing.locked = !drawing.locked; + this.drawingService.update(this.server, drawing).subscribe((drawing) => { + this.drawingsDataSource.update(drawing); + }); + }); + } } diff --git a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts index 434844d4..6230adcf 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.spec.ts @@ -8,7 +8,7 @@ describe('MoveLayerDownActionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [MoveLayerDownActionComponent] + declarations: [MoveLayerDownActionComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts index 9453629c..e51708a1 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts @@ -9,7 +9,7 @@ import { DrawingService } from '../../../../../services/drawing.service'; @Component({ selector: 'app-move-layer-down-action', - templateUrl: './move-layer-down-action.component.html' + templateUrl: './move-layer-down-action.component.html', }) export class MoveLayerDownActionComponent implements OnInit { @Input() server: Server; diff --git a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts index 26111dd4..c79974a6 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.spec.ts @@ -8,7 +8,7 @@ describe('MoveLayerUpActionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [MoveLayerUpActionComponent] + declarations: [MoveLayerUpActionComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts index 587cfc9b..353615e2 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts @@ -9,7 +9,7 @@ import { DrawingService } from '../../../../../services/drawing.service'; @Component({ selector: 'app-move-layer-up-action', - templateUrl: './move-layer-up-action.component.html' + templateUrl: './move-layer-up-action.component.html', }) export class MoveLayerUpActionComponent implements OnInit { @Input() server: Server; diff --git a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.html b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.html index e3f6f301..a7a10114 100644 --- a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.html +++ b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts index 563d8a5b..27f33907 100644 --- a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts @@ -3,18 +3,15 @@ import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; import { ElectronService } from 'ngx-electron'; - @Component({ selector: 'app-open-file-explorer-action', - templateUrl: './open-file-explorer-action.component.html' + templateUrl: './open-file-explorer-action.component.html', }) export class OpenFileExplorerActionComponent implements OnInit { @Input() server: Server; @Input() node: Node; - constructor( - private electronService: ElectronService - ) {} + constructor(private electronService: ElectronService) {} ngOnInit() {} diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.html b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.html index ea808178..3b3a7f19 100644 --- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.html +++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts index f7df9c58..b3aab17f 100644 --- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from "@angular/core"; +import { Component, Input } from '@angular/core'; import { Link } from '../../../../../models/link'; import { Server } from '../../../../../models/server'; import { Project } from '../../../../../models/project'; @@ -6,26 +6,26 @@ import { MatDialog } from '@angular/material/dialog'; import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-filters/packet-filters.component'; @Component({ - selector: 'app-packet-filters-action', - templateUrl: './packet-filters-action.component.html' + selector: 'app-packet-filters-action', + templateUrl: './packet-filters-action.component.html', }) export class PacketFiltersActionComponent { - @Input() server: Server; - @Input() project: Project; - @Input() link: Link; + @Input() server: Server; + @Input() project: Project; + @Input() link: Link; - constructor(private dialog: MatDialog) {} + constructor(private dialog: MatDialog) {} - openPacketFilters() { - const dialogRef = this.dialog.open(PacketFiltersDialogComponent, { - width: '900px', - height: '400px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - instance.server = this.server; - instance.project = this.project; - instance.link = this.link; - } + openPacketFilters() { + const dialogRef = this.dialog.open(PacketFiltersDialogComponent, { + width: '900px', + height: '400px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.server = this.server; + instance.project = this.project; + instance.link = this.link; + } } diff --git a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.html b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.html index f8884c90..c7f16985 100644 --- a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.html +++ b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts index 7cee91cc..df5a6a15 100644 --- a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; @Component({ selector: 'app-reload-node-action', - templateUrl: './reload-node-action.component.html' + templateUrl: './reload-node-action.component.html', }) export class ReloadNodeActionComponent implements OnInit { @Input() server: Server; @@ -17,15 +17,20 @@ export class ReloadNodeActionComponent implements OnInit { ngOnInit() { this.nodes.forEach((node) => { - if (node.node_type === 'vpcs' || node.node_type === 'qemu' || node.node_type === 'virtualbox' || node.node_type === 'vmware') { - this.filteredNodes.push(node); - } + if ( + node.node_type === 'vpcs' || + node.node_type === 'qemu' || + node.node_type === 'virtualbox' || + node.node_type === 'vmware' + ) { + this.filteredNodes.push(node); + } }); } reloadNodes() { this.filteredNodes.forEach((node) => { - this.nodeService.reload(this.server, node).subscribe((n: Node) => {}); + this.nodeService.reload(this.server, node).subscribe((n: Node) => {}); }); } } diff --git a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.html b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.html index ffc7be94..f191112f 100644 --- a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.html +++ b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts index 9cbb48bb..938f36d8 100644 --- a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts @@ -5,18 +5,16 @@ import { LinkService } from '../../../../../services/link.service'; @Component({ selector: 'app-resume-link-action', - templateUrl: './resume-link-action.component.html' + templateUrl: './resume-link-action.component.html', }) export class ResumeLinkActionComponent { - @Input() server: Server; - @Input() link: Link; + @Input() server: Server; + @Input() link: Link; - constructor( - private linkService: LinkService - ) {} + constructor(private linkService: LinkService) {} - resumeLink() { - this.link.suspend = false; - this.linkService.updateLink(this.server, this.link).subscribe(() => {}); - } + resumeLink() { + this.link.suspend = false; + this.linkService.updateLink(this.server, this.link).subscribe(() => {}); + } } diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.html b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.html index b92a0071..0f2ec136 100644 --- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.html +++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts index 58eb8181..a91b0cf5 100644 --- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts @@ -6,20 +6,20 @@ import { Server } from '../../../../../models/server'; @Component({ selector: 'app-show-node-action', - templateUrl: './show-node-action.component.html' + templateUrl: './show-node-action.component.html', }) export class ShowNodeActionComponent { @Input() node: Node; - @Input() server: Server + @Input() server: Server; constructor(private dialog: MatDialog) {} showNode() { const dialogRef = this.dialog.open(InfoDialogComponent, { - width: '600px', - maxHeight: '600px', - autoFocus: false, - disableClose: true + width: '600px', + maxHeight: '600px', + autoFocus: false, + disableClose: true, }); let instance = dialogRef.componentInstance; instance.node = this.node; diff --git a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.html b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.html index 532b38ab..a755300c 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.html +++ b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts index b7fcd6a3..dc4c330c 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts @@ -6,16 +6,14 @@ import { PacketCaptureService } from '../../../../../services/packet-capture.ser @Component({ selector: 'app-start-capture-on-started-link-action', - templateUrl: './start-capture-on-started-link.component.html' + templateUrl: './start-capture-on-started-link.component.html', }) export class StartCaptureOnStartedLinkActionComponent { @Input() server: Server; @Input() project: Project; @Input() link: Link; - constructor( - private packetCaptureService: PacketCaptureService - ) {} + constructor(private packetCaptureService: PacketCaptureService) {} startCapture() { var splittedFileName = this.link.capture_file_name.split('.'); diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.html b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.html index 551336cf..1fb1d1b4 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.html +++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts index 678a81e7..2ef8abb8 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts @@ -7,7 +7,7 @@ import { Project } from '../../../../../models/project'; @Component({ selector: 'app-start-capture-action', - templateUrl: './start-capture-action.component.html' + templateUrl: './start-capture-action.component.html', }) export class StartCaptureActionComponent { @Input() server: Server; @@ -18,9 +18,9 @@ export class StartCaptureActionComponent { startCapture() { const dialogRef = this.dialog.open(StartCaptureDialogComponent, { - width: '400px', - autoFocus: false, - disableClose: true + width: '400px', + autoFocus: false, + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts index 917075b1..158fdbd2 100644 --- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.spec.ts @@ -8,7 +8,7 @@ describe('StartNodeActionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [StartNodeActionComponent] + declarations: [StartNodeActionComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts index 3bb39a6d..b19a2a05 100644 --- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts @@ -6,23 +6,19 @@ import { ToasterService } from '../../../../../services/toaster.service'; @Component({ selector: 'app-start-node-action', - templateUrl: './start-node-action.component.html' + templateUrl: './start-node-action.component.html', }) export class StartNodeActionComponent implements OnInit, OnChanges { @Input() server: Server; @Input() nodes: Node[]; isNodeWithStoppedStatus: boolean; - constructor( - private nodeService: NodeService, - private toasterService: ToasterService - ) {} + constructor(private nodeService: NodeService, private toasterService: ToasterService) {} - ngOnInit() { - } + ngOnInit() {} ngOnChanges(changes) { - if(changes.nodes) { + if (changes.nodes) { this.isNodeWithStoppedStatus = false; this.nodes.forEach((node) => { if (node.status === 'stopped' || node.status === 'suspended') { @@ -36,8 +32,8 @@ export class StartNodeActionComponent implements OnInit, OnChanges { this.nodes.forEach((node) => { this.nodeService.start(this.server, node).subscribe( (n: Node) => {}, - error => { - this.toasterService.error(error.error.message) + (error) => { + this.toasterService.error(error.error.message); } ); }); diff --git a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.html b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.html index 68dd9851..aed02cdd 100644 --- a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.html +++ b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts index 3dfcaeab..9335e30c 100644 --- a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts @@ -5,15 +5,13 @@ import { LinkService } from '../../../../../services/link.service'; @Component({ selector: 'app-stop-capture-action', - templateUrl: './stop-capture-action.component.html' + templateUrl: './stop-capture-action.component.html', }) export class StopCaptureActionComponent { @Input() server: Server; @Input() link: Link; - constructor( - private linkService: LinkService - ) {} + constructor(private linkService: LinkService) {} stopCapture() { this.linkService.stopCaptureOnLink(this.server, this.link).subscribe(() => {}); diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts index c49c6157..4cd2300c 100644 --- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.spec.ts @@ -8,7 +8,7 @@ describe('StopNodeActionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [StopNodeActionComponent] + declarations: [StopNodeActionComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts index 2d7fcc81..68479b36 100644 --- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; @Component({ selector: 'app-stop-node-action', - templateUrl: './stop-node-action.component.html' + templateUrl: './stop-node-action.component.html', }) export class StopNodeActionComponent implements OnInit, OnChanges { @Input() server: Server; @@ -14,11 +14,10 @@ export class StopNodeActionComponent implements OnInit, OnChanges { constructor(private nodeService: NodeService) {} - ngOnInit() { - } + ngOnInit() {} ngOnChanges(changes) { - if(changes.nodes) { + if (changes.nodes) { this.isNodeWithStartedStatus = false; this.nodes.forEach((node) => { if (node.status === 'started') { diff --git a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.html b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.html index c503dadb..7494d0dc 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.html +++ b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts index f07dc592..8a60d2c3 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts @@ -5,18 +5,16 @@ import { LinkService } from '../../../../../services/link.service'; @Component({ selector: 'app-suspend-link-action', - templateUrl: './suspend-link-action.component.html' + templateUrl: './suspend-link-action.component.html', }) export class SuspendLinkActionComponent { - @Input() server: Server; - @Input() link: Link; + @Input() server: Server; + @Input() link: Link; - constructor( - private linkService: LinkService - ) {} + constructor(private linkService: LinkService) {} - suspendLink() { - this.link.suspend = true; - this.linkService.updateLink(this.server, this.link).subscribe(() => {}); - } + suspendLink() { + this.link.suspend = true; + this.linkService.updateLink(this.server, this.link).subscribe(() => {}); + } } diff --git a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.html b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.html index de0b01c3..0e1e5861 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.html +++ b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts index 17688b62..a42c2d00 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts @@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node'; @Component({ selector: 'app-suspend-node-action', - templateUrl: './suspend-node-action.component.html' + templateUrl: './suspend-node-action.component.html', }) export class SuspendNodeActionComponent implements OnInit, OnChanges { @Input() server: Server; @@ -14,11 +14,10 @@ export class SuspendNodeActionComponent implements OnInit, OnChanges { constructor(private nodeService: NodeService) {} - ngOnInit() { - } + ngOnInit() {} ngOnChanges(changes) { - if(changes.nodes) { + if (changes.nodes) { this.isNodeWithStartedStatus = false; this.nodes.forEach((node) => { if (node.status === 'started') { diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html index d8563c6b..9dc61b2f 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.html +++ b/src/app/components/project-map/context-menu/context-menu.component.html @@ -1,27 +1,19 @@
- - + + - + @@ -31,41 +23,45 @@ [nodes]="nodes" > - - - - - @@ -106,61 +111,92 @@ [drawings]="drawings" > diff --git a/src/app/components/project-map/context-menu/context-menu.component.scss b/src/app/components/project-map/context-menu/context-menu.component.scss index 1226043f..eafff99b 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.scss +++ b/src/app/components/project-map/context-menu/context-menu.component.scss @@ -3,6 +3,14 @@ min-height: 0px; } -.mat-menu-panel ng-trigger ng-trigger-transformMenu ng-tns-c7-5 context-menu-items mat-menu-after mat-menu-below ng-star-inserted mat-elevation-z4 { - min-height: 0px!important; -} \ No newline at end of file +.mat-menu-panel + ng-trigger + ng-trigger-transformMenu + ng-tns-c7-5 + context-menu-items + mat-menu-after + mat-menu-below + ng-star-inserted + mat-elevation-z4 { + min-height: 0px !important; +} diff --git a/src/app/components/project-map/context-menu/context-menu.component.spec.ts b/src/app/components/project-map/context-menu/context-menu.component.spec.ts index 97fa46e0..776c6889 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.spec.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.spec.ts @@ -17,25 +17,25 @@ describe('ContextMenuComponent', () => { beforeEach(async(() => { const electronMock = { - isElectronApp: true + isElectronApp: true, }; TestBed.configureTestingModule({ imports: [MatMenuModule, BrowserModule], providers: [ - { provide: ChangeDetectorRef }, + { provide: ChangeDetectorRef }, { provide: ProjectService, useClass: MockedProjectService }, - { provide: ElectronService, useValue: electronMock} + { provide: ElectronService, useValue: electronMock }, ], declarations: [ContextMenuComponent], - schemas: [NO_ERRORS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(ContextMenuComponent); component = fixture.componentInstance; - component.server = {location: 'local'} as Server; + component.server = { location: 'local' } as Server; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts index 47d50764..52c51ec7 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.ts @@ -12,11 +12,10 @@ import { Link } from '../../../models/link'; import { ElectronService } from 'ngx-electron'; import { LinkNode } from '../../../models/link-node'; - @Component({ selector: 'app-context-menu', templateUrl: './context-menu.component.html', - styleUrls: ['./context-menu.component.scss'] + styleUrls: ['./context-menu.component.scss'], }) export class ContextMenuComponent implements OnInit { @Input() project: Project; @@ -96,7 +95,14 @@ export class ContextMenuComponent implements OnInit { this.contextMenu.openMenu(); } - public openMenuForListOfElements(drawings: Drawing[], nodes: Node[], labels: Label[], links: Link[], top: number, left: number) { + public openMenuForListOfElements( + drawings: Drawing[], + nodes: Node[], + labels: Label[], + links: Link[], + top: number, + left: number + ) { this.resetCapabilities(); this.drawings = drawings; diff --git a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.html b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.html index 86ff530d..7beb15f2 100644 --- a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.html +++ b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.html @@ -1,16 +1,12 @@

Choose configuration file

-
-
- -
-
- -
+
+
+
+
+ +
+
diff --git a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.scss b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.scss index 655685b5..add91a3f 100644 --- a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.scss +++ b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.scss @@ -1,5 +1,5 @@ .container { - width: 100%; - display: flex; - justify-content: space-between; + width: 100%; + display: flex; + justify-content: space-between; } diff --git a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts index 9f7fcb0a..57a62646 100644 --- a/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts +++ b/src/app/components/project-map/context-menu/dialogs/config-dialog/config-dialog.component.ts @@ -2,16 +2,14 @@ import { Component, Input } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; @Component({ - selector: 'app-config-dialog', - templateUrl: './config-dialog.component.html', - styleUrls: ['./config-dialog.component.scss'] + selector: 'app-config-dialog', + templateUrl: './config-dialog.component.html', + styleUrls: ['./config-dialog.component.scss'], }) export class ConfigDialogComponent { - constructor( - public dialogRef: MatDialogRef, - ) {} + constructor(public dialogRef: MatDialogRef) {} - close(fileType: string) { - this.dialogRef.close(fileType); - } + close(fileType: string) { + this.dialogRef.close(fileType); + } } diff --git a/src/app/components/project-map/draw-link-tool/draw-link-tool.component.spec.ts b/src/app/components/project-map/draw-link-tool/draw-link-tool.component.spec.ts index 5978e4d7..7fc7d466 100644 --- a/src/app/components/project-map/draw-link-tool/draw-link-tool.component.spec.ts +++ b/src/app/components/project-map/draw-link-tool/draw-link-tool.component.spec.ts @@ -8,7 +8,7 @@ describe('DrawLinkToolComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [DrawLinkToolComponent] + declarations: [DrawLinkToolComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts b/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts index 98e5c827..9d637fdf 100644 --- a/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts +++ b/src/app/components/project-map/draw-link-tool/draw-link-tool.component.ts @@ -15,7 +15,7 @@ import { NodeToMapNodeConverter } from '../../../cartography/converters/map/node @Component({ selector: 'app-draw-link-tool', templateUrl: './draw-link-tool.component.html', - styleUrls: ['./draw-link-tool.component.scss'] + styleUrls: ['./draw-link-tool.component.scss'], }) export class DrawLinkToolComponent implements OnInit, OnDestroy { @Input() links: Link[]; @@ -33,7 +33,7 @@ export class DrawLinkToolComponent implements OnInit, OnDestroy { ) {} ngOnInit() { - this.nodeClicked$ = this.nodesEventSource.clicked.subscribe(clickedEvent => { + this.nodeClicked$ = this.nodesEventSource.clicked.subscribe((clickedEvent) => { let node = this.mapNodeToNode.convert(clickedEvent.datum); this.nodeSelectInterfaceMenu.open(node, clickedEvent.y, clickedEvent.x); }); @@ -55,7 +55,7 @@ export class DrawLinkToolComponent implements OnInit, OnDestroy { } else { this.drawingLineTool.start(node.x + node.width / 2, node.y + node.height / 2, { node: node, - port: port + port: port, }); } } diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html index f7605d69..be6c49aa 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html @@ -3,23 +3,41 @@
- + - + - + - + - + - +
diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.scss b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.scss index 36dbdb7d..9b03ab66 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.scss +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.scss @@ -25,18 +25,18 @@ input:focus { outline: none; } -input[type="color"] { - -webkit-appearance: none; - border: none; +input[type='color'] { + -webkit-appearance: none; + border: none; height: 25px; } -input[type="color"]::-webkit-color-swatch-wrapper { - padding: 0; +input[type='color']::-webkit-color-swatch-wrapper { + padding: 0; } -input[type="color"]::-webkit-color-swatch { - border: none; +input[type='color']::-webkit-color-swatch { + border: none; } .modal-form-container { diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts index a49b059e..9ef0c3ff 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts @@ -18,7 +18,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator'; @Component({ selector: 'app-style-editor', templateUrl: './style-editor.component.html', - styleUrls: ['./style-editor.component.scss'] + styleUrls: ['./style-editor.component.scss'], }) export class StyleEditorDialogComponent implements OnInit { server: Server; @@ -40,7 +40,7 @@ export class StyleEditorDialogComponent implements OnInit { ) { this.formGroup = this.formBuilder.group({ borderWidth: new FormControl('', [Validators.required, nonNegativeValidator.get]), - rotation: new FormControl('', [Validators.required, rotationValidator.get]) + rotation: new FormControl('', [Validators.required, rotationValidator.get]), }); } @@ -69,10 +69,9 @@ export class StyleEditorDialogComponent implements OnInit { onYesClick() { if (this.formGroup.valid) { - - this.element.stroke_width = this.formGroup.get('borderWidth').value; + this.element.stroke_width = this.formGroup.get('borderWidth').value; this.drawing.rotation = this.formGroup.get('rotation').value; - + if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) { this.drawing.element.fill = this.element.fill; this.drawing.element.stroke = this.element.stroke; diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.html b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.html index 82f44aa1..f3b7b65f 100644 --- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.html +++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.html @@ -2,16 +2,22 @@
- +
- +
- +
diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.scss b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.scss index cc5ede13..ebd8d15d 100644 --- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.scss +++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.scss @@ -25,18 +25,18 @@ input:focus { outline: none; } -input[type="color"] { - -webkit-appearance: none; - border: none; +input[type='color'] { + -webkit-appearance: none; + border: none; height: 25px; } -input[type="color"]::-webkit-color-swatch-wrapper { - padding: 0; +input[type='color']::-webkit-color-swatch-wrapper { + padding: 0; } -input[type="color"]::-webkit-color-swatch { - border: none; +input[type='color']::-webkit-color-swatch { + border: none; } .text { diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts index ec55e88b..d71f4adf 100644 --- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts @@ -25,10 +25,10 @@ import { FontFixer } from '../../../../cartography/helpers/font-fixer'; @Component({ selector: 'app-text-editor', templateUrl: './text-editor.component.html', - styleUrls: ['./text-editor.component.scss'] + styleUrls: ['./text-editor.component.scss'], }) export class TextEditorDialogComponent implements OnInit { - @ViewChild('textArea', {static: true}) textArea: ElementRef; + @ViewChild('textArea', { static: true }) textArea: ElementRef; server: Server; project: Project; @@ -56,12 +56,12 @@ export class TextEditorDialogComponent implements OnInit { private formBuilder: FormBuilder, private toasterService: ToasterService, private rotationValidator: RotationValidator, - private fontFixer: FontFixer + private fontFixer: FontFixer ) {} ngOnInit() { this.formGroup = this.formBuilder.group({ - rotation: new FormControl('', [Validators.required, this.rotationValidator.get]) + rotation: new FormControl('', [Validators.required, this.rotationValidator.get]), }); if (this.label && this.node) { @@ -70,19 +70,19 @@ export class TextEditorDialogComponent implements OnInit { this.element = this.getTextElementFromLabel(); } else if (this.linkNode && this.link) { this.isTextEditable = true; - this.label = this.link.nodes.find(n => n.node_id === this.linkNode.node_id).label; + this.label = this.link.nodes.find((n) => n.node_id === this.linkNode.node_id).label; this.rotation = this.label.rotation.toString(); this.element = this.getTextElementFromLabel(); } else if (this.drawing) { this.isTextEditable = true; this.rotation = this.drawing.rotation.toString(); this.element = this.drawing.element as TextElement; - }; + } let font: Font = { font_family: this.element.font_family, font_size: this.element.font_size, - font_weight: this.element.font_weight + font_weight: this.element.font_weight, }; font = this.fontFixer.fix(font); @@ -93,28 +93,38 @@ export class TextEditorDialogComponent implements OnInit { this.renderer.setStyle(this.textArea.nativeElement, 'font-weight', font.font_weight); } - getTextElementFromLabel(): TextElement{ + getTextElementFromLabel(): TextElement { var styleProperties: StyleProperty[] = []; var textElement = new TextElement(); - for (var property of this.label.style.split(";")){ + for (var property of this.label.style.split(';')) { styleProperties.push({ - property: property.split(": ")[0], - value: property.split(": ")[1] + property: property.split(': ')[0], + value: property.split(': ')[1], }); } textElement.text = this.label.text ? this.label.text : ''; - textElement.font_family = styleProperties.find(p => p.property === 'font-family') ? styleProperties.find(p => p.property === 'font-family').value : 'TypeWriter'; - textElement.font_size = styleProperties.find(p => p.property === 'font-size') ? +styleProperties.find(p => p.property === 'font-size').value : 10.0; - textElement.font_weight = styleProperties.find(p => p.property === 'font-weight') ? styleProperties.find(p => p.property === 'font-weight').value : 'normal'; - textElement.fill = styleProperties.find(p => p.property === 'fill') ? styleProperties.find(p => p.property === 'fill').value : '#000000'; - textElement.fill_opacity = styleProperties.find(p => p.property === 'fill-opacity') ? +styleProperties.find(p => p.property === 'fill-opacity').value : 1.0; + textElement.font_family = styleProperties.find((p) => p.property === 'font-family') + ? styleProperties.find((p) => p.property === 'font-family').value + : 'TypeWriter'; + textElement.font_size = styleProperties.find((p) => p.property === 'font-size') + ? +styleProperties.find((p) => p.property === 'font-size').value + : 10.0; + textElement.font_weight = styleProperties.find((p) => p.property === 'font-weight') + ? styleProperties.find((p) => p.property === 'font-weight').value + : 'normal'; + textElement.fill = styleProperties.find((p) => p.property === 'fill') + ? styleProperties.find((p) => p.property === 'fill').value + : '#000000'; + textElement.fill_opacity = styleProperties.find((p) => p.property === 'fill-opacity') + ? +styleProperties.find((p) => p.property === 'fill-opacity').value + : 1.0; return textElement; } - getStyleFromTextElement(): string{ + getStyleFromTextElement(): string { return `font-family: ${this.element.font_family};font-size: ${this.element.font_size};font-weight: ${this.element.font_weight};fill: ${this.element.fill};fill-opacity: ${this.element.fill_opacity};`; } @@ -129,7 +139,7 @@ export class TextEditorDialogComponent implements OnInit { if (this.label && this.node) { this.node.label.style = this.getStyleFromTextElement(); this.node.label.rotation = +this.rotation; - + this.nodeService.updateLabel(this.server, this.node, this.node.label).subscribe((node: Node) => { this.nodesDataSource.update(node); this.dialogRef.close(); @@ -138,7 +148,7 @@ export class TextEditorDialogComponent implements OnInit { this.label.style = this.getStyleFromTextElement(); this.label.rotation = +this.rotation; this.label.text = this.element.text; - + this.linkService.updateLink(this.server, this.link).subscribe((link: Link) => { this.linksDataSource.update(link); this.dialogRef.close(); @@ -146,17 +156,17 @@ export class TextEditorDialogComponent implements OnInit { } else if (this.drawing) { this.drawing.rotation = +this.rotation; this.drawing.element = this.element; - + let mapDrawing = this.drawingToMapDrawingConverter.convert(this.drawing); mapDrawing.element = this.drawing.element; - + this.drawing.svg = this.mapDrawingToSvgConverter.convert(mapDrawing); - + this.drawingService.update(this.server, this.drawing).subscribe((serverDrawing: Drawing) => { this.drawingsDataSource.update(serverDrawing); this.dialogRef.close(); }); - }; + } } else { this.toasterService.error(`Entered data is incorrect`); } diff --git a/src/app/components/project-map/help-dialog/help-dialog.component.html b/src/app/components/project-map/help-dialog/help-dialog.component.html index 0f96d635..d24d0379 100644 --- a/src/app/components/project-map/help-dialog/help-dialog.component.html +++ b/src/app/components/project-map/help-dialog/help-dialog.component.html @@ -1,16 +1,16 @@ -

{{title}}

+

{{ title }}

-
-
- {{message.name}} -
- - {{message.description}} - -
+
+
+ {{ message.name }} +
+ + {{ message.description }} + +
- +
diff --git a/src/app/components/project-map/help-dialog/help-dialog.component.scss b/src/app/components/project-map/help-dialog/help-dialog.component.scss index f382464c..f6d3f38d 100644 --- a/src/app/components/project-map/help-dialog/help-dialog.component.scss +++ b/src/app/components/project-map/help-dialog/help-dialog.component.scss @@ -1,7 +1,7 @@ .message { - margin-bottom: 10px; + margin-bottom: 10px; } .description { - color: #b0bec5; + color: #b0bec5; } diff --git a/src/app/components/project-map/help-dialog/help-dialog.component.ts b/src/app/components/project-map/help-dialog/help-dialog.component.ts index 65d97ab1..c9728679 100644 --- a/src/app/components/project-map/help-dialog/help-dialog.component.ts +++ b/src/app/components/project-map/help-dialog/help-dialog.component.ts @@ -3,19 +3,17 @@ import { MatDialogRef } from '@angular/material/dialog'; import { Message } from '../../../models/message'; @Component({ - selector: 'app-help-dialog', - templateUrl: './help-dialog.component.html', - styleUrls: ['./help-dialog.component.scss'] + selector: 'app-help-dialog', + templateUrl: './help-dialog.component.html', + styleUrls: ['./help-dialog.component.scss'], }) export class HelpDialogComponent { - @Input() title: string; - @Input() messages: Message[]; + @Input() title: string; + @Input() messages: Message[]; - constructor( - public dialogRef: MatDialogRef, - ) {} + constructor(public dialogRef: MatDialogRef) {} - onCloseClick() { - this.dialogRef.close(); - } + onCloseClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/helpers/node-created-label-styles-fixer.spec.ts b/src/app/components/project-map/helpers/node-created-label-styles-fixer.spec.ts index 3e58ec29..de96317b 100644 --- a/src/app/components/project-map/helpers/node-created-label-styles-fixer.spec.ts +++ b/src/app/components/project-map/helpers/node-created-label-styles-fixer.spec.ts @@ -1,4 +1,4 @@ -import { NodeCreatedLabelStylesFixer } from "./node-created-label-styles-fixer"; +import { NodeCreatedLabelStylesFixer } from './node-created-label-styles-fixer'; import { Node } from '../../../cartography/models/node'; import { Label } from '../../../cartography/models/label'; @@ -11,14 +11,12 @@ describe('NodeCreatedLabelStylesFixer', () => { calculate: (text, styles) => { return { width: 50, - height: 10 + height: 10, }; - } + }, }; - fixer = new NodeCreatedLabelStylesFixer( - calculator - ); + fixer = new NodeCreatedLabelStylesFixer(calculator); }); it('should fix label styles and position', () => { @@ -26,11 +24,13 @@ describe('NodeCreatedLabelStylesFixer', () => { node.width = 100; node.height = 100; node.label = new Label(); - node.label.text = "my new label"; + node.label.text = 'my new label'; const fixed = fixer.fix(node); - expect(fixed.label.style).toEqual('font-family: TypeWriter;font-size: 10.0;font-weight: bold;fill: #000000;fill-opacity: 1.0;'); + expect(fixed.label.style).toEqual( + 'font-family: TypeWriter;font-size: 10.0;font-weight: bold;fill: #000000;fill-opacity: 1.0;' + ); expect(fixed.label.x).toEqual(25); expect(fixed.label.y).toEqual(-18); }); diff --git a/src/app/components/project-map/helpers/node-created-label-styles-fixer.ts b/src/app/components/project-map/helpers/node-created-label-styles-fixer.ts index 43a3e33d..6b4530d5 100644 --- a/src/app/components/project-map/helpers/node-created-label-styles-fixer.ts +++ b/src/app/components/project-map/helpers/node-created-label-styles-fixer.ts @@ -6,9 +6,7 @@ import { FontBBoxCalculator } from '../../../cartography/helpers/font-bbox-calcu export class NodeCreatedLabelStylesFixer { MARGIN_BETWEEN_NODE_AND_LABEL = 8; - constructor( - private fontBBCalculator: FontBBoxCalculator - ) {} + constructor(private fontBBCalculator: FontBBoxCalculator) {} fix(node: Node): Node { node.label.style = 'font-family: TypeWriter;font-size: 10.0;font-weight: bold;fill: #000000;fill-opacity: 1.0;'; diff --git a/src/app/components/project-map/import-appliance/import-appliance.component.ts b/src/app/components/project-map/import-appliance/import-appliance.component.ts index 2d2e4c67..bd76db8b 100644 --- a/src/app/components/project-map/import-appliance/import-appliance.component.ts +++ b/src/app/components/project-map/import-appliance/import-appliance.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from "@angular/core"; +import { Component, Input, OnInit } from '@angular/core'; import { Project } from '../../../models/project'; import { Server } from '../../../models/server'; import { ToasterService } from '../../../services/toaster.service'; @@ -16,144 +16,143 @@ import { IouService } from '../../../services/iou.service'; import { IosService } from '../../../services/ios.service'; import { TemplatePortalDirective } from '@angular/cdk/portal'; - @Component({ - selector: 'app-import-appliance', - templateUrl: './import-appliance.component.html', - styleUrls: ['./import-appliance.component.scss'] + selector: 'app-import-appliance', + templateUrl: './import-appliance.component.html', + styleUrls: ['./import-appliance.component.scss'], }) export class ImportApplianceComponent implements OnInit { - @Input('project') project: Project; - @Input('server') server: Server; - uploader: FileUploader; - template; + @Input('project') project: Project; + @Input('server') server: Server; + uploader: FileUploader; + template; - constructor( - private toasterService: ToasterService, - private dockerService: DockerService, - private qemuService: QemuService, - private iouService: IouService, - private iosService: IosService - ) {} + constructor( + private toasterService: ToasterService, + private dockerService: DockerService, + private qemuService: QemuService, + private iouService: IouService, + private iosService: IosService + ) {} - ngOnInit() { - this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { - file.withCredentials = false; - }; - - this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error has occured'); - }; - - this.uploader.onCompleteItem = ( - item: FileItem, - response: string, - status: number, - headers: ParsedResponseHeaders - ) => { - if (this.template.template_type === 'qemu') { - this.qemuService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); - } else if (this.template.template_type === 'iou') { - this.iouService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); - } else if (this.template.template_type === 'dynamips') { - this.iosService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); - } else if (this.template.template_type === 'docker') { - this.dockerService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); - } - }; - } + ngOnInit() { + this.uploader = new FileUploader({}); + this.uploader.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; - private onUploadComplete() { - this.toasterService.success('Appliance imported successfully'); - this.uploader.queue = []; - } + this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { + this.toasterService.error('An error has occured'); + }; - public uploadAppliance(event) { - let file: File = event.target.files[0]; - let name: string = file.name; - let fileReader: FileReader = new FileReader(); + this.uploader.onCompleteItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + if (this.template.template_type === 'qemu') { + this.qemuService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); + } else if (this.template.template_type === 'iou') { + this.iouService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); + } else if (this.template.template_type === 'dynamips') { + this.iosService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); + } else if (this.template.template_type === 'docker') { + this.dockerService.addTemplate(this.server, this.template).subscribe(() => this.onUploadComplete()); + } + }; + } - let template; - fileReader.onloadend = () => { - let appliance = JSON.parse(fileReader.result as string); - let emulator: string; + private onUploadComplete() { + this.toasterService.success('Appliance imported successfully'); + this.uploader.queue = []; + } - if (appliance.qemu) { - // option to select qemu image is missing - template = new QemuTemplate(); - template.template_type = 'qemu'; - template.adapter_type = appliance.qemu.adapter_type; - template.adapters = appliance.qemu.adapters; - template.ram = appliance.qemu.ram; - template.options = appliance.qemu.options; - template.console_type = appliance.qemu.console_type; - } else if (appliance.iou) { - // option to choose IOU image is missing - template = new IouTemplate(); - template.template_type = 'iou'; - template.console_type = appliance.iou.console_type; - template.console_auto_start = appliance.iou.console_auto_start; - template.ethernet_adapters = appliance.iou.ethernet_adapters; - template.l1_keepalives = appliance.iou.l1_keepalives; - template.nvram = appliance.iou.nvram; - template.ram = appliance.iou.ram; - template.serial_adapters = appliance.iou.serial_adapters; - } else if (appliance.dynamips) { - // option to choose IOS image is missing - template = new IosTemplate(); - template.template_type = 'dynamips'; - template.platform = appliance.dynamips.platform; - template.ram = appliance.dynamips.ram; - template.nvram = appliance.dynamips.nvram; - template.startup_config = appliance.dynamips.startup_config; - template.wic0 = appliance.dynamips.wic0; - template.wic1 = appliance.dynamips.wic1; - template.wic2 = appliance.dynamips.wic2; - template.slot0 = appliance.dynamips.slot0; - template.slot1 = appliance.dynamips.slot1; - template.slot2 = appliance.dynamips.slot2; - template.slot3 = appliance.dynamips.slot3; - template.slot4 = appliance.dynamips.slot4; - template.slot5 = appliance.dynamips.slot5; - template.slot6 = appliance.dynamips.slot6; - template.slot7 = appliance.dynamips.slot7; - } else if (appliance.docker) { - template = new DockerTemplate(); - template.template_type = 'docker'; - template.adapters = appliance.docker.adapters; - template.console_type = appliance.docker.console_type; - template.image = appliance.docker.image; - } else { - this.toasterService.error("Template type not supported"); - return; - } - template.name = appliance.name; - template.category = appliance.category; - template.builtin = false; - template.default_name_format = '{name}-{0}'; - template.compute_id = "vm"; - // qemu - VM - // iou - VM + main server - // dynamips - vm + main server - // docker - vm + public uploadAppliance(event) { + let file: File = event.target.files[0]; + let name: string = file.name; + let fileReader: FileReader = new FileReader(); - if (template.category === 'guest') { - template.symbol = `:/symbols/computer.svg`; - } else { - template.symbol = `:/symbols/${template.category}_guest.svg`; - } - this.template = template; + let template; + fileReader.onloadend = () => { + let appliance = JSON.parse(fileReader.result as string); + let emulator: string; - const url = this.getUploadPath(this.server, template.template_type, name); - this.uploader.queue.forEach(elem => (elem.url = url)); - const itemToUpload = this.uploader.queue[0]; - this.uploader.uploadItem(itemToUpload); - }; - fileReader.readAsText(file); - } + if (appliance.qemu) { + // option to select qemu image is missing + template = new QemuTemplate(); + template.template_type = 'qemu'; + template.adapter_type = appliance.qemu.adapter_type; + template.adapters = appliance.qemu.adapters; + template.ram = appliance.qemu.ram; + template.options = appliance.qemu.options; + template.console_type = appliance.qemu.console_type; + } else if (appliance.iou) { + // option to choose IOU image is missing + template = new IouTemplate(); + template.template_type = 'iou'; + template.console_type = appliance.iou.console_type; + template.console_auto_start = appliance.iou.console_auto_start; + template.ethernet_adapters = appliance.iou.ethernet_adapters; + template.l1_keepalives = appliance.iou.l1_keepalives; + template.nvram = appliance.iou.nvram; + template.ram = appliance.iou.ram; + template.serial_adapters = appliance.iou.serial_adapters; + } else if (appliance.dynamips) { + // option to choose IOS image is missing + template = new IosTemplate(); + template.template_type = 'dynamips'; + template.platform = appliance.dynamips.platform; + template.ram = appliance.dynamips.ram; + template.nvram = appliance.dynamips.nvram; + template.startup_config = appliance.dynamips.startup_config; + template.wic0 = appliance.dynamips.wic0; + template.wic1 = appliance.dynamips.wic1; + template.wic2 = appliance.dynamips.wic2; + template.slot0 = appliance.dynamips.slot0; + template.slot1 = appliance.dynamips.slot1; + template.slot2 = appliance.dynamips.slot2; + template.slot3 = appliance.dynamips.slot3; + template.slot4 = appliance.dynamips.slot4; + template.slot5 = appliance.dynamips.slot5; + template.slot6 = appliance.dynamips.slot6; + template.slot7 = appliance.dynamips.slot7; + } else if (appliance.docker) { + template = new DockerTemplate(); + template.template_type = 'docker'; + template.adapters = appliance.docker.adapters; + template.console_type = appliance.docker.console_type; + template.image = appliance.docker.image; + } else { + this.toasterService.error('Template type not supported'); + return; + } + template.name = appliance.name; + template.category = appliance.category; + template.builtin = false; + template.default_name_format = '{name}-{0}'; + template.compute_id = 'vm'; + // qemu - VM + // iou - VM + main server + // dynamips - vm + main server + // docker - vm - private getUploadPath(server: Server, emulator: string, filename: string) { - return `${server.protocol}//${server.host}:${server.port}/v2/${emulator}/images/${filename}`; - } + if (template.category === 'guest') { + template.symbol = `:/symbols/computer.svg`; + } else { + template.symbol = `:/symbols/${template.category}_guest.svg`; + } + this.template = template; + + const url = this.getUploadPath(this.server, template.template_type, name); + this.uploader.queue.forEach((elem) => (elem.url = url)); + const itemToUpload = this.uploader.queue[0]; + this.uploader.uploadItem(itemToUpload); + }; + fileReader.readAsText(file); + } + + private getUploadPath(server: Server, emulator: string, filename: string) { + return `${server.protocol}//${server.host}:${server.port}/v2/${emulator}/images/${filename}`; + } } diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.html b/src/app/components/project-map/info-dialog/info-dialog.component.html index fbb64687..e8cb46af 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.html +++ b/src/app/components/project-map/info-dialog/info-dialog.component.html @@ -1,27 +1,27 @@ -

{{node.name}}

+

{{ node.name }}

- - -
-
- {{info}} -
-
- - -
- {{usage}} -
- - -
- {{commandLine}} -
- - + + +
+
+ {{ info }} +
+
+ + +
+ {{ usage }} +
+ + +
+ {{ commandLine }} +
+ +
- +
diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.scss b/src/app/components/project-map/info-dialog/info-dialog.component.scss index e28aaee8..e54f5357 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.scss +++ b/src/app/components/project-map/info-dialog/info-dialog.component.scss @@ -1,3 +1,3 @@ .textBox { - margin-top: 10px; + margin-top: 10px; } diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.ts b/src/app/components/project-map/info-dialog/info-dialog.component.ts index 7bfd0839..0e2608b4 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.ts +++ b/src/app/components/project-map/info-dialog/info-dialog.component.ts @@ -5,29 +5,26 @@ import { InfoService } from '../../../services/info.service'; import { Server } from '../../../models/server'; @Component({ - selector: 'app-info-dialog', - templateUrl: './info-dialog.component.html', - styleUrls: ['./info-dialog.component.scss'] + selector: 'app-info-dialog', + templateUrl: './info-dialog.component.html', + styleUrls: ['./info-dialog.component.scss'], }) export class InfoDialogComponent implements OnInit { - @Input() server: Server; - @Input() node: Node; - infoList: string[] = []; - usage: string = ''; - commandLine: string = ''; + @Input() server: Server; + @Input() node: Node; + infoList: string[] = []; + usage: string = ''; + commandLine: string = ''; - constructor( - public dialogRef: MatDialogRef, - private infoService: InfoService - ) {} + constructor(public dialogRef: MatDialogRef, private infoService: InfoService) {} - ngOnInit() { - this.infoList = this.infoService.getInfoAboutNode(this.node, this.server); - this.commandLine = this.infoService.getCommandLine(this.node); - this.usage = this.node.usage ? this.node.usage : `No usage information has been provided for this node.`; - } + ngOnInit() { + this.infoList = this.infoService.getInfoAboutNode(this.node, this.server); + this.commandLine = this.infoService.getCommandLine(this.node); + this.usage = this.node.usage ? this.node.usage : `No usage information has been provided for this node.`; + } - onCloseClick() { - this.dialogRef.close(); - } + onCloseClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/log-console/log-console.component.html b/src/app/components/project-map/log-console/log-console.component.html index 83bcf275..c73a091d 100644 --- a/src/app/components/project-map/log-console/log-console.component.html +++ b/src/app/components/project-map/log-console/log-console.component.html @@ -1,32 +1,31 @@
-
- - - - - - - - - -
+
+ + + + + + + + + +
-
- - {{event.message}}
- +
+ {{ event.message }}
-
- keyboard_arrow_right - +
+ keyboard_arrow_right +
diff --git a/src/app/components/project-map/log-console/log-console.component.scss b/src/app/components/project-map/log-console/log-console.component.scss index f8302fed..0f952e38 100644 --- a/src/app/components/project-map/log-console/log-console.component.scss +++ b/src/app/components/project-map/log-console/log-console.component.scss @@ -1,96 +1,96 @@ .consoleWrapper { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - position: fixed; - bottom: 20px; - left: 20px; - height: 180px; - width: 600px; - background: #263238; - color: white; - overflow: hidden; - font-size: 12px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + position: fixed; + bottom: 20px; + left: 20px; + height: 180px; + width: 600px; + background: #263238; + color: white; + overflow: hidden; + font-size: 12px; } .lightTheme { - background: white!important; - color: black; + background: white !important; + color: black; } .filterButton { - background: transparent; - color: white; - border: none; - margin-top: 0px; - outline: none; - color: #dbd5d5; - font-weight: bold; - padding: 0px; + background: transparent; + color: white; + border: none; + margin-top: 0px; + outline: none; + color: #dbd5d5; + font-weight: bold; + padding: 0px; } .consoleFiltering { - display: flex; + display: flex; } .consoleHeader { - width: 100%; - height: 40px; - font-size: 12px; - overflow: hidden; - display: flex; - padding: 2px; - justify-content: space-between; + width: 100%; + height: 40px; + font-size: 12px; + overflow: hidden; + display: flex; + padding: 2px; + justify-content: space-between; } .console { - width: 596px; - height: 120px; - overflow-y: scroll; - padding: 2px; - color: #dbd5d5; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + width: 596px; + height: 120px; + overflow-y: scroll; + padding: 2px; + color: #dbd5d5; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } .consoleInput { - width: 100%; - height: 30px; - padding: 2px; - display: flex; + width: 100%; + height: 30px; + padding: 2px; + display: flex; } .commandLine { - background-color: transparent; - color: white; - border: none; + background-color: transparent; + color: white; + border: none; } .inputIcon { - margin-top: 2px; + margin-top: 2px; } mat-icon { - font-size: 20px; - width: 20px; - height: 20px; + font-size: 20px; + width: 20px; + height: 20px; } -input:focus{ - outline: none; +input:focus { + outline: none; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } - + ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + ::-webkit-scrollbar-thumb { background-color: darkgrey; outline: 1px solid #263238; } .closeButton { - cursor: pointer; + cursor: pointer; } diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts index b198dbc0..e55330f4 100644 --- a/src/app/components/project-map/log-console/log-console.component.spec.ts +++ b/src/app/components/project-map/log-console/log-console.component.spec.ts @@ -16,12 +16,12 @@ import { HttpClient } from '@angular/common/http'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; export class MockedProjectWebServiceHandler { - public nodeNotificationEmitter = new EventEmitter(); - public linkNotificationEmitter = new EventEmitter(); - public drawingNotificationEmitter = new EventEmitter(); - public infoNotificationEmitter = new EventEmitter(); - public warningNotificationEmitter = new EventEmitter(); - public errorNotificationEmitter = new EventEmitter(); + public nodeNotificationEmitter = new EventEmitter(); + public linkNotificationEmitter = new EventEmitter(); + public drawingNotificationEmitter = new EventEmitter(); + public infoNotificationEmitter = new EventEmitter(); + public warningNotificationEmitter = new EventEmitter(); + public errorNotificationEmitter = new EventEmitter(); } describe('LogConsoleComponent', () => { @@ -30,7 +30,7 @@ describe('LogConsoleComponent', () => { let mockedNodeService: MockedNodeService = new MockedNodeService(); let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource(); - let mockedProjectWebServiceHandler: MockedProjectWebServiceHandler = new MockedProjectWebServiceHandler(); + let mockedProjectWebServiceHandler: MockedProjectWebServiceHandler = new MockedProjectWebServiceHandler(); let httpServer = new HttpServer({} as HttpClient, {} as ServerErrorHandler); @@ -38,22 +38,22 @@ describe('LogConsoleComponent', () => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, MatMenuModule, BrowserModule], providers: [ - { provide: ProjectWebServiceHandler, useValue: mockedProjectWebServiceHandler }, + { provide: ProjectWebServiceHandler, useValue: mockedProjectWebServiceHandler }, { provide: NodeService, useValue: mockedNodeService }, { provide: NodesDataSource, useValue: mockedNodesDataSource }, { provide: LogEventsDataSource, useClass: LogEventsDataSource }, { provide: HttpServer, useValue: httpServer }, - { provide: NodeConsoleService } + { provide: NodeConsoleService }, ], declarations: [LogConsoleComponent], - schemas: [NO_ERRORS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(LogConsoleComponent); component = fixture.componentInstance; - component.server = {location: 'local'} as Server; + component.server = { location: 'local' } as Server; fixture.detectChanges(); }); @@ -67,7 +67,11 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: "Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}."}); + expect(component.showMessage).toHaveBeenCalledWith({ + type: 'command', + message: + 'Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.', + }); }); xit('should call show message when version command entered', () => { @@ -76,7 +80,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Current version: 2.2.18dev'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Current version: 2.2.18dev' }); }); it('should call show message when unknown command entered', () => { @@ -85,7 +89,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Unknown syntax: xyz'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Unknown syntax: xyz' }); }); it('should call node service when start all entered', () => { @@ -95,7 +99,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Starting all nodes...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Starting all nodes...' }); expect(mockedNodeService.startAll).toHaveBeenCalled(); }); @@ -106,7 +110,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Stopping all nodes...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Stopping all nodes...' }); expect(mockedNodeService.stopAll).toHaveBeenCalled(); }); @@ -117,7 +121,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Suspending all nodes...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Suspending all nodes...' }); expect(mockedNodeService.suspendAll).toHaveBeenCalled(); }); @@ -128,7 +132,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Reloading all nodes...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Reloading all nodes...' }); expect(mockedNodeService.reloadAll).toHaveBeenCalled(); }); @@ -139,7 +143,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Starting node testNode...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Starting node testNode...' }); expect(mockedNodeService.start).toHaveBeenCalled(); }); @@ -150,7 +154,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Stopping node testNode...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Stopping node testNode...' }); expect(mockedNodeService.stop).toHaveBeenCalled(); }); @@ -161,7 +165,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Suspending node testNode...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Suspending node testNode...' }); expect(mockedNodeService.suspend).toHaveBeenCalled(); }); @@ -172,7 +176,7 @@ describe('LogConsoleComponent', () => { component.handleCommand(); - expect(component.showMessage).toHaveBeenCalledWith({type: 'command', message: 'Reloading node testNode...'}); + expect(component.showMessage).toHaveBeenCalledWith({ type: 'command', message: 'Reloading node testNode...' }); expect(mockedNodeService.reload).toHaveBeenCalled(); }); }); diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 2dd0e249..14f1cd04 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -1,4 +1,16 @@ -import { Component, OnInit, AfterViewInit, OnDestroy, Input, ViewChild, ElementRef, Output, EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; +import { + Component, + OnInit, + AfterViewInit, + OnDestroy, + Input, + ViewChild, + ElementRef, + Output, + EventEmitter, + ChangeDetectionStrategy, + ChangeDetectorRef, +} from '@angular/core'; import { Subscription } from 'rxjs'; import { ProjectWebServiceHandler } from '../../../handlers/project-web-service-handler'; import { NodeService } from '../../../services/node.service'; @@ -18,266 +30,277 @@ import { FormControl } from '@angular/forms'; import { version } from '../../../version'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; - @Component({ - changeDetection: ChangeDetectionStrategy.OnPush, - selector: 'app-log-console', - templateUrl: './log-console.component.html', - styleUrls: ['./log-console.component.scss'] + changeDetection: ChangeDetectionStrategy.OnPush, + selector: 'app-log-console', + templateUrl: './log-console.component.html', + styleUrls: ['./log-console.component.scss'], }) export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { - @Input() server: Server; - @Input() project: Project; + @Input() server: Server; + @Input() project: Project; - @ViewChild('console') console: ElementRef; + @ViewChild('console') console: ElementRef; - private version = version; - private nodeSubscription: Subscription; - private linkSubscription: Subscription; - private drawingSubscription: Subscription; - private serverRequestsSubscription: Subscription; - private errorSubscription: Subscription; - private warningSubscription: Subscription; - private infoSubscription: Subscription; + private version = version; + private nodeSubscription: Subscription; + private linkSubscription: Subscription; + private drawingSubscription: Subscription; + private serverRequestsSubscription: Subscription; + private errorSubscription: Subscription; + private warningSubscription: Subscription; + private infoSubscription: Subscription; - public command: string = ''; - public filters: string[] = ['all', 'errors', 'warnings', 'info', 'map updates', 'server requests']; - public selectedFilter: string = 'all'; - public filteredEvents: LogEvent[] = []; + public command: string = ''; + public filters: string[] = ['all', 'errors', 'warnings', 'info', 'map updates', 'server requests']; + public selectedFilter: string = 'all'; + public filteredEvents: LogEvent[] = []; - private regexStart: RegExp = /^start (.*?)$/; - private regexStop: RegExp = /^stop (.*?)$/; - private regexSuspend: RegExp = /^suspend (.*?)$/; - private regexReload: RegExp = /^reload (.*?)$/; - private regexShow: RegExp = /^show (.*?)$/; - private regexConsole: RegExp = /^console (.*?)$/; + private regexStart: RegExp = /^start (.*?)$/; + private regexStop: RegExp = /^stop (.*?)$/; + private regexSuspend: RegExp = /^suspend (.*?)$/; + private regexReload: RegExp = /^reload (.*?)$/; + private regexShow: RegExp = /^show (.*?)$/; + private regexConsole: RegExp = /^console (.*?)$/; - public style: object = {}; - public isDraggingEnabled: boolean = false; - public isLightThemeEnabled: boolean = false; - public selected = new FormControl(0); + public style: object = {}; + public isDraggingEnabled: boolean = false; + public isLightThemeEnabled: boolean = false; + public selected = new FormControl(0); - constructor( - private projectWebServiceHandler: ProjectWebServiceHandler, - private nodeService: NodeService, - private nodesDataSource: NodesDataSource, - private logEventsDataSource: LogEventsDataSource, - private httpService: HttpServer, - private themeService: ThemeService, - private cd: ChangeDetectorRef, - private nodeConsoleService: NodeConsoleService, - private changeDetectorRef: ChangeDetectorRef - ) {} - - ngOnInit() { - this.nodeConsoleService.consoleResized.subscribe(ev => { - this.style = { bottom: '20px', left: '20px', width: `${ev.width}px`, height: `${ev.height - 70}px`}; - this.changeDetectorRef.detectChanges(); - }); + constructor( + private projectWebServiceHandler: ProjectWebServiceHandler, + private nodeService: NodeService, + private nodesDataSource: NodesDataSource, + private logEventsDataSource: LogEventsDataSource, + private httpService: HttpServer, + private themeService: ThemeService, + private cd: ChangeDetectorRef, + private nodeConsoleService: NodeConsoleService, + private changeDetectorRef: ChangeDetectorRef + ) {} - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false - this.style = { bottom: '20px', left: '20px', width: '720px', height: '340px'}; + ngOnInit() { + this.nodeConsoleService.consoleResized.subscribe((ev) => { + this.style = { bottom: '20px', left: '20px', width: `${ev.width}px`, height: `${ev.height - 70}px` }; + this.changeDetectorRef.detectChanges(); + }); - this.nodeSubscription = this.projectWebServiceHandler.nodeNotificationEmitter.subscribe((event) => { - let node: Node = event.event as Node; - let message: string = ''; + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + this.style = { bottom: '20px', left: '20px', width: '720px', height: '340px' }; - if (node.label) { - message = `Event received: ${event.action} - ${this.printNode(node)}.`; + this.nodeSubscription = this.projectWebServiceHandler.nodeNotificationEmitter.subscribe((event) => { + let node: Node = event.event as Node; + let message: string = ''; + + if (node.label) { + message = `Event received: ${event.action} - ${this.printNode(node)}.`; + } else { + message = `Event received: ${event.action} - ${node.name}.`; + } + + this.showMessage({ + type: 'map update', + message: message, + }); + }); + this.linkSubscription = this.projectWebServiceHandler.linkNotificationEmitter.subscribe((event) => { + let link: Link = event.event as Link; + let message = `Event received: ${event.action} - ${this.printLink(link)}.`; + this.showMessage({ + type: 'map update', + message: message, + }); + }); + this.drawingSubscription = this.projectWebServiceHandler.drawingNotificationEmitter.subscribe((event) => { + let drawing: Drawing = event.event as Drawing; + let message = `Event received: ${event.action} - ${this.printDrawing(drawing)}.`; + this.showMessage({ + type: 'map update', + message: message, + }); + }); + this.serverRequestsSubscription = this.httpService.requestsNotificationEmitter.subscribe((message) => { + this.showMessage({ + type: 'server request', + message: message, + }); + }); + this.errorSubscription = this.projectWebServiceHandler.errorNotificationEmitter.subscribe((message) => { + this.showMessage({ + type: 'error', + message: message, + }); + }); + this.warningSubscription = this.projectWebServiceHandler.warningNotificationEmitter.subscribe((message) => { + this.showMessage({ + type: 'warning', + message: message, + }); + }); + this.infoSubscription = this.projectWebServiceHandler.infoNotificationEmitter.subscribe((message) => { + this.showMessage({ + type: 'info', + message: message, + }); + }); + } + + ngAfterViewInit() { + if (this.console.nativeElement) this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; + } + + ngOnDestroy() { + this.nodeSubscription.unsubscribe(); + this.linkSubscription.unsubscribe(); + this.drawingSubscription.unsubscribe(); + this.serverRequestsSubscription.unsubscribe(); + this.errorSubscription.unsubscribe(); + this.warningSubscription.unsubscribe(); + this.infoSubscription.unsubscribe(); + } + + applyFilter(filter: string) { + this.selectedFilter = filter; + this.filteredEvents = this.getFilteredEvents(); + this.cd.detectChanges(); + } + + onKeyDown(event) { + if (event.key === 'Enter') { + this.handleCommand(); + } + } + + handleCommand() { + if (this.command === 'help' || this.command === '') { + this.showCommand( + 'Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.' + ); + } else if (this.command === 'version') { + this.showCommand('Current version: ' + this.version); + } else if (this.command === 'start all') { + this.showCommand('Starting all nodes...'); + this.nodeService.startAll(this.server, this.project).subscribe(() => { + this.showCommand('All nodes started.'); + }); + } else if (this.command === 'stop all') { + this.showCommand('Stopping all nodes...'); + this.nodeService.stopAll(this.server, this.project).subscribe(() => { + this.showCommand('All nodes stopped.'); + }); + } else if (this.command === 'suspend all') { + this.showCommand('Suspending all nodes...'); + this.nodeService.suspendAll(this.server, this.project).subscribe(() => { + this.showCommand('All nodes suspended.'); + }); + } else if (this.command === 'reload all') { + this.showCommand('Reloading all nodes...'); + this.nodeService.reloadAll(this.server, this.project).subscribe(() => { + this.showCommand('All nodes reloaded.'); + }); + } else if ( + this.regexStart.test(this.command) || + this.regexStop.test(this.command) || + this.regexSuspend.test(this.command) || + this.regexReload.test(this.command) || + this.regexShow.test(this.command) || + this.regexConsole.test(this.command) + ) { + let splittedCommand = this.command.split(/[ ,]+/); + let node = this.nodesDataSource.getItems().find((n) => n.name.valueOf() === splittedCommand[1].valueOf()); + if (node) { + if (this.regexStart.test(this.command)) { + this.showCommand(`Starting node ${splittedCommand[1]}...`); + this.nodeService.start(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} started.`)); + } else if (this.regexStop.test(this.command)) { + this.showCommand(`Stopping node ${splittedCommand[1]}...`); + this.nodeService.stop(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} stopped.`)); + } else if (this.regexSuspend.test(this.command)) { + this.showCommand(`Suspending node ${splittedCommand[1]}...`); + this.nodeService.suspend(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} suspended.`)); + } else if (this.regexReload.test(this.command)) { + this.showCommand(`Reloading node ${splittedCommand[1]}...`); + this.nodeService.reload(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} reloaded.`)); + } else if (this.regexConsole.test(this.command)) { + if (node.status === 'started') { + this.showCommand(`Launching console for node ${splittedCommand[1]}...`); + if (node.console_type === 'telnet') { + location.assign( + `gns3+telnet://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + ); + } else if (node.console_type === 'vnc') { + location.assign( + `gns3+vnc://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + ); + } else if (node.console_type === 'spice') { + location.assign( + `gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}` + ); } else { - message = `Event received: ${event.action} - ${node.name}.`; + this.showCommand('Supported console types: telnet, vnc, spice.'); } - - this.showMessage({ - type: 'map update', - message: message - }); - }); - this.linkSubscription = this.projectWebServiceHandler.linkNotificationEmitter.subscribe((event) => { - let link: Link = event.event as Link; - let message = `Event received: ${event.action} - ${this.printLink(link)}.` - this.showMessage({ - type: 'map update', - message: message - }); - }); - this.drawingSubscription = this.projectWebServiceHandler.drawingNotificationEmitter.subscribe((event) => { - let drawing: Drawing = event.event as Drawing; - let message = `Event received: ${event.action} - ${this.printDrawing(drawing)}.` - this.showMessage({ - type: 'map update', - message: message - }); - }); - this.serverRequestsSubscription = this.httpService.requestsNotificationEmitter.subscribe((message) => { - this.showMessage({ - type: 'server request', - message: message - }); - }); - this.errorSubscription = this.projectWebServiceHandler.errorNotificationEmitter.subscribe((message) => { - this.showMessage({ - type: 'error', - message: message - }); - }); - this.warningSubscription = this.projectWebServiceHandler.warningNotificationEmitter.subscribe((message) => { - this.showMessage({ - type: 'warning', - message: message - }); - }); - this.infoSubscription = this.projectWebServiceHandler.infoNotificationEmitter.subscribe((message) => { - this.showMessage({ - type: 'info', - message: message - }); - }); - } - - ngAfterViewInit() { - if (this.console.nativeElement) this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; - } - - ngOnDestroy() { - this.nodeSubscription.unsubscribe(); - this.linkSubscription.unsubscribe(); - this.drawingSubscription.unsubscribe(); - this.serverRequestsSubscription.unsubscribe(); - this.errorSubscription.unsubscribe(); - this.warningSubscription.unsubscribe(); - this.infoSubscription.unsubscribe(); - } - - applyFilter(filter: string) { - this.selectedFilter = filter; - this.filteredEvents = this.getFilteredEvents(); - this.cd.detectChanges(); - } - - onKeyDown(event) { - if (event.key === "Enter") { - this.handleCommand(); + } else { + this.showCommand(`This node must be started before a console can be opened.`); + } + } else if (this.regexShow.test(this.command)) { + this.showCommand(`Information about node ${node.name}:`); + this.showCommand(this.printNode(node)); } + } else { + this.showCommand(`Node with ${splittedCommand[1]} name was not found.`); + } + } else { + this.showCommand(`Unknown syntax: ${this.command}`); } + this.command = ''; + this.cd.detectChanges(); + } - handleCommand() { - if (this.command === 'help' || this.command === '') { - this.showCommand("Available commands: help, version, console {node name}, start all, start {node name}, stop all, stop {node name}, suspend all, suspend {node name}, reload all, reload {node name}, show {node name}.") - } else if (this.command === 'version') { - this.showCommand("Current version: " + this.version); - } else if (this.command === 'start all') { - this.showCommand("Starting all nodes..."); - this.nodeService.startAll(this.server, this.project).subscribe(() => { - this.showCommand("All nodes started.") - }); - } else if (this.command === 'stop all') { - this.showCommand("Stopping all nodes..."); - this.nodeService.stopAll(this.server, this.project).subscribe(() => { - this.showCommand("All nodes stopped.") - }); - } else if (this.command === 'suspend all') { - this.showCommand("Suspending all nodes..."); - this.nodeService.suspendAll(this.server, this.project).subscribe(() => { - this.showCommand("All nodes suspended.") - }); - } else if (this.command === 'reload all') { - this.showCommand("Reloading all nodes..."); - this.nodeService.reloadAll(this.server, this.project).subscribe(() => { - this.showCommand("All nodes reloaded.") - }); - } else if ( - this.regexStart.test(this.command) || this.regexStop.test(this.command) || this.regexSuspend.test(this.command) || this.regexReload.test(this.command) || this.regexShow.test(this.command) || this.regexConsole.test(this.command)) { - let splittedCommand = this.command.split(/[ ,]+/); - let node = this.nodesDataSource.getItems().find(n => n.name.valueOf() === splittedCommand[1].valueOf()); - if (node) { - if (this.regexStart.test(this.command)) { - this.showCommand(`Starting node ${splittedCommand[1]}...`); - this.nodeService.start(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} started.`)); - } - else if (this.regexStop.test(this.command)) { - this.showCommand(`Stopping node ${splittedCommand[1]}...`); - this.nodeService.stop(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} stopped.`)); - } - else if (this.regexSuspend.test(this.command)) { - this.showCommand(`Suspending node ${splittedCommand[1]}...`); - this.nodeService.suspend(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} suspended.`)); - } - else if (this.regexReload.test(this.command)) { - this.showCommand(`Reloading node ${splittedCommand[1]}...`); - this.nodeService.reload(this.server, node).subscribe(() => this.showCommand(`Node ${node.name} reloaded.`)); - } - else if (this.regexConsole.test(this.command)) { - if (node.status === 'started') { - this.showCommand(`Launching console for node ${splittedCommand[1]}...`); - if (node.console_type === "telnet") { - location.assign(`gns3+telnet://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`); - } else if (node.console_type === "vnc") { - location.assign(`gns3+vnc://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`); - } else if(node.console_type === "spice") { - location.assign(`gns3+spice://${node.console_host}:${node.console}?name=${node.name}&project_id=${node.project_id}&node_id=${node.node_id}`); - } else { - this.showCommand("Supported console types: telnet, vnc, spice."); - } - } else { - this.showCommand(`This node must be started before a console can be opened.`); - } - } - else if (this.regexShow.test(this.command)) { - this.showCommand(`Information about node ${node.name}:`); - this.showCommand(this.printNode(node)); - } - } else { - this.showCommand(`Node with ${splittedCommand[1]} name was not found.`); - } - } else { - this.showCommand(`Unknown syntax: ${this.command}`); - } - this.command = ''; - this.cd.detectChanges(); + clearConsole() { + this.filteredEvents = []; + this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; + } + + showCommand(message: string) { + this.showMessage({ + type: 'command', + message: message, + }); + } + + showMessage(event: LogEvent) { + this.logEventsDataSource.add(event); + this.filteredEvents = this.getFilteredEvents(); + this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; + + setTimeout(() => { + this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; + }, 100); + this.cd.detectChanges(); + } + + getFilteredEvents(): LogEvent[] { + if (this.selectedFilter === 'server requests') { + return this.logEventsDataSource.getItems().filter((n) => n.type === 'server request'); + } else if (this.selectedFilter === 'errors') { + return this.logEventsDataSource.getItems().filter((n) => n.type === 'error'); + } else if (this.selectedFilter === 'warnings') { + return this.logEventsDataSource.getItems().filter((n) => n.type === 'warning'); + } else if (this.selectedFilter === 'info') { + return this.logEventsDataSource.getItems().filter((n) => n.type === 'info'); + } else if (this.selectedFilter === 'map updates') { + return this.logEventsDataSource.getItems().filter((n) => n.type === 'map update' || n.type === 'command'); + } else { + return this.logEventsDataSource.getItems(); } + } - clearConsole() { - this.filteredEvents = []; - this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; - } - - showCommand(message: string) { - this.showMessage({ - type: 'command', - message: message - }); - } - - showMessage(event: LogEvent) { - this.logEventsDataSource.add(event); - this.filteredEvents = this.getFilteredEvents(); - this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; - - setTimeout( () => { - this.console.nativeElement.scrollTop = this.console.nativeElement.scrollHeight; - }, 100 ); - this.cd.detectChanges(); - } - - getFilteredEvents(): LogEvent[] { - if (this.selectedFilter === 'server requests') { - return this.logEventsDataSource.getItems().filter(n => n.type === 'server request'); - } else if (this.selectedFilter === 'errors') { - return this.logEventsDataSource.getItems().filter(n => n.type === 'error'); - } else if (this.selectedFilter === 'warnings') { - return this.logEventsDataSource.getItems().filter(n => n.type === 'warning'); - } else if (this.selectedFilter === 'info') { - return this.logEventsDataSource.getItems().filter(n => n.type === 'info'); - } else if (this.selectedFilter === 'map updates') { - return this.logEventsDataSource.getItems().filter(n => n.type === 'map update' || n.type === 'command'); - } else { - return this.logEventsDataSource.getItems(); - } - } - - printNode(node: Node): string { - return `command_line: ${node.command_line}, + printNode(node: Node): string { + return ( + `command_line: ${node.command_line}, compute_id: ${node.compute_id}, console: ${node.console}, console_host: ${node.console_host}, @@ -291,45 +314,48 @@ export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { node_type: ${node.node_type}, port_name_format: ${node.port_name_format}, port_segment_size: ${node.port_segment_size}, ` + - this.printPorts(node.ports) + - `project_id: ${node.project_id}, + this.printPorts(node.ports) + + `project_id: ${node.project_id}, status: ${node.status}, symbol: ${node.symbol}, symbol_url: ${node.symbol_url}, width: ${node.width}, x: ${node.x}, y: ${node.y}, - z: ${node.z}`; - } + z: ${node.z}` + ); + } - printPorts(ports: Port[]): string { - let response: string = `ports: ` - ports.forEach(port => { - response = response + `adapter_number: ${port.adapter_number}, + printPorts(ports: Port[]): string { + let response: string = `ports: `; + ports.forEach((port) => { + response = + response + + `adapter_number: ${port.adapter_number}, link_type: ${port.link_type}, name: ${port.name}, port_number: ${port.port_number}, - short_name: ${port.short_name}, ` - }); - return response; - } + short_name: ${port.short_name}, `; + }); + return response; + } - printLink(link: Link): string { - return `capture_file_name: ${link.capture_file_name}, + printLink(link: Link): string { + return `capture_file_name: ${link.capture_file_name}, capture_file_path: ${link.capture_file_path}, capturing: ${link.capturing}, link_id: ${link.link_id}, link_type: ${link.link_type}, project_id: ${link.project_id}, suspend: ${link.suspend}, `; - } + } - printDrawing(drawing: Drawing): string { - return `drawing_id: ${drawing.drawing_id}, + printDrawing(drawing: Drawing): string { + return `drawing_id: ${drawing.drawing_id}, project_id: ${drawing.project_id}, rotation: ${drawing.rotation}, x: ${drawing.x}, y: ${drawing.y}, z: ${drawing.z}`; - } + } } diff --git a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.html b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.html index 756720fa..20b56767 100644 --- a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.html +++ b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.html @@ -1,23 +1,13 @@
-

{{appliance.name}}

+

{{ appliance.name }}

-
- Vendor: {{appliance.vendor_name}} -
-
- Status: {{appliance.status}} -
-
- Maintainer: {{appliance.maintainer}} -
-
- Adapters: {{appliance.qemu.adapters}} -
-
- Console type: {{appliance.qemu.console_type}} -
+
Vendor: {{ appliance.vendor_name }}
+
Status: {{ appliance.status }}
+
Maintainer: {{ appliance.maintainer }}
+
Adapters: {{ appliance.qemu.adapters }}
+
Console type: {{ appliance.qemu.console_type }}
- +
diff --git a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts index bc69255c..212d855b 100644 --- a/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component.ts @@ -3,18 +3,18 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Appliance } from '../../../../models/appliance'; @Component({ - selector: 'appliance-info-dialog', - templateUrl: 'appliance-info-dialog.component.html', + selector: 'appliance-info-dialog', + templateUrl: 'appliance-info-dialog.component.html', }) export class ApplianceInfoDialogComponent { public appliance: Appliance; - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: any - ) {} - - onNoClick(): void { - this.dialogRef.close(); - } + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) {} + + onNoClick(): void { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html index dd72bc12..ada6fd3e 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html @@ -1,81 +1,91 @@

Add new template

- - Please select how you want to create new template + + Please select how you want to create new template - - Install new appliance from the GNS server
- Import an appliance file - + + Install new appliance from the GNS server
+ Import an appliance file + -
- - -
- +
+ + +
+ - - {{actionTitle}} + + {{ actionTitle }} - -
- - - - - - - {{category}} - - -
+ +
+ + + - - - Name - {{row.name}} - + + + {{ category }} + + +
- - Emulator - {{row.emulator}} - + + + Name + {{ row.name }} + - - Vendor - {{row.vendor_name}} - - - - Actions - - - - - - + + Emulator + {{ row.emulator }} + - - - - - - + - - + + - - - - + + + + +
+ + + +
+ + + + {{ secondActionTitle }} + + + Please configure GNS3 VM to install selected appliance + + + +
- - - + Server type
+ + Install the appliance locally + Install the appliance on the GNS3 VM +
- - - - {{secondActionTitle}} - - - Please configure GNS3 VM to install selected appliance - - - -
-
- Server type
- - Install the appliance locally - Install the appliance on the GNS3 VM - -
-
- Qemu binary
- - - {{binary.path}} - - -
-
- Install required files -
-
-
-
- {{applianceToInstall.name}} version {{version.name}} - -
- -
-
- -
- - {{version.images.hda_disk_image}} - - -
- check - close - - - - -
-
- -
- - {{version.images.hdb_disk_image}} - - -
- check - close - - - - -
-
-
-
-
-
- -
-
- Server type
- - Install the appliance locally - Install the appliance on the GNS3 VM - -
- -
- -
-
- Server type
- - Install the appliance locally - Install the appliance on the GNS3 VM - -
-
- Install required files -
- - -
-
- {{image.filename}} -
-
- - - -
-
- - -
-
- -
-
- Server type
- - Install the appliance locally - Install the appliance on the GNS3 VM - -
-
- Install required files -
- - -
-
- {{image.filename}} -
-
- - - -
-
- - -
-
- -
- - + Qemu binary
+ + + {{ binary.path }} + +
- +
+ Install required files +
+
+
+
+ {{ applianceToInstall.name }} version {{ version.name }} + +
+ +
+
+ +
+ + {{ version.images.hda_disk_image }} + + +
+ check + close + + + + +
+
+ +
+ + {{ version.images.hdb_disk_image }} + + +
+ check + close + + + + +
+
+
+
+
+
+ +
+
+ Server type
+ + Install the appliance locally + Install the appliance on the GNS3 VM + +
+ +
+ +
+
+ Server type
+ + Install the appliance locally + Install the appliance on the GNS3 VM + +
+
+ Install required files +
+ + +
+
+ {{ image.filename }} +
+
+ + + +
+
+ + +
+
+ +
+
+ Server type
+ + Install the appliance locally + Install the appliance on the GNS3 VM + +
+
+ Install required files +
+ + +
+
+ {{ image.filename }} +
+
+ + + +
+
+ + +
+
+ + +
+ + +
+ diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.scss b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.scss index 0637da95..20491523 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.scss +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.scss @@ -1,73 +1,73 @@ .radio-button { - margin-bottom: 30px; + margin-bottom: 30px; } .tableHeader { - width: 100%; + width: 100%; } .filter-field { - width: 100%; + width: 100%; } .example-container { - display: flex; - flex-direction: column; - max-height: 500px; - min-width: 300px; + display: flex; + flex-direction: column; + max-height: 500px; + min-width: 300px; } .mat-table { - overflow: auto; - max-height: 500px; + overflow: auto; + max-height: 500px; } .element-row { - position: relative; + position: relative; } .element-row:not(.expanded) { - cursor: pointer; + cursor: pointer; } .element-row:not(.expanded):hover { - background: #f5f5f5; + background: #f5f5f5; } .element-row.expanded { - border-bottom-color: transparent; + border-bottom-color: transparent; } .list-item { - display: flex; - justify-content: space-between; - width: 100%; - margin-bottom: 15px; + display: flex; + justify-content: space-between; + width: 100%; + margin-bottom: 15px; } .list-item-inside { - display: flex; - justify-content: space-between; - width: 100%; - padding-left: 30px; - margin-bottom: 15px; + display: flex; + justify-content: space-between; + width: 100%; + padding-left: 30px; + margin-bottom: 15px; } .button { - margin-left: 10px; + margin-left: 10px; } .create-button { - width: 100%; - margin-top: 10px; - margin-bottom: 10px; + width: 100%; + margin-top: 10px; + margin-bottom: 10px; } .radio-button { - width: 50%; - padding-top: 20px; + width: 50%; + padding-top: 20px; } .selection-group { - padding-bottom: 20px; + padding-bottom: 20px; } diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts index 274f9dd2..6a5587fe 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts @@ -33,649 +33,671 @@ import { TemplateNameDialogComponent } from './template-name-dialog/template-nam import * as SparkMD5 from 'spark-md5'; @Component({ - selector: 'app-new-template-dialog', - templateUrl: './new-template-dialog.component.html', - styleUrls: ['./new-template-dialog.component.scss'], - animations: [ - trigger('detailExpand', [ - state('collapsed', style({ height: '0px', minHeight: '0', visibility: 'hidden' })), - state('expanded', style({ height: '*', visibility: 'visible' })), - transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), - ]), - ], + selector: 'app-new-template-dialog', + templateUrl: './new-template-dialog.component.html', + styleUrls: ['./new-template-dialog.component.scss'], + animations: [ + trigger('detailExpand', [ + state('collapsed', style({ height: '0px', minHeight: '0', visibility: 'hidden' })), + state('expanded', style({ height: '*', visibility: 'visible' })), + transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), + ]), + ], }) export class NewTemplateDialogComponent implements OnInit { - @Input() server: Server; - @Input() project: Project; + @Input() server: Server; + @Input() project: Project; - uploader: FileUploader; - uploaderImage: FileUploader; + uploader: FileUploader; + uploaderImage: FileUploader; - public action: string = 'install'; - public actionTitle: string = 'Install appliance from server'; - public secondActionTitle: string = 'Appliance settings'; + public action: string = 'install'; + public actionTitle: string = 'Install appliance from server'; + public secondActionTitle: string = 'Appliance settings'; - public searchText: string = ''; - public allAppliances: Appliance[] = []; - public appliances: Appliance[] = []; - public applianceToInstall: Appliance; - public selectedImages: any[]; + public searchText: string = ''; + public allAppliances: Appliance[] = []; + public appliances: Appliance[] = []; + public applianceToInstall: Appliance; + public selectedImages: any[]; - public isGns3VmAvailable = false; - public isLinuxPlatform = false; + public isGns3VmAvailable = false; + public isLinuxPlatform = false; - private isGns3VmChosen = false; - private isLocalComputerChosen = false; + private isGns3VmChosen = false; + private isLocalComputerChosen = false; - public qemuBinaries: QemuBinary[] = []; - public selectedBinary: QemuBinary; + public qemuBinaries: QemuBinary[] = []; + public selectedBinary: QemuBinary; - public categories: string[] = ['all categories', 'router', 'multilayer_switch', 'guest', 'firewall']; - public category: string = 'all categories'; - public displayedColumns: string[] = ['name', 'emulator', 'vendor', 'actions']; + public categories: string[] = ['all categories', 'router', 'multilayer_switch', 'guest', 'firewall']; + public category: string = 'all categories'; + public displayedColumns: string[] = ['name', 'emulator', 'vendor', 'actions']; - public dataSource: MatTableDataSource; + public dataSource: MatTableDataSource; - private qemuImages: Image[] = []; - private iosImages: Image[] = []; - private iouImages: Image[] = []; + private qemuImages: Image[] = []; + private iosImages: Image[] = []; + private iouImages: Image[] = []; - private templates: Template[] = []; + private templates: Template[] = []; - @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; - @ViewChild('stepper', {static: true}) stepper: MatStepper; + @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; + @ViewChild('stepper', { static: true }) stepper: MatStepper; - constructor( - public dialogRef: MatDialogRef, - private applianceService: ApplianceService, - private changeDetector: ChangeDetectorRef, - private toasterService: ToasterService, - private qemuService: QemuService, - private dockerService: DockerService, - private iosService: IosService, - private iouService: IouService, - private templateService: TemplateService, - public dialog: MatDialog, - private computeService: ComputeService, - private changeDetectorRef: ChangeDetectorRef, - private progressService: ProgressService - ) {} + constructor( + public dialogRef: MatDialogRef, + private applianceService: ApplianceService, + private changeDetector: ChangeDetectorRef, + private toasterService: ToasterService, + private qemuService: QemuService, + private dockerService: DockerService, + private iosService: IosService, + private iouService: IouService, + private templateService: TemplateService, + public dialog: MatDialog, + private computeService: ComputeService, + private changeDetectorRef: ChangeDetectorRef, + private progressService: ProgressService + ) {} - ngOnInit() { - this.templateService.list(this.server).subscribe((templates) => { - this.templates = templates; - }); - - this.computeService.getComputes(this.server).subscribe((computes) => { - computes.forEach(compute => { - if (compute.compute_id === 'vm') { - this.isGns3VmAvailable = true; - this.isGns3VmChosen = true; - } - if (compute.capabilities.platform === 'linux') this.isLinuxPlatform = true; - }) - }); + ngOnInit() { + this.templateService.list(this.server).subscribe((templates) => { + this.templates = templates; + }); - this.qemuService.getImages(this.server).subscribe((qemuImages) => { - this.qemuImages = qemuImages; - }); - - this.iosService.getImages(this.server).subscribe((iosImages) => { - this.iosImages = iosImages; - }); - - this.iouService.getImages(this.server).subscribe((iouImages) => { - this.iouImages = iouImages; - }); - - this.applianceService.getAppliances(this.server).subscribe((appliances) => { - this.appliances = appliances; - this.appliances.forEach(appliance => { - if (appliance.docker) appliance.emulator = 'Docker'; - if (appliance.dynamips) appliance.emulator = 'Dynamips'; - if (appliance.iou) appliance.emulator = 'Iou'; - if (appliance.qemu) appliance.emulator = 'Qemu'; - }); - this.allAppliances = appliances; - this.dataSource = new MatTableDataSource(this.allAppliances); - this.dataSource.paginator = this.paginator; - }); - - this.qemuService.getBinaries(this.server).subscribe((binaries) => { - this.qemuBinaries = binaries; - }); - - this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { - file.withCredentials = false; - }; - - this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error has occured'); - }; - - this.uploader.onSuccessItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.success('Appliance imported succesfully'); - this.getAppliance(item.url); - }; - - this.uploaderImage = new FileUploader({}); - this.uploaderImage.onAfterAddingFile = file => { - file.withCredentials = false; - }; - - this.uploaderImage.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.error('An error has occured'); - this.progressService.deactivate(); - this.uploaderImage.clearQueue(); - }; - - this.uploaderImage.onSuccessItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { - this.toasterService.success('Image imported succesfully'); - this.refreshImages(); - this.progressService.deactivate(); - this.uploaderImage.clearQueue(); - }; - } - - updateAppliances() { - this.progressService.activate(); - this.applianceService.updateAppliances(this.server).subscribe((appliances) => { - this.appliances = appliances; - this.progressService.deactivate(); - this.toasterService.success('Appliances are up-to-date.'); - }, error => { - this.progressService.deactivate(); - this.toasterService.error('Appliances were not updated correctly.'); - }); - } - - refreshImages() { - this.qemuService.getImages(this.server).subscribe((qemuImages) => { - this.qemuImages = qemuImages; - }); - - this.iosService.getImages(this.server).subscribe((iosImages) => { - this.iosImages = iosImages; - }); - - this.iouService.getImages(this.server).subscribe((iouImages) => { - this.iouImages = iouImages; - }); - } - - getAppliance(url: string) { - let str = url.split('/v2'); - let appliancePath = str[str.length-1]; - this.applianceService.getAppliance(this.server, appliancePath).subscribe((appliance: Appliance) => { - this.applianceToInstall = appliance; - setTimeout(() => { - this.stepper.next(); - }, 100); - }); - } - - addAppliance(event): void { - let name = event.target.files[0].name.split('-')[0]; - let fileName = event.target.files[0].name; - let file = event.target.files[0]; - let fileReader: FileReader = new FileReader(); - let emulator; - - fileReader.onloadend = () => { - let appliance = JSON.parse(fileReader.result as string); - - if (appliance.docker) emulator = 'docker'; - if (appliance.dynamips) emulator = 'dynamips'; - if (appliance.iou) emulator = 'iou'; - if (appliance.qemu) emulator = 'qemu'; - - const url = this.applianceService.getUploadPath(this.server, emulator, fileName); - this.uploader.queue.forEach(elem => (elem.url = url)); - - const itemToUpload = this.uploader.queue[0]; - (itemToUpload as any).options.disableMultipart = true; - - this.uploader.uploadItem(itemToUpload); - }; - - fileReader.readAsText(file); - } - - filterAppliances(event) { - let temporaryAppliances = this.allAppliances.filter(item => { - return item.name.toLowerCase().includes(this.searchText.toLowerCase()); - }); - - if (this.category === 'all categories' || !this.category) { - this.appliances = temporaryAppliances; - } else { - this.appliances = temporaryAppliances.filter(t => t.category === this.category); + this.computeService.getComputes(this.server).subscribe((computes) => { + computes.forEach((compute) => { + if (compute.compute_id === 'vm') { + this.isGns3VmAvailable = true; + this.isGns3VmChosen = true; } + if (compute.capabilities.platform === 'linux') this.isLinuxPlatform = true; + }); + }); - this.dataSource = new MatTableDataSource(this.appliances); - this.dataSource.paginator = this.paginator; + this.qemuService.getImages(this.server).subscribe((qemuImages) => { + this.qemuImages = qemuImages; + }); + + this.iosService.getImages(this.server).subscribe((iosImages) => { + this.iosImages = iosImages; + }); + + this.iouService.getImages(this.server).subscribe((iouImages) => { + this.iouImages = iouImages; + }); + + this.applianceService.getAppliances(this.server).subscribe((appliances) => { + this.appliances = appliances; + this.appliances.forEach((appliance) => { + if (appliance.docker) appliance.emulator = 'Docker'; + if (appliance.dynamips) appliance.emulator = 'Dynamips'; + if (appliance.iou) appliance.emulator = 'Iou'; + if (appliance.qemu) appliance.emulator = 'Qemu'; + }); + this.allAppliances = appliances; + this.dataSource = new MatTableDataSource(this.allAppliances); + this.dataSource.paginator = this.paginator; + }); + + this.qemuService.getBinaries(this.server).subscribe((binaries) => { + this.qemuBinaries = binaries; + }); + + this.uploader = new FileUploader({}); + this.uploader.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; + + this.uploader.onErrorItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => { + this.toasterService.error('An error has occured'); + }; + + this.uploader.onSuccessItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.toasterService.success('Appliance imported succesfully'); + this.getAppliance(item.url); + }; + + this.uploaderImage = new FileUploader({}); + this.uploaderImage.onAfterAddingFile = (file) => { + file.withCredentials = false; + }; + + this.uploaderImage.onErrorItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.toasterService.error('An error has occured'); + this.progressService.deactivate(); + this.uploaderImage.clearQueue(); + }; + + this.uploaderImage.onSuccessItem = ( + item: FileItem, + response: string, + status: number, + headers: ParsedResponseHeaders + ) => { + this.toasterService.success('Image imported succesfully'); + this.refreshImages(); + this.progressService.deactivate(); + this.uploaderImage.clearQueue(); + }; + } + + updateAppliances() { + this.progressService.activate(); + this.applianceService.updateAppliances(this.server).subscribe( + (appliances) => { + this.appliances = appliances; + this.progressService.deactivate(); + this.toasterService.success('Appliances are up-to-date.'); + }, + (error) => { + this.progressService.deactivate(); + this.toasterService.error('Appliances were not updated correctly.'); + } + ); + } + + refreshImages() { + this.qemuService.getImages(this.server).subscribe((qemuImages) => { + this.qemuImages = qemuImages; + }); + + this.iosService.getImages(this.server).subscribe((iosImages) => { + this.iosImages = iosImages; + }); + + this.iouService.getImages(this.server).subscribe((iouImages) => { + this.iouImages = iouImages; + }); + } + + getAppliance(url: string) { + let str = url.split('/v2'); + let appliancePath = str[str.length - 1]; + this.applianceService.getAppliance(this.server, appliancePath).subscribe((appliance: Appliance) => { + this.applianceToInstall = appliance; + setTimeout(() => { + this.stepper.next(); + }, 100); + }); + } + + addAppliance(event): void { + let name = event.target.files[0].name.split('-')[0]; + let fileName = event.target.files[0].name; + let file = event.target.files[0]; + let fileReader: FileReader = new FileReader(); + let emulator; + + fileReader.onloadend = () => { + let appliance = JSON.parse(fileReader.result as string); + + if (appliance.docker) emulator = 'docker'; + if (appliance.dynamips) emulator = 'dynamips'; + if (appliance.iou) emulator = 'iou'; + if (appliance.qemu) emulator = 'qemu'; + + const url = this.applianceService.getUploadPath(this.server, emulator, fileName); + this.uploader.queue.forEach((elem) => (elem.url = url)); + + const itemToUpload = this.uploader.queue[0]; + (itemToUpload as any).options.disableMultipart = true; + + this.uploader.uploadItem(itemToUpload); + }; + + fileReader.readAsText(file); + } + + filterAppliances(event) { + let temporaryAppliances = this.allAppliances.filter((item) => { + return item.name.toLowerCase().includes(this.searchText.toLowerCase()); + }); + + if (this.category === 'all categories' || !this.category) { + this.appliances = temporaryAppliances; + } else { + this.appliances = temporaryAppliances.filter((t) => t.category === this.category); } - setAction(action: string) { - this.action = action; - if (action === 'install') { - this.actionTitle = 'Install appliance from server'; - } else if (action === 'import') { - this.actionTitle = 'Import an appliance file'; - } + this.dataSource = new MatTableDataSource(this.appliances); + this.dataSource.paginator = this.paginator; + } + + setAction(action: string) { + this.action = action; + if (action === 'install') { + this.actionTitle = 'Install appliance from server'; + } else if (action === 'import') { + this.actionTitle = 'Import an appliance file'; } + } - setServerType(serverType: string) { - if (serverType === 'gns3 vm') { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; - this.isLocalComputerChosen = true; - } + setServerType(serverType: string) { + if (serverType === 'gns3 vm') { + this.isGns3VmChosen = true; + this.isLocalComputerChosen = false; + } else { + this.isGns3VmChosen = false; + this.isLocalComputerChosen = true; } + } - sortData(sort: Sort) { - if (!sort.active || sort.direction === '') return; + sortData(sort: Sort) { + if (!sort.active || sort.direction === '') return; - let appliances = this.appliances.slice(); - this.appliances = appliances.sort((a, b) => { - const isAsc = sort.direction === 'asc'; - if (sort.active === 'name') { - return compareNames(a.name, b.name, isAsc); - } else if (sort.active === 'emulator') { - return compareNames(a.emulator, b.emulator, isAsc); - } else if (sort.active === 'vendor') { - return compareNames(a.vendor_name, b.vendor_name, isAsc); - } else return 0; - }); - } + let appliances = this.appliances.slice(); + this.appliances = appliances.sort((a, b) => { + const isAsc = sort.direction === 'asc'; + if (sort.active === 'name') { + return compareNames(a.name, b.name, isAsc); + } else if (sort.active === 'emulator') { + return compareNames(a.emulator, b.emulator, isAsc); + } else if (sort.active === 'vendor') { + return compareNames(a.vendor_name, b.vendor_name, isAsc); + } else return 0; + }); + } - onCloseClick() { - this.dialogRef.close(); - } + onCloseClick() { + this.dialogRef.close(); + } - install(object: Appliance) { - this.applianceToInstall = object; + install(object: Appliance) { + this.applianceToInstall = object; + setTimeout(() => { + this.stepper.next(); + if (this.applianceToInstall.qemu) { setTimeout(() => { - this.stepper.next(); - if (this.applianceToInstall.qemu) { - setTimeout(() => { - if (this.qemuBinaries.length) { - if (this.applianceToInstall.qemu.arch === 'x86_64') { - let filtered_binaries = this.qemuBinaries.filter(n => n.path.includes('qemu-system-x86_64')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else if (this.applianceToInstall.qemu.arch === 'i386') { - let filtered_binaries = this.qemuBinaries.filter(n => n.path.includes('qemu-system-i386')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else if (this.applianceToInstall.qemu.arch === 'x86_64') { - let filtered_binaries = this.qemuBinaries.filter(n => n.path.includes('qemu-system-arm')); - if (filtered_binaries.length) { - this.selectedBinary = filtered_binaries[0]; - } - } else { - this.selectedBinary = this.qemuBinaries[0]; - } - } - }, 100); + if (this.qemuBinaries.length) { + if (this.applianceToInstall.qemu.arch === 'x86_64') { + let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-x86_64')); + if (filtered_binaries.length) { + this.selectedBinary = filtered_binaries[0]; + } + } else if (this.applianceToInstall.qemu.arch === 'i386') { + let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-i386')); + if (filtered_binaries.length) { + this.selectedBinary = filtered_binaries[0]; + } + } else if (this.applianceToInstall.qemu.arch === 'x86_64') { + let filtered_binaries = this.qemuBinaries.filter((n) => n.path.includes('qemu-system-arm')); + if (filtered_binaries.length) { + this.selectedBinary = filtered_binaries[0]; + } + } else { + this.selectedBinary = this.qemuBinaries[0]; } + } }, 100); - } + } + }, 100); + } - showInfo(object: Appliance) { - let dialogRef = this.dialog.open(ApplianceInfoDialogComponent, { - width: '250px', - data: {appliance: object} - }); - dialogRef.componentInstance.appliance = object; - } + showInfo(object: Appliance) { + let dialogRef = this.dialog.open(ApplianceInfoDialogComponent, { + width: '250px', + data: { appliance: object }, + }); + dialogRef.componentInstance.appliance = object; + } - importImage(event, imageName) { - this.progressService.activate(); - this.computeChecksumMd5(event.target.files[0], false).then((output) => { - let imageToInstall = this.applianceToInstall.images.filter(n => n.filename === imageName)[0]; + importImage(event, imageName) { + this.progressService.activate(); + this.computeChecksumMd5(event.target.files[0], false).then((output) => { + let imageToInstall = this.applianceToInstall.images.filter((n) => n.filename === imageName)[0]; - if (imageToInstall.md5sum !== output) { - this.progressService.deactivate(); - const dialogRef = this.dialog.open(InformationDialogComponent, { - width: '400px', - height: '200px', - autoFocus: false, - disableClose: true - }); - dialogRef.componentInstance.confirmationMessage = `This is not the correct file. - The MD5 sum is ${output} and should be ${imageToInstall.md5sum}. Do you want to accept it at your own risks?`; - dialogRef.afterClosed().subscribe((answer: boolean) => { - if (answer) { - this.importImageFile(event) - } else { - this.uploaderImage.clearQueue(); - } - }); - } else { - this.importImageFile(event); - } - }); - } - - importImageFile(event) { - let name = event.target.files[0].name.split('-')[0]; - let fileName = event.target.files[0].name; - let file = event.target.files[0]; - let fileReader: FileReader = new FileReader(); - let emulator; - - fileReader.onloadend = () => { - if (this.applianceToInstall.qemu) emulator = 'qemu'; - if (this.applianceToInstall.dynamips) emulator = 'dynamips'; - if (this.applianceToInstall.iou) emulator = 'iou'; - - const url = this.applianceService.getUploadPath(this.server, emulator, fileName); - this.uploaderImage.queue.forEach(elem => (elem.url = url)); - - const itemToUpload = this.uploaderImage.queue[0]; - (itemToUpload as any).options.disableMultipart = true; - - this.uploaderImage.uploadItem(itemToUpload); - this.progressService.activate(); - }; - - fileReader.readAsText(file); - } - - checkImageFromVersion(image: string): boolean { - let imageToInstall = this.applianceToInstall.images.filter(n => n.filename === image)[0]; - if (this.applianceToInstall.qemu) { - if (this.qemuImages.filter(n => n.md5sum === imageToInstall.md5sum).length > 0) return true; - } else if (this.applianceToInstall.dynamips) { - if (this.iosImages.filter(n => n.md5sum === imageToInstall.md5sum).length > 0) return true; - } else if (this.applianceToInstall.iou) { - if (this.iouImages.filter(n => n.md5sum === imageToInstall.md5sum).length > 0) return true; - } - - return false; - } - - checkImages(version: Version): boolean { - if (version.images.hdb_disk_image) { - if (this.checkImageFromVersion(version.images.hda_disk_image) && this.checkImageFromVersion(version.images.hdb_disk_image)) return true; - return false; - } - - if (this.checkImageFromVersion(version.images.hda_disk_image)) return true; - return false; - } - - openConfirmationDialog(message: string, link: string) { + if (imageToInstall.md5sum !== output) { + this.progressService.deactivate(); const dialogRef = this.dialog.open(InformationDialogComponent, { - width: '400px', - height: '200px', - autoFocus: false, - disableClose: true + width: '400px', + height: '200px', + autoFocus: false, + disableClose: true, }); - dialogRef.componentInstance.confirmationMessage = message; - + dialogRef.componentInstance.confirmationMessage = `This is not the correct file. + The MD5 sum is ${output} and should be ${imageToInstall.md5sum}. Do you want to accept it at your own risks?`; dialogRef.afterClosed().subscribe((answer: boolean) => { - if (answer) { - window.open(link); - } + if (answer) { + this.importImageFile(event); + } else { + this.uploaderImage.clearQueue(); + } }); + } else { + this.importImageFile(event); + } + }); + } + + importImageFile(event) { + let name = event.target.files[0].name.split('-')[0]; + let fileName = event.target.files[0].name; + let file = event.target.files[0]; + let fileReader: FileReader = new FileReader(); + let emulator; + + fileReader.onloadend = () => { + if (this.applianceToInstall.qemu) emulator = 'qemu'; + if (this.applianceToInstall.dynamips) emulator = 'dynamips'; + if (this.applianceToInstall.iou) emulator = 'iou'; + + const url = this.applianceService.getUploadPath(this.server, emulator, fileName); + this.uploaderImage.queue.forEach((elem) => (elem.url = url)); + + const itemToUpload = this.uploaderImage.queue[0]; + (itemToUpload as any).options.disableMultipart = true; + + this.uploaderImage.uploadItem(itemToUpload); + this.progressService.activate(); + }; + + fileReader.readAsText(file); + } + + checkImageFromVersion(image: string): boolean { + let imageToInstall = this.applianceToInstall.images.filter((n) => n.filename === image)[0]; + if (this.applianceToInstall.qemu) { + if (this.qemuImages.filter((n) => n.md5sum === imageToInstall.md5sum).length > 0) return true; + } else if (this.applianceToInstall.dynamips) { + if (this.iosImages.filter((n) => n.md5sum === imageToInstall.md5sum).length > 0) return true; + } else if (this.applianceToInstall.iou) { + if (this.iouImages.filter((n) => n.md5sum === imageToInstall.md5sum).length > 0) return true; } - downloadImage(image: Image) { - const directDownloadMessage: string = "Download will redirect you where the required file can be downloaded, you may have to be registered with the vendor in order to download the file."; - const compressionMessage: string = `The file is compressed with ${image.compression}, it must be uncompressed first.`; + return false; + } - if (image.direct_download_url) { - if (image.compression) { - this.openConfirmationDialog(compressionMessage, image.direct_download_url); - } else { - window.open(image.direct_download_url); - } + checkImages(version: Version): boolean { + if (version.images.hdb_disk_image) { + if ( + this.checkImageFromVersion(version.images.hda_disk_image) && + this.checkImageFromVersion(version.images.hdb_disk_image) + ) + return true; + return false; + } + + if (this.checkImageFromVersion(version.images.hda_disk_image)) return true; + return false; + } + + openConfirmationDialog(message: string, link: string) { + const dialogRef = this.dialog.open(InformationDialogComponent, { + width: '400px', + height: '200px', + autoFocus: false, + disableClose: true, + }); + dialogRef.componentInstance.confirmationMessage = message; + + dialogRef.afterClosed().subscribe((answer: boolean) => { + if (answer) { + window.open(link); + } + }); + } + + downloadImage(image: Image) { + const directDownloadMessage: string = + 'Download will redirect you where the required file can be downloaded, you may have to be registered with the vendor in order to download the file.'; + const compressionMessage: string = `The file is compressed with ${image.compression}, it must be uncompressed first.`; + + if (image.direct_download_url) { + if (image.compression) { + this.openConfirmationDialog(compressionMessage, image.direct_download_url); + } else { + window.open(image.direct_download_url); + } + } else { + this.openConfirmationDialog(directDownloadMessage, image.download_url); + } + } + + downloadImageFromVersion(image: string) { + this.applianceToInstall.images.forEach((n) => { + if (n.filename === image) this.downloadImage(n); + }); + } + + getCategory() { + if (this.applianceToInstall.category === 'multilayer_switch') { + return 'switch'; + } + return this.applianceToInstall.category; + } + + createIouTemplate(image: Image) { + let iouTemplate: IouTemplate = new IouTemplate(); + iouTemplate.nvram = this.applianceToInstall.iou.nvram; + iouTemplate.ram = this.applianceToInstall.iou.ram; + iouTemplate.ethernet_adapters = this.applianceToInstall.iou.ethernet_adapters; + iouTemplate.serial_adapters = this.applianceToInstall.iou.serial_adapters; + iouTemplate.startup_config = this.applianceToInstall.iou.startup_config; + iouTemplate.builtin = this.applianceToInstall.builtin; + iouTemplate.category = this.getCategory(); + iouTemplate.default_name_format = this.applianceToInstall.port_name_format; + iouTemplate.symbol = this.applianceToInstall.symbol; + iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + iouTemplate.template_id = uuid(); + iouTemplate.path = image.filename; + iouTemplate.template_type = 'iou'; + + const dialogRef = this.dialog.open(TemplateNameDialogComponent, { + width: '400px', + height: '250px', + autoFocus: false, + disableClose: true, + data: { + name: this.applianceToInstall.name, + }, + }); + dialogRef.componentInstance.server = this.server; + dialogRef.afterClosed().subscribe((answer: string) => { + if (answer) { + iouTemplate.name = answer; + + this.iouService.addTemplate(this.server, iouTemplate).subscribe((template) => { + this.templateService.newTemplateCreated.next(template); + this.toasterService.success('Template added'); + this.dialogRef.close(); + }); + } else { + return false; + } + }); + } + + createIosTemplate(image: Image) { + let iosTemplate: IosTemplate = new IosTemplate(); + iosTemplate.chassis = this.applianceToInstall.dynamips.chassis; + iosTemplate.nvram = this.applianceToInstall.dynamips.nvram; + iosTemplate.platform = this.applianceToInstall.dynamips.platform; + iosTemplate.ram = this.applianceToInstall.dynamips.ram; + iosTemplate.startup_config = this.applianceToInstall.dynamips.startup_config; + iosTemplate.slot0 = this.applianceToInstall.dynamips.slot0; + iosTemplate.slot1 = this.applianceToInstall.dynamips.slot1; + iosTemplate.slot2 = this.applianceToInstall.dynamips.slot2; + iosTemplate.slot3 = this.applianceToInstall.dynamips.slot3; + iosTemplate.slot4 = this.applianceToInstall.dynamips.slot4; + iosTemplate.slot5 = this.applianceToInstall.dynamips.slot5; + iosTemplate.slot6 = this.applianceToInstall.dynamips.slot6; + iosTemplate.slot7 = this.applianceToInstall.dynamips.slot7; + iosTemplate.builtin = this.applianceToInstall.builtin; + iosTemplate.category = this.getCategory(); + iosTemplate.default_name_format = this.applianceToInstall.port_name_format; + iosTemplate.symbol = this.applianceToInstall.symbol; + iosTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + iosTemplate.template_id = uuid(); + iosTemplate.image = image.filename; + iosTemplate.template_type = 'dynamips'; + + const dialogRef = this.dialog.open(TemplateNameDialogComponent, { + width: '400px', + height: '250px', + autoFocus: false, + disableClose: true, + data: { + name: this.applianceToInstall.name, + }, + }); + dialogRef.componentInstance.server = this.server; + dialogRef.afterClosed().subscribe((answer: string) => { + if (answer) { + iosTemplate.name = answer; + + this.iosService.addTemplate(this.server, iosTemplate).subscribe((template) => { + this.templateService.newTemplateCreated.next((template as any) as Template); + this.toasterService.success('Template added'); + this.dialogRef.close(); + }); + } else { + return false; + } + }); + } + + createDockerTemplate() { + let dockerTemplate: DockerTemplate = new DockerTemplate(); + dockerTemplate.adapters = this.applianceToInstall.docker.adapters; + dockerTemplate.console_type = this.applianceToInstall.docker.console_type; + dockerTemplate.builtin = this.applianceToInstall.builtin; + dockerTemplate.category = this.getCategory(); + dockerTemplate.default_name_format = this.applianceToInstall.port_name_format; + dockerTemplate.symbol = this.applianceToInstall.symbol; + dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + dockerTemplate.template_id = uuid(); + dockerTemplate.image = this.applianceToInstall.docker.image; + dockerTemplate.template_type = 'docker'; + + const dialogRef = this.dialog.open(TemplateNameDialogComponent, { + width: '400px', + height: '250px', + autoFocus: false, + disableClose: true, + data: { + name: this.applianceToInstall.name, + }, + }); + dialogRef.componentInstance.server = this.server; + dialogRef.afterClosed().subscribe((answer: string) => { + if (answer) { + dockerTemplate.name = answer; + + this.dockerService.addTemplate(this.server, dockerTemplate).subscribe((template) => { + this.templateService.newTemplateCreated.next((template as any) as Template); + this.toasterService.success('Template added'); + this.dialogRef.close(); + }); + } else { + return false; + } + }); + } + + createQemuTemplateFromVersion(version: Version) { + if (!this.checkImages(version)) { + this.toasterService.error('Please install required images first'); + return; + } + + if (!this.selectedBinary) { + this.toasterService.error('Please select QEMU binary first'); + return; + } + + let qemuTemplate: QemuTemplate = new QemuTemplate(); + qemuTemplate.ram = this.applianceToInstall.qemu.ram; + qemuTemplate.adapters = this.applianceToInstall.qemu.adapters; + qemuTemplate.adapter_type = this.applianceToInstall.qemu.adapter_type; + qemuTemplate.boot_priority = this.applianceToInstall.qemu.boot_priority; + qemuTemplate.console_type = this.applianceToInstall.qemu.console_type; + qemuTemplate.hda_disk_interface = this.applianceToInstall.qemu.hda_disk_interface; + qemuTemplate.hdb_disk_interface = this.applianceToInstall.qemu.hdb_disk_interface; + qemuTemplate.hdc_disk_interface = this.applianceToInstall.qemu.hdc_disk_interface; + qemuTemplate.hdd_disk_interface = this.applianceToInstall.qemu.hdd_disk_interface; + qemuTemplate.builtin = this.applianceToInstall.builtin; + qemuTemplate.category = this.getCategory(); + qemuTemplate.first_port_name = this.applianceToInstall.first_port_name; + qemuTemplate.port_name_format = this.applianceToInstall.port_name_format; + qemuTemplate.symbol = this.applianceToInstall.symbol; + qemuTemplate.qemu_path = this.selectedBinary.path; + qemuTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + qemuTemplate.template_id = uuid(); + qemuTemplate.hda_disk_image = version.images.hda_disk_image; + qemuTemplate.hdb_disk_image = version.images.hdb_disk_image; + qemuTemplate.template_type = 'qemu'; + qemuTemplate.usage = this.applianceToInstall.usage; + + const dialogRef = this.dialog.open(TemplateNameDialogComponent, { + width: '400px', + height: '250px', + autoFocus: false, + disableClose: true, + data: { + name: this.applianceToInstall.name, + }, + }); + dialogRef.componentInstance.server = this.server; + dialogRef.afterClosed().subscribe((answer: string) => { + if (answer) { + qemuTemplate.name = answer; + + this.qemuService.addTemplate(this.server, qemuTemplate).subscribe((template) => { + this.templateService.newTemplateCreated.next((template as any) as Template); + this.toasterService.success('Template added'); + this.dialogRef.close(); + }); + } else { + return false; + } + }); + } + + private computeChecksumMd5(file: File, encode = false): Promise { + return new Promise((resolve, reject) => { + const chunkSize = 2097152; + const spark = new SparkMD5.ArrayBuffer(); + const fileReader = new FileReader(); + let cursor = 0; + + fileReader.onerror = function (): void { + reject('MD5 computation failed - error reading the file'); + }; + + function processChunk(chunkStart: number): void { + const chunkEnd = Math.min(file.size, chunkStart + chunkSize); + fileReader.readAsArrayBuffer(file.slice(chunkStart, chunkEnd)); + } + + fileReader.onload = function (e: any): void { + spark.append(e.target.result); + cursor += chunkSize; + if (cursor < file.size) { + processChunk(cursor); } else { - this.openConfirmationDialog(directDownloadMessage, image.download_url); + resolve(spark.end(encode)); } - } + }; - downloadImageFromVersion(image: string) { - this.applianceToInstall.images.forEach(n => { - if (n.filename === image) this.downloadImage(n); - }); - } - - getCategory() { - if (this.applianceToInstall.category === 'multilayer_switch') { - return 'switch'; - } - return this.applianceToInstall.category; - } - - createIouTemplate (image: Image) { - let iouTemplate: IouTemplate = new IouTemplate(); - iouTemplate.nvram = this.applianceToInstall.iou.nvram; - iouTemplate.ram = this.applianceToInstall.iou.ram; - iouTemplate.ethernet_adapters = this.applianceToInstall.iou.ethernet_adapters; - iouTemplate.serial_adapters = this.applianceToInstall.iou.serial_adapters; - iouTemplate.startup_config = this.applianceToInstall.iou.startup_config; - iouTemplate.builtin = this.applianceToInstall.builtin; - iouTemplate.category = this.getCategory(); - iouTemplate.default_name_format = this.applianceToInstall.port_name_format; - iouTemplate.symbol = this.applianceToInstall.symbol; - iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - iouTemplate.template_id = uuid(); - iouTemplate.path = image.filename; - iouTemplate.template_type = 'iou'; - - const dialogRef = this.dialog.open(TemplateNameDialogComponent, { - width: '400px', - height: '250px', - autoFocus: false, - disableClose: true, - data: { - name: this.applianceToInstall.name - } - }); - dialogRef.componentInstance.server = this.server; - dialogRef.afterClosed().subscribe((answer: string) => { - if (answer) { - iouTemplate.name = answer; - - this.iouService.addTemplate(this.server, iouTemplate).subscribe((template) => { - this.templateService.newTemplateCreated.next(template); - this.toasterService.success('Template added'); - this.dialogRef.close(); - }); - } else{ - return false; - } - }); - } - - createIosTemplate(image: Image) { - let iosTemplate: IosTemplate = new IosTemplate(); - iosTemplate.chassis = this.applianceToInstall.dynamips.chassis; - iosTemplate.nvram = this.applianceToInstall.dynamips.nvram; - iosTemplate.platform = this.applianceToInstall.dynamips.platform; - iosTemplate.ram = this.applianceToInstall.dynamips.ram; - iosTemplate.startup_config = this.applianceToInstall.dynamips.startup_config; - iosTemplate.slot0 = this.applianceToInstall.dynamips.slot0; - iosTemplate.slot1 = this.applianceToInstall.dynamips.slot1; - iosTemplate.slot2 = this.applianceToInstall.dynamips.slot2; - iosTemplate.slot3 = this.applianceToInstall.dynamips.slot3; - iosTemplate.slot4 = this.applianceToInstall.dynamips.slot4; - iosTemplate.slot5 = this.applianceToInstall.dynamips.slot5; - iosTemplate.slot6 = this.applianceToInstall.dynamips.slot6; - iosTemplate.slot7 = this.applianceToInstall.dynamips.slot7; - iosTemplate.builtin = this.applianceToInstall.builtin; - iosTemplate.category = this.getCategory(); - iosTemplate.default_name_format = this.applianceToInstall.port_name_format; - iosTemplate.symbol = this.applianceToInstall.symbol; - iosTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - iosTemplate.template_id = uuid(); - iosTemplate.image = image.filename; - iosTemplate.template_type = 'dynamips'; - - const dialogRef = this.dialog.open(TemplateNameDialogComponent, { - width: '400px', - height: '250px', - autoFocus: false, - disableClose: true, - data: { - name: this.applianceToInstall.name - } - }); - dialogRef.componentInstance.server = this.server; - dialogRef.afterClosed().subscribe((answer: string) => { - if (answer) { - iosTemplate.name = answer; - - this.iosService.addTemplate(this.server, iosTemplate).subscribe((template) => { - this.templateService.newTemplateCreated.next(template as any as Template); - this.toasterService.success('Template added'); - this.dialogRef.close(); - }); - } else{ - return false; - } - }); - } - - createDockerTemplate() { - let dockerTemplate: DockerTemplate = new DockerTemplate(); - dockerTemplate.adapters = this.applianceToInstall.docker.adapters; - dockerTemplate.console_type = this.applianceToInstall.docker.console_type; - dockerTemplate.builtin = this.applianceToInstall.builtin; - dockerTemplate.category = this.getCategory(); - dockerTemplate.default_name_format = this.applianceToInstall.port_name_format; - dockerTemplate.symbol = this.applianceToInstall.symbol; - dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - dockerTemplate.template_id = uuid(); - dockerTemplate.image = this.applianceToInstall.docker.image; - dockerTemplate.template_type = 'docker'; - - const dialogRef = this.dialog.open(TemplateNameDialogComponent, { - width: '400px', - height: '250px', - autoFocus: false, - disableClose: true, - data: { - name: this.applianceToInstall.name - } - }); - dialogRef.componentInstance.server = this.server; - dialogRef.afterClosed().subscribe((answer: string) => { - if (answer) { - dockerTemplate.name = answer; - - this.dockerService.addTemplate(this.server, dockerTemplate).subscribe((template) => { - this.templateService.newTemplateCreated.next(template as any as Template); - this.toasterService.success('Template added'); - this.dialogRef.close(); - }); - } else{ - return false; - } - }); - } - - createQemuTemplateFromVersion(version: Version) { - if (!this.checkImages(version)) { - this.toasterService.error('Please install required images first'); - return; - } - - if (!this.selectedBinary) { - this.toasterService.error('Please select QEMU binary first'); - return; - } - - let qemuTemplate: QemuTemplate = new QemuTemplate(); - qemuTemplate.ram = this.applianceToInstall.qemu.ram; - qemuTemplate.adapters = this.applianceToInstall.qemu.adapters; - qemuTemplate.adapter_type = this.applianceToInstall.qemu.adapter_type; - qemuTemplate.boot_priority = this.applianceToInstall.qemu.boot_priority; - qemuTemplate.console_type = this.applianceToInstall.qemu.console_type; - qemuTemplate.hda_disk_interface = this.applianceToInstall.qemu.hda_disk_interface; - qemuTemplate.hdb_disk_interface = this.applianceToInstall.qemu.hdb_disk_interface; - qemuTemplate.hdc_disk_interface = this.applianceToInstall.qemu.hdc_disk_interface; - qemuTemplate.hdd_disk_interface = this.applianceToInstall.qemu.hdd_disk_interface; - qemuTemplate.builtin = this.applianceToInstall.builtin; - qemuTemplate.category = this.getCategory(); - qemuTemplate.first_port_name = this.applianceToInstall.first_port_name; - qemuTemplate.port_name_format = this.applianceToInstall.port_name_format; - qemuTemplate.symbol = this.applianceToInstall.symbol; - qemuTemplate.qemu_path = this.selectedBinary.path; - qemuTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; - qemuTemplate.template_id = uuid(); - qemuTemplate.hda_disk_image = version.images.hda_disk_image; - qemuTemplate.hdb_disk_image = version.images.hdb_disk_image; - qemuTemplate.template_type = 'qemu'; - qemuTemplate.usage = this.applianceToInstall.usage; - - - const dialogRef = this.dialog.open(TemplateNameDialogComponent, { - width: '400px', - height: '250px', - autoFocus: false, - disableClose: true, - data: { - name: this.applianceToInstall.name - } - }); - dialogRef.componentInstance.server = this.server; - dialogRef.afterClosed().subscribe((answer: string) => { - if (answer) { - qemuTemplate.name = answer; - - this.qemuService.addTemplate(this.server, qemuTemplate).subscribe((template) => { - this.templateService.newTemplateCreated.next(template as any as Template); - this.toasterService.success('Template added'); - this.dialogRef.close(); - }); - } else{ - return false; - } - }); - } - - private computeChecksumMd5(file: File, encode = false): Promise { - return new Promise((resolve, reject) => { - const chunkSize = 2097152; - const spark = new SparkMD5.ArrayBuffer(); - const fileReader = new FileReader(); - let cursor = 0; - - fileReader.onerror = function(): void { - reject('MD5 computation failed - error reading the file'); - }; - - function processChunk(chunkStart: number): void { - const chunkEnd = Math.min(file.size, chunkStart + chunkSize); - fileReader.readAsArrayBuffer(file.slice(chunkStart, chunkEnd)); - } - - fileReader.onload = function(e: any): void { - spark.append(e.target.result); - cursor += chunkSize; - if (cursor < file.size) { - processChunk(cursor); - } else { - resolve(spark.end(encode)); - } - }; - - processChunk(0); - }); - } + processChunk(0); + }); + } } function compareNames(a: string, b: string, isAsc: boolean) { - a = a.toLowerCase(); - b = b.toLowerCase(); - return (a < b ? -1 : 1) * (isAsc ? 1 : -1); + a = a.toLowerCase(); + b = b.toLowerCase(); + return (a < b ? -1 : 1) * (isAsc ? 1 : -1); } diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.html b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.html index 72de353f..f83bec76 100644 --- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.html +++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.html @@ -21,6 +21,8 @@
- +
diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.scss b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.scss index acf081db..2fa952b3 100644 --- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.scss +++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.scss @@ -1,7 +1,7 @@ .file-name-form-field { - width: 100%; + width: 100%; } .project-snackbar { - background: #2196F3; + background: #2196f3; } diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts index 62a88939..ed89222f 100644 --- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts @@ -10,12 +10,11 @@ import { TemplateService } from '../../../../services/template.service'; import { templateNameAsyncValidator } from '../../../../validators/template-name-async-validator'; import { Template } from '../../../../models/template'; - @Component({ selector: 'app-template-name-dialog', templateUrl: './template-name-dialog.component.html', styleUrls: ['./template-name-dialog.component.scss'], - providers: [ProjectNameValidator] + providers: [ProjectNameValidator], }) export class TemplateNameDialogComponent implements OnInit { server: Server; @@ -35,9 +34,13 @@ export class TemplateNameDialogComponent implements OnInit { ngOnInit() { let name = this.data['name']; this.templateNameForm = this.formBuilder.group({ - templateName: new FormControl(name, [Validators.required, this.templateNameValidator.get], [templateNameAsyncValidator(this.server, this.templateService)]) + templateName: new FormControl( + name, + [Validators.required, this.templateNameValidator.get], + [templateNameAsyncValidator(this.server, this.templateService)] + ), }); - + setTimeout(() => { this.templateNameForm.controls['templateName'].markAsTouched(); }, 100); @@ -54,7 +57,7 @@ export class TemplateNameDialogComponent implements OnInit { } this.templateService.list(this.server).subscribe((templates: Template[]) => { const templateName = this.templateNameForm.controls['templateName'].value; - let existingProject = templates.find(t => t.name === templateName); + let existingProject = templates.find((t) => t.name === templateName); if (existingProject) { this.toasterService.error('Template with this name exists'); @@ -69,7 +72,7 @@ export class TemplateNameDialogComponent implements OnInit { } onKeyDown(event) { - if (event.key === "Enter") { + if (event.key === 'Enter') { this.onAddClick(); } } diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.html b/src/app/components/project-map/node-editors/config-editor/config-editor.component.html index d4795b4e..3eba95f7 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.html +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.html @@ -1,16 +1,16 @@ -

Configuration for node {{node.name}}

+

Configuration for node {{ node.name }}

-
- +
+
- - - - - - - + + + + + + +
diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.scss b/src/app/components/project-map/node-editors/config-editor/config-editor.component.scss index 6010a550..738dca82 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.scss +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.scss @@ -1,9 +1,9 @@ .textArea { - width: 100%; - height: 350px; + width: 100%; + height: 350px; } .textAreaTab { - width: 100%; - height: 300px; + width: 100%; + height: 300px; } diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts index e7d3a2a2..4c49f955 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts @@ -19,10 +19,10 @@ describe('ConfigEditorDialogComponent', () => { let server: Server; let node: Node; let toaster = { - success: jasmine.createSpy('success') + success: jasmine.createSpy('success'), }; let dialogRef = { - close: jasmine.createSpy('close') + close: jasmine.createSpy('close'), }; let mockedNodeService: MockedNodeService = new MockedNodeService(); @@ -34,15 +34,15 @@ describe('ConfigEditorDialogComponent', () => { NoopAnimationsModule, MatSnackBarModule, FormsModule, - MatTabsModule + MatTabsModule, ], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: [] }, { provide: NodeService, useValue: mockedNodeService }, - { provide: ToasterService, useValue: toaster } + { provide: ToasterService, useValue: toaster }, ], - declarations: [ConfigEditorDialogComponent] + declarations: [ConfigEditorDialogComponent], }).compileComponents(); server = new Server(); diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts index c5cab711..11425058 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts @@ -7,51 +7,51 @@ import { NodeService } from '../../../../services/node.service'; import { ToasterService } from '../../../../services/toaster.service'; @Component({ - selector: 'app-config-editor', - templateUrl: './config-editor.component.html', - styleUrls: ['./config-editor.component.scss'] + selector: 'app-config-editor', + templateUrl: './config-editor.component.html', + styleUrls: ['./config-editor.component.scss'], }) export class ConfigEditorDialogComponent implements OnInit { - server: Server; - project: Project; - node: Node; + server: Server; + project: Project; + node: Node; - config: any; - privateConfig: any; + config: any; + privateConfig: any; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService - ) {} + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService + ) {} - ngOnInit() { - this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { - this.config = config; - }); + ngOnInit() { + this.nodeService.getStartupConfiguration(this.server, this.node).subscribe((config: any) => { + this.config = config; + }); - if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { - this.nodeService.getPrivateConfiguration(this.server, this.node).subscribe((privateConfig: any) => { - this.privateConfig = privateConfig; - }); - } + if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { + this.nodeService.getPrivateConfiguration(this.server, this.node).subscribe((privateConfig: any) => { + this.privateConfig = privateConfig; + }); } + } - onSaveClick() { - this.nodeService.saveConfiguration(this.server, this.node, this.config).subscribe((response) => { - if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { - this.nodeService.savePrivateConfiguration(this.server, this.node, this.privateConfig).subscribe((resp) => { - this.dialogRef.close(); - this.toasterService.success(`Configuration for node ${this.node.name} saved.`); - }); - } else { - this.dialogRef.close(); - this.toasterService.success(`Configuration for node ${this.node.name} saved.`); - } + onSaveClick() { + this.nodeService.saveConfiguration(this.server, this.node, this.config).subscribe((response) => { + if (this.node.node_type === 'iou' || this.node.node_type === 'dynamips') { + this.nodeService.savePrivateConfiguration(this.server, this.node, this.privateConfig).subscribe((resp) => { + this.dialogRef.close(); + this.toasterService.success(`Configuration for node ${this.node.name} saved.`); }); - } - - onCancelClick() { + } else { this.dialogRef.close(); - } + this.toasterService.success(`Configuration for node ${this.node.name} saved.`); + } + }); + } + + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.html b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.html index 16741089..0b5b4091 100644 --- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.html +++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.html @@ -1,106 +1,100 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - - - - - - - - - - - - - - - - - -
Port : VPI : VCI {{element.portIn}} Port : VPI : VCI {{element.portOut}} Actions - -

+
+
+ + + + + + - - - - - + + + + - - Use VPI only (VP tunnel) - + + + + - - Source - - - - - - - - - - - - - - Destination - - - - - - - - - - - - - - - - - - + + +
Port : VPI : VCI{{ element.portIn }}
Port : VPI : VCI{{ element.portOut }}Actions + +
+
+ +
+ + + +
+ + Use VPI only (VP tunnel) + +
+ Source + + + +
+
+ + + +
+
+ + + + Destination + + + +
+
+ + + +
+
+ + + +
+ + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts index e854a632..376757f5 100644 --- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -6,159 +6,161 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-atm-switch', - templateUrl: './configurator-atm-switch.component.html', - styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'] + selector: 'app-configurator-atm-switch', + templateUrl: './configurator-atm-switch.component.html', + styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogAtmSwitchComponent implements OnInit { - server: Server; - node: Node; - name: string; - nameForm: FormGroup; - inputForm: FormGroup; - abstractForm: FormGroup; - consoleTypes: string[] = []; + server: Server; + node: Node; + name: string; + nameForm: FormGroup; + inputForm: FormGroup; + abstractForm: FormGroup; + consoleTypes: string[] = []; - nodeMappings = new Map(); - nodeMappingsDataSource: NodeMapping[] = []; - dataSource = []; - displayedColumns = ['portIn', 'portOut', 'actions'] + nodeMappings = new Map(); + nodeMappingsDataSource: NodeMapping[] = []; + dataSource = []; + displayedColumns = ['portIn', 'portOut', 'actions']; - sourcePort: string = ''; - sourceVpi: string = ''; - sourceVci: string = ''; - destinationPort: string = ''; - destinationVpi: string = ''; - destinationVci: string = ''; + sourcePort: string = ''; + sourceVpi: string = ''; + sourceVci: string = ''; + destinationPort: string = ''; + destinationVpi: string = ''; + destinationVci: string = ''; - useVpiOnly: boolean = false; + useVpiOnly: boolean = false; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder - ) { - this.nameForm = this.formBuilder.group({ - name: new FormControl('', Validators.required), + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder + ) { + this.nameForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + + this.inputForm = this.formBuilder.group({ + sourcePort: new FormControl('', Validators.required), + sourceVci: new FormControl('', Validators.required), + destinationPort: new FormControl('', Validators.required), + destinationVci: new FormControl('', Validators.required), + }); + + this.abstractForm = this.formBuilder.group({ + sourceVpi: new FormControl('', Validators.required), + destinationVpi: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + + let mappings = node.properties.mappings; + Object.keys(mappings).forEach((key) => { + this.nodeMappings.set(key, mappings[key]); + }); + + this.nodeMappings.forEach((value: string, key: string) => { + this.nodeMappingsDataSource.push({ + portIn: key, + portOut: value, }); + }); + }); + } - this.inputForm = this.formBuilder.group({ - sourcePort: new FormControl('', Validators.required), - sourceVci: new FormControl('', Validators.required), - destinationPort: new FormControl('', Validators.required), - destinationVci: new FormControl('', Validators.required), - }); + delete(elem: NodeMapping) { + this.nodeMappingsDataSource = this.nodeMappingsDataSource.filter((n) => n !== elem); + } - this.abstractForm = this.formBuilder.group({ - sourceVpi: new FormControl('', Validators.required), - destinationVpi: new FormControl('', Validators.required) - }); - } + add() { + if (this.inputForm.valid) { + let nodeMapping: NodeMapping; + if (!this.useVpiOnly) { + if (this.abstractForm.valid) { + nodeMapping = { + portIn: `${this.sourcePort}:${this.sourceVpi}:${this.sourceVci}`, + portOut: `${this.destinationPort}:${this.destinationVpi}:${this.destinationVci}`, + }; - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - - let mappings = node.properties.mappings; - Object.keys(mappings).forEach(key => { - this.nodeMappings.set(key, mappings[key]); - }); - - this.nodeMappings.forEach((value: string, key: string) => { - this.nodeMappingsDataSource.push({ - portIn: key, - portOut: value - }); - }); - }); - } - - delete(elem: NodeMapping) { - this.nodeMappingsDataSource = this.nodeMappingsDataSource.filter(n => n !== elem); - } - - add() { - if (this.inputForm.valid) { - let nodeMapping: NodeMapping; - if (!this.useVpiOnly) { - if (this.abstractForm.valid) { - nodeMapping = { - portIn: `${this.sourcePort}:${this.sourceVpi}:${this.sourceVci}`, - portOut: `${this.destinationPort}:${this.destinationVpi}:${this.destinationVci}` - }; - - if (this.nodeMappingsDataSource.filter(n => n.portIn === nodeMapping.portIn).length > 0) { - this.toasterService.error('Mapping already defined.'); - } else { - this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); - this.clearUserInput(); - } - } else { - this.toasterService.error('Fill all required fields.'); - } - } else { - nodeMapping = { - portIn: `${this.sourcePort}:${this.sourceVci}`, - portOut: `${this.destinationPort}:${this.destinationVci}` - }; - - if (this.nodeMappingsDataSource.filter(n => n.portIn === nodeMapping.portIn).length > 0) { - this.toasterService.error('Mapping already defined.'); - } else { - this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); - this.clearUserInput(); - } - } + if (this.nodeMappingsDataSource.filter((n) => n.portIn === nodeMapping.portIn).length > 0) { + this.toasterService.error('Mapping already defined.'); + } else { + this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); + this.clearUserInput(); + } } else { - this.toasterService.error('Fill all required fields.'); + this.toasterService.error('Fill all required fields.'); } - } + } else { + nodeMapping = { + portIn: `${this.sourcePort}:${this.sourceVci}`, + portOut: `${this.destinationPort}:${this.destinationVci}`, + }; - clearUserInput() { - this.sourcePort = '0'; - this.sourceVpi = '0'; - this.sourceVci = '0'; - this.destinationPort = '0'; - this.destinationVpi = '0'; - this.sourceVci = '0'; - } - - strMapToObj(strMap) { - let obj = Object.create(null); - for (let [k,v] of strMap) { - obj[k] = v; - } - return obj; - } - - onSaveClick() { - if (this.nameForm.valid) { - this.nodeMappings.clear(); - this.nodeMappingsDataSource.forEach(elem => { - this.nodeMappings.set(elem.portIn, elem.portOut); - }); - - this.node.properties.mappings = Array.from(this.nodeMappings).reduce((obj, [key, value]) => (Object.assign(obj, { [key]: value })), {}); - - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); + if (this.nodeMappingsDataSource.filter((n) => n.portIn === nodeMapping.portIn).length > 0) { + this.toasterService.error('Mapping already defined.'); } else { - this.toasterService.error(`Fill all required fields.`); + this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); + this.clearUserInput(); } + } + } else { + this.toasterService.error('Fill all required fields.'); } + } - onCancelClick() { - this.dialogRef.close(); + clearUserInput() { + this.sourcePort = '0'; + this.sourceVpi = '0'; + this.sourceVci = '0'; + this.destinationPort = '0'; + this.destinationVpi = '0'; + this.sourceVci = '0'; + } + + strMapToObj(strMap) { + let obj = Object.create(null); + for (let [k, v] of strMap) { + obj[k] = v; } + return obj; + } + + onSaveClick() { + if (this.nameForm.valid) { + this.nodeMappings.clear(); + this.nodeMappingsDataSource.forEach((elem) => { + this.nodeMappings.set(elem.portIn, elem.portOut); + }); + + this.node.properties.mappings = Array.from(this.nodeMappings).reduce( + (obj, [key, value]) => Object.assign(obj, { [key]: value }), + {} + ); + + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); + } + } + + onCancelClick() { + this.dialogRef.close(); + } } export interface NodeMapping { - portIn: string, - portOut: string + portIn: string; + portOut: string; } diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html index d7618fda..fb0f0aa4 100644 --- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html +++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.html @@ -1,86 +1,86 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
-
{{port.name}}


-
- - - - {{type}} - - - - - +
+
+ + + +
+
{{ port.name }}
+

+
+ + + + {{ type }} + + + + + - -
-
{{port.name}}


-
- - - - - + +
+
{{ port.name }}
+

+
+ + + + + - - - + + + - -
- - - -
- - - - {{type}} - - - - - - - - - - - - - - - -
+ +
+ + + +
+ + + + {{ type }} + + + + + + + + + + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts index 92ba0343..a6265439 100644 --- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts +++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -11,106 +11,104 @@ import { BuiltInTemplatesConfigurationService } from '../../../../../services/bu import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity'; import { UdpTunnelsComponent } from '../../../../../components/preferences/common/udp-tunnels/udp-tunnels.component'; - @Component({ - selector: 'app-configurator-cloud', - templateUrl: './configurator-cloud.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-cloud', + templateUrl: './configurator-cloud.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogCloudComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - consoleTypes: string[] = []; - binaries: QemuBinary[] = []; - onCloseOptions = []; - bootPriorities = []; - diskInterfaces: string[] = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + consoleTypes: string[] = []; + binaries: QemuBinary[] = []; + onCloseOptions = []; + bootPriorities = []; + diskInterfaces: string[] = []; - portsMappingEthernet: PortsMappingEntity[] = []; - portsMappingTap: PortsMappingEntity[] = []; - portsMappingUdp: PortsMappingEntity[] = []; + portsMappingEthernet: PortsMappingEntity[] = []; + portsMappingTap: PortsMappingEntity[] = []; + portsMappingUdp: PortsMappingEntity[] = []; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - networkTypes = []; - tapInterface: string = ''; - ethernetInterface: string = ''; - ethernetInterfaces: string[] = ['Ethernet 2', 'Ethernet 3']; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + networkTypes = []; + tapInterface: string = ''; + ethernetInterface: string = ''; + ethernetInterfaces: string[] = ['Ethernet 2', 'Ethernet 3']; - @ViewChild("udpTunnels") udpTunnels: UdpTunnelsComponent; + @ViewChild('udpTunnels') udpTunnels: UdpTunnelsComponent; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService, - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private builtInTemplatesConfigurationService: BuiltInTemplatesConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + + this.portsMappingEthernet = this.node.properties.ports_mapping.filter((elem) => elem.type === 'ethernet'); + + this.portsMappingTap = this.node.properties.ports_mapping.filter((elem) => elem.type === 'tap'); + + this.portsMappingUdp = this.node.properties.ports_mapping.filter((elem) => elem.type === 'udp'); + }); + } + + getConfiguration() { + this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForCloudNodes(); + } + + onAddEthernetInterface() { + if (this.ethernetInterface) { + this.portsMappingEthernet.push({ + interface: this.ethernetInterface, + name: this.ethernetInterface, + port_number: 0, + type: 'ethernet', + }); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - - this.portsMappingEthernet = this.node.properties.ports_mapping - .filter((elem) => elem.type === 'ethernet'); - - this.portsMappingTap = this.node.properties.ports_mapping - .filter((elem) => elem.type === 'tap'); - - this.portsMappingUdp = this.node.properties.ports_mapping - .filter((elem) => elem.type === 'udp'); - }) + onAddTapInterface() { + if (this.tapInterface) { + this.portsMappingTap.push({ + interface: this.tapInterface, + name: this.tapInterface, + port_number: 0, + type: 'tap', + }); } + } - getConfiguration() { - this.consoleTypes = this.builtInTemplatesConfigurationService.getConsoleTypesForCloudNodes(); + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.portsMappingUdp = this.udpTunnels.dataSourceUdp; + + this.node.properties.ports_mapping = this.portsMappingUdp + .concat(this.portsMappingEthernet) + .concat(this.portsMappingTap); + + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onAddEthernetInterface() { - if (this.ethernetInterface) { - this.portsMappingEthernet.push({ - interface: this.ethernetInterface, - name: this.ethernetInterface, - port_number: 0, - type: "ethernet" - }); - } - } - - onAddTapInterface() { - if (this.tapInterface) { - this.portsMappingTap.push({ - interface: this.tapInterface, - name: this.tapInterface, - port_number: 0, - type: "tap" - }); - } - } - - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.portsMappingUdp = this.udpTunnels.dataSourceUdp; - - this.node.properties.ports_mapping = this.portsMappingUdp.concat(this.portsMappingEthernet).concat(this.portsMappingTap); - - this.nodeService. updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/configurator.component.scss b/src/app/components/project-map/node-editors/configurator/configurator.component.scss index 7bae870f..ad4f3001 100644 --- a/src/app/components/project-map/node-editors/configurator/configurator.component.scss +++ b/src/app/components/project-map/node-editors/configurator/configurator.component.scss @@ -1,51 +1,51 @@ .form-field { - width: 100%; + width: 100%; } .configButton { - width: 100%; + width: 100%; } .select { - width: 100%; + width: 100%; } .default-content { - max-height: 400px; - overflow-y: scroll; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + max-height: 400px; + overflow-y: scroll; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } .file-button { - width: 18%; + width: 18%; } .create-button { - width: 100%; + width: 100%; } .file-name-form-field { - padding-left: 2%; - width: 80%; + padding-left: 2%; + width: 80%; } .nonvisible { - display: none; + display: none; } mat-radio-button { - margin-right: 10px; + margin-right: 10px; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } - + ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + ::-webkit-scrollbar-thumb { background-color: darkgrey; outline: 1px solid #263238; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html index 936fd35c..488b72a1 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html @@ -1,86 +1,119 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - +
+
+ + + +
+ + + + - - - + + + - - - + + + - + - - - - {{type}} - - - - - Auto start console - + + + + {{ type }} + + + + + Auto start console + - - - - {{resolution}} - - - + + + + {{ resolution }} + + + - - - + + + - - - + + + - - -
Environment
- - - - + + +
Environment
+ + + + - -
Extra hosts
- - -
+ +
Extra hosts
+ +
-
Additional directories
- - - - +
Additional directories
+ + + + - - - - - - - -
+ + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index ba346076..6a297e46 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -9,89 +9,80 @@ import { DockerConfigurationService } from '../../../../../services/docker-confi import { EditNetworkConfigurationDialogComponent } from './edit-network-configuration/edit-network-configuration.component'; import { ConfigureCustomAdaptersDialogComponent } from './configure-custom-adapters/configure-custom-adapters.component'; - @Component({ - selector: 'app-configurator-docker', - templateUrl: './configurator-docker.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-docker', + templateUrl: './configurator-docker.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogDockerComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - consoleTypes: string[] = []; - consoleResolutions: string[] = [ - '640x480', - '800x600', - '1024x768', - '1280x800', - '1280x1024', - '1366x768', - '1920x1080' - ]; - private conf = { - autoFocus: false, - width: '800px', - disableClose: true - }; - dialogRef; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + consoleTypes: string[] = []; + consoleResolutions: string[] = ['640x480', '800x600', '1024x768', '1280x800', '1280x1024', '1366x768', '1920x1080']; + private conf = { + autoFocus: false, + width: '800px', + disableClose: true, + }; + dialogRef; - constructor( - public dialogReference: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private dockerConfigurationService: DockerConfigurationService, - private dialog: MatDialog - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required), - adapter: new FormControl('', Validators.required), - startCommand: new FormControl('', Validators.required), - consoleHttpPort: new FormControl('', Validators.required), - consoleHttpPath: new FormControl('', Validators.required) - }); - } + constructor( + public dialogReference: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private dockerConfigurationService: DockerConfigurationService, + private dialog: MatDialog + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + adapter: new FormControl('', Validators.required), + startCommand: new FormControl('', Validators.required), + consoleHttpPort: new FormControl('', Validators.required), + consoleHttpPath: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } - getConfiguration() { - this.consoleTypes = this.dockerConfigurationService.getConsoleTypes(); - } + getConfiguration() { + this.consoleTypes = this.dockerConfigurationService.getConsoleTypes(); + } - configureCustomAdapters() { - this.dialogRef = this.dialog.open(ConfigureCustomAdaptersDialogComponent, this.conf); - let instance = this.dialogRef.componentInstance; - instance.server = this.server; - instance.node = this.node; - } + configureCustomAdapters() { + this.dialogRef = this.dialog.open(ConfigureCustomAdaptersDialogComponent, this.conf); + let instance = this.dialogRef.componentInstance; + instance.server = this.server; + instance.node = this.node; + } - editNetworkConfiguration() { - this.dialogRef = this.dialog.open(EditNetworkConfigurationDialogComponent, this.conf); - let instance = this.dialogRef.componentInstance; - instance.server = this.server; - instance.node = this.node; - } + editNetworkConfiguration() { + this.dialogRef = this.dialog.open(EditNetworkConfigurationDialogComponent, this.conf); + let instance = this.dialogRef.componentInstance; + instance.server = this.server; + instance.node = this.node; + } - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogReference.close(); - } + onCancelClick() { + this.dialogReference.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.html b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.html index 7cebbcd5..e7f879ed 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.html +++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.html @@ -1,29 +1,23 @@ -

Configure custom adapters for node {{node.name}}

+

Configure custom adapters for node {{ node.name }}

-
- - Adapter number - - - Port name - -
+
+ Adapter number + Port name +
-
- - -
- - Adapter {{adapter.adapter_number}} - - - - -
- - -
+
+ + +
+ Adapter {{ adapter.adapter_number }} + + + +
+ + +
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.scss b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.scss index 351c6f12..07f4d76e 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.scss +++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.scss @@ -1,21 +1,21 @@ th { - border: 0px!important; + border: 0px !important; } th.mat-header-cell { - padding-bottom: 15px; + padding-bottom: 15px; } td.mat-cell { - padding-top: 15px; + padding-top: 15px; } .header { - display: flex; - justify-content: space-between; - width: 100%; + display: flex; + justify-content: space-between; + width: 100%; } .column { - width: 50%; + width: 50%; } diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts index 58af0a88..a3c25290 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../../cartography/models/node'; import { Server } from '../../../../../../models/server'; @@ -7,54 +7,53 @@ import { ToasterService } from '../../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; import { DockerConfigurationService } from '../../../../../../services/docker-configuration.service'; - @Component({ - selector: 'app-configure-custom-adapters', - templateUrl: './configure-custom-adapters.component.html', - styleUrls: ['./configure-custom-adapters.component.scss'] + selector: 'app-configure-custom-adapters', + templateUrl: './configure-custom-adapters.component.html', + styleUrls: ['./configure-custom-adapters.component.scss'], }) export class ConfigureCustomAdaptersDialogComponent implements OnInit { - server: Server; - node: Node; - displayedColumns: string[] = ['adapter_number', 'port_name']; - adapters: CustomAdapter[] = []; + server: Server; + node: Node; + displayedColumns: string[] = ['adapter_number', 'port_name']; + adapters: CustomAdapter[] = []; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private dockerConfigurationService: DockerConfigurationService - ) {} + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private dockerConfigurationService: DockerConfigurationService + ) {} - ngOnInit() { - let i: number = 0; - if (!this.node.custom_adapters) { - this.node.ports.forEach((port) => { - this.adapters.push({ - adapter_number: i, - port_name: '' - }); - }); - } else { - this.adapters = this.node.custom_adapters; - } - } - - onSaveClick() { - this.node.custom_adapters = this.adapters; - this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { - this.onCancelClick(); - this.toasterService.success(`Configuration saved for node ${this.node.name}`); + ngOnInit() { + let i: number = 0; + if (!this.node.custom_adapters) { + this.node.ports.forEach((port) => { + this.adapters.push({ + adapter_number: i, + port_name: '', }); + }); + } else { + this.adapters = this.node.custom_adapters; } + } - onCancelClick() { - this.dialogRef.close(); - } + onSaveClick() { + this.node.custom_adapters = this.adapters; + this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { + this.onCancelClick(); + this.toasterService.success(`Configuration saved for node ${this.node.name}`); + }); + } + + onCancelClick() { + this.dialogRef.close(); + } } export class CustomAdapter { - adapter_number: number; - port_name: string; + adapter_number: number; + port_name: string; } diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.html b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.html index 40432342..75ceddf0 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.html +++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.html @@ -1,7 +1,7 @@ -

Edit network configuration for node {{node.name}}

+

Edit network configuration for node {{ node.name }}

- +
diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.scss b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.scss index d874a5ff..d47c6ad4 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.scss +++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.scss @@ -1,4 +1,4 @@ .textArea { - width: 100%; - height: 350px; + width: 100%; + height: 350px; } diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts index c6ed260f..2fd87694 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../../cartography/models/node'; import { Server } from '../../../../../../models/server'; @@ -7,37 +7,38 @@ import { ToasterService } from '../../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; import { DockerConfigurationService } from '../../../../../../services/docker-configuration.service'; - @Component({ - selector: 'app-edit-network-configuration', - templateUrl: './edit-network-configuration.component.html', - styleUrls: ['./edit-network-configuration.component.scss'] + selector: 'app-edit-network-configuration', + templateUrl: './edit-network-configuration.component.html', + styleUrls: ['./edit-network-configuration.component.scss'], }) export class EditNetworkConfigurationDialogComponent implements OnInit { - server: Server; - node: Node; - configuration: string; + server: Server; + node: Node; + configuration: string; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService - ) {} + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService + ) {} - ngOnInit() { - this.nodeService.getNetworkConfiguration(this.server, this.node).subscribe((response: string) => { - this.configuration = response; - }); - } + ngOnInit() { + this.nodeService.getNetworkConfiguration(this.server, this.node).subscribe((response: string) => { + this.configuration = response; + }); + } - onSaveClick() { - this.nodeService.saveNetworkConfiguration(this.server, this.node, this.configuration).subscribe((response: string) => { - this.onCancelClick(); - this.toasterService.success(`Configuration for node ${this.node.name} saved.`); - }); - } + onSaveClick() { + this.nodeService + .saveNetworkConfiguration(this.server, this.node, this.configuration) + .subscribe((response: string) => { + this.onCancelClick(); + this.toasterService.success(`Configuration for node ${this.node.name} saved.`); + }); + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.html b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.html index 826a0154..eb26d008 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.html +++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.html @@ -1,32 +1,29 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- -
- - - - - - - {{type}} - - - -
- - -
+
+
+ +
+ + + + + + + {{ type }} + + + +
+ +
+
diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts index 8184b55a..87a8972a 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -8,57 +8,56 @@ import { MatDialogRef } from '@angular/material/dialog'; import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service'; import { PortsComponent } from '../../../../../components/preferences/common/ports/ports.component'; - @Component({ - selector: 'app-configurator-ethernet-switch', - templateUrl: './configurator-ethernet-switch.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-ethernet-switch', + templateUrl: './configurator-ethernet-switch.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogEthernetSwitchComponent implements OnInit { - @ViewChild(PortsComponent) portsComponent: PortsComponent; - server: Server; - node: Node; - name: string; - inputForm: FormGroup; - consoleTypes: string[] = []; + @ViewChild(PortsComponent) portsComponent: PortsComponent; + server: Server; + node: Node; + name: string; + inputForm: FormGroup; + consoleTypes: string[] = []; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private ethernetSwitchesConfigurationService: BuiltInTemplatesConfigurationService - ) { - this.inputForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private ethernetSwitchesConfigurationService: BuiltInTemplatesConfigurationService + ) { + this.inputForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = this.node.name; - this.getConfiguration(); - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = this.node.name; + this.getConfiguration(); + }); + } - getConfiguration() { - this.consoleTypes = this.ethernetSwitchesConfigurationService.getConsoleTypesForEthernetSwitches(); - } + getConfiguration() { + this.consoleTypes = this.ethernetSwitchesConfigurationService.getConsoleTypesForEthernetSwitches(); + } - onSaveClick() { - if (this.inputForm.valid) { - this.node.properties.ports_mapping = this.portsComponent.ethernetPorts; - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.inputForm.valid) { + this.node.properties.ports_mapping = this.portsComponent.ethernetPorts; + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.html b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.html index 13d7838c..e6735ef5 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.html +++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.html @@ -1,28 +1,26 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- -
- - - - - - -
- -
+
+
+ +
+ + + + + + +
+
+
diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts index 73f22b28..dfb9d6b8 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service'; import { Node } from '../../../../../cartography/models/node'; @@ -7,67 +7,66 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-ethernet-hub', - templateUrl: './configurator-ethernet-hub.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-ethernet-hub', + templateUrl: './configurator-ethernet-hub.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogEthernetHubComponent implements OnInit { - server: Server; - node: Node; - numberOfPorts: number; - inputForm: FormGroup; - consoleTypes: string[] = []; - categories = []; - name: string; + server: Server; + node: Node; + numberOfPorts: number; + inputForm: FormGroup; + consoleTypes: string[] = []; + categories = []; + name: string; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private vpcsConfigurationService: VpcsConfigurationService - ) { - this.inputForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private vpcsConfigurationService: VpcsConfigurationService + ) { + this.inputForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = this.node.name; + this.numberOfPorts = this.node.ports.length; + this.getConfiguration(); + }); + } + + getConfiguration() { + this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); + this.categories = this.vpcsConfigurationService.getCategories(); + } + + onSaveClick() { + if (this.inputForm.valid) { + this.node.properties.ports_mapping = []; + for (let i = 0; i < this.numberOfPorts; i++) { + this.node.properties.ports_mapping.push({ + name: `Ethernet${i}`, + port_number: i, }); - } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = this.node.name; - this.numberOfPorts = this.node.ports.length; - this.getConfiguration(); - }) + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - getConfiguration() { - this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); - this.categories = this.vpcsConfigurationService.getCategories(); - } - - onSaveClick() { - if (this.inputForm.valid) { - this.node.properties.ports_mapping = []; - for(let i=0; i { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`) - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html index d3136b4b..cebe922a 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html @@ -1,50 +1,62 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - -
- - - - {{type}} - - - - - Auto start console -
- +
+
+ + + +
+
+ + + +
+ + + + {{ type }} + + + + Auto start console
+ - -
- - - MB - - - - MB - -
- + +
+
+ + + MB + + + + MB + +
+ - - - - - - - -
+ + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts index 3cff737b..39c281c7 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -7,61 +7,60 @@ import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; import { IosConfigurationService } from '../../../../../services/ios-configuration.service'; - @Component({ - selector: 'app-configurator-ios', - templateUrl: './configurator-ios.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-ios', + templateUrl: './configurator-ios.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIosComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - memoryForm: FormGroup; - consoleTypes: string[] = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + memoryForm: FormGroup; + consoleTypes: string[] = []; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private configurationService: IosConfigurationService - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private configurationService: IosConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); - this.memoryForm = this.formBuilder.group({ - ram: new FormControl('', Validators.required), - nvram: new FormControl('', Validators.required) - }); + this.memoryForm = this.formBuilder.group({ + ram: new FormControl('', Validators.required), + nvram: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } + + getConfiguration() { + this.consoleTypes = this.configurationService.getConsoleTypes(); + } + + onSaveClick() { + if (this.generalSettingsForm.valid && this.memoryForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }); - } - - getConfiguration() { - this.consoleTypes = this.configurationService.getConsoleTypes(); - } - - onSaveClick() { - if (this.generalSettingsForm.valid && this.memoryForm.valid) { - this.nodeService. updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.html b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.html index 52c63b9e..09dafd94 100644 --- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.html +++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.html @@ -1,56 +1,68 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - -
- - - - {{type}} - - - - - Auto start console -
- - - MB - - - - MB - - +
+
+ + + +
+
+ + + +
+ + + + {{ type }} + + + + Auto start console
+ + + MB + + + + MB + + - -
- - - - - - -
- + +
+
+ + + + + + +
+ - - - - - - - -
+ + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts index a433c130..5d305b44 100644 --- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts +++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -7,61 +7,60 @@ import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; import { IouConfigurationService } from '../../../../../services/iou-configuration.service'; - @Component({ - selector: 'app-configurator-iou', - templateUrl: './configurator-iou.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-iou', + templateUrl: './configurator-iou.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIouComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - networkForm: FormGroup; - consoleTypes: string[] = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + networkForm: FormGroup; + consoleTypes: string[] = []; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private configurationService: IouConfigurationService - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private configurationService: IouConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); - this.networkForm = this.formBuilder.group({ - ethernetAdapters: new FormControl('', Validators.required), - serialAdapters: new FormControl('', Validators.required) - }); + this.networkForm = this.formBuilder.group({ + ethernetAdapters: new FormControl('', Validators.required), + serialAdapters: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } + + getConfiguration() { + this.consoleTypes = this.configurationService.getConsoleTypes(); + } + + onSaveClick() { + if (this.generalSettingsForm.valid && this.networkForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }); - } - - getConfiguration() { - this.consoleTypes = this.configurationService.getConsoleTypes(); - } - - onSaveClick() { - if (this.generalSettingsForm.valid && this.networkForm.valid) { - this.nodeService. updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.html b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.html index ff1164d0..e257af66 100644 --- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.html +++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.html @@ -1,21 +1,17 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- -
- - - -
- -
+
+
+ +
+ + + +
+
+
diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts index f31c558d..11497838 100644 --- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts +++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -6,48 +6,47 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-nat', - templateUrl: './configurator-nat.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-nat', + templateUrl: './configurator-nat.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogNatComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + }); + } - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html index e181eac4..d62b81fb 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html @@ -1,277 +1,255 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - - - - MB - -
- - - - - - - {{binary.path}} - - - - - - - {{priority[0]}} - - - - - - - {{option[0]}} - - - - - - - {{type}} - - - - - Auto start console - - - - - - - - - HDA (Primary Master) - - - - - {{image.filename}} - - - - - - {{interface}} - - - - - - - - - HDB (Primary Slave) - - - - - {{image.filename}} - - - - - - {{interface}} - - - - - - - - - HDC (Secondary Master) - - - - - {{image.filename}} - - - - - - {{interface}} - - - - - - - - - HDD (Secondary Slave) - - - - - {{image.filename}} - - - - - - {{interface}} - - - - - - - -
- - - - - -
- - -
- Use the legacy networking mode - -
- Replicate network connection state - - - - - - - - Linux boot specific settings - - -
- - - - - -
-
- - - - - -
- - - - - - - - - Bios - - -
- - - - - -
- - - - - - Optimization - - - - Activate CPU throttling - - - - - - - - {{priority}} - - - - - - - - - Additional settings - - - - - - - - - - - - - - +
+
+ + + +
+
+ + + + + + MB + +
+ + + + + + + {{ binary.path }} + + + + + + + {{ priority[0] }} + + + + + + + {{ option[0] }} + + + + + + + {{ type }} + + + + Auto start console + + + + + + + HDA (Primary Master) + + + + {{ image.filename }} + + + + + + {{ interface }} + + + + -
+ + + HDB (Primary Slave) + + + + {{ image.filename }} + + + + + + {{ interface }} + + + + + + + + HDC (Secondary Master) + + + + {{ image.filename }} + + + + + + {{ interface }} + + + + + + + + HDD (Secondary Slave) + + + + {{ image.filename }} + + + + + + {{ interface }} + + + + + + + +
+ + + + + +
+ + +
+ Use the legacy networking mode + +
+ Replicate network connection state + + + + + + + Linux boot specific settings + +
+ + + + + +
+
+ + + + + +
+ + + + + + + + Bios + +
+ + + + + +
+ + + + + Optimization + + Activate CPU throttling + + + + + + + {{ priority }} + + + + + + + + Additional settings + + + + + + + + + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts index c7291097..43dda36f 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -12,121 +12,120 @@ import { QemuBinary } from '../../../../../models/qemu/qemu-binary'; import { QemuImageCreatorComponent } from './qemu-image-creator/qemu-image-creator.component'; import { QemuImage } from '../../../../../models/qemu/qemu-image'; - @Component({ - selector: 'app-configurator-qemu', - templateUrl: './configurator-qemu.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-qemu', + templateUrl: './configurator-qemu.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogQemuComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - consoleTypes: string[] = []; - binaries: QemuBinary[] = []; - onCloseOptions = []; - bootPriorities = []; - diskInterfaces: string[] = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + consoleTypes: string[] = []; + binaries: QemuBinary[] = []; + onCloseOptions = []; + bootPriorities = []; + diskInterfaces: string[] = []; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - networkTypes = []; - qemuImages: QemuImage[] = []; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + networkTypes = []; + qemuImages: QemuImage[] = []; - private conf = { - autoFocus: false, - width: '800px', - disableClose: true - }; - dialogRefQemuImageCreator; + private conf = { + autoFocus: false, + width: '800px', + disableClose: true, + }; + dialogRefQemuImageCreator; - @ViewChild("customAdapters") customAdapters: CustomAdaptersTableComponent; + @ViewChild('customAdapters') customAdapters: CustomAdaptersTableComponent; - constructor( - private dialog: MatDialog, - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private qemuService: QemuService, - private qemuConfigurationService: QemuConfigurationService - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required), - ram: new FormControl('', Validators.required) + constructor( + private dialog: MatDialog, + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private qemuService: QemuService, + private qemuConfigurationService: QemuConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + ram: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + + this.qemuService.getBinaries(this.server).subscribe((qemuBinaries: QemuBinary[]) => { + this.binaries = qemuBinaries; + }); + + this.qemuService.getImages(this.server).subscribe((qemuImages: QemuImage[]) => { + this.qemuImages = qemuImages; + }); + } + + openQemuImageCreator() { + this.dialogRefQemuImageCreator = this.dialog.open(QemuImageCreatorComponent, this.conf); + let instance = this.dialogRefQemuImageCreator.componentInstance; + instance.server = this.server; + } + + uploadCdromImageFile(event) { + this.node.properties.cdrom_image = event.target.files[0].name; + } + + uploadInitrdFile(event) { + this.node.properties.initrd = event.target.files[0].name; + } + + uploadKernelImageFile(event) { + this.node.properties.kernel_image = event.target.files[0].name; + } + + uploadBiosFile(event) { + this.node.properties.bios_image = event.target.files[0].name; + } + + getConfiguration() { + this.consoleTypes = this.qemuConfigurationService.getConsoleTypes(); + this.onCloseOptions = this.qemuConfigurationService.getOnCloseOptions(); + this.qemuConfigurationService.getNetworkTypes().forEach((n) => { + this.networkTypes.push(n); + }); + this.bootPriorities = this.qemuConfigurationService.getBootPriorities(); + this.diskInterfaces = this.qemuConfigurationService.getDiskInterfaces(); + } + + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.node.custom_adapters = []; + this.customAdapters.adapters.forEach((n) => { + this.node.custom_adapters.push({ + adapter_number: n.adapter_number, + adapter_type: n.adapter_type, }); + }); + + this.node.properties.adapters = this.node.custom_adapters.length; + + this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }) - - this.qemuService.getBinaries(this.server).subscribe((qemuBinaries: QemuBinary[]) => { - this.binaries = qemuBinaries; - }); - - this.qemuService.getImages(this.server).subscribe((qemuImages: QemuImage[]) => { - this.qemuImages = qemuImages; - }); - } - - openQemuImageCreator() { - this.dialogRefQemuImageCreator = this.dialog.open(QemuImageCreatorComponent, this.conf); - let instance = this.dialogRefQemuImageCreator.componentInstance; - instance.server = this.server; - } - - uploadCdromImageFile(event){ - this.node.properties.cdrom_image = event.target.files[0].name; - } - - uploadInitrdFile(event){ - this.node.properties.initrd = event.target.files[0].name; - } - - uploadKernelImageFile(event){ - this.node.properties.kernel_image = event.target.files[0].name; - } - - uploadBiosFile(event){ - this.node.properties.bios_image = event.target.files[0].name; - } - - getConfiguration() { - this.consoleTypes = this.qemuConfigurationService.getConsoleTypes(); - this.onCloseOptions = this.qemuConfigurationService.getOnCloseOptions(); - this.qemuConfigurationService.getNetworkTypes().forEach(n => { - this.networkTypes.push(n); - }); - this.bootPriorities = this.qemuConfigurationService.getBootPriorities(); - this.diskInterfaces = this.qemuConfigurationService.getDiskInterfaces(); - } - - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.node.custom_adapters = []; - this.customAdapters.adapters.forEach(n => { - this.node.custom_adapters.push({ - adapter_number: n.adapter_number, - adapter_type: n.adapter_type - }) - }); - - this.node.properties.adapters = this.node.custom_adapters.length; - - this.nodeService. updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.html b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.html index aec8fdd5..c5081381 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.html +++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.html @@ -1,104 +1,108 @@

Qemu image configurator

-
-
- -
- - - -
- - - - {{format}} - - - -
- Size options - - - - {{preallocation}} - - - - - - - {{clusterSize.name}} - - - - Refcounts - - - - {{lazyRefcount}} - - - - - - - {{clusterSize.name}} - - - -
-
- - Dynamic - Fixed - -
-
- Adapter type
- - IDE - LSI Logic - BusLogic - Legacy (ESX) -

- Image file sizing mode
- - Stream optimized - Split every 2GB (sparse) - Split every 2GB (flat) - Monolithic sparse - Monolithic flat -

- - - {{option}} - - -
-
- - - - - - -
- +
+
+ +
+ + + +
+ + + + {{ format }} + + + +
+ Size options + + + + {{ preallocation }} + + + + + + + {{ clusterSize.name }} + + + + Refcounts + + + + {{ lazyRefcount }} + + + + + + + {{ clusterSize.name }} + + +
+
+ + Dynamic + Fixed + +
+
+ Adapter type
+ + IDE + LSI Logic + BusLogic + Legacy (ESX)

+ Image file sizing mode
+ + Stream optimized + Split every 2GB (sparse) + Split every 2GB (flat) + Monolithic sparse + Monolithic flat

+ + + {{ option }} + + +
+
+ + + + + + +
+
+
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts index 87d8e5a6..09eb73f0 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Server } from '../../../../../../models/server'; import { NodeService } from '../../../../../../services/node.service'; @@ -7,115 +7,114 @@ import { MatDialogRef } from '@angular/material/dialog'; import { QemuService } from '../../../../../../services/qemu.service'; import { QemuImg } from '../../../../../../models/qemu/qemu-img'; - @Component({ - selector: 'app-qemu-image-creator', - templateUrl: './qemu-image-creator.component.html', - styleUrls: ['../../configurator.component.scss'] + selector: 'app-qemu-image-creator', + templateUrl: './qemu-image-creator.component.html', + styleUrls: ['../../configurator.component.scss'], }) export class QemuImageCreatorComponent implements OnInit { - server: Server; - qemuImg: QemuImg; + server: Server; + qemuImg: QemuImg; - formatOptions: string[] = ['qcow2', 'qcow', 'vhd', 'vdi', 'vmdk', 'raw']; - preallocationsOptions: string[] = ['off', 'metadata', 'falloc', 'full']; - clusterSizeOptions: ClusterSize[] = [ - { - name: '512', - value: 512 - }, - { - name: '1k', - value: 1024 - }, - { - name: '2k', - value: 2048 - }, - { - name: '4k', - value: 4096 - }, - { - name: '8k', - value: 8192 - }, - { - name: '16k', - value: 16384 - }, - { - name: '32k', - value: 32768 - }, - { - name: '64k', - value: 65536 - }, - { - name: '128k', - value: 131072 - }, - { - name: '256k', - value: 262144 - }, - { - name: '512k', - value: 524288 - }, - { - name: '1024k', - value: 1048576 - }, - { - name: '2048k', - value: 2097152 - } - ]; - lazyRefcountsOptions: string[] = ['off', 'on']; - refcountBitsOptions: number[] = [1,2,4,8,16,32,64]; - zeroedGrainOptions: string[] = ['on', 'off']; - inputForm: FormGroup; + formatOptions: string[] = ['qcow2', 'qcow', 'vhd', 'vdi', 'vmdk', 'raw']; + preallocationsOptions: string[] = ['off', 'metadata', 'falloc', 'full']; + clusterSizeOptions: ClusterSize[] = [ + { + name: '512', + value: 512, + }, + { + name: '1k', + value: 1024, + }, + { + name: '2k', + value: 2048, + }, + { + name: '4k', + value: 4096, + }, + { + name: '8k', + value: 8192, + }, + { + name: '16k', + value: 16384, + }, + { + name: '32k', + value: 32768, + }, + { + name: '64k', + value: 65536, + }, + { + name: '128k', + value: 131072, + }, + { + name: '256k', + value: 262144, + }, + { + name: '512k', + value: 524288, + }, + { + name: '1024k', + value: 1048576, + }, + { + name: '2048k', + value: 2097152, + }, + ]; + lazyRefcountsOptions: string[] = ['off', 'on']; + refcountBitsOptions: number[] = [1, 2, 4, 8, 16, 32, 64]; + zeroedGrainOptions: string[] = ['on', 'off']; + inputForm: FormGroup; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private qemuService: QemuService - ) { - this.inputForm = this.formBuilder.group({ - qemu_img: new FormControl('', Validators.required), - path: new FormControl('', Validators.required), - size: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private qemuService: QemuService + ) { + this.inputForm = this.formBuilder.group({ + qemu_img: new FormControl('', Validators.required), + path: new FormControl('', Validators.required), + size: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.qemuImg = {} as QemuImg; - } + ngOnInit() { + this.qemuImg = {} as QemuImg; + } - setSubformat(subformat: string) { - this.qemuImg.subformat = subformat; - } + setSubformat(subformat: string) { + this.qemuImg.subformat = subformat; + } - onSaveClick() { - if (this.inputForm.valid && this.qemuImg.format) { - this.qemuService.addImage(this.server, this.qemuImg).subscribe(() => { - this.dialogRef.close(); - }); - } else { - this.toasterService.error('Fill all required fields.') - } - } - - onCancelClick() { + onSaveClick() { + if (this.inputForm.valid && this.qemuImg.format) { + this.qemuService.addImage(this.server, this.qemuImg).subscribe(() => { this.dialogRef.close(); + }); + } else { + this.toasterService.error('Fill all required fields.'); } + } + + onCancelClick() { + this.dialogRef.close(); + } } export interface ClusterSize { - name: string; - value: number; + name: string; + value: number; } diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.html b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.html index e2f2f293..e0faf72c 100644 --- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.html +++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.html @@ -1,80 +1,78 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - - - - - - - - - - - - - - - - - -
Port : DLCI {{element.portIn}} Port : DLCI {{element.portOut}} Actions - -

+
+
+ + + + + + - - - - - + + + + - - Source - - - - - - - Destination - - - - - - - - - - - + + + + + + + +
Port : DLCI{{ element.portIn }}
Port : DLCI{{ element.portOut }}
Actions + +
+
+ +
+ + + +
+ +
+ Source + + + + + + + Destination + + + + + + +
+ + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts index 0bc51497..393069f7 100644 --- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -6,128 +6,130 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-switch', - templateUrl: './configurator-switch.component.html', - styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'] + selector: 'app-configurator-switch', + templateUrl: './configurator-switch.component.html', + styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogSwitchComponent implements OnInit { - server: Server; - node: Node; - name: string; - nameForm: FormGroup; - inputForm: FormGroup; - consoleTypes: string[] = []; + server: Server; + node: Node; + name: string; + nameForm: FormGroup; + inputForm: FormGroup; + consoleTypes: string[] = []; - nodeMappings = new Map(); - nodeMappingsDataSource: NodeMapping[] = []; - dataSource = []; - displayedColumns = ['portIn', 'portOut', 'actions'] + nodeMappings = new Map(); + nodeMappingsDataSource: NodeMapping[] = []; + dataSource = []; + displayedColumns = ['portIn', 'portOut', 'actions']; - sourcePort: string = ''; - sourceDlci: string = ''; - destinationPort: string = ''; - destinationDlci: string = ''; + sourcePort: string = ''; + sourceDlci: string = ''; + destinationPort: string = ''; + destinationDlci: string = ''; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder - ) { - this.nameForm = this.formBuilder.group({ - name: new FormControl('', Validators.required), + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder + ) { + this.nameForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + + this.inputForm = this.formBuilder.group({ + sourcePort: new FormControl('', Validators.required), + sourceDlci: new FormControl('', Validators.required), + destinationPort: new FormControl('', Validators.required), + destinationDlci: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + + let mappings = node.properties.mappings; + Object.keys(mappings).forEach((key) => { + this.nodeMappings.set(key, mappings[key]); + }); + + this.nodeMappings.forEach((value: string, key: string) => { + this.nodeMappingsDataSource.push({ + portIn: key, + portOut: value, }); + }); + }); + } - this.inputForm = this.formBuilder.group({ - sourcePort: new FormControl('', Validators.required), - sourceDlci: new FormControl('', Validators.required), - destinationPort: new FormControl('', Validators.required), - destinationDlci: new FormControl('', Validators.required), - }); + delete(elem: NodeMapping) { + this.nodeMappingsDataSource = this.nodeMappingsDataSource.filter((n) => n !== elem); + } + + add() { + if (this.inputForm.valid) { + let nodeMapping: NodeMapping = { + portIn: `${this.sourcePort}:${this.sourceDlci}`, + portOut: `${this.destinationPort}:${this.destinationDlci}`, + }; + + if (this.nodeMappingsDataSource.filter((n) => n.portIn === nodeMapping.portIn).length > 0) { + this.toasterService.error('Mapping already defined.'); + } else { + this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); + this.clearUserInput(); + } + } else { + this.toasterService.error('Fill all required fields.'); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; + clearUserInput() { + this.sourcePort = '0'; + this.sourceDlci = '0'; + this.destinationPort = '0'; + this.destinationDlci = '0'; + } - let mappings = node.properties.mappings; - Object.keys(mappings).forEach(key => { - this.nodeMappings.set(key, mappings[key]); - }); - - this.nodeMappings.forEach((value: string, key: string) => { - this.nodeMappingsDataSource.push({ - portIn: key, - portOut: value - }); - }); - }); + strMapToObj(strMap) { + let obj = Object.create(null); + for (let [k, v] of strMap) { + obj[k] = v; } + return obj; + } - delete(elem: NodeMapping) { - this.nodeMappingsDataSource = this.nodeMappingsDataSource.filter(n => n !== elem); + onSaveClick() { + if (this.nameForm.valid) { + this.nodeMappings.clear(); + this.nodeMappingsDataSource.forEach((elem) => { + this.nodeMappings.set(elem.portIn, elem.portOut); + }); + + this.node.properties.mappings = Array.from(this.nodeMappings).reduce( + (obj, [key, value]) => Object.assign(obj, { [key]: value }), + {} + ); + + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - add() { - if (this.inputForm.valid) { - let nodeMapping: NodeMapping = { - portIn: `${this.sourcePort}:${this.sourceDlci}`, - portOut: `${this.destinationPort}:${this.destinationDlci}` - }; - - if (this.nodeMappingsDataSource.filter(n => n.portIn === nodeMapping.portIn).length > 0) { - this.toasterService.error('Mapping already defined.'); - } else { - this.nodeMappingsDataSource = this.nodeMappingsDataSource.concat([nodeMapping]); - this.clearUserInput(); - } - } else { - this.toasterService.error('Fill all required fields.'); - } - } - - clearUserInput() { - this.sourcePort = '0'; - this.sourceDlci = '0'; - this.destinationPort = '0'; - this.destinationDlci = '0'; - } - - strMapToObj(strMap) { - let obj = Object.create(null); - for (let [k,v] of strMap) { - obj[k] = v; - } - return obj; - } - - onSaveClick() { - if (this.nameForm.valid) { - this.nodeMappings.clear(); - this.nodeMappingsDataSource.forEach(elem => { - this.nodeMappings.set(elem.portIn, elem.portOut); - }); - - this.node.properties.mappings = Array.from(this.nodeMappings).reduce((obj, [key, value]) => (Object.assign(obj, { [key]: value })), {}); - - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } export interface NodeMapping { - portIn: string, - portOut: string + portIn: string; + portOut: string; } diff --git a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.html b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.html index ff1164d0..e257af66 100644 --- a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.html +++ b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.html @@ -1,21 +1,17 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- -
- - - -
- -
+
+
+ +
+ + + +
+
+
diff --git a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts index 4cb45eae..68553449 100644 --- a/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts +++ b/src/app/components/project-map/node-editors/configurator/traceng/configurator-traceng.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -6,48 +6,47 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-traceng', - templateUrl: './configurator-traceng.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-traceng', + templateUrl: './configurator-traceng.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogTracengComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + }); + } - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.html b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.html index 44a25210..c8b653e7 100644 --- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.html +++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.html @@ -1,61 +1,74 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - - - - - {{type}} - - - - - Auto start console - - - - MB - - - - - {{option[0]}} - - - -
- - Start VM in headless mode - - - -
- Allow GNS3 to use any configured VirtualBox adapter - - - - - - - - - - -
+
+
+ + + +
+
+ + + + + + + {{ type }} + + + + + Auto start console + + + + MB + + + + + {{ option[0] }} + + + +
+ Start VM in headless mode + + +
+ Allow GNS3 to use any configured VirtualBox adapter + + + + + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts index ee427a7d..458be2c2 100644 --- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts +++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -8,74 +8,73 @@ import { MatDialogRef } from '@angular/material/dialog'; import { VirtualBoxConfigurationService } from '../../../../../services/virtual-box-configuration.service'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; - @Component({ - selector: 'app-configurator-virtualbox', - templateUrl: './configurator-virtualbox.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-virtualbox', + templateUrl: './configurator-virtualbox.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVirtualBoxComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - consoleTypes: string[] = []; - onCloseOptions = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + consoleTypes: string[] = []; + onCloseOptions = []; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - networkTypes = []; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + networkTypes = []; - @ViewChild("customAdapters") customAdapters: CustomAdaptersTableComponent; + @ViewChild('customAdapters') customAdapters: CustomAdaptersTableComponent; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private virtualBoxConfigurationService: VirtualBoxConfigurationService - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required), - ram: new FormControl('', Validators.required) + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private virtualBoxConfigurationService: VirtualBoxConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + ram: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } + + getConfiguration() { + this.consoleTypes = this.virtualBoxConfigurationService.getConsoleTypes(); + this.onCloseOptions = this.virtualBoxConfigurationService.getOnCloseoptions(); + this.networkTypes = this.virtualBoxConfigurationService.getNetworkTypes(); + } + + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.node.custom_adapters = []; + this.customAdapters.adapters.forEach((n) => { + this.node.custom_adapters.push({ + adapter_number: n.adapter_number, + adapter_type: n.adapter_type, }); + }); + + this.node.properties.adapters = this.node.custom_adapters.length; + + this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }) - } - - getConfiguration() { - this.consoleTypes = this.virtualBoxConfigurationService.getConsoleTypes(); - this.onCloseOptions = this.virtualBoxConfigurationService.getOnCloseoptions(); - this.networkTypes = this.virtualBoxConfigurationService.getNetworkTypes(); - } - - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.node.custom_adapters = []; - this.customAdapters.adapters.forEach(n => { - this.node.custom_adapters.push({ - adapter_number: n.adapter_number, - adapter_type: n.adapter_type - }) - }); - - this.node.properties.adapters = this.node.custom_adapters.length; - - this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.html b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.html index 6750e2b5..a4562818 100644 --- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.html +++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.html @@ -1,60 +1,67 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- - - -
- - - - - - - {{type}} - - - - - Auto start console - - - - - {{option[0]}} - - - -
- - Start VM in headless mode -
- - Use a linked base VM (experimental) - - - -
- Allow GNS3 to override non custom VMware adapter - - - - - - - - - - -
+
+
+ + + +
+
+ + + + + + + {{ type }} + + + + + Auto start console + + + + + {{ option[0] }} + + + +
+ Start VM in headless mode
+ + Use a linked base VM (experimental) + + + +
+ Allow GNS3 to override non custom VMware adapter + + + + + + + + + +
+
diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts index 75c5196a..7ad3372c 100644 --- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ViewChild } from "@angular/core"; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { Node } from '../../../../../cartography/models/node'; import { Server } from '../../../../../models/server'; @@ -8,73 +8,72 @@ import { MatDialogRef } from '@angular/material/dialog'; import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component'; import { VmwareConfigurationService } from '../../../../../services/vmware-configuration.service'; - @Component({ - selector: 'app-configurator-vmware', - templateUrl: './configurator-vmware.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-vmware', + templateUrl: './configurator-vmware.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVmwareComponent implements OnInit { - server: Server; - node: Node; - name: string; - generalSettingsForm: FormGroup; - consoleTypes: string[] = []; - onCloseOptions = []; + server: Server; + node: Node; + name: string; + generalSettingsForm: FormGroup; + consoleTypes: string[] = []; + onCloseOptions = []; - displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; - networkTypes = []; + displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; + networkTypes = []; - @ViewChild("customAdapters") customAdapters: CustomAdaptersTableComponent; + @ViewChild('customAdapters') customAdapters: CustomAdaptersTableComponent; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private vmwareConfigurationService: VmwareConfigurationService - ) { - this.generalSettingsForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private vmwareConfigurationService: VmwareConfigurationService + ) { + this.generalSettingsForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } + + getConfiguration() { + this.consoleTypes = this.vmwareConfigurationService.getConsoleTypes(); + this.onCloseOptions = this.vmwareConfigurationService.getOnCloseoptions(); + this.networkTypes = this.vmwareConfigurationService.getNetworkTypes(); + } + + onSaveClick() { + if (this.generalSettingsForm.valid) { + this.node.custom_adapters = []; + this.customAdapters.adapters.forEach((n) => { + this.node.custom_adapters.push({ + adapter_number: n.adapter_number, + adapter_type: n.adapter_type, }); + }); + + this.node.properties.adapters = this.node.custom_adapters.length; + + this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }) - } - - getConfiguration() { - this.consoleTypes = this.vmwareConfigurationService.getConsoleTypes(); - this.onCloseOptions = this.vmwareConfigurationService.getOnCloseoptions(); - this.networkTypes = this.vmwareConfigurationService.getNetworkTypes(); - } - - onSaveClick() { - if (this.generalSettingsForm.valid) { - this.node.custom_adapters = []; - this.customAdapters.adapters.forEach(n => { - this.node.custom_adapters.push({ - adapter_number: n.adapter_number, - adapter_type: n.adapter_type - }) - }); - - this.node.properties.adapters = this.node.custom_adapters.length; - - this.nodeService.updateNodeWithCustomAdapters(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } - } - - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.html b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.html index c431fe58..3d67e82f 100644 --- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.html +++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.html @@ -1,36 +1,31 @@ -

Configurator for node {{name}}

+

Configurator for node {{ name }}

-
-
- -
- - - - - - - {{type}} - - - - - Auto start console - -
- -
+
+
+ +
+ + + + + + + {{ type }} + + + + + Auto start console + +
+
+
diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts index c97f9a78..9b1dd78e 100644 --- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service'; import { Node } from '../../../../../cartography/models/node'; @@ -7,55 +7,54 @@ import { NodeService } from '../../../../../services/node.service'; import { ToasterService } from '../../../../../services/toaster.service'; import { MatDialogRef } from '@angular/material/dialog'; - @Component({ - selector: 'app-configurator-vpcs', - templateUrl: './configurator-vpcs.component.html', - styleUrls: ['../configurator.component.scss'] + selector: 'app-configurator-vpcs', + templateUrl: './configurator-vpcs.component.html', + styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVpcsComponent implements OnInit { - server: Server; - node: Node; - name: string; - inputForm: FormGroup; - consoleTypes: string[] = []; + server: Server; + node: Node; + name: string; + inputForm: FormGroup; + consoleTypes: string[] = []; - constructor( - public dialogRef: MatDialogRef, - public nodeService: NodeService, - private toasterService: ToasterService, - private formBuilder: FormBuilder, - private vpcsConfigurationService: VpcsConfigurationService - ) { - this.inputForm = this.formBuilder.group({ - name: new FormControl('', Validators.required) - }); - } + constructor( + public dialogRef: MatDialogRef, + public nodeService: NodeService, + private toasterService: ToasterService, + private formBuilder: FormBuilder, + private vpcsConfigurationService: VpcsConfigurationService + ) { + this.inputForm = this.formBuilder.group({ + name: new FormControl('', Validators.required), + }); + } - ngOnInit() { - this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { - this.node = node; - this.name = node.name; - this.getConfiguration(); - }) - } + ngOnInit() { + this.nodeService.getNode(this.server, this.node).subscribe((node: Node) => { + this.node = node; + this.name = node.name; + this.getConfiguration(); + }); + } - getConfiguration() { - this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); - } + getConfiguration() { + this.consoleTypes = this.vpcsConfigurationService.getConsoleTypes(); + } - onSaveClick() { - if (this.inputForm.valid) { - this.nodeService.updateNode(this.server, this.node).subscribe(() => { - this.toasterService.success(`Node ${this.node.name} updated.`); - this.onCancelClick(); - }); - } else { - this.toasterService.error(`Fill all required fields.`); - } + onSaveClick() { + if (this.inputForm.valid) { + this.nodeService.updateNode(this.server, this.node).subscribe(() => { + this.toasterService.success(`Node ${this.node.name} updated.`); + this.onCancelClick(); + }); + } else { + this.toasterService.error(`Fill all required fields.`); } + } - onCancelClick() { - this.dialogRef.close(); - } + onCancelClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/node-select-interface/node-select-interface.component.scss b/src/app/components/project-map/node-select-interface/node-select-interface.component.scss index 5ca0ac3f..9c0da1fd 100644 --- a/src/app/components/project-map/node-select-interface/node-select-interface.component.scss +++ b/src/app/components/project-map/node-select-interface/node-select-interface.component.scss @@ -3,7 +3,7 @@ } .context-menu-items { - min-height: 0px!important; + min-height: 0px !important; } .status { diff --git a/src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts b/src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts index 9a7116ff..2046ea71 100644 --- a/src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts +++ b/src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts @@ -8,7 +8,7 @@ describe('NodeSelectInterfaceComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [NodeSelectInterfaceComponent] + declarations: [NodeSelectInterfaceComponent], }).compileComponents(); })); diff --git a/src/app/components/project-map/node-select-interface/node-select-interface.component.ts b/src/app/components/project-map/node-select-interface/node-select-interface.component.ts index 177d12c7..13f1498a 100644 --- a/src/app/components/project-map/node-select-interface/node-select-interface.component.ts +++ b/src/app/components/project-map/node-select-interface/node-select-interface.component.ts @@ -1,4 +1,13 @@ -import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnInit, + Output, + ViewChild, + ViewEncapsulation, +} from '@angular/core'; import { MatMenuTrigger } from '@angular/material/menu'; import { DomSanitizer } from '@angular/platform-browser'; import { Node } from '../../../cartography/models/node'; @@ -9,7 +18,7 @@ import { LinkNode } from '../../../models/link-node'; @Component({ selector: 'app-node-select-interface', templateUrl: './node-select-interface.component.html', - styleUrls: ['./node-select-interface.component.scss'] + styleUrls: ['./node-select-interface.component.scss'], }) export class NodeSelectInterfaceComponent implements OnInit { @Input() links: Link[]; @@ -22,10 +31,7 @@ export class NodeSelectInterfaceComponent implements OnInit { public node: Node; public ports: Port[]; - constructor( - private sanitizer: DomSanitizer, - private changeDetector: ChangeDetectorRef - ) {} + constructor(private sanitizer: DomSanitizer, private changeDetector: ChangeDetectorRef) {} ngOnInit() { this.setPosition(0, 0); @@ -56,11 +62,16 @@ export class NodeSelectInterfaceComponent implements OnInit { this.ports = []; this.node.ports.forEach((port: Port) => { - let linkNodesOnTheSameAdapter = linkNodes.filter((linkNode: LinkNode) => linkNode.adapter_number === port.adapter_number); + let linkNodesOnTheSameAdapter = linkNodes.filter( + (linkNode: LinkNode) => linkNode.adapter_number === port.adapter_number + ); if (linkNodesOnTheSameAdapter.length === 0) { port.available = true; } else { - if (linkNodesOnTheSameAdapter.filter((linkNode: LinkNode) => linkNode.port_number === port.port_number).length === 0) { + if ( + linkNodesOnTheSameAdapter.filter((linkNode: LinkNode) => linkNode.port_number === port.port_number).length === + 0 + ) { port.available = true; } else { port.available = false; @@ -74,7 +85,7 @@ export class NodeSelectInterfaceComponent implements OnInit { public chooseInterface(port: Port) { this.onChooseInterface.emit({ node: this.node, - port: port + port: port, }); } } diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.html b/src/app/components/project-map/nodes-menu/nodes-menu.component.html index afb87690..b495ad3c 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.html +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.html @@ -1,43 +1,47 @@
- - - - - - + + + + +
diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.scss b/src/app/components/project-map/nodes-menu/nodes-menu.component.scss index 0417dd8f..fb7e4cb2 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.scss +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.scss @@ -1,7 +1,7 @@ .menu-button { - margin: 0px 5px !important; + margin: 0px 5px !important; } .marked { - color: #0097a7!important; + color: #0097a7 !important; } diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts index bbc38bf4..2d1fcab7 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts @@ -16,69 +16,67 @@ import { SettingsService } from '../../../services/settings.service'; import { ElectronService } from 'ngx-electron'; xdescribe('NodesMenuComponent', () => { - let component: NodesMenuComponent; - let fixture: ComponentFixture; - let mockedToasterService: MockedToasterService = new MockedToasterService(); - let mockedNodeService: MockedNodeService = new MockedNodeService(); - let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource(); + let component: NodesMenuComponent; + let fixture: ComponentFixture; + let mockedToasterService: MockedToasterService = new MockedToasterService(); + let mockedNodeService: MockedNodeService = new MockedNodeService(); + let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatButtonModule, MatIconModule, CommonModule, NoopAnimationsModule], - providers: [ - { provide: NodeService, useValue: mockedNodeService }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: NodesDataSource, useValue: mockedNodesDataSource }, - { provide: ServerService }, - { provide: SettingsService }, - { provide: ElectronService } - ], - declarations: [ - NodesMenuComponent, - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [MatButtonModule, MatIconModule, CommonModule, NoopAnimationsModule], + providers: [ + { provide: NodeService, useValue: mockedNodeService }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: NodesDataSource, useValue: mockedNodesDataSource }, + { provide: ServerService }, + { provide: SettingsService }, + { provide: ElectronService }, + ], + declarations: [NodesMenuComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(NodesMenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(NodesMenuComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should call start all nodes', () => { - spyOn(mockedNodeService, 'startAll').and.returnValue(of()); + it('should call start all nodes', () => { + spyOn(mockedNodeService, 'startAll').and.returnValue(of()); - component.startNodes(); + component.startNodes(); - expect(mockedNodeService.startAll).toHaveBeenCalled(); - }); + expect(mockedNodeService.startAll).toHaveBeenCalled(); + }); - it('should call stop all nodes', () => { - spyOn(mockedNodeService, 'stopAll').and.returnValue(of()); + it('should call stop all nodes', () => { + spyOn(mockedNodeService, 'stopAll').and.returnValue(of()); - component.stopNodes(); + component.stopNodes(); - expect(mockedNodeService.stopAll).toHaveBeenCalled(); - }); + expect(mockedNodeService.stopAll).toHaveBeenCalled(); + }); - it('should call suspend all nodes', () => { - spyOn(mockedNodeService, 'suspendAll').and.returnValue(of()); + it('should call suspend all nodes', () => { + spyOn(mockedNodeService, 'suspendAll').and.returnValue(of()); - component.suspendNodes(); + component.suspendNodes(); - expect(mockedNodeService.suspendAll).toHaveBeenCalled(); - }); + expect(mockedNodeService.suspendAll).toHaveBeenCalled(); + }); - it('should call reload all nodes', () => { - spyOn(mockedNodeService, 'reloadAll').and.returnValue(of()); + it('should call reload all nodes', () => { + spyOn(mockedNodeService, 'reloadAll').and.returnValue(of()); - component.reloadNodes(); + component.reloadNodes(); - expect(mockedNodeService.reloadAll).toHaveBeenCalled(); - }); + expect(mockedNodeService.reloadAll).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts index 0c9a1d2c..c1e13322 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, ChangeDetectionStrategy } from "@angular/core"; +import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; import { Project } from '../../../models/project'; import { Server } from '../../../models/server'; import { NodeService } from '../../../services/node.service'; @@ -9,68 +9,70 @@ import { SettingsService } from '../../../services/settings.service'; import { ServerService } from '../../../services/server.service'; @Component({ - selector: 'app-nodes-menu', - templateUrl: './nodes-menu.component.html', - styleUrls: ['./nodes-menu.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-nodes-menu', + templateUrl: './nodes-menu.component.html', + styleUrls: ['./nodes-menu.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class NodesMenuComponent { - @Input('project') project: Project; - @Input('server') server: Server; + @Input('project') project: Project; + @Input('server') server: Server; - constructor( - private nodeService: NodeService, - private nodesDataSource: NodesDataSource, - private toasterService: ToasterService, - private serverService: ServerService, - private settingsService: SettingsService, - private electronService: ElectronService - ) {} + constructor( + private nodeService: NodeService, + private nodesDataSource: NodesDataSource, + private toasterService: ToasterService, + private serverService: ServerService, + private settingsService: SettingsService, + private electronService: ElectronService + ) {} - async startConsoleForAllNodes() { - if (this.electronService.isElectronApp) { - let consoleCommand = this.settingsService.get('console_command') ? this.settingsService.get('console_command') : this.nodeService.getDefaultCommand(); + async startConsoleForAllNodes() { + if (this.electronService.isElectronApp) { + let consoleCommand = this.settingsService.get('console_command') + ? this.settingsService.get('console_command') + : this.nodeService.getDefaultCommand(); - let nodes = this.nodesDataSource.getItems(); - for(var node of nodes) { - const request = { - command: consoleCommand, - type: node.console_type, - host: node.console_host, - port: node.console, - name: node.name, - project_id: node.project_id, - node_id: node.node_id, - server_url: this.serverService.getServerUrl(this.server) - }; - await this.electronService.remote.require('./console-executor.js').openConsole(request); - } - } else { - this.toasterService.error("Option to start all nodes not available in web browser."); - } + let nodes = this.nodesDataSource.getItems(); + for (var node of nodes) { + const request = { + command: consoleCommand, + type: node.console_type, + host: node.console_host, + port: node.console, + name: node.name, + project_id: node.project_id, + node_id: node.node_id, + server_url: this.serverService.getServerUrl(this.server), + }; + await this.electronService.remote.require('./console-executor.js').openConsole(request); + } + } else { + this.toasterService.error('Option to start all nodes not available in web browser.'); } + } - startNodes() { - this.nodeService.startAll(this.server, this.project).subscribe(() => { - this.toasterService.success('All nodes successfully started'); - }); - } + startNodes() { + this.nodeService.startAll(this.server, this.project).subscribe(() => { + this.toasterService.success('All nodes successfully started'); + }); + } - stopNodes() { - this.nodeService.stopAll(this.server, this.project).subscribe(() => { - this.toasterService.success('All nodes successfully stopped'); - }); - } + stopNodes() { + this.nodeService.stopAll(this.server, this.project).subscribe(() => { + this.toasterService.success('All nodes successfully stopped'); + }); + } - suspendNodes() { - this.nodeService.suspendAll(this.server, this.project).subscribe(() => { - this.toasterService.success('All nodes successfully suspended'); - }); - } + suspendNodes() { + this.nodeService.suspendAll(this.server, this.project).subscribe(() => { + this.toasterService.success('All nodes successfully suspended'); + }); + } - reloadNodes() { - this.nodeService.reloadAll(this.server, this.project).subscribe(() => { - this.toasterService.success('All nodes successfully reloaded'); - }); - } + reloadNodes() { + this.nodeService.reloadAll(this.server, this.project).subscribe(() => { + this.toasterService.success('All nodes successfully reloaded'); + }); + } } diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.html b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.html index 09856747..bb3db223 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.html +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.html @@ -1,44 +1,44 @@

Packet filters

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-
- - - -
- -
+
+
+ + + +
+ +
diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.scss b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.scss index 529a458e..54328173 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.scss +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.scss @@ -1,67 +1,67 @@ .spacer { - flex-grow: 1; + flex-grow: 1; } .content { - height: 260px; + height: 260px; } .item { - height: 25px; - font-size: 10pt; - margin-bottom: 10px; + height: 25px; + font-size: 10pt; + margin-bottom: 10px; } .item-name { - margin-bottom: 10px; + margin-bottom: 10px; } .item-value { - width: 100%; - margin-bottom: 10px; + width: 100%; + margin-bottom: 10px; } .input-field { - width: 100%; - margin-top: 10px; + width: 100%; + margin-top: 10px; } .divider { - width: fit-content; - flex: 1 1 auto; + width: fit-content; + flex: 1 1 auto; } .input-color { - padding: 0px; - border-width: 0px; - width: 100%; - background-color: transparent; - outline: none; + padding: 0px; + border-width: 0px; + width: 100%; + background-color: transparent; + outline: none; } input:focus { - outline: none; + outline: none; } -input[type="color"] { - -webkit-appearance: none; - border: none; - height: 25px; +input[type='color'] { + -webkit-appearance: none; + border: none; + height: 25px; } -input[type="color"]::-webkit-color-swatch-wrapper { - padding: 0; +input[type='color']::-webkit-color-swatch-wrapper { + padding: 0; } -input[type="color"]::-webkit-color-swatch { - border: none; +input[type='color']::-webkit-color-swatch { + border: none; } .modal-form-container { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .modal-form-container > * { - width: 100%; + width: 100%; } diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.spec.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.spec.ts index 8a220fa2..8fbf5e71 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.spec.ts +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.spec.ts @@ -15,53 +15,61 @@ import { of } from 'rxjs'; import { PacketFiltersDialogComponent } from './packet-filters.component'; describe('PacketFiltersDialogComponent', () => { - let component: PacketFiltersDialogComponent; - let fixture: ComponentFixture; + let component: PacketFiltersDialogComponent; + let fixture: ComponentFixture; - let mockedLinkService = new MockedLinkService; - let dialogRef = { - close: jasmine.createSpy('close') - }; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatDialogModule, FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], - providers: [ - { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: [] }, - { provide: LinkService, useValue: mockedLinkService } - ], - declarations: [ - PacketFiltersDialogComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedLinkService = new MockedLinkService(); + let dialogRef = { + close: jasmine.createSpy('close'), + }; - beforeEach(() => { - fixture = TestBed.createComponent(PacketFiltersDialogComponent); - component = fixture.componentInstance; - component.link = {link_type: 'ethernet'} as Link; - fixture.detectChanges(); - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatDialogModule, + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef }, + { provide: MAT_DIALOG_DATA, useValue: [] }, + { provide: LinkService, useValue: mockedLinkService }, + ], + declarations: [PacketFiltersDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(PacketFiltersDialogComponent); + component = fixture.componentInstance; + component.link = { link_type: 'ethernet' } as Link; + fixture.detectChanges(); + }); - it('should call update link when filters applied', () => { - spyOn(mockedLinkService, 'updateLink').and.returnValue(of({})); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onYesClick(); + it('should call update link when filters applied', () => { + spyOn(mockedLinkService, 'updateLink').and.returnValue(of({})); - expect(mockedLinkService.updateLink).toHaveBeenCalled(); - }); + component.onYesClick(); - it('should call update link after resetting', () => { - spyOn(mockedLinkService, 'updateLink').and.returnValue(of({})); + expect(mockedLinkService.updateLink).toHaveBeenCalled(); + }); - component.onResetClick(); + it('should call update link after resetting', () => { + spyOn(mockedLinkService, 'updateLink').and.returnValue(of({})); - expect(mockedLinkService.updateLink).toHaveBeenCalled(); - }); + component.onResetClick(); + + expect(mockedLinkService.updateLink).toHaveBeenCalled(); + }); }); diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts index afbcf5e5..898b5c78 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts @@ -10,88 +10,88 @@ import { Message } from '../../../../models/message'; import { Filter } from '../../../../models/filter'; @Component({ - selector: 'app-packet-filters', - templateUrl: './packet-filters.component.html', - styleUrls: ['./packet-filters.component.scss'] + selector: 'app-packet-filters', + templateUrl: './packet-filters.component.html', + styleUrls: ['./packet-filters.component.scss'], }) -export class PacketFiltersDialogComponent implements OnInit{ - server: Server; - project: Project; - link: Link; - filters: Filter; - availableFilters: FilterDescription[]; +export class PacketFiltersDialogComponent implements OnInit { + server: Server; + project: Project; + link: Link; + filters: Filter; + availableFilters: FilterDescription[]; - constructor( - private dialogRef: MatDialogRef, - private linkService: LinkService, - private dialog: MatDialog - ) {} + constructor( + private dialogRef: MatDialogRef, + private linkService: LinkService, + private dialog: MatDialog + ) {} - ngOnInit(){ - this.linkService.getLink(this.server, this.link.project_id, this.link.link_id).subscribe((link: Link) => { - this.link = link; - this.filters = { - bpf: [], - corrupt: [0], - delay: [0, 0], - frequency_drop: [0], - packet_loss: [0] - }; + ngOnInit() { + this.linkService.getLink(this.server, this.link.project_id, this.link.link_id).subscribe((link: Link) => { + this.link = link; + this.filters = { + bpf: [], + corrupt: [0], + delay: [0, 0], + frequency_drop: [0], + packet_loss: [0], + }; - if (this.link.filters) { - this.filters.bpf = this.link.filters.bpf ? this.link.filters.bpf : []; - this.filters.corrupt = this.link.filters.corrupt ? this.link.filters.corrupt : [0]; - this.filters.delay = this.link.filters.delay ? this.link.filters.delay : [0, 0]; - this.filters.frequency_drop = this.link.filters.frequency_drop ? this.link.filters.frequency_drop : [0]; - this.filters.packet_loss = this.link.filters.packet_loss ? this.link.filters.packet_loss : [0]; - } - }); + if (this.link.filters) { + this.filters.bpf = this.link.filters.bpf ? this.link.filters.bpf : []; + this.filters.corrupt = this.link.filters.corrupt ? this.link.filters.corrupt : [0]; + this.filters.delay = this.link.filters.delay ? this.link.filters.delay : [0, 0]; + this.filters.frequency_drop = this.link.filters.frequency_drop ? this.link.filters.frequency_drop : [0]; + this.filters.packet_loss = this.link.filters.packet_loss ? this.link.filters.packet_loss : [0]; + } + }); - this.linkService.getAvailableFilters(this.server, this.link).subscribe((availableFilters: FilterDescription[]) => { - this.availableFilters = availableFilters; - }); - } + this.linkService.getAvailableFilters(this.server, this.link).subscribe((availableFilters: FilterDescription[]) => { + this.availableFilters = availableFilters; + }); + } - onNoClick() { - this.dialogRef.close(); - } + onNoClick() { + this.dialogRef.close(); + } - onResetClick() { - this.link.filters = { - bpf: [], - corrupt: [0], - delay: [0, 0], - frequency_drop: [0], - packet_loss: [0] - }; + onResetClick() { + this.link.filters = { + bpf: [], + corrupt: [0], + delay: [0, 0], + frequency_drop: [0], + packet_loss: [0], + }; - this.linkService.updateLink(this.server, this.link).subscribe((link: Link) => { - this.dialogRef.close(); - }); - } + this.linkService.updateLink(this.server, this.link).subscribe((link: Link) => { + this.dialogRef.close(); + }); + } - onYesClick() { - this.link.filters = this.filters; - this.linkService.updateLink(this.server, this.link).subscribe((link: Link) => { - this.dialogRef.close(); - }); - } + onYesClick() { + this.link.filters = this.filters; + this.linkService.updateLink(this.server, this.link).subscribe((link: Link) => { + this.dialogRef.close(); + }); + } - onHelpClick() { - const dialogRef = this.dialog.open(HelpDialogComponent, { - width: '500px', - autoFocus: false, - disableClose: true - }); - let instance = dialogRef.componentInstance; - instance.title = 'Help for filters'; - let messages: Message[] = []; - this.availableFilters.forEach((filter: FilterDescription) => { - messages.push({ - name: filter.name, - description: filter.description - }); - }); - instance.messages = messages; - } + onHelpClick() { + const dialogRef = this.dialog.open(HelpDialogComponent, { + width: '500px', + autoFocus: false, + disableClose: true, + }); + let instance = dialogRef.componentInstance; + instance.title = 'Help for filters'; + let messages: Message[] = []; + this.availableFilters.forEach((filter: FilterDescription) => { + messages.push({ + name: filter.name, + description: filter.description, + }); + }); + instance.messages = messages; + } } diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.html b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.html index 12b6ae70..44480753 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.html +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.html @@ -1,30 +1,24 @@

Packet capture

-
- - - - {{type[0]}} - - - - - - - - Start the capture visualization program - -
+
+ + + + {{ type[0] }} + + + + + + + + Start the capture visualization program + +
- - + +
diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.scss b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.scss index 396495e3..2888a748 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.scss +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.scss @@ -1,3 +1,3 @@ .input-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts index 5ce8651d..bc77c034 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts @@ -1,4 +1,4 @@ -import { StartCaptureDialogComponent } from "./start-capture.component"; +import { StartCaptureDialogComponent } from './start-capture.component'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; @@ -19,70 +19,78 @@ import { NodesDataSource } from '../../../../cartography/datasources/nodes-datas import { PacketCaptureService } from '../../../../services/packet-capture.service'; describe('StartCaptureDialogComponent', () => { - let component: StartCaptureDialogComponent; - let fixture: ComponentFixture; + let component: StartCaptureDialogComponent; + let fixture: ComponentFixture; - let mockedToasterService = new MockedToasterService; - let mockedLinkService = new MockedLinkService; - let mockedNodesDataSource = new MockedNodesDataSource; - let dialogRef = { - close: jasmine.createSpy('close') - }; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatDialogModule, FormsModule, ReactiveFormsModule, MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], - providers: [ - { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: [] }, - { provide: ToasterService, useValue: mockedToasterService }, - { provide: LinkService, useValue: mockedLinkService }, - { provide: NodesDataSource, useValue: mockedNodesDataSource }, - { provide: PacketCaptureService } - ], - declarations: [ - StartCaptureDialogComponent - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + let mockedToasterService = new MockedToasterService(); + let mockedLinkService = new MockedLinkService(); + let mockedNodesDataSource = new MockedNodesDataSource(); + let dialogRef = { + close: jasmine.createSpy('close'), + }; - beforeEach(() => { - fixture = TestBed.createComponent(StartCaptureDialogComponent); - component = fixture.componentInstance; - component.link = {link_type: 'ethernet', nodes: [{node_id: '1'}, {node_id: '2'}]} as Link; - }); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatDialogModule, + FormsModule, + ReactiveFormsModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef }, + { provide: MAT_DIALOG_DATA, useValue: [] }, + { provide: ToasterService, useValue: mockedToasterService }, + { provide: LinkService, useValue: mockedLinkService }, + { provide: NodesDataSource, useValue: mockedNodesDataSource }, + { provide: PacketCaptureService }, + ], + declarations: [StartCaptureDialogComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - it('should create', () => { - expect(component).toBeTruthy(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(StartCaptureDialogComponent); + component = fixture.componentInstance; + component.link = { link_type: 'ethernet', nodes: [{ node_id: '1' }, { node_id: '2' }] } as Link; + }); - it('should call link service when input is valid', () => { - component.inputForm.controls['linkType'].setValue('Ethernet'); - component.inputForm.controls['fileName'].setValue('SampleFileName'); - spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); + it('should create', () => { + expect(component).toBeTruthy(); + }); - component.onYesClick(); + it('should call link service when input is valid', () => { + component.inputForm.controls['linkType'].setValue('Ethernet'); + component.inputForm.controls['fileName'].setValue('SampleFileName'); + spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); - expect(mockedLinkService.startCaptureOnLink).toHaveBeenCalled(); - }); + component.onYesClick(); - it('should not call link service when link type is not set', () => { - component.inputForm.controls['fileName'].setValue('SampleFileName'); - spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); + expect(mockedLinkService.startCaptureOnLink).toHaveBeenCalled(); + }); - component.onYesClick(); + it('should not call link service when link type is not set', () => { + component.inputForm.controls['fileName'].setValue('SampleFileName'); + spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); - expect(mockedLinkService.startCaptureOnLink).not.toHaveBeenCalled(); - }); + component.onYesClick(); - it('should not call link service when filename is empty', () => { - component.inputForm.controls['linkType'].setValue('Ethernet'); - component.inputForm.controls['fileName'].setValue(''); - spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); + expect(mockedLinkService.startCaptureOnLink).not.toHaveBeenCalled(); + }); - component.onYesClick(); + it('should not call link service when filename is empty', () => { + component.inputForm.controls['linkType'].setValue('Ethernet'); + component.inputForm.controls['fileName'].setValue(''); + spyOn(mockedLinkService, 'startCaptureOnLink').and.returnValue(of({})); - expect(mockedLinkService.startCaptureOnLink).not.toHaveBeenCalled(); - }); + component.onYesClick(); + + expect(mockedLinkService.startCaptureOnLink).not.toHaveBeenCalled(); + }); }); diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts index 3f46f43e..04a6e78c 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts @@ -13,81 +13,81 @@ import { PacketCaptureService } from '../../../../services/packet-capture.servic import { Project } from '../../../../models/project'; @Component({ - selector: 'app-start-capture', - templateUrl: './start-capture.component.html', - styleUrls: ['./start-capture.component.scss'] + selector: 'app-start-capture', + templateUrl: './start-capture.component.html', + styleUrls: ['./start-capture.component.scss'], }) export class StartCaptureDialogComponent implements OnInit { - server: Server; - project: Project; - link: Link; - linkTypes = []; - inputForm: FormGroup; - startProgram: boolean; + server: Server; + project: Project; + link: Link; + linkTypes = []; + inputForm: FormGroup; + startProgram: boolean; - constructor( - private dialogRef: MatDialogRef, - private linkService: LinkService, - private formBuilder: FormBuilder, - private toasterService: ToasterService, - private nodesDataSource: NodesDataSource, - private packetCaptureService: PacketCaptureService - ) { - this.inputForm = this.formBuilder.group({ - linkType: new FormControl('', Validators.required), - fileName: new FormControl('', Validators.required) - }); + constructor( + private dialogRef: MatDialogRef, + private linkService: LinkService, + private formBuilder: FormBuilder, + private toasterService: ToasterService, + private nodesDataSource: NodesDataSource, + private packetCaptureService: PacketCaptureService + ) { + this.inputForm = this.formBuilder.group({ + linkType: new FormControl('', Validators.required), + fileName: new FormControl('', Validators.required), + }); + } + + ngOnInit() { + if (this.link.link_type === 'ethernet') { + this.linkTypes = [['Ethernet', 'DLT_EN10MB']]; + } else { + this.linkTypes = [ + ['Cisco HDLC', 'DLT_C_HDLC'], + ['Cisco PPP', 'DLT_PPP_SERIAL'], + ['Frame Relay', 'DLT_FRELAY'], + ['ATM', 'DLT_ATM_RFC1483'], + ]; } - ngOnInit() { - if (this.link.link_type === 'ethernet') { - this.linkTypes = [ - ["Ethernet", "DLT_EN10MB"] - ]; - } else { - this.linkTypes = [ - ["Cisco HDLC", "DLT_C_HDLC"], - ["Cisco PPP", "DLT_PPP_SERIAL"], - ["Frame Relay", "DLT_FRELAY"], - ["ATM", "DLT_ATM_RFC1483"] - ]; - } + const sourceNode = this.nodesDataSource.get(this.link.nodes[0].node_id); + const targetNode = this.nodesDataSource.get(this.link.nodes[1].node_id); + const sourcePort = sourceNode.ports[this.link.nodes[0].port_number]; + const targetPort = targetNode.ports[this.link.nodes[1].port_number]; + this.inputForm.controls['fileName'].setValue( + `${sourceNode.name}_${sourcePort.name}_to_${targetNode.name}_${targetPort.name}` + ); + } - const sourceNode = this.nodesDataSource.get(this.link.nodes[0].node_id); - const targetNode = this.nodesDataSource.get(this.link.nodes[1].node_id); - const sourcePort = sourceNode.ports[this.link.nodes[0].port_number]; - const targetPort = targetNode.ports[this.link.nodes[1].port_number]; - this.inputForm.controls['fileName'].setValue(`${sourceNode.name}_${sourcePort.name}_to_${targetNode.name}_${targetPort.name}`); - } + onYesClick() { + let isAnyRunningDevice = false; + this.link.nodes.forEach((linkNode: LinkNode) => { + let node = this.nodesDataSource.get(linkNode.node_id); + if (node.status === 'started') isAnyRunningDevice = true; + }); - onYesClick() { - let isAnyRunningDevice = false; - this.link.nodes.forEach((linkNode: LinkNode) => { - let node = this.nodesDataSource.get(linkNode.node_id); - if (node.status === 'started') isAnyRunningDevice = true; - }); + if (!isAnyRunningDevice) { + this.toasterService.error(`Cannot capture because there is no running device on this link`); + } else if (this.inputForm.invalid) { + this.toasterService.error(`Fill all required fields`); + } else { + let captureSettings: CapturingSettings = { + capture_file_name: this.inputForm.get('fileName').value, + data_link_type: this.inputForm.get('linkType').value, + }; - if (!isAnyRunningDevice) { - this.toasterService.error(`Cannot capture because there is no running device on this link`); - } else if (this.inputForm.invalid) { - this.toasterService.error(`Fill all required fields`); - } else { - let captureSettings: CapturingSettings = { - capture_file_name: this.inputForm.get('fileName').value, - data_link_type: this.inputForm.get('linkType').value - }; + if (this.startProgram) { + this.packetCaptureService.startCapture(this.server, this.project, this.link, captureSettings.capture_file_name); + } - if (this.startProgram) { - this.packetCaptureService.startCapture(this.server, this.project, this.link, captureSettings.capture_file_name); - } - - this.linkService.startCaptureOnLink(this.server, this.link, captureSettings).subscribe(() => { - this.dialogRef.close(); - }); - } - } - - onNoClick() { + this.linkService.startCaptureOnLink(this.server, this.link, captureSettings).subscribe(() => { this.dialogRef.close(); + }); } + } + + onNoClick() { + this.dialogRef.close(); + } } diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.html b/src/app/components/project-map/project-map-menu/project-map-menu.component.html index 3edf9562..81f0fc0f 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.html +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.html @@ -1,96 +1,108 @@ + type="file" + accept=".svg, .bmp, .jpeg, .jpg, .gif, .png" + class="non-visible" + #file + (change)="uploadImageFile($event)" +/> + (drawingSaved)="onDrawingSaved()" +> -
-
+
diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.scss b/src/app/components/project-map/project-map-menu/project-map-menu.component.scss index c429af51..05c0892d 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.scss +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.scss @@ -1,15 +1,15 @@ .non-visible { - display: none; + display: none; } .unmarked { - color: white!important; + color: white !important; } .unmarkedLight { - color: black!important; + color: black !important; } .marked { - color: #0097a7!important; + color: #0097a7 !important; } diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.spec.ts b/src/app/components/project-map/project-map-menu/project-map-menu.component.spec.ts index 104a8edb..5fb785eb 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.spec.ts +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.spec.ts @@ -1,4 +1,4 @@ -import { ProjectMapMenuComponent } from "./project-map-menu.component"; +import { ProjectMapMenuComponent } from './project-map-menu.component'; import { ComponentFixture, async, TestBed } from '@angular/core/testing'; import { MockedDrawingService } from '../project-map.component.spec'; import { MapSettingsService } from '../../../services/mapsettings.service'; @@ -19,59 +19,67 @@ import { MockedSymbolService } from '../../preferences/common/symbols/symbols.co import { ElectronService } from 'ngx-electron'; describe('ProjectMapMenuComponent', () => { - let component: ProjectMapMenuComponent; - let fixture: ComponentFixture; - let drawingService = new MockedDrawingService(); - let mapSettingService = new MapSettingsService(); - let mockedSymbolService = new MockedSymbolService; + let component: ProjectMapMenuComponent; + let fixture: ComponentFixture; + let drawingService = new MockedDrawingService(); + let mapSettingService = new MapSettingsService(); + let mockedSymbolService = new MockedSymbolService(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatIconModule, MatDialogModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], - providers: [ - { provide: DrawingService, useValue: drawingService }, - { provide: ToolsService }, - { provide: MapSettingsService, useValue: mapSettingService }, - { provide: SymbolService, useValue: mockedSymbolService}, - { provide: ElectronService } - ], - declarations: [ProjectMapMenuComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatIconModule, + MatDialogModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + ], + providers: [ + { provide: DrawingService, useValue: drawingService }, + { provide: ToolsService }, + { provide: MapSettingsService, useValue: mapSettingService }, + { provide: SymbolService, useValue: mockedSymbolService }, + { provide: ElectronService }, + ], + declarations: [ProjectMapMenuComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ProjectMapMenuComponent); - component = fixture.componentInstance; - }); + beforeEach(() => { + fixture = TestBed.createComponent(ProjectMapMenuComponent); + component = fixture.componentInstance; + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should reset choice on draw menu after saving drawing', () => { - spyOn(component, 'resetDrawToolChoice'); + it('should reset choice on draw menu after saving drawing', () => { + spyOn(component, 'resetDrawToolChoice'); - component.onDrawingSaved(); + component.onDrawingSaved(); - expect(component.resetDrawToolChoice).toHaveBeenCalled(); - }); + expect(component.resetDrawToolChoice).toHaveBeenCalled(); + }); - it('should call map settings service when lock value was changed', () => { - spyOn(mapSettingService, 'changeMapLockValue'); + it('should call map settings service when lock value was changed', () => { + spyOn(mapSettingService, 'changeMapLockValue'); - component.changeLockValue(); + component.changeLockValue(); - expect(mapSettingService.changeMapLockValue).toHaveBeenCalled(); - }); + expect(mapSettingService.changeMapLockValue).toHaveBeenCalled(); + }); - it('should call map settings service with proper value', () => { - spyOn(mapSettingService, 'changeMapLockValue'); + it('should call map settings service with proper value', () => { + spyOn(mapSettingService, 'changeMapLockValue'); - component.changeLockValue(); - expect(mapSettingService.changeMapLockValue).toHaveBeenCalledWith(true); + component.changeLockValue(); + expect(mapSettingService.changeMapLockValue).toHaveBeenCalledWith(true); - component.changeLockValue(); - expect(mapSettingService.changeMapLockValue).toHaveBeenCalledWith(false); - }); + component.changeLockValue(); + expect(mapSettingService.changeMapLockValue).toHaveBeenCalledWith(false); + }); }); diff --git a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts index dba46728..30e252ef 100644 --- a/src/app/components/project-map/project-map-menu/project-map-menu.component.ts +++ b/src/app/components/project-map/project-map-menu/project-map-menu.component.ts @@ -15,170 +15,173 @@ import { saveAsPng, saveAsJpeg } from 'save-html-as-image'; import { ThemeService } from '../../../services/theme.service'; @Component({ - selector: 'app-project-map-menu', - templateUrl: './project-map-menu.component.html', - styleUrls: ['./project-map-menu.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-project-map-menu', + templateUrl: './project-map-menu.component.html', + styleUrls: ['./project-map-menu.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class ProjectMapMenuComponent implements OnInit, OnDestroy { - @Input() project: Project; - @Input() server: Server; + @Input() project: Project; + @Input() server: Server; - public selectedDrawing: string; - public drawTools = { - isRectangleChosen: false, - isEllipseChosen: false, - isLineChosen: false, - isTextChosen: false + public selectedDrawing: string; + public drawTools = { + isRectangleChosen: false, + isEllipseChosen: false, + isLineChosen: false, + isTextChosen: false, + }; + public isLocked: boolean = false; + public isLightThemeEnabled: boolean = false; + + constructor( + private toolsService: ToolsService, + private mapSettingsService: MapSettingsService, + private drawingService: DrawingService, + private symbolService: SymbolService, + private dialog: MatDialog, + private themeService: ThemeService + ) {} + + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + } + + getCssClassForIcon(type: string) { + if (type === 'text') { + return { + unmarkedLight: !this.drawTools.isTextChosen && this.isLightThemeEnabled, + marked: this.drawTools.isTextChosen, + }; + } else if (type === 'rectangle') { + return { + unmarkedLight: !this.drawTools.isRectangleChosen && this.isLightThemeEnabled, + marked: this.drawTools.isRectangleChosen, + }; + } + return { + unmarkedLight: !this.drawTools.isEllipseChosen && this.isLightThemeEnabled, + marked: this.drawTools.isEllipseChosen, }; - public isLocked: boolean = false; - public isLightThemeEnabled: boolean = false; + } - constructor( - private toolsService: ToolsService, - private mapSettingsService: MapSettingsService, - private drawingService: DrawingService, - private symbolService: SymbolService, - private dialog: MatDialog, - private themeService: ThemeService - ) {} + public takeScreenshot() { + const dialogRef = this.dialog.open(ScreenshotDialogComponent, { + width: '400px', + autoFocus: false, + disableClose: true, + }); + dialogRef.afterClosed().subscribe((result: Screenshot) => { + if (result) this.saveImage(result); + }); + } - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + private async saveImage(screenshotProperties: Screenshot) { + if (screenshotProperties.filetype === 'png') { + let splittedSvg = document.getElementsByTagName('svg')[0].outerHTML.split('image'); + let i = 1; + + while (i < splittedSvg.length) { + let splittedImage = splittedSvg[i].split('"'); + let splittedUrl = splittedImage[1].split('/'); + + let elem = await this.symbolService.raw(this.server, splittedUrl[7]).toPromise(); + let splittedElement = elem.split('-->'); + splittedSvg[i] = splittedElement[1].substring(2); + i += 2; + } + let svgString = splittedSvg.join(); + + let placeholder = document.createElement('div'); + placeholder.innerHTML = svgString; + let element = placeholder.firstChild; + + svg.saveSvgAsPng(element, `${screenshotProperties.name}.png`); + } else { + var svg_el = select('svg').attr('version', 1.1).attr('xmlns', 'http://www.w3.org/2000/svg').node(); + downloadSvg(select('svg').node(), `${screenshotProperties.name}`); } + } - getCssClassForIcon(type: string) { - if (type === 'text') { - return { - 'unmarkedLight': !this.drawTools.isTextChosen && this.isLightThemeEnabled, - 'marked': this.drawTools.isTextChosen - }; - } else if (type === 'rectangle') { - return { - 'unmarkedLight': !this.drawTools.isRectangleChosen && this.isLightThemeEnabled, - 'marked': this.drawTools.isRectangleChosen - }; - } - return { - 'unmarkedLight': !this.drawTools.isEllipseChosen && this.isLightThemeEnabled, - 'marked': this.drawTools.isEllipseChosen - }; - } - - public takeScreenshot() { - const dialogRef = this.dialog.open(ScreenshotDialogComponent, { - width: '400px', - autoFocus: false, - disableClose: true - }); - dialogRef.afterClosed().subscribe((result: Screenshot) => { - if (result) this.saveImage(result); - }); - } - - private async saveImage(screenshotProperties: Screenshot) { - if (screenshotProperties.filetype === 'png') { - let splittedSvg = document.getElementsByTagName("svg")[0].outerHTML.split('image'); - let i = 1; - - while (i < splittedSvg.length) { - let splittedImage = splittedSvg[i].split("\""); - let splittedUrl = splittedImage[1].split("/"); - - let elem = await this.symbolService.raw(this.server, splittedUrl[7]).toPromise(); - let splittedElement = elem.split('-->'); - splittedSvg[i] = splittedElement[1].substring(2); - i += 2; - } - let svgString = splittedSvg.join(); - - let placeholder = document.createElement('div'); - placeholder.innerHTML = svgString; - let element = placeholder.firstChild; - - svg.saveSvgAsPng(element, `${screenshotProperties.name}.png`); - } else { - var svg_el = select("svg") - .attr("version", 1.1) - .attr("xmlns", "http://www.w3.org/2000/svg") - .node(); - downloadSvg(select("svg").node(), `${screenshotProperties.name}`); - } - } - - public addDrawing(selectedObject: string) { - switch (selectedObject) { - case 'rectangle': - this.drawTools.isTextChosen = false; - this.drawTools.isEllipseChosen = false; - this.drawTools.isRectangleChosen = !this.drawTools.isRectangleChosen; - this.drawTools.isLineChosen = false; - break; - case 'ellipse': - this.drawTools.isTextChosen = false; - this.drawTools.isEllipseChosen = !this.drawTools.isEllipseChosen; - this.drawTools.isRectangleChosen = false; - this.drawTools.isLineChosen = false; - break; - case 'line': - this.drawTools.isTextChosen = false; - this.drawTools.isEllipseChosen = false; - this.drawTools.isRectangleChosen = false; - this.drawTools.isLineChosen = !this.drawTools.isLineChosen; - break; - case 'text': - this.drawTools.isTextChosen = !this.drawTools.isTextChosen; - this.drawTools.isEllipseChosen = false; - this.drawTools.isRectangleChosen = false; - this.drawTools.isLineChosen = false; - this.toolsService.textAddingToolActivation(this.drawTools.isTextChosen); - break; - } - - this.selectedDrawing = this.selectedDrawing === selectedObject ? '' : selectedObject; - } - - public onDrawingSaved() { - this.resetDrawToolChoice(); - } - - public resetDrawToolChoice() { - this.drawTools.isRectangleChosen = false; - this.drawTools.isEllipseChosen = false; - this.drawTools.isLineChosen = false; + public addDrawing(selectedObject: string) { + switch (selectedObject) { + case 'rectangle': this.drawTools.isTextChosen = false; - this.selectedDrawing = ''; + this.drawTools.isEllipseChosen = false; + this.drawTools.isRectangleChosen = !this.drawTools.isRectangleChosen; + this.drawTools.isLineChosen = false; + break; + case 'ellipse': + this.drawTools.isTextChosen = false; + this.drawTools.isEllipseChosen = !this.drawTools.isEllipseChosen; + this.drawTools.isRectangleChosen = false; + this.drawTools.isLineChosen = false; + break; + case 'line': + this.drawTools.isTextChosen = false; + this.drawTools.isEllipseChosen = false; + this.drawTools.isRectangleChosen = false; + this.drawTools.isLineChosen = !this.drawTools.isLineChosen; + break; + case 'text': + this.drawTools.isTextChosen = !this.drawTools.isTextChosen; + this.drawTools.isEllipseChosen = false; + this.drawTools.isRectangleChosen = false; + this.drawTools.isLineChosen = false; this.toolsService.textAddingToolActivation(this.drawTools.isTextChosen); + break; } - public changeLockValue() { - this.isLocked = !this.isLocked; - this.mapSettingsService.changeMapLockValue(this.isLocked); - } + this.selectedDrawing = this.selectedDrawing === selectedObject ? '' : selectedObject; + } - public uploadImageFile(event) { - this.readImageFile(event.target); - } - - private readImageFile(fileInput) { - let file: File = fileInput.files[0]; - let fileReader: FileReader = new FileReader(); - let imageToUpload = new Image(); - - fileReader.onloadend = () => { - let image = fileReader.result; - let svg = this.createSvgFileForImage(image, imageToUpload); - this.drawingService.add(this.server, this.project.project_id, -(imageToUpload.width/2), -(imageToUpload.height/2), svg).subscribe(() => {}); - } - - imageToUpload.onload = () => { fileReader.readAsDataURL(file) }; - imageToUpload.src = window.URL.createObjectURL(file); - } + public onDrawingSaved() { + this.resetDrawToolChoice(); + } - private createSvgFileForImage(image: string|ArrayBuffer, imageToUpload: HTMLImageElement) { - return `\n\n` - } + public resetDrawToolChoice() { + this.drawTools.isRectangleChosen = false; + this.drawTools.isEllipseChosen = false; + this.drawTools.isLineChosen = false; + this.drawTools.isTextChosen = false; + this.selectedDrawing = ''; + this.toolsService.textAddingToolActivation(this.drawTools.isTextChosen); + } - ngOnDestroy() {} + public changeLockValue() { + this.isLocked = !this.isLocked; + this.mapSettingsService.changeMapLockValue(this.isLocked); + } + + public uploadImageFile(event) { + this.readImageFile(event.target); + } + + private readImageFile(fileInput) { + let file: File = fileInput.files[0]; + let fileReader: FileReader = new FileReader(); + let imageToUpload = new Image(); + + fileReader.onloadend = () => { + let image = fileReader.result; + let svg = this.createSvgFileForImage(image, imageToUpload); + this.drawingService + .add(this.server, this.project.project_id, -(imageToUpload.width / 2), -(imageToUpload.height / 2), svg) + .subscribe(() => {}); + }; + + imageToUpload.onload = () => { + fileReader.readAsDataURL(file); + }; + imageToUpload.src = window.URL.createObjectURL(file); + } + + private createSvgFileForImage(image: string | ArrayBuffer, imageToUpload: HTMLImageElement) { + return `\n\n`; + } + + ngOnDestroy() {} } diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html index ce700c32..8154fa86 100644 --- a/src/app/components/project-map/project-map.component.html +++ b/src/app/components/project-map/project-map.component.html @@ -1,24 +1,63 @@ -
- +
+ - + -
-
-
- - -
@@ -29,12 +68,16 @@
-
@@ -49,11 +92,11 @@ developer_board Go to servers - - @@ -114,40 +157,51 @@
- Show interface labels -
+ Show interface labels
- Show console -
+ Show console
- Show topology/servers summary -
+ Show topology/servers summary
- Show notifications -
- - Show layers -
- - Show grid -
+ Show notifications
+ Show layers
+ Show grid
- Snap to grid -
+ Snap to grid
- Scale symbols -
+ Scale symbols
-
+
- -
diff --git a/src/app/components/project-map/project-map.component.scss b/src/app/components/project-map/project-map.component.scss index 4c826803..3d811b07 100644 --- a/src/app/components/project-map/project-map.component.scss +++ b/src/app/components/project-map/project-map.component.scss @@ -14,130 +14,114 @@ g.node:hover { } .project-map { - background-color: #e8ecef; + background-color: #e8ecef; } #project-titlebar { - position: fixed; - top: 0px; - left: 0px; - right: 0px; - height: 60px; - padding: 0px 20px; - background-color: #20313b; - display: flex; - justify-content: space-between; - align-items: center; - box-shadow: 3px 3px 10px rgba(0,0,0,0.2); - z-index: 2; + position: fixed; + top: 0px; + left: 0px; + right: 0px; + height: 60px; + padding: 0px 20px; + background-color: #20313b; + display: flex; + justify-content: space-between; + align-items: center; + box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.2); + z-index: 2; - .gns3-button { - position: relative; - top: -2px; + .gns3-button { + position: relative; + top: -2px; - mat-icon { - width: 30px !important; - height: 30px !important; - } - } + mat-icon { + width: 30px !important; + height: 30px !important; + } + } - .primary-controls { - border-right: 1px solid rgba(255,255,255,0.3); - padding-right: 15px; - margin-right: 15px; + .primary-controls { + border-right: 1px solid rgba(255, 255, 255, 0.3); + padding-right: 15px; + margin-right: 15px; - &.lightTheme { - border-right: 1px solid black; - } - } + &.lightTheme { + border-right: 1px solid black; + } + } - .menu-button-group { - display: flex; - align-items: center; - height: 24px; - } + .menu-button-group { + display: flex; + align-items: center; + height: 24px; + } - .menu-button { - display: flex; - justify-content: center; - align-items: center; - height: 36px; - width: 36px; - margin: 0px 8px; - border-radius: 18px; - background: none; - font-size: 20px; - } + .menu-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + margin: 0px 8px; + border-radius: 18px; + background: none; + font-size: 20px; + } - .add-menu-button mat-icon { - font-size: 28px !important; - } + .add-menu-button mat-icon { + font-size: 28px !important; + } - .selected { - background: rgba(0, 151, 167, 0.1); + .selected { + background: rgba(0, 151, 167, 0.1); - mat-icon { - color: #0097a7 !important; - } - } + mat-icon { + color: #0097a7 !important; + } + } - .project-titlebar-controls { - display: flex; - align-items: center; - } + .project-titlebar-controls { + display: flex; + align-items: center; + } - &.lightTheme { - background-color: white !important; + &.lightTheme { + background-color: white !important; - .selected mat-icon { - color: #0097a7 !important; - } - } + .selected mat-icon { + color: #0097a7 !important; + } + } } #project-toolbar { - position: fixed; - top: 60px; - left: 0px; - width: 50px; - margin: 20px; - background-color: #20313b; - border-radius: 6px; - box-shadow: 1px 1px 10px rgba(0,0,0,0.2); - z-index: 2; + position: fixed; + top: 60px; + left: 0px; + width: 50px; + margin: 20px; + background-color: #20313b; + border-radius: 6px; + box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2); + z-index: 2; - mat-icon { - font-size: 20px; - } + mat-icon { + font-size: 20px; + } - .menu-button { - display: flex; - justify-content: center; - align-items: center; - height: 36px; - width: 36px; - border-radius: 18px; - background: none; - margin: 2px 0px; - } + .menu-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + border-radius: 18px; + background: none; + margin: 2px 0px; + } - .zoom-button { - display: flex; - justify-content: center; - align-items: center; - height: 36px; - width: 36px; - border-radius: 18px; - background: none; - margin: 2px 0px; - color: white; - - mat-icon { - font-size: 24px!important; - } - } - - .reset-zoom-button { + .zoom-button { display: flex; justify-content: center; align-items: center; @@ -149,53 +133,69 @@ g.node:hover { color: white; mat-icon { - font-size: 16px!important; + font-size: 24px !important; + } + } + + .reset-zoom-button { + display: flex; + justify-content: center; + align-items: center; + height: 36px; + width: 36px; + border-radius: 18px; + background: none; + margin: 2px 0px; + color: white; + + mat-icon { + font-size: 16px !important; margin-top: 8px; } - } + } - .selection-button { - margin-bottom: 0px !important; - } + .selection-button { + margin-bottom: 0px !important; + } - .snapshot-button mat-icon { - font-size: 16px; - } + .snapshot-button mat-icon { + font-size: 16px; + } - .section { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - border-top: 1px solid rgba(255,255,255,0.3); - padding: 5px 0px; + .section { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + border-top: 1px solid rgba(255, 255, 255, 0.3); + padding: 5px 0px; + + &:first-child { + border: none; + } + } + + &.lightTheme { + background-color: rgba(244, 248, 252, 0.95) !important; + + .zoom-button { + opacity: 0.7; + color: black; + } + + .reset-zoom-button { + opacity: 0.7; + color: black; + } + + .section { + border-top: 1px solid rgba(0, 0, 0, 0.1); &:first-child { - border: none; + border: none; } - } - - &.lightTheme { - background-color: rgba(244, 248, 252, 0.95) !important; - - .zoom-button { - opacity: 0.7; - color: black; - } - - .reset-zoom-button { - opacity: 0.7; - color: black; - } - - .section { - border-top: 1px solid rgba(0,0,0,0.1); - - &:first-child { - border: none; - } - } - } + } + } } img { @@ -204,11 +204,11 @@ img { } .lightTheme { - color: black!important; + color: black !important; } .darkTheme { - color: white!important; + color: white !important; } #show-menu-wrapper { @@ -393,13 +393,13 @@ mat-menu-panel { } .unmarked { - color: white!important; + color: white !important; } .unmarkedLight { - color: black!important; + color: black !important; } .marked { - color: #0097a7!important; + color: #0097a7 !important; } diff --git a/src/app/components/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts index 15d07471..6bc6498b 100644 --- a/src/app/components/project-map/project-map.component.spec.ts +++ b/src/app/components/project-map/project-map.component.spec.ts @@ -58,7 +58,12 @@ import { ProjectMapMenuComponent } from './project-map-menu/project-map-menu.com import { MockedToasterService } from '../../services/toaster.service.spec'; import { ToasterService } from '../../services/toaster.service'; import { MockedActivatedRoute } from '../snapshots/list-of-snapshots/list-of-snaphshots.component.spec'; -import { MapNodesDataSource, MapLinksDataSource, MapDrawingsDataSource, MapSymbolsDataSource } from '../../cartography/datasources/map-datasource'; +import { + MapNodesDataSource, + MapLinksDataSource, + MapDrawingsDataSource, + MapSymbolsDataSource, +} from '../../cartography/datasources/map-datasource'; import { EthernetLinkWidget } from '../../cartography/widgets/links/ethernet-link'; import { SerialLinkWidget } from '../../cartography/widgets/links/serial-link'; import { NotificationService } from '../../services/notification.service'; @@ -73,7 +78,7 @@ export class MockedProgressService { export class MockedNodeService { public node = { label: {} } as Node; constructor() {} - + getDefaultCommand(): string { return `putty.exe -telnet \%h \%p -wt \"\%d\" -gns3 5 -skin 4`; } @@ -133,7 +138,7 @@ export class MockedNodeService { saveConfiguration(server: Server, node: Node, configuration: string) { return of(configuration); } - + update(server: Server, node: Node) { return of(node); } @@ -179,7 +184,7 @@ export class MockedLinkService { return of({}); } - deleteLink(_server: Server, link: Link){ + deleteLink(_server: Server, link: Link) { return of({}); } @@ -199,7 +204,7 @@ export class MockedLinkService { return of({}); } - getAvailableFilters(server: Server, link: Link) { + getAvailableFilters(server: Server, link: Link) { return of({}); } } @@ -224,11 +229,11 @@ export class MockedNodesDataSource { clear() {} get() { - return {status: 'started'}; + return { status: 'started' }; } getItems() { - return [{name: 'testNode'}]; + return [{ name: 'testNode' }]; } update() { @@ -253,15 +258,24 @@ xdescribe('ProjectMapComponent', () => { let linksDataSource = new MockedLinksDataSource(); let mockedToasterService = new MockedToasterService(); let nodeCreatedLabelStylesFixer; - let mockedRouter = new MockedActivatedRoute; + let mockedRouter = new MockedActivatedRoute(); beforeEach(async(() => { nodeCreatedLabelStylesFixer = { - fix: (node) => node + fix: (node) => node, }; TestBed.configureTestingModule({ - imports: [MatBottomSheetModule, MatIconModule, MatDialogModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule], + imports: [ + MatBottomSheetModule, + MatIconModule, + MatDialogModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + ], providers: [ { provide: ActivatedRoute }, { provide: ServerService, useClass: MockedServerService }, @@ -294,11 +308,11 @@ xdescribe('ProjectMapComponent', () => { { provide: MovingEventSource }, { provide: RecentlyOpenedProjectService, - useClass: RecentlyOpenedProjectService + useClass: RecentlyOpenedProjectService, }, - { provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer}, + { provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer }, { provide: MapScaleService }, - { provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer}, + { provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer }, { provide: ToasterService, useValue: mockedToasterService }, { provide: Router, useValue: mockedRouter }, { provide: MapNodesDataSource, useClass: MapNodesDataSource }, @@ -306,18 +320,18 @@ xdescribe('ProjectMapComponent', () => { { provide: MapDrawingsDataSource, useClass: MapDrawingsDataSource }, { provide: MapSymbolsDataSource, useClass: MapSymbolsDataSource }, { provide: MapSettingsService, useClass: MapSettingsService }, - { provide: NotificationService } + { provide: NotificationService }, ], declarations: [ProjectMapComponent, ProjectMapMenuComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS], - schemas: [NO_ERRORS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(ProjectMapComponent); component = fixture.componentInstance; - component.projectMapMenuComponent = { - resetDrawToolChoice(){} + component.projectMapMenuComponent = { + resetDrawToolChoice() {}, } as ProjectMapMenuComponent; component.ws = { diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 547e9a1f..40f18592 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -1,4 +1,12 @@ -import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation, ElementRef, ChangeDetectorRef } from '@angular/core'; +import { + Component, + OnDestroy, + OnInit, + ViewChild, + ViewEncapsulation, + ElementRef, + ChangeDetectorRef, +} from '@angular/core'; import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { Observable, Subject, Subscription, from } from 'rxjs'; @@ -31,7 +39,12 @@ import { MapNodeToNodeConverter } from '../../cartography/converters/map/map-nod import { SettingsService, Settings } from '../../services/settings.service'; import { D3MapComponent } from '../../cartography/components/d3-map/d3-map.component'; import { ToolsService } from '../../services/tools.service'; -import { DrawingContextMenu, LinkContextMenu, LabelContextMenu, InterfaceLabelContextMenu } from '../../cartography/events/event-source'; +import { + DrawingContextMenu, + LinkContextMenu, + LabelContextMenu, + InterfaceLabelContextMenu, +} from '../../cartography/events/event-source'; import { MapDrawingToDrawingConverter } from '../../cartography/converters/map/map-drawing-to-drawing-converter'; import { SelectionManager } from '../../cartography/managers/selection-manager'; import { SelectionTool } from '../../cartography/tools/selection-tool'; @@ -59,7 +72,13 @@ import { mixinColor } from '@angular/material/core'; import { MatDialog } from '@angular/material/dialog'; import { AddBlankProjectDialogComponent } from '../projects/add-blank-project-dialog/add-blank-project-dialog.component'; import { SaveProjectDialogComponent } from '../projects/save-project-dialog/save-project-dialog.component'; -import { MapNodesDataSource, MapLinksDataSource, MapDrawingsDataSource, MapSymbolsDataSource, Indexed } from '../../cartography/datasources/map-datasource'; +import { + MapNodesDataSource, + MapLinksDataSource, + MapDrawingsDataSource, + MapSymbolsDataSource, + Indexed, +} from '../../cartography/datasources/map-datasource'; import { MapSettingsService } from '../../services/mapsettings.service'; import { EditProjectDialogComponent } from '../projects/edit-project-dialog/edit-project-dialog.component'; import { EthernetLinkWidget } from '../../cartography/widgets/links/ethernet-link'; @@ -75,12 +94,11 @@ import { NodeConsoleService } from '../../services/nodeConsole.service'; import * as Mousetrap from 'mousetrap'; import { SymbolService } from '../../services/symbol.service'; - @Component({ selector: 'app-project-map', encapsulation: ViewEncapsulation.None, templateUrl: './project-map.component.html', - styleUrls: ['./project-map.component.scss'] + styleUrls: ['./project-map.component.scss'], }) export class ProjectMapComponent implements OnInit, OnDestroy { public nodes: Node[] = []; @@ -105,7 +123,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { selection: true, moving: false, draw_link: false, - text_editing: true + text_editing: true, }; protected settings: Settings; @@ -120,7 +138,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { @ViewChild(D3MapComponent) mapChild: D3MapComponent; @ViewChild(ProjectMapMenuComponent) projectMapMenuComponent: ProjectMapMenuComponent; - private projectMapSubscription: Subscription = new Subscription(); + private projectMapSubscription: Subscription = new Subscription(); constructor( private route: ActivatedRoute, @@ -189,19 +207,23 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.addKeyboardListeners(); this.themeService.themeChanged.subscribe((value: string) => { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); }); } getSettings() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); this.cd.detectChanges(); this.settings = this.settingsService.getAll(); this.symbolScaling = this.mapSettingsService.getSymbolScaling(); this.isTopologySummaryVisible = this.mapSettingsService.isTopologySummaryVisible; this.isConsoleVisible = this.mapSettingsService.isLogConsoleVisible; - this.mapSettingsService.logConsoleSubject.subscribe(value => this.isConsoleVisible = value); + this.mapSettingsService.logConsoleSubject.subscribe((value) => (this.isConsoleVisible = value)); this.notificationsVisibility = localStorage.getItem('notificationsVisibility') === 'true' ? true : false; this.layersVisibility = localStorage.getItem('layersVisibility') === 'true' ? true : false; this.gridVisibility = localStorage.getItem('gridVisibility') === 'true' ? true : false; @@ -247,23 +269,29 @@ export class ProjectMapComponent implements OnInit, OnDestroy { }) ); - this.projectMapSubscription.add(this.projectWebServiceHandler.errorNotificationEmitter.subscribe((message) => { - this.showMessage({ - type: 'error', - message: message - }); - })); - - this.projectMapSubscription.add(this.projectWebServiceHandler.warningNotificationEmitter.subscribe((message) => { + this.projectMapSubscription.add( + this.projectWebServiceHandler.errorNotificationEmitter.subscribe((message) => { this.showMessage({ - type: 'warning', - message: message + type: 'error', + message: message, }); - })); + }) + ); - this.projectMapSubscription.add(this.mapSettingsService.symbolScalingSubject.subscribe((value) => { + this.projectMapSubscription.add( + this.projectWebServiceHandler.warningNotificationEmitter.subscribe((message) => { + this.showMessage({ + type: 'warning', + message: message, + }); + }) + ); + + this.projectMapSubscription.add( + this.mapSettingsService.symbolScalingSubject.subscribe((value) => { if (value) this.applyScalingOfNodeSymbols(); - })); + }) + ); } applyScalingOfNodeSymbols() { @@ -283,29 +311,29 @@ export class ProjectMapComponent implements OnInit, OnDestroy { from(this.serverService.get(server_id)) .pipe( mergeMap((server: Server) => { - if (!server ) this.router.navigate(['/servers']); + if (!server) this.router.navigate(['/servers']); this.server = server; return this.projectService.get(server, paramMap.get('project_id')).pipe( - map(project => { + map((project) => { return project; }) ); }), mergeMap((project: Project) => { this.project = project; - if (!project ) this.router.navigate(['/servers']); + if (!project) this.router.navigate(['/servers']); this.projectService.open(this.server, this.project.project_id); this.title.setTitle(this.project.name); this.isInterfaceLabelVisible = this.mapSettingsService.showInterfaceLabels; - + this.recentlyOpenedProjectService.setServerId(this.server.id.toString()); this.recentlyOpenedProjectService.setProjectId(this.project.project_id); if (this.project.status === 'opened') { - return new Observable(observer => { + return new Observable((observer) => { observer.next(this.project); }); } else { @@ -317,7 +345,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { (project: Project) => { this.onProjectLoad(project); }, - error => { + (error) => { this.progressService.setError(error); }, () => { @@ -374,10 +402,10 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const selected = this.selectionManager.getSelected(); selected - .filter(item => item instanceof MapNode) + .filter((item) => item instanceof MapNode) .forEach((item: MapNode) => { const node = this.mapNodeToNode.convert(item); - this.nodeService.delete(this.server, node).subscribe(data => { + this.nodeService.delete(this.server, node).subscribe((data) => { this.toasterService.success('Node has been deleted'); }); }); @@ -407,7 +435,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.progressService.deactivate(); }); - this.projectMapSubscription.add(subscription); + this.projectMapSubscription.add(subscription); } setUpProjectWS(project: Project) { @@ -458,15 +486,22 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const onLabelContextMenu = this.labelWidget.onContextMenu.subscribe((eventLabel: LabelContextMenu) => { const label = this.mapLabelToLabel.convert(eventLabel.label); - const node = this.nodes.find(n => n.node_id === eventLabel.label.nodeId); + const node = this.nodes.find((n) => n.node_id === eventLabel.label.nodeId); this.contextMenu.openMenuForLabel(label, node, eventLabel.event.pageY, eventLabel.event.pageX); }); - const onInterfaceLabelContextMenu = this.interfaceLabelWidget.onContextMenu.subscribe((eventInterfaceLabel: InterfaceLabelContextMenu) => { - const linkNode = this.mapLinkNodeToLinkNode.convert(eventInterfaceLabel.interfaceLabel); - const link = this.links.find(l => l.link_id === eventInterfaceLabel.interfaceLabel.linkId); - this.contextMenu.openMenuForInterfaceLabel(linkNode, link, eventInterfaceLabel.event.pageY, eventInterfaceLabel.event.pageX); - }); + const onInterfaceLabelContextMenu = this.interfaceLabelWidget.onContextMenu.subscribe( + (eventInterfaceLabel: InterfaceLabelContextMenu) => { + const linkNode = this.mapLinkNodeToLinkNode.convert(eventInterfaceLabel.interfaceLabel); + const link = this.links.find((l) => l.link_id === eventInterfaceLabel.interfaceLabel.linkId); + this.contextMenu.openMenuForInterfaceLabel( + linkNode, + link, + eventInterfaceLabel.event.pageY, + eventInterfaceLabel.event.pageX + ); + } + ); const onContextMenu = this.selectionTool.contextMenuOpened.subscribe((event) => { const selectedItems = this.selectionManager.getSelected(); @@ -485,7 +520,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } else if (elem instanceof MapLabel) { labels.push(this.mapLabelToLabel.convert(elem)); } else if (elem instanceof MapLink) { - links.push(this.mapLinkToLink.convert(elem)) + links.push(this.mapLinkToLink.convert(elem)); } }); @@ -510,104 +545,120 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } onNodeCreation(nodeAddedEvent: NodeAddedEvent) { - if(!nodeAddedEvent) { + if (!nodeAddedEvent) { return; } this.progressService.activate(); - this.nodeService.createFromTemplate(this.server, this.project, nodeAddedEvent.template, nodeAddedEvent.x, nodeAddedEvent.y, nodeAddedEvent.server).subscribe((node: Node) => { - // if (nodeAddedEvent.name !== nodeAddedEvent.template.name) { - // node.name = nodeAddedEvent.name; - // this.nodeService.updateNode(this.server, node).subscribe(()=>{}); - // } - this.projectService.nodes(this.server, this.project.project_id).subscribe((nodes: Node[]) => { + this.nodeService + .createFromTemplate( + this.server, + this.project, + nodeAddedEvent.template, + nodeAddedEvent.x, + nodeAddedEvent.y, + nodeAddedEvent.server + ) + .subscribe( + (node: Node) => { + // if (nodeAddedEvent.name !== nodeAddedEvent.template.name) { + // node.name = nodeAddedEvent.name; + // this.nodeService.updateNode(this.server, node).subscribe(()=>{}); + // } + this.projectService.nodes(this.server, this.project.project_id).subscribe((nodes: Node[]) => { + nodes + .filter((node) => node.label.style === null) + .forEach((node) => { + const fixedNode = this.nodeCreatedLabelStylesFixer.fix(node); + this.nodeService.updateLabel(this.server, node, fixedNode.label).subscribe(); + }); - nodes.filter((node) => node.label.style === null).forEach((node) => { - const fixedNode = this.nodeCreatedLabelStylesFixer.fix(node); - this.nodeService.updateLabel(this.server, node, fixedNode.label).subscribe(); - }); - - this.nodesDataSource.set(nodes); - nodeAddedEvent.numberOfNodes--; - if (nodeAddedEvent.numberOfNodes > 0) { - nodeAddedEvent.x = nodeAddedEvent.x + 50 < this.project.scene_width/2 ? nodeAddedEvent.x + 50 : nodeAddedEvent.x; - nodeAddedEvent.y = nodeAddedEvent.y + 50 < this.project.scene_height/2 ? nodeAddedEvent.y + 50 : nodeAddedEvent.y; - this.onNodeCreation(nodeAddedEvent); - } else { + this.nodesDataSource.set(nodes); + nodeAddedEvent.numberOfNodes--; + if (nodeAddedEvent.numberOfNodes > 0) { + nodeAddedEvent.x = + nodeAddedEvent.x + 50 < this.project.scene_width / 2 ? nodeAddedEvent.x + 50 : nodeAddedEvent.x; + nodeAddedEvent.y = + nodeAddedEvent.y + 50 < this.project.scene_height / 2 ? nodeAddedEvent.y + 50 : nodeAddedEvent.y; + this.onNodeCreation(nodeAddedEvent); + } else { + this.progressService.deactivate(); + } + }); + }, + (error) => { + this.toasterService.error(error.error.message); this.progressService.deactivate(); } - }); - }, - error => { - this.toasterService.error(error.error.message); - this.progressService.deactivate(); - }); + ); } public fitInView() { - this.drawings.forEach(drawing => { - let splittedSvg = drawing.svg.split("\""); + this.drawings.forEach((drawing) => { + let splittedSvg = drawing.svg.split('"'); let height: number = parseInt(splittedSvg[1], 10); - let width: number = parseInt(splittedSvg[3], 10); + let width: number = parseInt(splittedSvg[3], 10); drawing.element = { width: width, - height: height + height: height, }; }); - if ((this.nodes.length === 0) && (this.drawings.length === 0)) { return }; - let minX : number, maxX : number, minY: number, maxY : number; + if (this.nodes.length === 0 && this.drawings.length === 0) { + return; + } + let minX: number, maxX: number, minY: number, maxY: number; let borderedNodes: BorderedNode[] = []; - this.nodes.forEach(n => { + this.nodes.forEach((n) => { let borderedNode: BorderedNode = new BorderedNode(); borderedNode.node = n; borderedNode.top = n.y; borderedNode.left = n.x; - borderedNode.bottom = n.y + n.height; + borderedNode.bottom = n.y + n.height; borderedNode.right = n.x + n.width; - if ((n.y + n.label.y) < borderedNode.top) { + if (n.y + n.label.y < borderedNode.top) { borderedNode.top = n.y + n.label.y; - }; + } - if ((n.x + n.label.x) < borderedNode.left) { + if (n.x + n.label.x < borderedNode.left) { borderedNode.left = n.x + n.label.x; - }; + } - if ((n.y + n.label.y) > borderedNode.bottom) { + if (n.y + n.label.y > borderedNode.bottom) { borderedNode.bottom = n.y + n.label.y; - }; + } - if ((n.x + n.label.x) > borderedNode.right) { + if (n.x + n.label.x > borderedNode.right) { borderedNode.right = n.x + n.label.x; - }; + } borderedNodes.push(borderedNode); }); - let nodeMinX = borderedNodes.sort((n,m) => n.left - m.left)[0]; - let nodeMaxX = borderedNodes.sort((n,m) => n.right - m.right)[borderedNodes.length - 1]; - let nodeMinY = borderedNodes.sort((n,m) => n.top - m.top)[0]; - let nodeMaxY = borderedNodes.sort((n,m) => n.bottom - m.bottom)[borderedNodes.length - 1]; + let nodeMinX = borderedNodes.sort((n, m) => n.left - m.left)[0]; + let nodeMaxX = borderedNodes.sort((n, m) => n.right - m.right)[borderedNodes.length - 1]; + let nodeMinY = borderedNodes.sort((n, m) => n.top - m.top)[0]; + let nodeMaxY = borderedNodes.sort((n, m) => n.bottom - m.bottom)[borderedNodes.length - 1]; let borderedDrawings: BorderedDrawing[] = []; - this.drawings.forEach(n => { - let borderedDrawing: BorderedDrawing = new BorderedDrawing(); + this.drawings.forEach((n) => { + let borderedDrawing: BorderedDrawing = new BorderedDrawing(); borderedDrawing.drawing = n; borderedDrawing.top = n.y; borderedDrawing.left = n.x; - borderedDrawing.bottom = n.y + n.element.height; + borderedDrawing.bottom = n.y + n.element.height; borderedDrawing.right = n.x + n.element.width; borderedDrawings.push(borderedDrawing); }); - let drawingMinX = borderedDrawings.sort((n,m) => n.left - m.left)[0]; - let drawingMaxX = borderedDrawings.sort((n,m) => n.right - m.right)[borderedDrawings.length - 1]; - let drawingMinY = borderedDrawings.sort((n,m) => n.top - m.top)[0]; - let drawingMaxY = borderedDrawings.sort((n,m) => n.bottom - m.bottom)[borderedDrawings.length - 1]; + let drawingMinX = borderedDrawings.sort((n, m) => n.left - m.left)[0]; + let drawingMaxX = borderedDrawings.sort((n, m) => n.right - m.right)[borderedDrawings.length - 1]; + let drawingMinY = borderedDrawings.sort((n, m) => n.top - m.top)[0]; + let drawingMaxY = borderedDrawings.sort((n, m) => n.bottom - m.bottom)[borderedDrawings.length - 1]; if (drawingMinX && nodeMinX) { if (nodeMinX.left < drawingMinX.left) { @@ -615,19 +666,19 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } else { minX = drawingMinX.left; } - + if (nodeMaxX.right > drawingMaxX.right) { maxX = nodeMaxX.right; } else { maxX = drawingMaxX.right; } - + if (nodeMinY.top < drawingMinY.top) { minY = nodeMinY.top; } else { minY = drawingMinY.top; } - + if (nodeMaxY.bottom > drawingMaxY.bottom) { maxY = nodeMaxY.bottom; } else { @@ -670,15 +721,15 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.project.scene_width = this.project.scene_width * scale; this.project.scene_height = this.project.scene_height * scale; if (heightToSceneHeightRatio < widthOfAreaToShow) { - this.scrollX = (minX * scale) - ((windowWidth - widthOfAreaToShow*scale)/2) + this.project.scene_width/2; - this.scrollY = (minY * scale) + this.project.scene_height/2; + this.scrollX = minX * scale - (windowWidth - widthOfAreaToShow * scale) / 2 + this.project.scene_width / 2; + this.scrollY = minY * scale + this.project.scene_height / 2; } else { - this.scrollX = (minX * scale) + this.project.scene_width/2; - this.scrollY = (minY * scale) - ((windowHeight - heightOfAreaToShow*scale)/2) + this.project.scene_height/2; + this.scrollX = minX * scale + this.project.scene_width / 2; + this.scrollY = minY * scale - (windowHeight - heightOfAreaToShow * scale) / 2 + this.project.scene_height / 2; } } else { - this.scrollX = (minX * scale) + this.project.scene_width/2; - this.scrollY = (minY * scale) + this.project.scene_height/2; + this.scrollX = minX * scale + this.project.scene_width / 2; + this.scrollY = minY * scale + this.project.scene_height / 2; } this.scrollEnabled = true; } @@ -690,9 +741,15 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public centerView() { if (this.project) { - let scrollX: number = (this.project.scene_width - document.documentElement.clientWidth) > 0 ? (this.project.scene_width - document.documentElement.clientWidth)/2 : 0; - let scrollY: number = (this.project.scene_height - document.documentElement.clientHeight) > 0 ? (this.project.scene_height - document.documentElement.clientHeight)/2 : 0; - + let scrollX: number = + this.project.scene_width - document.documentElement.clientWidth > 0 + ? (this.project.scene_width - document.documentElement.clientWidth) / 2 + : 0; + let scrollY: number = + this.project.scene_height - document.documentElement.clientHeight > 0 + ? (this.project.scene_height - document.documentElement.clientHeight) / 2 + : 0; + window.scrollTo(scrollX, scrollY); } else { this.toasterService.error('Please wait until all components are loaded.'); @@ -726,7 +783,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public toggleMovingMode() { this.tools.moving = !this.tools.moving; this.movingEventSource.movingModeState.emit(this.tools.moving); - + if (!this.readonly) { this.tools.selection = !this.tools.moving; this.toolsService.selectionToolActivation(this.tools.selection); @@ -748,7 +805,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.isConsoleVisible = visible; this.mapSettingsService.toggleLogConsole(this.isConsoleVisible); } - + public toggleShowTopologySummary(visible: boolean) { this.isTopologySummaryVisible = visible; this.mapSettingsService.toggleTopologySummary(this.isTopologySummaryVisible); @@ -769,7 +826,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { if (this.layersVisibility) { localStorage.setItem('layersVisibility', 'true'); } else { - localStorage.removeItem('layersVisibility') + localStorage.removeItem('layersVisibility'); } this.mapChild.applyMapSettingsChanges(); } @@ -781,7 +838,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } else { localStorage.removeItem('gridVisibility'); } - this.mapChild.gridVisibility = this.gridVisibility ? 1 : 0; + this.mapChild.gridVisibility = this.gridVisibility ? 1 : 0; } public toggleSnapToGrid(enabled: boolean) { @@ -796,7 +853,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } public hideMenu() { - this.projectMapMenuComponent.resetDrawToolChoice() + this.projectMapMenuComponent.resetDrawToolChoice(); this.isProjectMapMenuVisible = false; } @@ -811,7 +868,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { zoomOut() { let currentScale = this.mapScaleService.getScale(); - if ((currentScale - 0.1) > 0) { + if (currentScale - 0.1 > 0) { this.mapScaleService.setScale(currentScale - 0.1); } } @@ -824,7 +881,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(AddBlankProjectDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -834,7 +891,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(SaveProjectDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -845,7 +902,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(EditProjectDialogComponent, { width: '600px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -857,7 +914,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(ImportProjectDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -871,7 +928,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { this.bottomSheet.open(NavigationDialogComponent); let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; bottomSheetRef.instance.projectMessage = 'imported project'; - + const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => { if (result) { this.projectService.open(this.server, uuid).subscribe(() => { @@ -884,18 +941,22 @@ export class ProjectMapComponent implements OnInit, OnDestroy { } exportProject() { - if (this.nodes.filter(node => node.node_type === 'virtualbox').length > 0) { - this.toasterService.error('Map with VirtualBox machines cannot be exported.') - } else if (this.nodes.filter(node => - (node.status === 'started' && node.node_type==='vpcs') || - (node.status === 'started' && node.node_type==='virtualbox') || - (node.status === 'started' && node.node_type==='vmware')).length > 0) { - this.toasterService.error('Project with running nodes cannot be exported.') + if (this.nodes.filter((node) => node.node_type === 'virtualbox').length > 0) { + this.toasterService.error('Map with VirtualBox machines cannot be exported.'); + } else if ( + this.nodes.filter( + (node) => + (node.status === 'started' && node.node_type === 'vpcs') || + (node.status === 'started' && node.node_type === 'virtualbox') || + (node.status === 'started' && node.node_type === 'vmware') + ).length > 0 + ) { + this.toasterService.error('Project with running nodes cannot be exported.'); } else { location.assign(this.projectService.getExportPath(this.server, this.project)); } } - + public uploadImageFile(event) { this.readImageFile(event.target); } @@ -910,10 +971,14 @@ export class ProjectMapComponent implements OnInit, OnDestroy { let svg = `\n\n`; - this.drawingService.add(this.server, this.project.project_id, -(imageToUpload.width/2), -(imageToUpload.height/2), svg).subscribe(() => {}); - } - - imageToUpload.onload = () => { fileReader.readAsDataURL(file) }; + this.drawingService + .add(this.server, this.project.project_id, -(imageToUpload.width / 2), -(imageToUpload.height / 2), svg) + .subscribe(() => {}); + }; + + imageToUpload.onload = () => { + fileReader.readAsDataURL(file); + }; imageToUpload.src = window.URL.createObjectURL(file); } @@ -948,7 +1013,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { width: '1000px', maxHeight: '700px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; diff --git a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.html b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.html index c3bd3f57..2cc0ed50 100644 --- a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.html +++ b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.html @@ -1,8 +1,8 @@

Take a screenshot

- SVG - PNG + SVG + PNG
@@ -15,10 +15,12 @@ [ngClass]="{ 'is-invalid': form.acreenshotName?.errors }" placeholder="Please enter name" /> - Name for screenshot is required - Entered name is incorrect diff --git a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.scss b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.scss index bde5436e..7cd61f31 100644 --- a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.scss +++ b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.scss @@ -1,8 +1,8 @@ .name-form { - width: 100%; + width: 100%; } .radio-group { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } diff --git a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts index 54c98319..6926211b 100644 --- a/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts +++ b/src/app/components/project-map/screenshot-dialog/screenshot-dialog.component.ts @@ -5,11 +5,10 @@ import { ToasterService } from '../../../services/toaster.service'; import { ElectronService } from 'ngx-electron'; import { DeviceDetectorService } from 'ngx-device-detector'; - @Component({ selector: 'app-screenshot-dialog', templateUrl: './screenshot-dialog.component.html', - styleUrls: ['./screenshot-dialog.component.scss'] + styleUrls: ['./screenshot-dialog.component.scss'], }) export class ScreenshotDialogComponent implements OnInit { nameForm: FormGroup; @@ -24,9 +23,9 @@ export class ScreenshotDialogComponent implements OnInit { private deviceService: DeviceDetectorService ) { this.nameForm = this.formBuilder.group({ - screenshotName: new FormControl(`screenshot-${Date.now()}`, [Validators.required]) + screenshotName: new FormControl(`screenshot-${Date.now()}`, [Validators.required]), }); - this.isPngAvailable = this.electronService.isWindows || (this.deviceService.getDeviceInfo().os==='Windows'); + this.isPngAvailable = this.electronService.isWindows || this.deviceService.getDeviceInfo().os === 'Windows'; } ngOnInit() {} @@ -37,12 +36,12 @@ export class ScreenshotDialogComponent implements OnInit { onAddClick(): void { if (this.nameForm.invalid) { - return; + return; } let screenshotProperties: Screenshot = { - name: this.nameForm.get('screenshotName').value, - filetype: this.filetype + name: this.nameForm.get('screenshotName').value, + filetype: this.filetype, }; this.dialogRef.close(screenshotProperties); } @@ -52,19 +51,19 @@ export class ScreenshotDialogComponent implements OnInit { } onKeyDown(event) { - if (event.key === "Enter") { - this.onAddClick(); + if (event.key === 'Enter') { + this.onAddClick(); } } setFiletype(type: string) { if (this.isPngAvailable) { - this.filetype = type; + this.filetype = type; } } } export class Screenshot { - name: string; - filetype: string; + name: string; + filetype: string; } diff --git a/src/app/components/project-map/web-console/web-console.component.scss b/src/app/components/project-map/web-console/web-console.component.scss index 1f3236b0..f9fc6414 100644 --- a/src/app/components/project-map/web-console/web-console.component.scss +++ b/src/app/components/project-map/web-console/web-console.component.scss @@ -1,4 +1,4 @@ .lightTheme { - background: white!important; - color: black!important; + background: white !important; + color: black !important; } diff --git a/src/app/components/project-map/web-console/web-console.component.ts b/src/app/components/project-map/web-console/web-console.component.ts index a3c3abfd..6686b46b 100644 --- a/src/app/components/project-map/web-console/web-console.component.ts +++ b/src/app/components/project-map/web-console/web-console.component.ts @@ -8,79 +8,78 @@ import { FitAddon } from 'xterm-addon-fit'; import { NodeConsoleService } from '../../../services/nodeConsole.service'; import { ThemeService } from '../../../services/theme.service'; - @Component({ - encapsulation: ViewEncapsulation.None, - selector: 'app-web-console', - templateUrl: './web-console.component.html', - styleUrls: ['../../../../../node_modules/xterm/css/xterm.css', './web-console.component.scss'] + encapsulation: ViewEncapsulation.None, + selector: 'app-web-console', + templateUrl: './web-console.component.html', + styleUrls: ['../../../../../node_modules/xterm/css/xterm.css', './web-console.component.scss'], }) export class WebConsoleComponent implements OnInit, AfterViewInit { - @Input() server: Server; - @Input() project: Project; - @Input() node: Node; + @Input() server: Server; + @Input() project: Project; + @Input() node: Node; - public term: Terminal = new Terminal(); - public fitAddon: FitAddon = new FitAddon(); - public isLightThemeEnabled: boolean = false; - private copiedText: string = ''; + public term: Terminal = new Terminal(); + public fitAddon: FitAddon = new FitAddon(); + public isLightThemeEnabled: boolean = false; + private copiedText: string = ''; - @ViewChild('terminal') terminal: ElementRef; + @ViewChild('terminal') terminal: ElementRef; - constructor( - private consoleService: NodeConsoleService, - private themeService: ThemeService, - ) {} - - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; + constructor(private consoleService: NodeConsoleService, private themeService: ThemeService) {} - this.consoleService.consoleResized.subscribe(ev => { - let numberOfColumns = Math.floor(ev.width / 9); - let numberOfRows = Math.floor(ev.height / 17); + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); - this.consoleService.setNumberOfColumns(numberOfColumns); - this.consoleService.setNumberOfRows(numberOfRows); + this.consoleService.consoleResized.subscribe((ev) => { + let numberOfColumns = Math.floor(ev.width / 9); + let numberOfRows = Math.floor(ev.height / 17); - this.term.resize(numberOfColumns, numberOfRows); - }); + this.consoleService.setNumberOfColumns(numberOfColumns); + this.consoleService.setNumberOfRows(numberOfRows); - if (this.consoleService.getNumberOfColumns() && this.consoleService.getNumberOfRows()){ - this.term.resize(this.consoleService.getNumberOfColumns(), this.consoleService.getNumberOfRows()); + this.term.resize(numberOfColumns, numberOfRows); + }); + + if (this.consoleService.getNumberOfColumns() && this.consoleService.getNumberOfRows()) { + this.term.resize(this.consoleService.getNumberOfColumns(), this.consoleService.getNumberOfRows()); + } + } + + ngAfterViewInit() { + this.term.open(this.terminal.nativeElement); + if (this.isLightThemeEnabled) + this.term.setOption('theme', { background: 'white', foreground: 'black', cursor: 'black' }); + + const socket = new WebSocket(this.getUrl()); + + socket.onerror = (event) => { + this.term.write('Connection lost'); + }; + socket.onclose = (event) => { + this.consoleService.closeConsoleForNode(this.node); + }; + + const attachAddon = new AttachAddon(socket); + this.term.loadAddon(attachAddon); + this.term.setOption('cursorBlink', true); + this.term.loadAddon(this.fitAddon); + this.fitAddon.activate(this.term); + this.term.focus(); + + this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => { + if (key.code === 'KeyC' || key.code === 'KeyV') { + if (key.ctrlKey) { + return false; } - } + } + return true; + }); + } - ngAfterViewInit() { - this.term.open(this.terminal.nativeElement); - if (this.isLightThemeEnabled) this.term.setOption('theme', { background: 'white', foreground: 'black', cursor: 'black' }); - - const socket = new WebSocket(this.getUrl()); - - socket.onerror = ((event) => { - this.term.write('Connection lost'); - }); - socket.onclose = ((event) => { - this.consoleService.closeConsoleForNode(this.node); - }); - - const attachAddon = new AttachAddon(socket); - this.term.loadAddon(attachAddon); - this.term.setOption('cursorBlink', true); - this.term.loadAddon(this.fitAddon); - this.fitAddon.activate(this.term); - this.term.focus(); - - this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => { - if (key.code === 'KeyC' || key.code === 'KeyV'){ - if (key.ctrlKey) { - return false; - } - } - return true; - }); - } - - getUrl() { - return `ws://${this.server.host}:${this.server.port}/v2/projects/${this.node.project_id}/nodes/${this.node.node_id}/console/ws` - } + getUrl() { + return `ws://${this.server.host}:${this.server.port}/v2/projects/${this.node.project_id}/nodes/${this.node.node_id}/console/ws`; + } } diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html index 719798ab..ce6a6e8f 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html @@ -21,6 +21,8 @@
- +
diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.scss b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.scss index fd32953d..2fa952b3 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.scss +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.scss @@ -1,7 +1,7 @@ .file-name-form-field { - width: 100%; + width: 100%; } .project-snackbar { - background: #2196F3; -} \ No newline at end of file + background: #2196f3; +} diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts index fe9ca1c3..467e6b13 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts @@ -34,8 +34,8 @@ export class MockedProjectService { show_layers: false, show_grid: false, snap_to_grid: false, - variables: [] - } + variables: [], + }, ]; list() { @@ -46,7 +46,7 @@ export class MockedProjectService { return of(this.projects.pop); } - isReadOnly(project: Project){ + isReadOnly(project: Project) { return false; } } @@ -56,13 +56,13 @@ describe('AddBlankProjectDialogComponent', () => { let fixture: ComponentFixture; let server: Server; let router = { - navigate: jasmine.createSpy('navigate') + navigate: jasmine.createSpy('navigate'), }; let toaster = { - success: jasmine.createSpy('success') + success: jasmine.createSpy('success'), }; let dialogRef = { - close: jasmine.createSpy('close') + close: jasmine.createSpy('close'), }; beforeEach(async(() => { @@ -74,16 +74,16 @@ describe('AddBlankProjectDialogComponent', () => { NoopAnimationsModule, FormsModule, ReactiveFormsModule, - MatSnackBarModule + MatSnackBarModule, ], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: [] }, { provide: ProjectService, useClass: MockedProjectService }, { provide: ToasterService, useValue: toaster }, - { provide: Router, useValue: router } + { provide: Router, useValue: router }, ], - declarations: [AddBlankProjectDialogComponent] + declarations: [AddBlankProjectDialogComponent], }).compileComponents(); server = new Server(); @@ -146,7 +146,7 @@ describe('AddBlankProjectDialogComponent', () => { component.projectNameForm.controls['projectName'].setValue('validName'); spyOn(component, 'onAddClick'); - component.onKeyDown({key: 'Enter'}); + component.onKeyDown({ key: 'Enter' }); expect(component.onAddClick).toHaveBeenCalled(); }); diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts index 3bb9f2ca..e3fbc3c6 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts @@ -11,12 +11,11 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; import { ToasterService } from '../../../services/toaster.service'; import { projectNameAsyncValidator } from '../../../validators/project-name-async-validator'; - @Component({ selector: 'app-add-blank-project-dialog', templateUrl: './add-blank-project-dialog.component.html', styleUrls: ['./add-blank-project-dialog.component.scss'], - providers: [ProjectNameValidator] + providers: [ProjectNameValidator], }) export class AddBlankProjectDialogComponent implements OnInit { server: Server; @@ -36,7 +35,11 @@ export class AddBlankProjectDialogComponent implements OnInit { ngOnInit() { this.projectNameForm = this.formBuilder.group({ - projectName: new FormControl(null, [Validators.required, this.projectNameValidator.get], [projectNameAsyncValidator(this.server, this.projectService)]) + projectName: new FormControl( + null, + [Validators.required, this.projectNameValidator.get], + [projectNameAsyncValidator(this.server, this.projectService)] + ), }); } @@ -50,7 +53,7 @@ export class AddBlankProjectDialogComponent implements OnInit { } this.projectService.list(this.server).subscribe((projects: Project[]) => { const projectName = this.projectNameForm.controls['projectName'].value; - let existingProject = projects.find(project => project.name === projectName); + let existingProject = projects.find((project) => project.name === projectName); if (existingProject) { this.openConfirmationDialog(existingProject); @@ -76,7 +79,7 @@ export class AddBlankProjectDialogComponent implements OnInit { } onKeyDown(event) { - if (event.key === "Enter") { + if (event.key === 'Enter') { this.onAddClick(); } } @@ -86,10 +89,10 @@ export class AddBlankProjectDialogComponent implements OnInit { width: '300px', height: '150px', data: { - existingProject: existingProject + existingProject: existingProject, }, autoFocus: false, - disableClose: true + disableClose: true, }); dialogRef.afterClosed().subscribe((answer: boolean) => { diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html index 8d9b0d73..42d261a1 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.html @@ -1,12 +1,12 @@

Please choose name for exporting project

- - - + + +
- - + +
diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.scss b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.scss index 9c2173c2..8aff6f5a 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.scss +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.scss @@ -1,3 +1,3 @@ .form-field { - width: 100%; + width: 100%; } diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts index cc710248..cdc6441b 100644 --- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts +++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts @@ -4,33 +4,29 @@ import { Server } from '../../../models/server'; import { ProjectService } from '../../../services/project.service'; import { Project } from '../../../models/project'; - @Component({ - selector: 'app-choose-name-dialog', - templateUrl: './choose-name-dialog.component.html', - styleUrls: ['./choose-name-dialog.component.scss'] + selector: 'app-choose-name-dialog', + templateUrl: './choose-name-dialog.component.html', + styleUrls: ['./choose-name-dialog.component.scss'], }) export class ChooseNameDialogComponent implements OnInit { - @Input() server: Server; - @Input() project: Project - name: string; + @Input() server: Server; + @Input() project: Project; + name: string; - constructor( - public dialogRef: MatDialogRef, - private projectService: ProjectService - ) {} + constructor(public dialogRef: MatDialogRef, private projectService: ProjectService) {} - ngOnInit() { - this.name = this.project.name; - } + ngOnInit() { + this.name = this.project.name; + } - onCloseClick() { - this.dialogRef.close(); - } + onCloseClick() { + this.dialogRef.close(); + } - onSaveClick() { - this.projectService.duplicate(this.server, this.project.project_id, this.name).subscribe(() => { - this.dialogRef.close(); - }); - } + onSaveClick() { + this.projectService.duplicate(this.server, this.project.project_id, this.name).subscribe(() => { + this.dialogRef.close(); + }); + } } diff --git a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.html b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.html index e2fe915e..cceaad44 100644 --- a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.html +++ b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.html @@ -1,7 +1,7 @@ -
-
{{message}}
-
- - -
+
+
{{ message }}
+
+ + +
diff --git a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.scss b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.scss index ca9bfe4a..6b118b9a 100644 --- a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.scss +++ b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.scss @@ -1,17 +1,17 @@ .dialogWrapper { - background-color: #263238; - padding: 10px 20px; - margin-bottom: -8px; - display: flex; - justify-content: space-between; - align-items: center; + background-color: #263238; + padding: 10px 20px; + margin-bottom: -8px; + display: flex; + justify-content: space-between; + align-items: center; } .lightTheme { - background-color: white!important; + background-color: white !important; } .title { - margin-right: 10px; - margin-left: 10px; + margin-right: 10px; + margin-left: 10px; } diff --git a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts index 238b59b4..47dbdc0a 100644 --- a/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts +++ b/src/app/components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component.ts @@ -6,26 +6,28 @@ import { ThemeService } from '../../../services/theme.service'; @Component({ selector: 'app-confirmation-bottomsheet', templateUrl: 'confirmation-bottomsheet.component.html', - styleUrls: ['confirmation-bottomsheet.component.scss'] + styleUrls: ['confirmation-bottomsheet.component.scss'], }) export class ConfirmationBottomSheetComponent implements OnInit { - message: string = ''; - isLightThemeEnabled: boolean = false; + message: string = ''; + isLightThemeEnabled: boolean = false; - constructor( - private bottomSheetRef: MatBottomSheetRef, - private themeService: ThemeService - ) {} + constructor( + private bottomSheetRef: MatBottomSheetRef, + private themeService: ThemeService + ) {} - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; - } + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + } - onNoClick(): void { - this.bottomSheetRef.dismiss(false); - } + onNoClick(): void { + this.bottomSheetRef.dismiss(false); + } - onYesClick(): void { - this.bottomSheetRef.dismiss(true); - } + onYesClick(): void { + this.bottomSheetRef.dismiss(true); + } } diff --git a/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts b/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts index a2d68fc1..f69898e7 100644 --- a/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/app/components/projects/confirmation-dialog/confirmation-dialog.component.ts @@ -5,7 +5,7 @@ import { Project } from '../../../models/project'; @Component({ selector: 'app-import-project-dialog', templateUrl: 'confirmation-dialog.component.html', - styleUrls: ['confirmation-dialog.component.scss'] + styleUrls: ['confirmation-dialog.component.scss'], }) export class ConfirmationDialogComponent implements OnInit { private existingProject: Project; diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.html b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.html index 392bbbdb..175660ee 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.html +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.html @@ -1,82 +1,89 @@

Edit project

- - -
- - - - - - - - - - - - - - - - - - - -
- - - Open this project in the background when GNS3 server starts - - - - Start all nodes when this project is opened - - - - Leave this project running in the background after closing - - - - Show interface labels at start - - - -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - -
Name{{element.name}} Value{{element.value}}Actions - -
- - + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + Open this project in the background when GNS3 server starts + + + + Start all nodes when this project is opened + + + + Leave this project running in the background after closing + + + + Show interface labels at start + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
Name{{ element.name }}Value{{ element.value }}Actions + +
+ +
diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.scss b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.scss index 00dc4971..3bf4e100 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.scss +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.scss @@ -1,15 +1,15 @@ .form-field { - width: 100%; + width: 100%; } th { - border: 0px!important; + border: 0px !important; } th.mat-header-cell { - padding-bottom: 15px; + padding-bottom: 15px; } td.mat-cell { - padding-top: 15px; + padding-top: 15px; } diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts index e08e09ae..17060178 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts @@ -10,7 +10,7 @@ import { ProjectService } from '../../../services/project.service'; @Component({ selector: 'app-edit-project-dialog', templateUrl: './edit-project-dialog.component.html', - styleUrls: ['./edit-project-dialog.component.scss'] + styleUrls: ['./edit-project-dialog.component.scss'], }) export class EditProjectDialogComponent implements OnInit { server: Server; @@ -19,7 +19,7 @@ export class EditProjectDialogComponent implements OnInit { variableFormGroup: FormGroup; projectVariables: ProjectVariable[]; - displayedColumns: string[] = ['name', 'value', 'actions']; + displayedColumns: string[] = ['name', 'value', 'actions']; variables: ProjectVariable[] = []; auto_close: boolean; @@ -36,12 +36,12 @@ export class EditProjectDialogComponent implements OnInit { width: new FormControl('', [Validators.required, nonNegativeValidator.get]), height: new FormControl('', [Validators.required, nonNegativeValidator.get]), nodeGridSize: new FormControl('', [Validators.required, nonNegativeValidator.get]), - drawingGridSize: new FormControl('', [Validators.required, nonNegativeValidator.get]) + drawingGridSize: new FormControl('', [Validators.required, nonNegativeValidator.get]), }); this.variableFormGroup = this.formBuilder.group({ name: new FormControl('', [Validators.required]), - value: new FormControl('', [Validators.required]) + value: new FormControl('', [Validators.required]), }); } @@ -52,7 +52,7 @@ export class EditProjectDialogComponent implements OnInit { this.formGroup.controls['nodeGridSize'].setValue(this.project.grid_size); this.formGroup.controls['drawingGridSize'].setValue(this.project.drawing_grid_size); if (this.project.variables) { - this.project.variables.forEach(n => this.variables.push(n)); + this.project.variables.forEach((n) => this.variables.push(n)); } this.auto_close = !this.project.auto_close; } @@ -61,7 +61,7 @@ export class EditProjectDialogComponent implements OnInit { if (this.variableFormGroup.valid) { let variable: ProjectVariable = { name: this.variableFormGroup.get('name').value, - value: this.variableFormGroup.get('value').value + value: this.variableFormGroup.get('value').value, }; this.variables = this.variables.concat([variable]); } else { @@ -70,7 +70,7 @@ export class EditProjectDialogComponent implements OnInit { } deleteVariable(variable: ProjectVariable) { - this.variables = this.variables.filter(elem => elem!== variable); + this.variables = this.variables.filter((elem) => elem !== variable); } onNoClick() { @@ -89,9 +89,9 @@ export class EditProjectDialogComponent implements OnInit { this.project.auto_close = !this.project.auto_close; this.projectService.update(this.server, this.project).subscribe((project: Project) => { - this.toasterService.success(`Project ${project.name} updated.`); - this.onNoClick(); - }) + this.toasterService.success(`Project ${project.name} updated.`); + this.onNoClick(); + }); } else { this.toasterService.error(`Fill all required fields with correct values.`); } diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.html b/src/app/components/projects/import-project-dialog/import-project-dialog.component.html index fb86b6ac..dc620518 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.html +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.html @@ -10,7 +10,16 @@ ng2FileSelect [uploader]="uploader" /> - + { let fileSelectDirective: FileSelectDirective; let dialogRef = { - close: jasmine.createSpy('close') + close: jasmine.createSpy('close'), }; beforeEach(async(() => { @@ -80,14 +80,14 @@ describe('ImportProjectDialogComponent', () => { FileUploadModule, FormsModule, ReactiveFormsModule, - RouterTestingModule.withRoutes([]) + RouterTestingModule.withRoutes([]), ], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: [] }, - { provide: ProjectService, useClass: MockedProjectService } + { provide: ProjectService, useClass: MockedProjectService }, ], - declarations: [ImportProjectDialogComponent] + declarations: [ImportProjectDialogComponent], }).compileComponents(); server = new Server(); @@ -222,8 +222,8 @@ describe('ImportProjectDialogComponent', () => { fileSelectDirective.uploader.queue.push(fileItem); let event = { target: { - files: [{ name: 'uploadedFile' }] - } + files: [{ name: 'uploadedFile' }], + }, }; component.uploadProjectFile(event); @@ -235,8 +235,8 @@ describe('ImportProjectDialogComponent', () => { fileSelectDirective.uploader.queue.push(fileItem); let event = { target: { - files: [{ name: 'uploadedFile' }] - } + files: [{ name: 'uploadedFile' }], + }, }; component.uploadProjectFile(event); component.onDeleteClick(); diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts index 650e286b..efa17563 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts @@ -14,7 +14,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; selector: 'app-import-project-dialog', templateUrl: 'import-project-dialog.component.html', styleUrls: ['import-project-dialog.component.scss'], - providers: [ProjectNameValidator] + providers: [ProjectNameValidator], }) export class ImportProjectDialogComponent implements OnInit { uploader: FileUploader; @@ -38,13 +38,13 @@ export class ImportProjectDialogComponent implements OnInit { private projectNameValidator: ProjectNameValidator ) { this.projectNameForm = this.formBuilder.group({ - projectName: new FormControl(null, [Validators.required, projectNameValidator.get]) + projectName: new FormControl(null, [Validators.required, projectNameValidator.get]), }); } ngOnInit() { this.uploader = new FileUploader({}); - this.uploader.onAfterAddingFile = file => { + this.uploader.onAfterAddingFile = (file) => { file.withCredentials = false; }; @@ -82,7 +82,7 @@ export class ImportProjectDialogComponent implements OnInit { } else { this.projectService.list(this.server).subscribe((projects: Project[]) => { const projectName = this.projectNameForm.controls['projectName'].value; - let existingProject = projects.find(project => project.name === projectName); + let existingProject = projects.find((project) => project.name === projectName); if (existingProject) { this.openConfirmationDialog(existingProject); @@ -95,7 +95,7 @@ export class ImportProjectDialogComponent implements OnInit { importProject() { const url = this.prepareUploadPath(); - this.uploader.queue.forEach(elem => (elem.url = url)); + this.uploader.queue.forEach((elem) => (elem.url = url)); this.isFirstStepCompleted = true; @@ -108,10 +108,10 @@ export class ImportProjectDialogComponent implements OnInit { width: '300px', height: '150px', data: { - existingProject: existingProject + existingProject: existingProject, }, autoFocus: false, - disableClose: true + disableClose: true, }); dialogRef.afterClosed().subscribe((answer: boolean) => { diff --git a/src/app/components/projects/navigation-dialog/navigation-dialog.component.html b/src/app/components/projects/navigation-dialog/navigation-dialog.component.html index 814ac4dc..519a6af2 100644 --- a/src/app/components/projects/navigation-dialog/navigation-dialog.component.html +++ b/src/app/components/projects/navigation-dialog/navigation-dialog.component.html @@ -1,7 +1,7 @@ -
-
Do you want to navigate to {{projectMessage}}?
-
- - -
+
+
Do you want to navigate to {{ projectMessage }}?
+
+ + +
diff --git a/src/app/components/projects/navigation-dialog/navigation-dialog.component.scss b/src/app/components/projects/navigation-dialog/navigation-dialog.component.scss index ca9bfe4a..6b118b9a 100644 --- a/src/app/components/projects/navigation-dialog/navigation-dialog.component.scss +++ b/src/app/components/projects/navigation-dialog/navigation-dialog.component.scss @@ -1,17 +1,17 @@ .dialogWrapper { - background-color: #263238; - padding: 10px 20px; - margin-bottom: -8px; - display: flex; - justify-content: space-between; - align-items: center; + background-color: #263238; + padding: 10px 20px; + margin-bottom: -8px; + display: flex; + justify-content: space-between; + align-items: center; } .lightTheme { - background-color: white!important; + background-color: white !important; } .title { - margin-right: 10px; - margin-left: 10px; + margin-right: 10px; + margin-left: 10px; } diff --git a/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts b/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts index 62f1b2ae..99e16d6a 100644 --- a/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts +++ b/src/app/components/projects/navigation-dialog/navigation-dialog.component.ts @@ -6,26 +6,28 @@ import { ThemeService } from '../../../services/theme.service'; @Component({ selector: 'app-navigation-dialog', templateUrl: 'navigation-dialog.component.html', - styleUrls: ['navigation-dialog.component.scss'] + styleUrls: ['navigation-dialog.component.scss'], }) export class NavigationDialogComponent implements OnInit { - projectMessage: string = ''; - isLightThemeEnabled: boolean = false; + projectMessage: string = ''; + isLightThemeEnabled: boolean = false; - constructor( - private bottomSheetRef: MatBottomSheetRef, - private themeService: ThemeService - ) {} + constructor( + private bottomSheetRef: MatBottomSheetRef, + private themeService: ThemeService + ) {} - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; - } + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + } - onNoClick(): void { - this.bottomSheetRef.dismiss(false); - } + onNoClick(): void { + this.bottomSheetRef.dismiss(false); + } - onYesClick(): void { - this.bottomSheetRef.dismiss(true); - } + onYesClick(): void { + this.bottomSheetRef.dismiss(true); + } } diff --git a/src/app/components/projects/projects.component.html b/src/app/components/projects/projects.component.html index 95fd98cc..e2e32dd4 100644 --- a/src/app/components/projects/projects.component.html +++ b/src/app/components/projects/projects.component.html @@ -2,42 +2,20 @@

Projects

- - + -
- - - + + +
@@ -53,16 +31,40 @@ Actions - - - - diff --git a/src/app/components/projects/projects.component.scss b/src/app/components/projects/projects.component.scss index 5ed0ed20..0268f4a2 100644 --- a/src/app/components/projects/projects.component.scss +++ b/src/app/components/projects/projects.component.scss @@ -1,15 +1,15 @@ .import-button { - height: 40px; - margin: 20px; + height: 40px; + margin: 20px; } .add-button { - height: 40px; - margin: 20px; + height: 40px; + margin: 20px; } .full-width { - width: 940px; - margin-left: -470px; - left: 50%; + width: 940px; + margin-left: -470px; + left: 50%; } diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts index 55ea6cac..ba8088a3 100644 --- a/src/app/components/projects/projects.component.spec.ts +++ b/src/app/components/projects/projects.component.spec.ts @@ -48,10 +48,10 @@ xdescribe('ProjectsComponent', () => { remote: { require: (file) => { return { - openConsole() {} - } - } - } + openConsole() {}, + }; + }, + }, }; TestBed.configureTestingModule({ @@ -67,7 +67,7 @@ xdescribe('ProjectsComponent', () => { MatBottomSheetModule, FormsModule, ReactiveFormsModule, - RouterTestingModule.withRoutes([]) + RouterTestingModule.withRoutes([]), ], providers: [ { provide: ServerService, useClass: MockedServerService }, @@ -75,13 +75,15 @@ xdescribe('ProjectsComponent', () => { { provide: SettingsService, useClass: MockedSettingsService }, { provide: ToasterService }, { provide: ElectronService, useValue: electronService }, - ProgressService + ProgressService, ], declarations: [ProjectsComponent, ChooseNameDialogComponent, ConfigureGns3VMDialogComponent, ProjectsFilter], - schemas: [NO_ERRORS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA], }) - .overrideModule(BrowserDynamicTestingModule, { set: { entryComponents: [ChooseNameDialogComponent, ConfigureGns3VMDialogComponent] } }) - .compileComponents(); + .overrideModule(BrowserDynamicTestingModule, { + set: { entryComponents: [ChooseNameDialogComponent, ConfigureGns3VMDialogComponent] }, + }) + .compileComponents(); serverService = TestBed.get(ServerService); settingsService = TestBed.get(SettingsService); diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts index 097f2c00..51ecb3e1 100644 --- a/src/app/components/projects/projects.component.ts +++ b/src/app/components/projects/projects.component.ts @@ -29,7 +29,7 @@ import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProje @Component({ selector: 'app-projects', templateUrl: './projects.component.html', - styleUrls: ['./projects.component.scss'] + styleUrls: ['./projects.component.scss'], }) export class ProjectsComponent implements OnInit { server: Server; @@ -40,7 +40,7 @@ export class ProjectsComponent implements OnInit { searchText: string = ''; - @ViewChild(MatSort, {static: true}) sort: MatSort; + @ViewChild(MatSort, { static: true }) sort: MatSort; constructor( private route: ActivatedRoute, @@ -57,13 +57,13 @@ export class ProjectsComponent implements OnInit { ngOnInit() { this.server = this.route.snapshot.data['server']; - if(!this.server) this.router.navigate(['/servers']); + if (!this.server) this.router.navigate(['/servers']); this.recentlyOpenedProjectService.setServerIdProjectList(this.server.id.toString()); this.refresh(); this.sort.sort({ id: 'name', - start: 'asc' + start: 'asc', }); this.dataSource = new ProjectDataSource(this.projectDatabase, this.sort); this.settings = this.settingsService.getAll(); @@ -71,26 +71,27 @@ export class ProjectsComponent implements OnInit { this.projectService.projectListSubject.subscribe(() => this.refresh()); let gns3vmConfig = localStorage.getItem('gns3vmConfig'); - if (this.electronService.isElectronApp && gns3vmConfig!=='configured') { + if (this.electronService.isElectronApp && gns3vmConfig !== 'configured') { const dialogRef = this.dialog.open(ConfigureGns3VMDialogComponent, { width: '350px', height: '120px', autoFocus: false, - disableClose: true + disableClose: true, }); - + dialogRef.afterClosed().subscribe((answer: boolean) => { if (answer) { localStorage.setItem('gns3vmConfig', 'configured'); this.router.navigate(['/server', this.server.id, 'preferences', 'gns3vm']); } }); - }; + } } goToPreferences() { - this.router.navigate(['/server', this.server.id, 'preferences']) - .catch(error => this.toasterService.error('Cannot navigate to the preferences')); + this.router + .navigate(['/server', this.server.id, 'preferences']) + .catch((error) => this.toasterService.error('Cannot navigate to the preferences')); } refresh() { @@ -98,7 +99,7 @@ export class ProjectsComponent implements OnInit { (projects: Project[]) => { this.projectDatabase.addProjects(projects); }, - error => { + (error) => { this.progressService.setError(error); } ); @@ -153,7 +154,7 @@ export class ProjectsComponent implements OnInit { const dialogRef = this.dialog.open(ChooseNameDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -167,7 +168,7 @@ export class ProjectsComponent implements OnInit { const dialogRef = this.dialog.open(AddBlankProjectDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -178,7 +179,7 @@ export class ProjectsComponent implements OnInit { const dialogRef = this.dialog.open(ImportProjectDialogComponent, { width: '400px', autoFocus: false, - disableClose: true + disableClose: true, }); let instance = dialogRef.componentInstance; instance.server = this.server; @@ -193,7 +194,7 @@ export class ProjectsComponent implements OnInit { this.bottomSheet.open(NavigationDialogComponent); let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; bottomSheetRef.instance.projectMessage = 'imported project'; - + const bottomSheetSubscription = bottomSheetRef.afterDismissed().subscribe((result: boolean) => { if (result) { this.projectService.open(this.server, uuid).subscribe(() => { diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.scss b/src/app/components/projects/save-project-dialog/save-project-dialog.component.scss index acf081db..2fa952b3 100644 --- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.scss +++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.scss @@ -1,7 +1,7 @@ .file-name-form-field { - width: 100%; + width: 100%; } .project-snackbar { - background: #2196F3; + background: #2196f3; } diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts index 591ab1f3..8414257b 100644 --- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts +++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts @@ -10,12 +10,11 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; import { ToasterService } from '../../../services/toaster.service'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; - @Component({ selector: 'app-save-project-dialog', templateUrl: './save-project-dialog.component.html', styleUrls: ['./save-project-dialog.component.scss'], - providers: [ProjectNameValidator] + providers: [ProjectNameValidator], }) export class SaveProjectDialogComponent implements OnInit { server: Server; @@ -32,7 +31,7 @@ export class SaveProjectDialogComponent implements OnInit { private projectNameValidator: ProjectNameValidator ) { this.projectNameForm = this.formBuilder.group({ - projectName: new FormControl(null, [Validators.required, projectNameValidator.get]) + projectName: new FormControl(null, [Validators.required, projectNameValidator.get]), }); } @@ -48,15 +47,21 @@ export class SaveProjectDialogComponent implements OnInit { } this.projectService.list(this.server).subscribe((projects: Project[]) => { const projectName = this.projectNameForm.controls['projectName'].value; - let existingProject = projects.find(project => project.name === projectName); + let existingProject = projects.find((project) => project.name === projectName); if (existingProject) { this.toasterService.error(`Project with this name already exists.`); - } else if (this.nodesDataSource.getItems().filter(node => - (node.status === 'started' && node.node_type==='vpcs') || - (node.status === 'started' && node.node_type==='virtualbox') || - (node.status === 'started' && node.node_type==='vmware')).length > 0) { - this.toasterService.error('Please stop all nodes in order to save project.') + } else if ( + this.nodesDataSource + .getItems() + .filter( + (node) => + (node.status === 'started' && node.node_type === 'vpcs') || + (node.status === 'started' && node.node_type === 'virtualbox') || + (node.status === 'started' && node.node_type === 'vmware') + ).length > 0 + ) { + this.toasterService.error('Please stop all nodes in order to save project.'); } else { this.addProject(); } @@ -68,14 +73,16 @@ export class SaveProjectDialogComponent implements OnInit { } addProject(): void { - this.projectService.duplicate(this.server, this.project.project_id, this.projectNameForm.controls['projectName'].value).subscribe((project: Project) => { + this.projectService + .duplicate(this.server, this.project.project_id, this.projectNameForm.controls['projectName'].value) + .subscribe((project: Project) => { this.dialogRef.close(); this.toasterService.success(`Project ${project.name} added`); - }); + }); } onKeyDown(event) { - if (event.key === "Enter") { + if (event.key === 'Enter') { this.onAddClick(); } } diff --git a/src/app/components/servers/add-server-dialog/add-server-dialog.component.html b/src/app/components/servers/add-server-dialog/add-server-dialog.component.html index 1104fddf..f918e07b 100644 --- a/src/app/components/servers/add-server-dialog/add-server-dialog.component.html +++ b/src/app/components/servers/add-server-dialog/add-server-dialog.component.html @@ -1,13 +1,13 @@

Add server

-
+
You must enter a value - - + + {{ location.name }} @@ -29,13 +29,13 @@ - + {{ protocol.name }} - + {{ auth.name }} @@ -47,7 +47,6 @@ -
diff --git a/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts b/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts index ce40e905..aa34579b 100644 --- a/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts +++ b/src/app/components/servers/add-server-dialog/add-server-dialog.component.ts @@ -6,27 +6,32 @@ import { FormGroup, FormControl, Validators } from '@angular/forms'; import { ServerService } from '../../../services/server.service'; import { ToasterService } from '../../../services/toaster.service'; - @Component({ selector: 'app-add-server-dialog', - templateUrl: 'add-server-dialog.component.html' + templateUrl: 'add-server-dialog.component.html', }) export class AddServerDialogComponent implements OnInit { - authorizations = [{ key: 'none', name: 'No authorization' }, { key: 'basic', name: 'Basic authorization' }]; - protocols = [{ key: 'http:', name: 'HTTP' }, { key: 'https:', name: 'HTTPS' }]; + authorizations = [ + { key: 'none', name: 'No authorization' }, + { key: 'basic', name: 'Basic authorization' }, + ]; + protocols = [ + { key: 'http:', name: 'HTTP' }, + { key: 'https:', name: 'HTTPS' }, + ]; locations = []; serverForm = new FormGroup({ - 'name': new FormControl('', [ Validators.required ]), - 'location': new FormControl(''), - 'path': new FormControl(''), - 'ubridge_path': new FormControl(''), - 'host': new FormControl('', [ Validators.required ]), - 'port': new FormControl('', [ Validators.required, Validators.min(1) ]), - 'protocol': new FormControl('http:'), - 'authorization': new FormControl('none'), - 'login': new FormControl(''), - 'password': new FormControl('') + name: new FormControl('', [Validators.required]), + location: new FormControl(''), + path: new FormControl(''), + ubridge_path: new FormControl(''), + host: new FormControl('', [Validators.required]), + port: new FormControl('', [Validators.required, Validators.min(1)]), + protocol: new FormControl('http:'), + authorization: new FormControl('none'), + login: new FormControl(''), + password: new FormControl(''), }); constructor( @@ -34,24 +39,23 @@ export class AddServerDialogComponent implements OnInit { private electronService: ElectronService, private serverService: ServerService, private toasterService: ToasterService, - @Inject(MAT_DIALOG_DATA) public data: any, + @Inject(MAT_DIALOG_DATA) public data: any ) {} async getLocations() { const localServers = await this.numberOfLocalServers(); let locations = []; - if(this.electronService.isElectronApp && localServers === 0) { + if (this.electronService.isElectronApp && localServers === 0) { locations.push({ key: 'local', name: 'Local' }); } locations.push({ key: 'remote', name: 'Remote' }); - return locations + return locations; } - async getDefaultLocation() { const localServers = await this.numberOfLocalServers(); - if(this.electronService.isElectronApp && localServers === 0) { + if (this.electronService.isElectronApp && localServers === 0) { return 'local'; } return 'remote'; @@ -72,14 +76,14 @@ export class AddServerDialogComponent implements OnInit { } async getDefaultLocalServerPath() { - if(this.electronService.isElectronApp) { + if (this.electronService.isElectronApp) { return await this.electronService.remote.require('./local-server.js').getLocalServerPath(); } return; } async getDefaultUbridgePath() { - if(this.electronService.isElectronApp) { + if (this.electronService.isElectronApp) { return await this.electronService.remote.require('./local-server.js').getUbridgePath(); } return; @@ -95,14 +99,13 @@ export class AddServerDialogComponent implements OnInit { const pathControl = this.serverForm.get('path'); const ubridgePathControl = this.serverForm.get('ubridge_path'); - if(location === 'local') { + if (location === 'local') { pathControl.setValue(defaultLocalServerPath); pathControl.setValidators([Validators.required]); ubridgePathControl.setValue(defaultUbridgePath); ubridgePathControl.setValidators([Validators.required]); - } - else { + } else { pathControl.setValue(''); pathControl.clearValidators(); @@ -112,29 +115,28 @@ export class AddServerDialogComponent implements OnInit { [pathControl, ubridgePathControl].forEach((control) => { control.updateValueAndValidity({ - onlySelf: true + onlySelf: true, }); - }) + }); }); - + this.serverForm.get('authorization').valueChanges.subscribe((authorization: string) => { const loginControl = this.serverForm.get('login'); const passwordControl = this.serverForm.get('password'); - if(authorization === 'none') { + if (authorization === 'none') { loginControl.clearValidators(); passwordControl.clearValidators(); - } - else { + } else { loginControl.setValidators([Validators.required]); passwordControl.setValidators([Validators.required]); } [loginControl, passwordControl].forEach((control) => { control.updateValueAndValidity({ - onlySelf: true + onlySelf: true, }); - }) + }); }); const defaultLocation = await this.getDefaultLocation(); @@ -145,23 +147,23 @@ export class AddServerDialogComponent implements OnInit { } onAddClick(): void { - if(!this.serverForm.valid) { + if (!this.serverForm.valid) { return; } const server: Server = Object.assign({}, this.serverForm.value); this.serverService.checkServerVersion(server).subscribe( (serverInfo) => { - if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) { + if (serverInfo.version.split('.')[1] >= 2 && serverInfo.version.split('.')[0] >= 2) { this.dialogRef.close(server); - this.toasterService.success(`Server ${server.name} added.`) + this.toasterService.success(`Server ${server.name} added.`); } else { this.dialogRef.close(); - this.toasterService.error(`Server version is not supported.`) + this.toasterService.error(`Server version is not supported.`); } }, - error => { - this.toasterService.error('Cannot connect to the server: ' + error) + (error) => { + this.toasterService.error('Cannot connect to the server: ' + error); } ); } diff --git a/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.html b/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.html index c9f74ebf..bc7ff337 100644 --- a/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.html +++ b/src/app/components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component.html @@ -1,4 +1,4 @@ -{{message}} +{{ message }}
- - - - - @@ -62,7 +96,9 @@
- +
diff --git a/src/app/components/servers/servers.component.scss b/src/app/components/servers/servers.component.scss index 9a7ae95d..e7e1f28f 100644 --- a/src/app/components/servers/servers.component.scss +++ b/src/app/components/servers/servers.component.scss @@ -1,7 +1,7 @@ .buttons-bar { - padding-top: 0px; + padding-top: 0px; } .button { - margin: 20px!important; + margin: 20px !important; } diff --git a/src/app/components/servers/servers.component.spec.ts b/src/app/components/servers/servers.component.spec.ts index a0c628c5..ca48efc3 100644 --- a/src/app/components/servers/servers.component.spec.ts +++ b/src/app/components/servers/servers.component.spec.ts @@ -8,7 +8,7 @@ describe('ServersComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ServersComponent] + declarations: [ServersComponent], }).compileComponents(); })); diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts index d49c99ac..cdcfb707 100644 --- a/src/app/components/servers/servers.component.ts +++ b/src/app/components/servers/servers.component.ts @@ -14,11 +14,10 @@ import { ElectronService } from 'ngx-electron'; import { ChildProcessService } from 'ngx-childprocess'; import { ConfirmationBottomSheetComponent } from '../projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; - @Component({ selector: 'app-server-list', templateUrl: './servers.component.html', - styleUrls: ['./servers.component.scss'] + styleUrls: ['./servers.component.scss'], }) export class ServersComponent implements OnInit, OnDestroy { dataSource: ServerDataSource; @@ -35,17 +34,17 @@ export class ServersComponent implements OnInit, OnDestroy { private electronService: ElectronService, private childProcessService: ChildProcessService, private bottomSheet: MatBottomSheet, - private route : ActivatedRoute, + private route: ActivatedRoute, private router: Router ) {} - + getServers() { const runningServersNames = this.serverManagement.getRunningServers(); this.serverService.findAll().then((servers: Server[]) => { servers.forEach((server) => { const serverIndex = runningServersNames.findIndex((serverName) => server.name === serverName); - if(serverIndex >= 0) { + if (serverIndex >= 0) { server.status = 'running'; } }); @@ -53,13 +52,13 @@ export class ServersComponent implements OnInit, OnDestroy { servers.forEach((server) => { this.serverService.checkServerVersion(server).subscribe( (serverInfo) => { - if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) { + if (serverInfo.version.split('.')[1] >= 2 && serverInfo.version.split('.')[0] >= 2) { if (!server.protocol) server.protocol = location.protocol as ServerProtocol; if (!this.serverDatabase.find(server.name)) this.serverDatabase.addServer(server); } }, - error => {} - ); + (error) => {} + ); }); }); } @@ -79,19 +78,19 @@ export class ServersComponent implements OnInit, OnDestroy { this.serverStatusSubscription = this.serverManagement.serverStatusChanged.subscribe((serverStatus) => { const server = this.serverDatabase.find(serverStatus.serverName); - if(!server) { + if (!server) { return; } - if(serverStatus.status === 'starting') { + if (serverStatus.status === 'starting') { server.status = 'starting'; } - if(serverStatus.status === 'stopped') { + if (serverStatus.status === 'stopped') { server.status = 'stopped'; } - if(serverStatus.status === 'errored') { + if (serverStatus.status === 'errored') { server.status = 'stopped'; } - if(serverStatus.status === 'started') { + if (serverStatus.status === 'started') { server.status = 'running'; } this.serverDatabase.update(server); @@ -104,7 +103,7 @@ export class ServersComponent implements OnInit, OnDestroy { } startLocalServer() { - const server = this.serverDatabase.data.find(n => n.location === 'bundled' || 'local'); + const server = this.serverDatabase.data.find((n) => n.location === 'bundled' || 'local'); this.startServer(server); } @@ -116,10 +115,10 @@ export class ServersComponent implements OnInit, OnDestroy { const dialogRef = this.dialog.open(AddServerDialogComponent, { width: '350px', autoFocus: false, - disableClose: true + disableClose: true, }); - dialogRef.afterClosed().subscribe(server => { + dialogRef.afterClosed().subscribe((server) => { if (server) { this.serverService.create(server).then((created: Server) => { this.serverDatabase.addServer(created); @@ -129,8 +128,8 @@ export class ServersComponent implements OnInit, OnDestroy { } getServerStatus(server: Server) { - if(server.location === 'local') { - if(server.status === undefined) { + if (server.location === 'local') { + if (server.status === undefined) { return 'stopped'; } return server.status; @@ -145,7 +144,7 @@ export class ServersComponent implements OnInit, OnDestroy { if (result) { this.serverService.delete(server).then(() => { this.serverDatabase.remove(server); - }); + }); } }); } diff --git a/src/app/components/settings/console/console.component.html b/src/app/components/settings/console/console.component.html index 67c2316f..185b553e 100644 --- a/src/app/components/settings/console/console.component.html +++ b/src/app/components/settings/console/console.component.html @@ -1,28 +1,29 @@
-
-

Console settings

-
+
+

Console settings

+
- - - - - -
The following variables are replaced by GNS3:
- %h: console IP or hostname
- %p: console port
- %s: path of the serial connection
- %d: title of the console
- %i: Project UUID
- %c: server URL (http://user:password@server:port) -
- - -
- -
-
+ +
+ + + +
+ The following variables are replaced by GNS3:
+ %h: console IP or hostname
+ %p: console port
+ %s: path of the serial connection
+ %d: title of the console
+ %i: Project UUID
+ %c: server URL (http://user:password@server:port) +
+
+ +
+ +
+
diff --git a/src/app/components/settings/console/console.component.scss b/src/app/components/settings/console/console.component.scss index 6955ed73..9057bc2e 100644 --- a/src/app/components/settings/console/console.component.scss +++ b/src/app/components/settings/console/console.component.scss @@ -1,3 +1,3 @@ .help { font-size: 14px; -} \ No newline at end of file +} diff --git a/src/app/components/settings/console/console.component.spec.ts b/src/app/components/settings/console/console.component.spec.ts index 3af4ba64..62d491f8 100644 --- a/src/app/components/settings/console/console.component.spec.ts +++ b/src/app/components/settings/console/console.component.spec.ts @@ -11,7 +11,6 @@ import { MockedToasterService } from '../../../services/toaster.service.spec'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Router } from '@angular/router'; - describe('ConsoleComponent', () => { let component: ConsoleComponent; let fixture: ComponentFixture; @@ -21,11 +20,11 @@ describe('ConsoleComponent', () => { beforeEach(async(() => { consoleService = { - command: 'command' + command: 'command', }; router = { - navigate: jasmine.createSpy('navigate') + navigate: jasmine.createSpy('navigate'), }; toaster = new MockedToasterService(); @@ -34,12 +33,18 @@ describe('ConsoleComponent', () => { providers: [ { provide: ConsoleService, useValue: consoleService }, { provide: ToasterService, useValue: toaster }, - { provide: Router, useValue: router} + { provide: Router, useValue: router }, ], - imports: [ FormsModule, ReactiveFormsModule, MatFormFieldModule, MatCardModule, MatInputModule, NoopAnimationsModule ], - declarations: [ ConsoleComponent ] - }) - .compileComponents(); + imports: [ + FormsModule, + ReactiveFormsModule, + MatFormFieldModule, + MatCardModule, + MatInputModule, + NoopAnimationsModule, + ], + declarations: [ConsoleComponent], + }).compileComponents(); })); beforeEach(() => { @@ -55,14 +60,13 @@ describe('ConsoleComponent', () => { it('should set default command', () => { component.ngOnInit(); expect(component.consoleForm.value.command).toEqual('command'); - }) + }); it('should go back', () => { component.goBack(); expect(router.navigate).toHaveBeenCalledWith(['/settings']); }); - it('should update console command', () => { component.consoleForm.get('command').setValue('newCommand'); spyOn(component, 'goBack'); @@ -70,5 +74,4 @@ describe('ConsoleComponent', () => { expect(toaster.success.length).toEqual(1); expect(component.goBack).toHaveBeenCalled(); }); - }); diff --git a/src/app/components/settings/console/console.component.ts b/src/app/components/settings/console/console.component.ts index f043bc5f..27a9caa0 100644 --- a/src/app/components/settings/console/console.component.ts +++ b/src/app/components/settings/console/console.component.ts @@ -7,19 +7,14 @@ import { ToasterService } from '../../../services/toaster.service'; @Component({ selector: 'app-console', templateUrl: './console.component.html', - styleUrls: ['./console.component.scss'] + styleUrls: ['./console.component.scss'], }) export class ConsoleComponent implements OnInit { - consoleForm = new FormGroup({ - 'command': new FormControl(''), + command: new FormControl(''), }); - - constructor( - private router: Router, - private consoleService: ConsoleService, - private toasterService: ToasterService - ) { } + + constructor(private router: Router, private consoleService: ConsoleService, private toasterService: ToasterService) {} ngOnInit() { const commandControl = this.consoleForm.get('command'); @@ -33,8 +28,7 @@ export class ConsoleComponent implements OnInit { save() { const formValue = this.consoleForm.value; this.consoleService.command = formValue.command; - this.toasterService.success("Console command has been updated."); + this.toasterService.success('Console command has been updated.'); this.goBack(); } - } diff --git a/src/app/components/settings/settings.component.html b/src/app/components/settings/settings.component.html index 1c3c0b6c..dd09dcf4 100644 --- a/src/app/components/settings/settings.component.html +++ b/src/app/components/settings/settings.component.html @@ -10,7 +10,7 @@
- Send anonymous crash reports
+ Send anonymous crash reports
Integrate link labels to links
@@ -35,11 +35,10 @@
- + mode_edit
- @@ -52,7 +51,6 @@
- @@ -64,12 +62,10 @@
-
-
diff --git a/src/app/components/settings/settings.component.scss b/src/app/components/settings/settings.component.scss index 279e9631..56307c92 100644 --- a/src/app/components/settings/settings.component.scss +++ b/src/app/components/settings/settings.component.scss @@ -1,9 +1,9 @@ .theme-panel { - justify-content: space-between; - display: flex; - padding: 10px; + justify-content: space-between; + display: flex; + padding: 10px; } .fullWidth { - width: 100%; + width: 100%; } diff --git a/src/app/components/settings/settings.component.spec.ts b/src/app/components/settings/settings.component.spec.ts index 65f16d90..17aabf97 100644 --- a/src/app/components/settings/settings.component.spec.ts +++ b/src/app/components/settings/settings.component.spec.ts @@ -24,26 +24,35 @@ describe('SettingsComponent', () => { let settingsService: SettingsService; let mapSettingsService = { integrateLinkLabelsToLinks: true, - toggleIntegrateInterfaceLabels(val: boolean) {} + toggleIntegrateInterfaceLabels(val: boolean) {}, }; let consoleService; let updatesService = autoSpy(UpdatesService); beforeEach(async(() => { consoleService = { - command: 'command' + command: 'command', }; TestBed.configureTestingModule({ - imports: [MatExpansionModule, MatCheckboxModule, FormsModule, PersistenceModule, BrowserAnimationsModule, MatIconModule, MatFormFieldModule, MatInputModule], + imports: [ + MatExpansionModule, + MatCheckboxModule, + FormsModule, + PersistenceModule, + BrowserAnimationsModule, + MatIconModule, + MatFormFieldModule, + MatInputModule, + ], providers: [ SettingsService, { provide: ToasterService, useClass: MockedToasterService }, { provide: ConsoleService, useValue: consoleService }, { provide: MapSettingsService, useValue: mapSettingsService }, - { provide: UpdatesService, useValue: updatesService } + { provide: UpdatesService, useValue: updatesService }, ], - declarations: [SettingsComponent] + declarations: [SettingsComponent], }).compileComponents(); settingsService = TestBed.get(SettingsService); @@ -64,7 +73,7 @@ describe('SettingsComponent', () => { crash_reports: true, experimental_features: true, angular_map: false, - console_command: '' + console_command: '', }; const getAll = spyOn(settingsService, 'getAll').and.returnValue(settings); const setAll = spyOn(settingsService, 'setAll'); @@ -75,5 +84,4 @@ describe('SettingsComponent', () => { component.save(); expect(setAll).toHaveBeenCalledWith(settings); }); - }); diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts index 5ff17c4f..16fb7e09 100644 --- a/src/app/components/settings/settings.component.ts +++ b/src/app/components/settings/settings.component.ts @@ -9,7 +9,7 @@ import { UpdatesService } from '../../services/updates.service'; @Component({ selector: 'app-settings', templateUrl: './settings.component.html', - styleUrls: ['./settings.component.scss'] + styleUrls: ['./settings.component.scss'], }) export class SettingsComponent implements OnInit { settings = { ...SettingsService.DEFAULTS }; @@ -42,6 +42,6 @@ export class SettingsComponent implements OnInit { } checkForUpdates() { - window.open("https://gns3.com/software"); + window.open('https://gns3.com/software'); } } diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.html b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.html index 43959d22..21f00940 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.html +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.html @@ -1,14 +1,19 @@

Create snapshot

- +
- +
diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.scss b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.scss index 7977448c..d21c1a32 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.scss +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.scss @@ -1,21 +1,21 @@ .title-container { - display: flex; - align-items: baseline; - justify-content: space-between; + display: flex; + align-items: baseline; + justify-content: space-between; } .name-input { - width: 100%; + width: 100%; } .top-button { - outline: none; - box-shadow: none !important; - background: transparent !important; + outline: none; + box-shadow: none !important; + background: transparent !important; } button:focus { - outline: 0 !important; - border: 0 !important; - box-shadow: none !important; + outline: 0 !important; + border: 0 !important; + box-shadow: none !important; } diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.spec.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.spec.ts index a981589e..e62e28e5 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.spec.ts +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.spec.ts @@ -8,7 +8,7 @@ describe('CreateSnapshotDialogComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [CreateSnapshotDialogComponent] + declarations: [CreateSnapshotDialogComponent], }).compileComponents(); })); diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts index 06c40d32..bf1ab6ed 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts @@ -9,11 +9,10 @@ import { SnapshotService } from '../../../services/snapshot.service'; import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource'; import { Node } from '../../../cartography/models/node'; - @Component({ selector: 'app-create-snapshot-dialog', templateUrl: './create-snapshot-dialog.component.html', - styleUrls: ['./create-snapshot-dialog.component.scss'] + styleUrls: ['./create-snapshot-dialog.component.scss'], }) export class CreateSnapshotDialogComponent { server: Server; @@ -35,7 +34,7 @@ export class CreateSnapshotDialogComponent { this.project = data['project']; this.inputForm = this.formBuilder.group({ - snapshotName: new FormControl('', Validators.required) + snapshotName: new FormControl('', Validators.required), }); this.snapshotService.list(this.server, this.project.project_id).subscribe((snapshots: Snapshot[]) => { @@ -52,7 +51,7 @@ export class CreateSnapshotDialogComponent { } isAlwaysRunningNode(nodeType: string) { - return !["qemu", "docker", "dynamips", "vpcs", "vmware", "virtualbox", "iou", "traceng"].includes(nodeType); + return !['qemu', 'docker', 'dynamips', 'vpcs', 'vmware', 'virtualbox', 'iou', 'traceng'].includes(nodeType); } onAddClick(): void { diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts index dad43a46..ee4638dd 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts @@ -26,136 +26,138 @@ import { NameFilter } from '../../../filters/nameFilter.pipe'; import { ServerResolve } from '../../../resolvers/server-resolve'; export class MockedActivatedRoute { - get() { - return { - params: of({ id: 3 }), - snapshot: { - parent: { - params: { - id: 1 - } - }, - paramMap: { - get(name: string): string { - return '1'; - } - }, - data: { - 'server': new Server() - } - }, - }; - } + get() { + return { + params: of({ id: 3 }), + snapshot: { + parent: { + params: { + id: 1, + }, + }, + paramMap: { + get(name: string): string { + return '1'; + }, + }, + data: { + server: new Server(), + }, + }, + }; + } } export class MockedSnapshotService { - public list(server: Server, project_id: string) { - return of([]); - } + public list(server: Server, project_id: string) { + return of([]); + } - public delete(server: Server, project_id: string, snapshot_id: string) { - return of({}); - } + public delete(server: Server, project_id: string, snapshot_id: string) { + return of({}); + } - public restore(server: Server, project_id: string, snapshot_id: string) { - return of({}); - } + public restore(server: Server, project_id: string, snapshot_id: string) { + return of({}); + } } describe('ListOfSnapshotsComponent', () => { - let component: ListOfSnapshotsComponent; - let fixture: ComponentFixture; - let activatedRoute = new MockedActivatedRoute().get(); - let mockedSnapshotService = new MockedSnapshotService(); - let mockedToasterService = new MockedToasterService(); + let component: ListOfSnapshotsComponent; + let fixture: ComponentFixture; + let activatedRoute = new MockedActivatedRoute().get(); + let mockedSnapshotService = new MockedSnapshotService(); + let mockedToasterService = new MockedToasterService(); - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [MatDialogModule, - MatTableModule, - MatIconModule, - MatToolbarModule, - MatMenuModule, - MatCheckboxModule, - CommonModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([ - { path: 'server/:server_id/project/:project_id/snapshots', component: ListOfSnapshotsComponent, resolve: {server: ServerResolve} } - ])], - providers: [ - { provide: SnapshotService, useValue: mockedSnapshotService }, - { provide: ActivatedRoute, useValue: activatedRoute }, - { provide: ProgressDialogService, useClass: ProgressDialogService }, - { provide: ToasterService, useValue: mockedToasterService } - ], - declarations: [ - ListOfSnapshotsComponent, - DateFilter, - NameFilter - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatDialogModule, + MatTableModule, + MatIconModule, + MatToolbarModule, + MatMenuModule, + MatCheckboxModule, + CommonModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([ + { + path: 'server/:server_id/project/:project_id/snapshots', + component: ListOfSnapshotsComponent, + resolve: { server: ServerResolve }, + }, + ]), + ], + providers: [ + { provide: SnapshotService, useValue: mockedSnapshotService }, + { provide: ActivatedRoute, useValue: activatedRoute }, + { provide: ProgressDialogService, useClass: ProgressDialogService }, + { provide: ToasterService, useValue: mockedToasterService }, + ], + declarations: [ListOfSnapshotsComponent, DateFilter, NameFilter], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ListOfSnapshotsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ListOfSnapshotsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should call snapshot service to get items', () => { - spyOn(mockedSnapshotService, 'list').and.returnValues(of([])); + it('should call snapshot service to get items', () => { + spyOn(mockedSnapshotService, 'list').and.returnValues(of([])); - component.getSnapshots(); + component.getSnapshots(); - expect(mockedSnapshotService.list).toHaveBeenCalled(); - }); + expect(mockedSnapshotService.list).toHaveBeenCalled(); + }); - it('should call snapshot service to delete snapshot', () => { - let snapshot: Snapshot = { - snapshot_id: 1, - name: 'snapshot1', - created_at: '111111', - project_id: 1 - }; - spyOn(mockedSnapshotService, 'delete').and.returnValues(of([])); + it('should call snapshot service to delete snapshot', () => { + let snapshot: Snapshot = { + snapshot_id: 1, + name: 'snapshot1', + created_at: '111111', + project_id: 1, + }; + spyOn(mockedSnapshotService, 'delete').and.returnValues(of([])); - component.deleteSnapshot(snapshot); + component.deleteSnapshot(snapshot); - expect(mockedSnapshotService.delete).toHaveBeenCalled(); - }); + expect(mockedSnapshotService.delete).toHaveBeenCalled(); + }); - it('should sort snapshots in correct order', () => { - component.snapshots = [ - { - snapshot_id: 2, - name: 'second snapshot', - created_at: '222222', - project_id: 1 - }, - { - snapshot_id: 1, - name: 'first snapshot', - created_at: '111111', - project_id: 1 - } - ]; - let sort: Sort = { - active: 'name', - direction: 'asc' - }; + it('should sort snapshots in correct order', () => { + component.snapshots = [ + { + snapshot_id: 2, + name: 'second snapshot', + created_at: '222222', + project_id: 1, + }, + { + snapshot_id: 1, + name: 'first snapshot', + created_at: '111111', + project_id: 1, + }, + ]; + let sort: Sort = { + active: 'name', + direction: 'asc', + }; - component.sortData(sort); + component.sortData(sort); - expect(component.snapshots[0].snapshot_id).toBe(1); + expect(component.snapshots[0].snapshot_id).toBe(1); - sort.direction = 'desc'; - component.sortData(sort); + sort.direction = 'desc'; + component.sortData(sort); - expect(component.snapshots[0].snapshot_id).toBe(2); - }); + expect(component.snapshots[0].snapshot_id).toBe(2); + }); }); diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.html b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.html index da8c9b6d..4951d2b5 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.html +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.html @@ -1,46 +1,58 @@
-
-
-

Snapshots

-
+
+
+

Snapshots

-
- - - - +
+
+ + + + - - - Name - {{row.name}} - + + + Name + {{ row.name }} + - - Date - {{row.created_at | datefilter}} - - - - Actions - - - - - - - - - - - -
+ + Date + {{ row.created_at | datefilter }} + + + + Actions + + + + + + + + + + + +
diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.scss b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.scss index 84536106..cc98a244 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.scss +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.scss @@ -1,7 +1,7 @@ .filter-field { - width: 100%; + width: 100%; } .mat-table { - margin: -16px!important; + margin: -16px !important; } diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts index 5ea0c685..cca659fe 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts @@ -13,79 +13,77 @@ import { ProgressDialogComponent } from '../../../common/progress-dialog/progres @Component({ selector: 'app-list-of-snapshots', templateUrl: './list-of-snapshots.component.html', - styleUrls: ['./list-of-snapshots.component.scss'] + styleUrls: ['./list-of-snapshots.component.scss'], }) export class ListOfSnapshotsComponent implements OnInit { - server: Server; - projectId: string; - snapshots: Snapshot[]; - displayedColumns = ['name', 'creationDate', 'actions']; - searchText: string; + server: Server; + projectId: string; + snapshots: Snapshot[]; + displayedColumns = ['name', 'creationDate', 'actions']; + searchText: string; - constructor( - private route: ActivatedRoute, - private snapshotService: SnapshotService, - private progressDialogService: ProgressDialogService, - private toaster: ToasterService - ) {} + constructor( + private route: ActivatedRoute, + private snapshotService: SnapshotService, + private progressDialogService: ProgressDialogService, + private toaster: ToasterService + ) {} - ngOnInit() { - this.projectId = this.route.snapshot.paramMap.get("project_id"); - this.server = this.route.snapshot.data['server']; - this.getSnapshots(); - } + ngOnInit() { + this.projectId = this.route.snapshot.paramMap.get('project_id'); + this.server = this.route.snapshot.data['server']; + this.getSnapshots(); + } - getSnapshots() { - this.snapshotService.list(this.server, this.projectId).subscribe((snapshots: Snapshot[]) => { - this.snapshots = snapshots; - }); - } + getSnapshots() { + this.snapshotService.list(this.server, this.projectId).subscribe((snapshots: Snapshot[]) => { + this.snapshots = snapshots; + }); + } - restoreSnapshot(snapshot: Snapshot) { - const restoring = this.snapshotService.restore(this.server, this.projectId, snapshot.snapshot_id.toString()); - const progress = this.progressDialogService.open(); - const subscription = restoring.subscribe( - (project: Project) => { - this.toaster.success(`Snapshot ${snapshot.name} has been restored.`); - progress.close(); - } - ); + restoreSnapshot(snapshot: Snapshot) { + const restoring = this.snapshotService.restore(this.server, this.projectId, snapshot.snapshot_id.toString()); + const progress = this.progressDialogService.open(); + const subscription = restoring.subscribe((project: Project) => { + this.toaster.success(`Snapshot ${snapshot.name} has been restored.`); + progress.close(); + }); - progress.afterClosed().subscribe(result => { - if (result === ProgressDialogComponent.CANCELLED) { - subscription.unsubscribe(); - } - }); - } + progress.afterClosed().subscribe((result) => { + if (result === ProgressDialogComponent.CANCELLED) { + subscription.unsubscribe(); + } + }); + } - deleteSnapshot(snapshot: Snapshot) { - this.snapshotService.delete(this.server, this.projectId, snapshot.snapshot_id.toString()).subscribe(() => { - this.getSnapshots(); - this.toaster.success(`Snapshot ${snapshot.name} has been deleted.`); - }); - } + deleteSnapshot(snapshot: Snapshot) { + this.snapshotService.delete(this.server, this.projectId, snapshot.snapshot_id.toString()).subscribe(() => { + this.getSnapshots(); + this.toaster.success(`Snapshot ${snapshot.name} has been deleted.`); + }); + } - sortData(sort: Sort) { - if (!sort.active || sort.direction === '') return; + sortData(sort: Sort) { + if (!sort.active || sort.direction === '') return; - let snapshots = this.snapshots.slice(); - this.snapshots = snapshots.sort((a, b) => { - const isAsc = sort.direction === 'asc'; - if (sort.active === 'name') { - return compareNames(a.name, b.name, isAsc); - } else if (sort.active === 'creationDate') { - return compareDates(+a.created_at, +b.created_at, !isAsc); - } else return 0; - }); - } + let snapshots = this.snapshots.slice(); + this.snapshots = snapshots.sort((a, b) => { + const isAsc = sort.direction === 'asc'; + if (sort.active === 'name') { + return compareNames(a.name, b.name, isAsc); + } else if (sort.active === 'creationDate') { + return compareDates(+a.created_at, +b.created_at, !isAsc); + } else return 0; + }); + } } function compareDates(a: number, b: number, isAsc: boolean) { - return (a < b ? -1 : 1) * (isAsc ? 1 : -1); -} + return (a < b ? -1 : 1) * (isAsc ? 1 : -1); +} function compareNames(a: string, b: string, isAsc: boolean) { - a = a.toLowerCase(); - b = b.toLowerCase(); - return (a < b ? -1 : 1) * (isAsc ? 1 : -1); -} + a = a.toLowerCase(); + b = b.toLowerCase(); + return (a < b ? -1 : 1) * (isAsc ? 1 : -1); +} diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html index df9c9668..9ad2f376 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.html @@ -1,8 +1,9 @@ diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts index 92eec731..22998bca 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.spec.ts @@ -8,7 +8,7 @@ describe('SnapshotMenuItemComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [SnapshotMenuItemComponent] + declarations: [SnapshotMenuItemComponent], }).compileComponents(); })); diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts index 574c4239..acead691 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts @@ -13,7 +13,7 @@ import { Snapshot } from '../../../models/snapshot'; @Component({ selector: 'app-snapshot-menu-item', templateUrl: './snapshot-menu-item.component.html', - styleUrls: ['./snapshot-menu-item.component.scss'] + styleUrls: ['./snapshot-menu-item.component.scss'], }) export class SnapshotMenuItemComponent implements OnInit { @Input('project') project: Project; @@ -33,26 +33,24 @@ export class SnapshotMenuItemComponent implements OnInit { width: '450px', data: { server: this.server, - project: this.project + project: this.project, }, autoFocus: false, - disableClose: true + disableClose: true, }); - dialogRef.afterClosed().subscribe(snapshot => { + dialogRef.afterClosed().subscribe((snapshot) => { if (snapshot) { const creation = this.snapshotService.create(this.server, this.project.project_id, snapshot); const progress = this.progressDialogService.open(); - const subscription = creation.subscribe( - (created_snapshot: Snapshot) => { - this.toaster.success(`Snapshot '${snapshot.name}' has been created.`); - progress.close(); - } - ); + const subscription = creation.subscribe((created_snapshot: Snapshot) => { + this.toaster.success(`Snapshot '${snapshot.name}' has been created.`); + progress.close(); + }); - progress.afterClosed().subscribe(result => { + progress.afterClosed().subscribe((result) => { if (result === ProgressDialogComponent.CANCELLED) { subscription.unsubscribe(); } diff --git a/src/app/components/system-status/status-chart/status-chart.component.html b/src/app/components/system-status/status-chart/status-chart.component.html index db2301a7..ee985753 100644 --- a/src/app/components/system-status/status-chart/status-chart.component.html +++ b/src/app/components/system-status/status-chart/status-chart.component.html @@ -1,155 +1,163 @@ -
- +
+ - + - + - -
+ +
-
- - - +
+ - -
+ -
- - Memory total: {{formatBytes(computeStatistics.statistics.memory_total)}} - - - Memory used: {{formatBytes(computeStatistics.statistics.memory_used)}} - - - Memory free: {{formatBytes(computeStatistics.statistics.memory_free)}} - -
+ +
-
- - Swap total: {{formatBytes(computeStatistics.statistics.swap_total)}} - - - Swap used: {{formatBytes(computeStatistics.statistics.swap_used)}} - - - Swap free: {{formatBytes(computeStatistics.statistics.swap_free)}} - -
+
+ + Memory total: {{ formatBytes(computeStatistics.statistics.memory_total) }} + + + Memory used: {{ formatBytes(computeStatistics.statistics.memory_used) }} + + + Memory free: {{ formatBytes(computeStatistics.statistics.memory_free) }} + +
+ +
+ + Swap total: {{ formatBytes(computeStatistics.statistics.swap_total) }} + + + Swap used: {{ formatBytes(computeStatistics.statistics.swap_used) }} + + + Swap free: {{ formatBytes(computeStatistics.statistics.swap_free) }} + +
diff --git a/src/app/components/system-status/status-chart/status-chart.component.scss b/src/app/components/system-status/status-chart/status-chart.component.scss index f0af5557..e7c92924 100644 --- a/src/app/components/system-status/status-chart/status-chart.component.scss +++ b/src/app/components/system-status/status-chart/status-chart.component.scss @@ -1,13 +1,13 @@ .wrapper { - width: 100%; - display: flex; - justify-content: space-between; - max-height: 250px!important; + width: 100%; + display: flex; + justify-content: space-between; + max-height: 250px !important; } .chips-wrapper { - width: 100%; - display: flex; - justify-content: space-between; - margin-bottom: 10px; + width: 100%; + display: flex; + justify-content: space-between; + margin-bottom: 10px; } diff --git a/src/app/components/system-status/status-chart/status-chart.component.ts b/src/app/components/system-status/status-chart/status-chart.component.ts index 05647246..cfdd383b 100644 --- a/src/app/components/system-status/status-chart/status-chart.component.ts +++ b/src/app/components/system-status/status-chart/status-chart.component.ts @@ -1,28 +1,27 @@ -import { Component, OnInit, Input } from "@angular/core"; +import { Component, OnInit, Input } from '@angular/core'; import { ComputeStatistics } from '../../../models/computeStatistics'; - @Component({ - selector: 'app-status-chart', - templateUrl: './status-chart.component.html', - styleUrls: ['./status-chart.component.scss'] + selector: 'app-status-chart', + templateUrl: './status-chart.component.html', + styleUrls: ['./status-chart.component.scss'], }) export class StatusChartComponent implements OnInit { - @Input() computeStatistics: ComputeStatistics; + @Input() computeStatistics: ComputeStatistics; - constructor() {} + constructor() {} - ngOnInit() {} + ngOnInit() {} - formatBytes(bytes, decimals = 2) { - if (bytes === 0) return '0 Bytes'; - - const k = 1024; - const dm = decimals < 0 ? 0 : decimals; - const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; - - const i = Math.floor(Math.log(bytes) / Math.log(k)); - - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; - } + formatBytes(bytes, decimals = 2) { + if (bytes === 0) return '0 Bytes'; + + const k = 1024; + const dm = decimals < 0 ? 0 : decimals; + const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; + + const i = Math.floor(Math.log(bytes) / Math.log(k)); + + return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; + } } diff --git a/src/app/components/system-status/status-info/status-info.component.html b/src/app/components/system-status/status-info/status-info.component.html index 3c672e38..89eade4a 100644 --- a/src/app/components/system-status/status-info/status-info.component.html +++ b/src/app/components/system-status/status-info/status-info.component.html @@ -1,7 +1,5 @@ -
- Statistics not loaded -
-
- {{statistics.compute_name}} - +
Statistics not loaded
+
+ {{ statistics.compute_name }} +
diff --git a/src/app/components/system-status/status-info/status-info.component.ts b/src/app/components/system-status/status-info/status-info.component.ts index 5d837c99..2b5fb7a6 100644 --- a/src/app/components/system-status/status-info/status-info.component.ts +++ b/src/app/components/system-status/status-info/status-info.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { ComputeService } from '../../../services/compute.service'; import { ComputeStatistics } from '../../../models/computeStatistics'; @@ -6,42 +6,39 @@ import { ServerService } from '../../../services/server.service'; import { Server } from '../../../models/server'; import { ToasterService } from '../../../services/toaster.service'; - @Component({ - selector: 'app-status-info', - templateUrl: './status-info.component.html', - styleUrls: ['./status-info.component.scss'] + selector: 'app-status-info', + templateUrl: './status-info.component.html', + styleUrls: ['./status-info.component.scss'], }) export class StatusInfoComponent implements OnInit { - public serverId: string = ""; - public computeStatistics: ComputeStatistics[] = []; - public connectionFailed: boolean; + public serverId: string = ''; + public computeStatistics: ComputeStatistics[] = []; + public connectionFailed: boolean; - constructor( - private route: ActivatedRoute, - private computeService: ComputeService, - private serverService: ServerService, - private toasterService: ToasterService - ) {} + constructor( + private route: ActivatedRoute, + private computeService: ComputeService, + private serverService: ServerService, + private toasterService: ToasterService + ) {} - ngOnInit() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - this.getStatistics(); - } + ngOnInit() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + this.getStatistics(); + } - getStatistics() { - this.serverService.get(Number(this.serverId)).then((server: Server) => { - this.computeService.getStatistics(server).subscribe((statistics: ComputeStatistics[]) => { - this.computeStatistics = statistics; - setTimeout(() => - { - this.getStatistics(); - }, - 20000); - }), - error => { - this.connectionFailed = true; - } - }); - } + getStatistics() { + this.serverService.get(Number(this.serverId)).then((server: Server) => { + this.computeService.getStatistics(server).subscribe((statistics: ComputeStatistics[]) => { + this.computeStatistics = statistics; + setTimeout(() => { + this.getStatistics(); + }, 20000); + }), + (error) => { + this.connectionFailed = true; + }; + }); + } } diff --git a/src/app/components/system-status/system-status.component.html b/src/app/components/system-status/system-status.component.html index d47624d2..28158e13 100644 --- a/src/app/components/system-status/system-status.component.html +++ b/src/app/components/system-status/system-status.component.html @@ -1,10 +1,10 @@
-
-
-

System status

-
-
-
- +
+
+

System status

+
+
+ +
diff --git a/src/app/components/system-status/system-status.component.ts b/src/app/components/system-status/system-status.component.ts index f2915a0a..0b476298 100644 --- a/src/app/components/system-status/system-status.component.ts +++ b/src/app/components/system-status/system-status.component.ts @@ -1,20 +1,17 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - @Component({ - selector: 'app-system-status', - templateUrl: './system-status.component.html', - styleUrls: ['./system-status.component.scss'] + selector: 'app-system-status', + templateUrl: './system-status.component.html', + styleUrls: ['./system-status.component.scss'], }) export class SystemStatusComponent implements OnInit { - public serverId: string = ""; + public serverId: string = ''; - constructor( - private route: ActivatedRoute - ) {} + constructor(private route: ActivatedRoute) {} - ngOnInit() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - } + ngOnInit() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + } } diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.html b/src/app/components/template/template-list-dialog/template-list-dialog.component.html index 4ef68e4a..617ccd2e 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.html +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.html @@ -1,38 +1,45 @@

Add a node

- +
Template
- + - - - {{type}} - - + + + {{ type }} + + - - - {{template.name}} - - + + + {{ template.name }} + +
@@ -43,16 +50,18 @@ --> - + - - - {{type}} - + + + {{ type }} +
@@ -61,15 +70,17 @@
Left:  - + Top:  - +
- +
diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.scss b/src/app/components/template/template-list-dialog/template-list-dialog.component.scss index 62ee0283..74c3f44a 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.scss +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.scss @@ -42,7 +42,7 @@ mat-table { } ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } ::-webkit-scrollbar-thumb { diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts index 2d15ef12..f61c35f7 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.spec.ts @@ -8,7 +8,7 @@ describe('TemplateListDialogComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TemplateListDialogComponent] + declarations: [TemplateListDialogComponent], }).compileComponents(); })); diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts index 337e0338..9444d818 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts @@ -14,12 +14,24 @@ import { NonNegativeValidator } from '../../../validators/non-negative-validator @Component({ selector: 'app-template-list-dialog', templateUrl: './template-list-dialog.component.html', - styleUrls: ['./template-list-dialog.component.scss'] + styleUrls: ['./template-list-dialog.component.scss'], }) export class TemplateListDialogComponent implements OnInit { server: Server; project: Project; - templateTypes: string[] = ['cloud', 'ethernet_hub', 'ethernet_switch', 'docker', 'dynamips', 'vpcs', 'traceng', 'virtualbox', 'vmware', 'iou', 'qemu']; + templateTypes: string[] = [ + 'cloud', + 'ethernet_hub', + 'ethernet_switch', + 'docker', + 'dynamips', + 'vpcs', + 'traceng', + 'virtualbox', + 'vmware', + 'iou', + 'qemu', + ]; selectedType: string; configurationForm: FormGroup; positionForm: FormGroup; @@ -36,17 +48,17 @@ export class TemplateListDialogComponent implements OnInit { private formBuilder: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any, private toasterService: ToasterService, - private nonNegativeValidator: NonNegativeValidator, + private nonNegativeValidator: NonNegativeValidator ) { this.server = data['server']; this.project = data['project']; this.configurationForm = this.formBuilder.group({ // name: new FormControl('new node', Validators.required), - numberOfNodes: new FormControl(1, [Validators.required, nonNegativeValidator.get]) + numberOfNodes: new FormControl(1, [Validators.required, nonNegativeValidator.get]), }); this.positionForm = this.formBuilder.group({ top: new FormControl(0, Validators.required), - left: new FormControl(0, Validators.required) + left: new FormControl(0, Validators.required), }); } @@ -62,15 +74,19 @@ export class TemplateListDialogComponent implements OnInit { } filterTemplates(event) { - let temporaryTemplates = this.templates.filter( item => { + let temporaryTemplates = this.templates.filter((item) => { return item.name.toLowerCase().includes(this.searchText.toLowerCase()); }); - this.filteredTemplates = temporaryTemplates.filter(t => t.template_type === event.value.toString()); + this.filteredTemplates = temporaryTemplates.filter((t) => t.template_type === event.value.toString()); } chooseTemplate(event) { this.selectedTemplate = event.value; - if (this.selectedTemplate.template_type === 'cloud' || this.selectedTemplate.template_type === 'ethernet_hub' || this.selectedTemplate.template_type === 'ethernet_switch') { + if ( + this.selectedTemplate.template_type === 'cloud' || + this.selectedTemplate.template_type === 'ethernet_hub' || + this.selectedTemplate.template_type === 'ethernet_switch' + ) { this.selectedTemplate.compute_id = 'local'; } // this.configurationForm.controls['name'].setValue(this.selectedTemplate.default_name_format); @@ -84,8 +100,13 @@ export class TemplateListDialogComponent implements OnInit { } else { let x: number = this.positionForm.get('left').value; let y: number = this.positionForm.get('top').value; - if (x>(this.project.scene_width/2) || x<-(this.project.scene_width/2) || y>(this.project.scene_height/2) || y<-(this.project.scene_height)) { - this.toasterService.error('Please set correct position values.') + if ( + x > this.project.scene_width / 2 || + x < -(this.project.scene_width / 2) || + y > this.project.scene_height / 2 || + y < -this.project.scene_height + ) { + this.toasterService.error('Please set correct position values.'); } else { let event: NodeAddedEvent = { template: this.selectedTemplate, @@ -93,7 +114,7 @@ export class TemplateListDialogComponent implements OnInit { // name: this.configurationForm.get('name').value, numberOfNodes: this.configurationForm.get('numberOfNodes').value, x: x, - y: y + y: y, }; this.dialogRef.close(event); } @@ -102,9 +123,9 @@ export class TemplateListDialogComponent implements OnInit { } export interface NodeAddedEvent { - template: Template, - server: string, - name?: string, + template: Template; + server: string; + name?: string; numberOfNodes: number; x: number; y: number; @@ -118,7 +139,7 @@ export class TemplateDatabase { } constructor(private server: Server, private templateService: TemplateService) { - this.templateService.list(this.server).subscribe(templates => { + this.templateService.list(this.server).subscribe((templates) => { this.dataChange.next(templates); }); } diff --git a/src/app/components/template/template.component.html b/src/app/components/template/template.component.html index 4c18af6a..917e30e2 100644 --- a/src/app/components/template/template.component.html +++ b/src/app/components/template/template.component.html @@ -1,72 +1,72 @@ - + - - - - - - - {{type}} - - - + + + + + + + {{ type }} + + + -
-
- - - -
- -
-
{{filteredTemplates[i].name}}
- - -
- -
-
{{filteredTemplates[i+1].name}}
- - -
- -
-
{{filteredTemplates[i+2].name}}
- - -
- -
-
{{filteredTemplates[i+3].name}}
- - - -
+
+
+ + + +
+ +
+
{{ filteredTemplates[i].name }}
+ + +
+ +
+
{{ filteredTemplates[i + 1].name }}
+ + +
+ +
+
{{ filteredTemplates[i + 2].name }}
+ + +
+ +
+
{{ filteredTemplates[i + 3].name }}
+ + +
+
diff --git a/src/app/components/template/template.component.scss b/src/app/components/template/template.component.scss index 23c26180..bded2894 100644 --- a/src/app/components/template/template.component.scss +++ b/src/app/components/template/template.component.scss @@ -1,55 +1,55 @@ ::ng-deep .mat-menu-panel { - max-width: 400px; - max-height: 500px; + max-width: 400px; + max-height: 500px; } .menu { - width: 100%; - overflow-y: scroll; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + width: 100%; + overflow-y: scroll; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } - + ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - + ::-webkit-scrollbar-thumb { - background-color: darkgrey; - outline: 1px solid #263238; + background-color: darkgrey; + outline: 1px solid #263238; } .form-field { - width: 90%; - margin-left: 5%; - margin-right: 5%; + width: 90%; + margin-left: 5%; + margin-right: 5%; } .image { - width: 65px; - height: 65px; - filter: invert(0); - --webkit-filter: invert(0)!important; + width: 65px; + height: 65px; + filter: invert(0); + --webkit-filter: invert(0) !important; } .templateList { - width: 100%; + width: 100%; } .templateRow { - display: flex; - margin-bottom: 10px; + display: flex; + margin-bottom: 10px; } .templateText { - word-wrap: break-word; + word-wrap: break-word; } .templateIcon { - width: 80px!important; - padding: 10px; + width: 80px !important; + padding: 10px; } diff --git a/src/app/components/template/template.component.spec.ts b/src/app/components/template/template.component.spec.ts index 07ea008b..4f1c9055 100644 --- a/src/app/components/template/template.component.spec.ts +++ b/src/app/components/template/template.component.spec.ts @@ -8,7 +8,7 @@ describe('TemplateComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TemplateComponent] + declarations: [TemplateComponent], }).compileComponents(); })); diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts index a6f0f09b..bb93b7d6 100644 --- a/src/app/components/template/template.component.ts +++ b/src/app/components/template/template.component.ts @@ -13,7 +13,7 @@ import { Subscription } from 'rxjs'; @Component({ selector: 'app-template', templateUrl: './template.component.html', - styleUrls: ['./template.component.scss'] + styleUrls: ['./template.component.scss'], }) export class TemplateComponent implements OnInit, OnDestroy { @Input() server: Server; @@ -23,7 +23,20 @@ export class TemplateComponent implements OnInit, OnDestroy { templates: Template[] = []; filteredTemplates: Template[] = []; searchText: string = ''; - templateTypes: string[] = ['all', 'cloud', 'ethernet_hub', 'ethernet_switch', 'docker', 'dynamips', 'vpcs', 'traceng', 'virtualbox', 'vmware', 'iou', 'qemu']; + templateTypes: string[] = [ + 'all', + 'cloud', + 'ethernet_hub', + 'ethernet_switch', + 'docker', + 'dynamips', + 'vpcs', + 'traceng', + 'virtualbox', + 'vmware', + 'iou', + 'qemu', + ]; selectedType: string; movementX: number; @@ -59,14 +72,14 @@ export class TemplateComponent implements OnInit, OnDestroy { } filterTemplates(event) { - let temporaryTemplates = this.templates.filter(item => { + let temporaryTemplates = this.templates.filter((item) => { return item.name.toLowerCase().includes(this.searchText.toLowerCase()); }); if (this.selectedType === 'all' || !this.selectedType) { this.filteredTemplates = temporaryTemplates; - } else { - this.filteredTemplates = temporaryTemplates.filter(t => t.template_type === this.selectedType); + } else { + this.filteredTemplates = temporaryTemplates.filter((t) => t.template_type === this.selectedType); } this.sortTemplates(); } @@ -83,15 +96,15 @@ export class TemplateComponent implements OnInit, OnDestroy { dragEnd(ev, template: Template) { this.symbolService.raw(this.server, template.symbol.substring(1)).subscribe((symbolSvg: string) => { - let width = +symbolSvg.split("width=\"")[1].split("\"")[0] ? +symbolSvg.split("width=\"")[1].split("\"")[0] : 0; + let width = +symbolSvg.split('width="')[1].split('"')[0] ? +symbolSvg.split('width="')[1].split('"')[0] : 0; let scale = this.scaleService.getScale(); let nodeAddedEvent: NodeAddedEvent = { template: template, server: 'local', numberOfNodes: 1, - x: (this.startX + ev.x - this.project.scene_width/2 - (width/2)) * scale + window.scrollX , - y: (this.startY + ev.y - this.project.scene_height/2) * scale + window.scrollY + x: (this.startX + ev.x - this.project.scene_width / 2 - width / 2) * scale + window.scrollX, + y: (this.startY + ev.y - this.project.scene_height / 2) * scale + window.scrollY, }; this.onNodeCreation.emit(nodeAddedEvent); }); @@ -102,10 +115,10 @@ export class TemplateComponent implements OnInit, OnDestroy { width: '600px', data: { server: this.server, - project: this.project + project: this.project, }, autoFocus: false, - disableClose: true + disableClose: true, }); dialogRef.afterClosed().subscribe((nodeAddedEvent: NodeAddedEvent) => { diff --git a/src/app/components/topology-summary/topology-summary.component.html b/src/app/components/topology-summary/topology-summary.component.html index 601f2ca6..652d5deb 100644 --- a/src/app/components/topology-summary/topology-summary.component.html +++ b/src/app/components/topology-summary/topology-summary.component.html @@ -1,97 +1,98 @@
-
+ *ngIf="isDraggingEnabled" + (document:mousemove)="dragWidget($event)" + (document:mouseup)="toggleDragging(false)" +>
-
- - -
-
- - - started - suspended - stopped - - - active capture(s) - active packet captures - - -
-
- - sort by name ascending - sort by name descending - -
- -
-
-
- - - - - - - - - - {{node.name}} -
-
- {{node.console_type}} {{node.console_host}}:{{node.console}} -
-
- none -
-
-
-
- - -
-
-
-
- - - - - - - {{compute.name}} -
-
- {{compute.host}} -
-
- {{server.location}} -
-
-
-
- - -
+ class="summaryWrapper" + (mousedown)="toggleDragging(true)" + *ngIf="projectsStatistics" + [ngStyle]="style" + [ngClass]="{ lightTheme: isLightThemeEnabled }" + mwlResizable + [validateResize]="validate" + [resizeEdges]="{ right: true, left: true, bottom: true, top: true }" + [enableGhostResize]="true" + (resizeStart)="toggleDragging(false)" + (resizeEnd)="onResizeEnd($event)" +> +
+ + +
+
+ + + started + suspended + stopped + + + active capture(s) + active packet captures + + +
+
+ + sort by name ascending + sort by name descending + +
+ +
+
+
+ + + + + + + + + + {{ node.name }} +
+
+ {{ node.console_type }} {{ node.console_host }}:{{ node.console }} +
+
+ none +
+
+
+
+ + +
+
+
+
+ + + + + + + {{ compute.name }} +
+
+ {{ compute.host }} +
+
+ {{ server.location }} +
+
+
+
+ + +
diff --git a/src/app/components/topology-summary/topology-summary.component.scss b/src/app/components/topology-summary/topology-summary.component.scss index e47673b7..4cef7500 100644 --- a/src/app/components/topology-summary/topology-summary.component.scss +++ b/src/app/components/topology-summary/topology-summary.component.scss @@ -1,133 +1,133 @@ @media screen and (max-width: 600px) { - .summaryWrapper { - visibility: hidden; - } + .summaryWrapper { + visibility: hidden; + } } mat-tab-group { - width: 100%; + width: 100%; } .summaryWrapper { - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - position: fixed; - top: 60px; - right: 0px; - height: 400px; - width: 320px; - background: #263238; - color: white; - overflow: hidden; - font-size: 12px; - margin: 20px; - border-radius: 8px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + position: fixed; + top: 60px; + right: 0px; + height: 400px; + width: 320px; + background: #263238; + color: white; + overflow: hidden; + font-size: 12px; + margin: 20px; + border-radius: 8px; } .lightTheme { - background-color: rgba(244, 248, 252, 0.95); - color: black; - margin: 20px; - border-radius: 8px; + background-color: rgba(244, 248, 252, 0.95); + color: black; + margin: 20px; + border-radius: 8px; } .summaryHeaderMenu { - height: 24px; + height: 24px; } .summaryHeader { - width: 100%; - display: flex; + width: 100%; + display: flex; } .summaryFilters { - height: 25px; - margin-left: 5px; - margin-right: 5px; + height: 25px; + margin-left: 5px; + margin-right: 5px; } .summarySorting { - height: 25px; - margin-left: 5px; - margin-right: 5px; + height: 25px; + margin-left: 5px; + margin-right: 5px; } .tabContent { - padding: 10px; + padding: 10px; } .summaryContent { - overflow: auto; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + overflow: auto; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } .summaryContentServers { - max-height: 350px; - overflow: auto; - scrollbar-color: darkgrey #263238; - scrollbar-width: thin; + max-height: 350px; + overflow: auto; + scrollbar-color: darkgrey #263238; + scrollbar-width: thin; } .titleButton { - margin-left: 5px; - margin-top: 4px; - outline: none; - border-radius: 0px; + margin-left: 5px; + margin-top: 4px; + outline: none; + border-radius: 0px; } .marked { - color: #0097a7; - border-bottom: 2px solid #0097a7; + color: #0097a7; + border-bottom: 2px solid #0097a7; } .divider { - margin-top: 5px; - margin-bottom: 5px; - width: 100%; - height: 2px; + margin-top: 5px; + margin-bottom: 5px; + width: 100%; + height: 2px; } .nodeRow { - width: 100%; - display: flex; - justify-content: space-between; - padding-right: 5px; + width: 100%; + display: flex; + justify-content: space-between; + padding-right: 5px; } ::-webkit-scrollbar { - width: 0.5em; + width: 0.5em; } ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } ::-webkit-scrollbar-thumb { - background-color: darkgrey; - outline: 1px solid #263238; + background-color: darkgrey; + outline: 1px solid #263238; } .radio-group-wrapper { - margin-top: 5px; + margin-top: 5px; } .radio-group { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } .closeButton { - cursor: pointer; - font-size: 24px; - margin-top: 8px; - margin-right: 5px; + cursor: pointer; + font-size: 24px; + margin-top: 8px; + margin-right: 5px; } .filterBox { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } .notvisible { - display: none; + display: none; } diff --git a/src/app/components/topology-summary/topology-summary.component.spec.ts b/src/app/components/topology-summary/topology-summary.component.spec.ts index 96cedfc0..8a32fb05 100644 --- a/src/app/components/topology-summary/topology-summary.component.spec.ts +++ b/src/app/components/topology-summary/topology-summary.component.spec.ts @@ -1,4 +1,4 @@ -import { TopologySummaryComponent } from "./topology-summary.component"; +import { TopologySummaryComponent } from './topology-summary.component'; import { ComponentFixture, async, TestBed } from '@angular/core/testing'; import { ProjectService } from '../../services/project.service'; import { MockedProjectService } from '../../services/project.service.spec'; @@ -20,147 +20,132 @@ import { ComputeService } from '../../services/compute.service'; import { LinksDataSource } from '../../cartography/datasources/links-datasource'; export class MockedComputeService { - getComputes(server: Server) { - return of([]); - } + getComputes(server: Server) { + return of([]); + } } describe('TopologySummaryComponent', () => { - let component: TopologySummaryComponent; - let fixture: ComponentFixture; - let mockedProjectService: MockedProjectService = new MockedProjectService(); - let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource(); - let mockedComputeService: MockedComputeService = new MockedComputeService(); - let mockedLinksDataSource: MockedLinksDataSource = new MockedLinksDataSource(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - MatTableModule, - MatTooltipModule, - MatIconModule, - MatSortModule, - MatDialogModule, - NoopAnimationsModule, - RouterTestingModule.withRoutes([]) - ], - providers: [ - { provide: ProjectService, useValue: mockedProjectService }, - { provide: NodesDataSource, useValue: mockedNodesDataSource }, - { provide: ComputeService, useValue: mockedComputeService}, - { provide: LinksDataSource, useValue: mockedLinksDataSource } - ], - declarations: [TopologySummaryComponent], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TopologySummaryComponent); - component = fixture.componentInstance; - component.project = { project_id: 1 } as unknown as Project; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); + let component: TopologySummaryComponent; + let fixture: ComponentFixture; + let mockedProjectService: MockedProjectService = new MockedProjectService(); + let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource(); + let mockedComputeService: MockedComputeService = new MockedComputeService(); + let mockedLinksDataSource: MockedLinksDataSource = new MockedLinksDataSource(); - it('should show only running nodes when filter started applied', () => { - component.nodes = [ - { status: 'started' } as Node, - { status: 'stopped' } as Node - ]; + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + MatTableModule, + MatTooltipModule, + MatIconModule, + MatSortModule, + MatDialogModule, + NoopAnimationsModule, + RouterTestingModule.withRoutes([]), + ], + providers: [ + { provide: ProjectService, useValue: mockedProjectService }, + { provide: NodesDataSource, useValue: mockedNodesDataSource }, + { provide: ComputeService, useValue: mockedComputeService }, + { provide: LinksDataSource, useValue: mockedLinksDataSource }, + ], + declarations: [TopologySummaryComponent], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + })); - component.applyStatusFilter('started'); + beforeEach(() => { + fixture = TestBed.createComponent(TopologySummaryComponent); + component = fixture.componentInstance; + component.project = ({ project_id: 1 } as unknown) as Project; + fixture.detectChanges(); + }); - expect(component.filteredNodes.length).toBe(1); - expect(component.filteredNodes[0].status).toBe('started'); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should show only stopped nodes when filter stopped applied', () => { - component.nodes = [ - { status: 'started' } as Node, - { status: 'stopped' } as Node - ]; + it('should show only running nodes when filter started applied', () => { + component.nodes = [{ status: 'started' } as Node, { status: 'stopped' } as Node]; - component.applyStatusFilter('stopped'); + component.applyStatusFilter('started'); - expect(component.filteredNodes.length).toBe(1); - expect(component.filteredNodes[0].status).toBe('stopped'); - }); + expect(component.filteredNodes.length).toBe(1); + expect(component.filteredNodes[0].status).toBe('started'); + }); - it('should show only suspended nodes when filter suspended applied', () => { - component.nodes = [ - { status: 'started' } as Node, - { status: 'stopped' } as Node - ]; + it('should show only stopped nodes when filter stopped applied', () => { + component.nodes = [{ status: 'started' } as Node, { status: 'stopped' } as Node]; - component.applyStatusFilter('suspended'); + component.applyStatusFilter('stopped'); - expect(component.filteredNodes.length).toBe(0); - }); + expect(component.filteredNodes.length).toBe(1); + expect(component.filteredNodes[0].status).toBe('stopped'); + }); - it('should show all nodes when all filters applied', () => { - component.nodes = [ - { status: 'started' } as Node, - { status: 'stopped' } as Node - ]; + it('should show only suspended nodes when filter suspended applied', () => { + component.nodes = [{ status: 'started' } as Node, { status: 'stopped' } as Node]; - component.applyStatusFilter('suspended'); - component.applyStatusFilter('started'); - component.applyStatusFilter('stopped'); + component.applyStatusFilter('suspended'); - expect(component.filteredNodes.length).toBe(2); - }); + expect(component.filteredNodes.length).toBe(0); + }); - it('should show all nodes when no filters applied', () => { - component.nodes = [ - { status: 'started' } as Node, - { status: 'stopped' } as Node - ]; + it('should show all nodes when all filters applied', () => { + component.nodes = [{ status: 'started' } as Node, { status: 'stopped' } as Node]; - component.applyStatusFilter('suspended'); - component.applyStatusFilter('started'); - component.applyStatusFilter('stopped'); + component.applyStatusFilter('suspended'); + component.applyStatusFilter('started'); + component.applyStatusFilter('stopped'); - expect(component.filteredNodes.length).toBe(2); + expect(component.filteredNodes.length).toBe(2); + }); - component.applyStatusFilter('stopped'); + it('should show all nodes when no filters applied', () => { + component.nodes = [{ status: 'started' } as Node, { status: 'stopped' } as Node]; - expect(component.filteredNodes.length).toBe(1); + component.applyStatusFilter('suspended'); + component.applyStatusFilter('started'); + component.applyStatusFilter('stopped'); - component.applyStatusFilter('suspended'); - component.applyStatusFilter('started'); + expect(component.filteredNodes.length).toBe(2); - expect(component.filteredNodes.length).toBe(2); - }); + component.applyStatusFilter('stopped'); - it('should sort nodes in correct order', () => { - component.nodes = [ - { status: 'started', name: 'A' } as Node, - { status: 'stopped', name: 'B' } as Node, - { status: 'stopped', name: 'D' } as Node, - ]; - component.sortingOrder = 'asc'; + expect(component.filteredNodes.length).toBe(1); - component.applyFilters(); - component.setSortingOrder(); + component.applyStatusFilter('suspended'); + component.applyStatusFilter('started'); - expect(component.filteredNodes[0].name).toBe('A'); - }); + expect(component.filteredNodes.length).toBe(2); + }); - it('should sort filtered nodes in correct order', () => { - component.nodes = [ - { status: 'started', name: 'A' } as Node, - { status: 'stopped', name: 'B' } as Node, - { status: 'stopped', name: 'D' } as Node, - ]; - component.sortingOrder = 'desc'; + it('should sort nodes in correct order', () => { + component.nodes = [ + { status: 'started', name: 'A' } as Node, + { status: 'stopped', name: 'B' } as Node, + { status: 'stopped', name: 'D' } as Node, + ]; + component.sortingOrder = 'asc'; - component.applyStatusFilter('stopped'); - component.setSortingOrder(); + component.applyFilters(); + component.setSortingOrder(); - expect(component.filteredNodes[0].name).toBe('D'); - }); + expect(component.filteredNodes[0].name).toBe('A'); + }); + + it('should sort filtered nodes in correct order', () => { + component.nodes = [ + { status: 'started', name: 'A' } as Node, + { status: 'stopped', name: 'B' } as Node, + { status: 'stopped', name: 'D' } as Node, + ]; + component.sortingOrder = 'desc'; + + component.applyStatusFilter('stopped'); + component.setSortingOrder(); + + expect(component.filteredNodes[0].name).toBe('D'); + }); }); diff --git a/src/app/components/topology-summary/topology-summary.component.ts b/src/app/components/topology-summary/topology-summary.component.ts index a7891086..d9a723a8 100644 --- a/src/app/components/topology-summary/topology-summary.component.ts +++ b/src/app/components/topology-summary/topology-summary.component.ts @@ -1,4 +1,13 @@ -import { Component, OnInit, OnDestroy, Input, AfterViewInit, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core'; +import { + Component, + OnInit, + OnDestroy, + Input, + AfterViewInit, + Output, + EventEmitter, + ChangeDetectionStrategy, +} from '@angular/core'; import { Project } from '../../models/project'; import { Server } from '../../models/server'; import { NodesDataSource } from '../../cartography/datasources/nodes-datasource'; @@ -12,255 +21,261 @@ import { LinksDataSource } from '../../cartography/datasources/links-datasource' import { ResizeEvent } from 'angular-resizable-element'; import { ThemeService } from '../../services/theme.service'; - @Component({ - selector: 'app-topology-summary', - templateUrl: './topology-summary.component.html', - styleUrls: ['./topology-summary.component.scss'], - changeDetection: ChangeDetectionStrategy.Default + selector: 'app-topology-summary', + templateUrl: './topology-summary.component.html', + styleUrls: ['./topology-summary.component.scss'], + changeDetection: ChangeDetectionStrategy.Default, }) export class TopologySummaryComponent implements OnInit, OnDestroy { - @Input() server: Server; - @Input() project: Project; + @Input() server: Server; + @Input() project: Project; - @Output() closeTopologySummary = new EventEmitter(); + @Output() closeTopologySummary = new EventEmitter(); - public style = { }; - public styleInside = { height: `280px` }; - private subscriptions: Subscription[] = []; - projectsStatistics: ProjectStatistics; - nodes: Node[] = []; - filteredNodes: Node[] = []; - public sortingOrder: string = 'asc'; - startedStatusFilterEnabled: boolean = false; - suspendedStatusFilterEnabled: boolean = false; - stoppedStatusFilterEnabled: boolean = false; - captureFilterEnabled: boolean = false; - packetFilterEnabled: boolean = false; - computes: Compute[] = []; + public style = {}; + public styleInside = { height: `280px` }; + private subscriptions: Subscription[] = []; + projectsStatistics: ProjectStatistics; + nodes: Node[] = []; + filteredNodes: Node[] = []; + public sortingOrder: string = 'asc'; + startedStatusFilterEnabled: boolean = false; + suspendedStatusFilterEnabled: boolean = false; + stoppedStatusFilterEnabled: boolean = false; + captureFilterEnabled: boolean = false; + packetFilterEnabled: boolean = false; + computes: Compute[] = []; - isTopologyVisible: boolean = true; - isDraggingEnabled: boolean = false; - isLightThemeEnabled: boolean = false; + isTopologyVisible: boolean = true; + isDraggingEnabled: boolean = false; + isLightThemeEnabled: boolean = false; - constructor( - private nodesDataSource: NodesDataSource, - private projectService: ProjectService, - private computeService: ComputeService, - private linksDataSource: LinksDataSource, - private themeService: ThemeService - ) {} + constructor( + private nodesDataSource: NodesDataSource, + private projectService: ProjectService, + private computeService: ComputeService, + private linksDataSource: LinksDataSource, + private themeService: ThemeService + ) {} - ngOnInit() { - this.themeService.getActualTheme() === 'light' ? this.isLightThemeEnabled = true : this.isLightThemeEnabled = false; - this.subscriptions.push( - this.nodesDataSource.changes.subscribe((nodes: Node[]) => { - this.nodes = nodes; - this.nodes.forEach(n => { - if (n.console_host === '0.0.0.0' || n.console_host === '0:0:0:0:0:0:0:0' || n.console_host === '::') { - n.console_host = this.server.host; - } - }); - if (this.sortingOrder === 'asc') { - this.filteredNodes = nodes.sort(this.compareAsc); - } else { - this.filteredNodes = nodes.sort(this.compareDesc); - } - }) - ); - - this.projectService.getStatistics(this.server, this.project.project_id).subscribe((stats) => { - this.projectsStatistics = stats; + ngOnInit() { + this.themeService.getActualTheme() === 'light' + ? (this.isLightThemeEnabled = true) + : (this.isLightThemeEnabled = false); + this.subscriptions.push( + this.nodesDataSource.changes.subscribe((nodes: Node[]) => { + this.nodes = nodes; + this.nodes.forEach((n) => { + if (n.console_host === '0.0.0.0' || n.console_host === '0:0:0:0:0:0:0:0' || n.console_host === '::') { + n.console_host = this.server.host; + } }); - - this.computeService.getComputes(this.server).subscribe((computes) => { - this.computes = computes; - }); - - this.style = { top: '60px', right: '0px', width: '320px', height: '400px'}; - } - - toggleDragging(value: boolean) { - this.isDraggingEnabled = value; - } - - dragWidget(event) { - let x: number = Number(event.movementX); - let y: number = Number(event.movementY); - - let width: number = Number(this.style['width'].split('px')[0]); - let height: number = Number(this.style['height'].split('px')[0]); - let top: number = Number(this.style['top'].split('px')[0]) + y; - if (this.style['left']) { - let left: number = Number(this.style['left'].split('px')[0]) + x; - this.style = { - position: 'fixed', - left: `${left}px`, - top: `${top}px`, - width: `${width}px`, - height: `${height}px` - }; - } else { - let right: number = Number(this.style['right'].split('px')[0]) - x; - this.style = { - position: 'fixed', - right: `${right}px`, - top: `${top}px`, - width: `${width}px`, - height: `${height}px` - }; - } - } - - validate(event: ResizeEvent): boolean { - if ( - event.rectangle.width && - event.rectangle.height && - (event.rectangle.width < 290 || - event.rectangle.height < 260) - ) { - return false; - } - return true; - } - - onResizeEnd(event: ResizeEvent): void { - this.style = { - position: 'fixed', - left: `${event.rectangle.left}px`, - top: `${event.rectangle.top}px`, - width: `${event.rectangle.width}px`, - height: `${event.rectangle.height}px` - }; - - this.styleInside = { - height: `${event.rectangle.height - 120}px` - }; - } - - toggleTopologyVisibility(value: boolean) { - this.isTopologyVisible = value; - } - - compareAsc(first: Node, second: Node) { - if (first.name < second.name) return -1; - return 1; - } - - compareDesc(first: Node, second: Node) { - if (first.name < second.name) return 1; - return -1; - } - - ngOnDestroy() { - this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe()); - } - - setSortingOrder() { if (this.sortingOrder === 'asc') { - this.filteredNodes = this.filteredNodes.sort(this.compareAsc); + this.filteredNodes = nodes.sort(this.compareAsc); } else { - this.filteredNodes = this.filteredNodes.sort(this.compareDesc); + this.filteredNodes = nodes.sort(this.compareDesc); } + }) + ); + + this.projectService.getStatistics(this.server, this.project.project_id).subscribe((stats) => { + this.projectsStatistics = stats; + }); + + this.computeService.getComputes(this.server).subscribe((computes) => { + this.computes = computes; + }); + + this.style = { top: '60px', right: '0px', width: '320px', height: '400px' }; + } + + toggleDragging(value: boolean) { + this.isDraggingEnabled = value; + } + + dragWidget(event) { + let x: number = Number(event.movementX); + let y: number = Number(event.movementY); + + let width: number = Number(this.style['width'].split('px')[0]); + let height: number = Number(this.style['height'].split('px')[0]); + let top: number = Number(this.style['top'].split('px')[0]) + y; + if (this.style['left']) { + let left: number = Number(this.style['left'].split('px')[0]) + x; + this.style = { + position: 'fixed', + left: `${left}px`, + top: `${top}px`, + width: `${width}px`, + height: `${height}px`, + }; + } else { + let right: number = Number(this.style['right'].split('px')[0]) - x; + this.style = { + position: 'fixed', + right: `${right}px`, + top: `${top}px`, + width: `${width}px`, + height: `${height}px`, + }; + } + } + + validate(event: ResizeEvent): boolean { + if ( + event.rectangle.width && + event.rectangle.height && + (event.rectangle.width < 290 || event.rectangle.height < 260) + ) { + return false; + } + return true; + } + + onResizeEnd(event: ResizeEvent): void { + this.style = { + position: 'fixed', + left: `${event.rectangle.left}px`, + top: `${event.rectangle.top}px`, + width: `${event.rectangle.width}px`, + height: `${event.rectangle.height}px`, + }; + + this.styleInside = { + height: `${event.rectangle.height - 120}px`, + }; + } + + toggleTopologyVisibility(value: boolean) { + this.isTopologyVisible = value; + } + + compareAsc(first: Node, second: Node) { + if (first.name < second.name) return -1; + return 1; + } + + compareDesc(first: Node, second: Node) { + if (first.name < second.name) return 1; + return -1; + } + + ngOnDestroy() { + this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe()); + } + + setSortingOrder() { + if (this.sortingOrder === 'asc') { + this.filteredNodes = this.filteredNodes.sort(this.compareAsc); + } else { + this.filteredNodes = this.filteredNodes.sort(this.compareDesc); + } + } + + applyStatusFilter(filter: string) { + if (filter === 'started') { + this.startedStatusFilterEnabled = !this.startedStatusFilterEnabled; + } else if (filter === 'stopped') { + this.stoppedStatusFilterEnabled = !this.stoppedStatusFilterEnabled; + } else if (filter === 'suspended') { + this.suspendedStatusFilterEnabled = !this.suspendedStatusFilterEnabled; + } + this.applyFilters(); + } + + applyCaptureFilter(filter: string) { + if (filter === 'capture') { + this.captureFilterEnabled = !this.captureFilterEnabled; + } else if (filter === 'packet') { + this.packetFilterEnabled = !this.packetFilterEnabled; + } + this.applyFilters(); + } + + applyFilters() { + let nodes: Node[] = []; + + if (this.startedStatusFilterEnabled) { + nodes = nodes.concat(this.nodes.filter((n) => n.status === 'started')); } - applyStatusFilter(filter: string) { - if (filter === 'started') { - this.startedStatusFilterEnabled = !this.startedStatusFilterEnabled; - } else if (filter === 'stopped') { - this.stoppedStatusFilterEnabled = !this.stoppedStatusFilterEnabled; - } else if (filter === 'suspended') { - this.suspendedStatusFilterEnabled = !this.suspendedStatusFilterEnabled; - } - this.applyFilters(); + if (this.stoppedStatusFilterEnabled) { + nodes = nodes.concat(this.nodes.filter((n) => n.status === 'stopped')); } - applyCaptureFilter(filter: string) { - if (filter === 'capture') { - this.captureFilterEnabled = !this.captureFilterEnabled; - } else if (filter === 'packet') { - this.packetFilterEnabled = !this.packetFilterEnabled; - } - this.applyFilters(); + if (this.suspendedStatusFilterEnabled) { + nodes = nodes.concat(this.nodes.filter((n) => n.status === 'suspended')); } - applyFilters() { - let nodes: Node[] = []; - - if (this.startedStatusFilterEnabled) { - nodes = nodes.concat(this.nodes.filter(n => n.status === 'started')); - } - - if (this.stoppedStatusFilterEnabled) { - nodes = nodes.concat(this.nodes.filter(n => n.status === 'stopped')); - } - - if (this.suspendedStatusFilterEnabled) { - nodes = nodes.concat(this.nodes.filter(n => n.status === 'suspended')); - } - - if (!this.startedStatusFilterEnabled && !this.stoppedStatusFilterEnabled && !this.suspendedStatusFilterEnabled) { - nodes = nodes.concat(this.nodes); - } - - if (this.captureFilterEnabled) { - nodes = this.checkCapturing(nodes); - } - - if(this.packetFilterEnabled) { - nodes = this.checkPacketFilters(nodes); - } - - if (this.sortingOrder === 'asc') { - this.filteredNodes = nodes.sort(this.compareAsc); - } else { - this.filteredNodes = nodes.sort(this.compareDesc); - } + if (!this.startedStatusFilterEnabled && !this.stoppedStatusFilterEnabled && !this.suspendedStatusFilterEnabled) { + nodes = nodes.concat(this.nodes); } - checkCapturing(nodes: Node[]): Node[] { - let links = this.linksDataSource.getItems(); - let nodesWithCapturing: string[] = []; + if (this.captureFilterEnabled) { + nodes = this.checkCapturing(nodes); + } - links.forEach(link => { - if (link.capturing) { - link.nodes.forEach(node => { - nodesWithCapturing.push(node.node_id); - }); - } + if (this.packetFilterEnabled) { + nodes = this.checkPacketFilters(nodes); + } + + if (this.sortingOrder === 'asc') { + this.filteredNodes = nodes.sort(this.compareAsc); + } else { + this.filteredNodes = nodes.sort(this.compareDesc); + } + } + + checkCapturing(nodes: Node[]): Node[] { + let links = this.linksDataSource.getItems(); + let nodesWithCapturing: string[] = []; + + links.forEach((link) => { + if (link.capturing) { + link.nodes.forEach((node) => { + nodesWithCapturing.push(node.node_id); }); + } + }); - let filteredNodes: Node[] = []; - nodes.forEach(node => { - if (nodesWithCapturing.includes(node.node_id)) { - filteredNodes.push(node); - } + let filteredNodes: Node[] = []; + nodes.forEach((node) => { + if (nodesWithCapturing.includes(node.node_id)) { + filteredNodes.push(node); + } + }); + return filteredNodes; + } + + checkPacketFilters(nodes: Node[]): Node[] { + let links = this.linksDataSource.getItems(); + let nodesWithPacketFilters: string[] = []; + + links.forEach((link) => { + if ( + link.filters.bpf || + link.filters.corrupt || + link.filters.corrupt || + link.filters.packet_loss || + link.filters.frequency_drop + ) { + link.nodes.forEach((node) => { + nodesWithPacketFilters.push(node.node_id); }); - return filteredNodes; - } + } + }); - checkPacketFilters(nodes: Node[]): Node[] { - let links = this.linksDataSource.getItems(); - let nodesWithPacketFilters: string[] = []; + let filteredNodes: Node[] = []; + nodes.forEach((node) => { + if (nodesWithPacketFilters.includes(node.node_id)) { + filteredNodes.push(node); + } + }); + return filteredNodes; + } - links.forEach(link => { - if (link.filters.bpf || link.filters.corrupt || link.filters.corrupt || link.filters.packet_loss || link.filters.frequency_drop) { - link.nodes.forEach(node => { - nodesWithPacketFilters.push(node.node_id); - }); - } - }); - - let filteredNodes: Node[] = []; - nodes.forEach(node => { - if (nodesWithPacketFilters.includes(node.node_id)) { - filteredNodes.push(node); - } - }); - return filteredNodes; - } - - close() { - this.closeTopologySummary.emit(false); - } + close() { + this.closeTopologySummary.emit(false); + } } diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.html b/src/app/components/web-console-full-window/web-console-full-window.component.html index 2710d097..2e4e92f7 100644 --- a/src/app/components/web-console-full-window/web-console-full-window.component.html +++ b/src/app/components/web-console-full-window/web-console-full-window.component.html @@ -1 +1 @@ -
+
diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.ts b/src/app/components/web-console-full-window/web-console-full-window.component.ts index 99b2f68f..52cc1413 100644 --- a/src/app/components/web-console-full-window/web-console-full-window.component.ts +++ b/src/app/components/web-console-full-window/web-console-full-window.component.ts @@ -12,101 +12,100 @@ import { Title } from '@angular/platform-browser'; import { NodeService } from '../../services/node.service'; import { Subscription } from 'rxjs'; - @Component({ - encapsulation: ViewEncapsulation.None, - selector: 'app-web-console-full-window', - templateUrl: './web-console-full-window.component.html', - styleUrls: ['../../../../node_modules/xterm/css/xterm.css'] + encapsulation: ViewEncapsulation.None, + selector: 'app-web-console-full-window', + templateUrl: './web-console-full-window.component.html', + styleUrls: ['../../../../node_modules/xterm/css/xterm.css'], }) export class WebConsoleFullWindowComponent implements OnInit { - private serverId: string; - private projectId: string; - private nodeId: string; - private subscriptions: Subscription = new Subscription(); - private server: Server; - private node: Node; + private serverId: string; + private projectId: string; + private nodeId: string; + private subscriptions: Subscription = new Subscription(); + private server: Server; + private node: Node; - public term: Terminal = new Terminal(); - public fitAddon: FitAddon = new FitAddon(); + public term: Terminal = new Terminal(); + public fitAddon: FitAddon = new FitAddon(); - @ViewChild('terminal') terminal: ElementRef; + @ViewChild('terminal') terminal: ElementRef; - constructor( - private consoleService: NodeConsoleService, - private serverService: ServerService, - private route: ActivatedRoute, - private title: Title, - private nodeService: NodeService - ) {} - - ngOnInit() { - if (this.serverService.isServiceInitialized) { - this.getData(); - } else { - this.subscriptions.add( - this.serverService.serviceInitialized.subscribe((val) => { - if (val) this.getData(); - }) - ); + constructor( + private consoleService: NodeConsoleService, + private serverService: ServerService, + private route: ActivatedRoute, + private title: Title, + private nodeService: NodeService + ) {} + + ngOnInit() { + if (this.serverService.isServiceInitialized) { + this.getData(); + } else { + this.subscriptions.add( + this.serverService.serviceInitialized.subscribe((val) => { + if (val) this.getData(); + }) + ); + } + } + + getData() { + this.serverId = this.route.snapshot.paramMap.get('server_id'); + this.projectId = this.route.snapshot.paramMap.get('project_id'); + this.nodeId = this.route.snapshot.paramMap.get('node_id'); + + this.consoleService.consoleResized.subscribe((ev) => { + this.fitAddon.fit(); + }); + + this.serverService.get(+this.serverId).then((server: Server) => { + this.server = server; + this.nodeService.getNodeById(this.server, this.projectId, this.nodeId).subscribe((node: Node) => { + this.node = node; + this.title.setTitle(this.node.name); + this.openTerminal(); + }); + }); + } + + openTerminal() { + setTimeout(() => { + this.term.open(this.terminal.nativeElement); + const socket = new WebSocket(this.getUrl()); + + socket.onerror = (event) => { + this.term.write('Connection lost' + '\r\n'); + }; + socket.onclose = (event) => { + this.term.write('Connection closed' + '\r\n'); + }; + + const attachAddon = new AttachAddon(socket); + this.term.loadAddon(attachAddon); + this.term.setOption('cursorBlink', true); + this.term.loadAddon(this.fitAddon); + this.fitAddon.activate(this.term); + this.fitAddon.fit(); + this.term.focus(); + + this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => { + if (key.code === 'KeyC' || key.code === 'KeyV') { + if (key.ctrlKey) { + return false; + } } - } + return true; + }); - getData() { - this.serverId = this.route.snapshot.paramMap.get("server_id"); - this.projectId = this.route.snapshot.paramMap.get("project_id"); - this.nodeId = this.route.snapshot.paramMap.get("node_id"); + let numberOfColumns = Math.round(window.innerWidth / this.consoleService.getLineWidth()); + let numberOfRows = Math.round(window.innerHeight / this.consoleService.getLineHeight()); + this.term.resize(numberOfColumns, numberOfRows); + }, 0); + } - this.consoleService.consoleResized.subscribe(ev => { - this.fitAddon.fit(); - }); - - this.serverService.get(+this.serverId).then((server: Server) => { - this.server = server; - this.nodeService.getNodeById(this.server, this.projectId, this.nodeId).subscribe((node: Node) => { - this.node = node; - this.title.setTitle(this.node.name); - this.openTerminal(); - }); - }); - } - - openTerminal() { - setTimeout(() => { - this.term.open(this.terminal.nativeElement); - const socket = new WebSocket(this.getUrl()); - - socket.onerror = ((event) => { - this.term.write("Connection lost" + "\r\n"); - }); - socket.onclose = ((event) => { - this.term.write("Connection closed" + "\r\n"); - }); - - const attachAddon = new AttachAddon(socket); - this.term.loadAddon(attachAddon); - this.term.setOption('cursorBlink', true); - this.term.loadAddon(this.fitAddon); - this.fitAddon.activate(this.term); - this.fitAddon.fit(); - this.term.focus(); - - this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => { - if (key.code === 'KeyC' || key.code === 'KeyV'){ - if (key.ctrlKey) { - return false; - } - } - return true; - }); - - let numberOfColumns = Math.round(window.innerWidth / this.consoleService.getLineWidth()); - let numberOfRows = Math.round(window.innerHeight / this.consoleService.getLineHeight()); - this.term.resize(numberOfColumns, numberOfRows); - }, 0 ); - } - - getUrl() { - return `ws://${this.server.host}:${this.server.port}/v2/projects/${this.projectId}/nodes/${this.nodeId}/console/ws` - } + getUrl() { + return `ws://${this.server.host}:${this.server.port}/v2/projects/${this.projectId}/nodes/${this.nodeId}/console/ws`; + } } diff --git a/src/app/filters/dataSourceFilter.ts b/src/app/filters/dataSourceFilter.ts index d5928004..2a4f27d6 100644 --- a/src/app/filters/dataSourceFilter.ts +++ b/src/app/filters/dataSourceFilter.ts @@ -1,17 +1,16 @@ import { Pipe, PipeTransform } from '@angular/core'; - @Pipe({ - name: 'datasourcefilter' + name: 'datasourcefilter', }) export class DataSourceFilter implements PipeTransform { - transform(items: any, searchText: string): any[] { - if(!items) return []; - if(!searchText) return items; - - searchText = searchText.toLowerCase(); - return items.filteredData.filter( item => { - return item.name.toLowerCase().includes(searchText); - }); - } + transform(items: any, searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; + + searchText = searchText.toLowerCase(); + return items.filteredData.filter((item) => { + return item.name.toLowerCase().includes(searchText); + }); + } } diff --git a/src/app/filters/dateFilter.pipe.ts b/src/app/filters/dateFilter.pipe.ts index 930a8683..fad6d7f6 100644 --- a/src/app/filters/dateFilter.pipe.ts +++ b/src/app/filters/dateFilter.pipe.ts @@ -1,21 +1,20 @@ import { Pipe, PipeTransform } from '@angular/core'; - @Pipe({ - name: 'datefilter' + name: 'datefilter', }) export class DateFilter implements PipeTransform { - transform(timestamp: string): string { - let date = new Date(+timestamp*1000); + transform(timestamp: string): string { + let date = new Date(+timestamp * 1000); - let hours = date.getHours(); - let minutes = "0" + date.getMinutes(); - let seconds = "0" + date.getSeconds(); + let hours = date.getHours(); + let minutes = '0' + date.getMinutes(); + let seconds = '0' + date.getSeconds(); - let year = date.getFullYear(); - let month = date.getMonth() + 1; - let day = date.getDate(); + let year = date.getFullYear(); + let month = date.getMonth() + 1; + let day = date.getDate(); - return hours + ':' + minutes.substr(-2) + ':' + seconds.substr(-2) + ' ' + day + '/' + month + '/' + year; - } + return hours + ':' + minutes.substr(-2) + ':' + seconds.substr(-2) + ' ' + day + '/' + month + '/' + year; + } } diff --git a/src/app/filters/nameFilter.pipe.ts b/src/app/filters/nameFilter.pipe.ts index 80514b2a..7b28250f 100644 --- a/src/app/filters/nameFilter.pipe.ts +++ b/src/app/filters/nameFilter.pipe.ts @@ -1,17 +1,16 @@ import { Pipe, PipeTransform } from '@angular/core'; - @Pipe({ - name: 'namefilter' + name: 'namefilter', }) export class NameFilter implements PipeTransform { - transform(items: any[], searchText: string): any[] { - if(!items) return []; - if(!searchText) return items; - - searchText = searchText.toLowerCase(); - return items.filter( item => { - return item.name.toLowerCase().includes(searchText); - }); - } + transform(items: any[], searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; + + searchText = searchText.toLowerCase(); + return items.filter((item) => { + return item.name.toLowerCase().includes(searchText); + }); + } } diff --git a/src/app/filters/projectsFilter.pipe.ts b/src/app/filters/projectsFilter.pipe.ts index a0d637f4..6f8c79c4 100644 --- a/src/app/filters/projectsFilter.pipe.ts +++ b/src/app/filters/projectsFilter.pipe.ts @@ -1,18 +1,17 @@ import { Pipe, PipeTransform } from '@angular/core'; import { ProjectDataSource } from '../components/projects/projects.component'; - @Pipe({ - name: 'projectsfilter' + name: 'projectsfilter', }) export class ProjectsFilter implements PipeTransform { - transform(items: ProjectDataSource, searchText: string) { - if(!items) return []; - if(!searchText) return items; - - searchText = searchText.toLowerCase(); - return items.projectDatabase.data.filter( item => { - return item.filename.toLowerCase().includes(searchText); - }); - } + transform(items: ProjectDataSource, searchText: string) { + if (!items) return []; + if (!searchText) return items; + + searchText = searchText.toLowerCase(); + return items.projectDatabase.data.filter((item) => { + return item.filename.toLowerCase().includes(searchText); + }); + } } diff --git a/src/app/filters/searchFilter.pipe.ts b/src/app/filters/searchFilter.pipe.ts index 5177a825..f761bf60 100644 --- a/src/app/filters/searchFilter.pipe.ts +++ b/src/app/filters/searchFilter.pipe.ts @@ -1,17 +1,16 @@ import { Pipe, PipeTransform } from '@angular/core'; - @Pipe({ - name: 'filenamefilter' + name: 'filenamefilter', }) export class SearchFilter implements PipeTransform { - transform(items: any[], searchText: string): any[] { - if(!items) return []; - if(!searchText) return items; - - searchText = searchText.toLowerCase(); - return items.filter( item => { - return item.filename.toLowerCase().includes(searchText); - }); - } + transform(items: any[], searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; + + searchText = searchText.toLowerCase(); + return items.filter((item) => { + return item.filename.toLowerCase().includes(searchText); + }); + } } diff --git a/src/app/filters/templateFilter.pipe.ts b/src/app/filters/templateFilter.pipe.ts index 7c1e30a1..6d71e650 100644 --- a/src/app/filters/templateFilter.pipe.ts +++ b/src/app/filters/templateFilter.pipe.ts @@ -1,18 +1,17 @@ import { Pipe, PipeTransform } from '@angular/core'; import { Template } from '../models/template'; - @Pipe({ - name: 'templatefilter' + name: 'templatefilter', }) export class TemplateFilter implements PipeTransform { - transform(items: Template[], searchText: string): any[] { - if(!items) return []; - if(!searchText) return items; - - searchText = searchText.toLowerCase(); - return items.filter( item => { - return item.name.toLowerCase().includes(searchText); - }); - } + transform(items: Template[], searchText: string): any[] { + if (!items) return []; + if (!searchText) return items; + + searchText = searchText.toLowerCase(); + return items.filter((item) => { + return item.name.toLowerCase().includes(searchText); + }); + } } diff --git a/src/app/guards/console-guard.ts b/src/app/guards/console-guard.ts index c744bf07..cd6a264e 100644 --- a/src/app/guards/console-guard.ts +++ b/src/app/guards/console-guard.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { CanDeactivate } from '@angular/router'; import { NodeConsoleService } from '../services/nodeConsole.service'; import { Observable } from 'rxjs'; @@ -6,24 +6,21 @@ import { MatBottomSheet } from '@angular/material/bottom-sheet'; import { ConfirmationBottomSheetComponent } from '../components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; export interface CanComponentDeactivate { - canDeactivate: () => Observable | Promise | boolean; + canDeactivate: () => Observable | Promise | boolean; } @Injectable() export class ConsoleGuard implements CanDeactivate { - constructor( - private consoleService: NodeConsoleService, - private bottomSheet: MatBottomSheet - ) {} + constructor(private consoleService: NodeConsoleService, private bottomSheet: MatBottomSheet) {} - canDeactivate() { - if (this.consoleService.openConsoles > 0) { - this.bottomSheet.open(ConfirmationBottomSheetComponent); - let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; - bottomSheetRef.instance.message = 'Exiting the project will close open consoles, do you want to continue?'; - return bottomSheetRef.afterDismissed(); - } else { - return true; - } + canDeactivate() { + if (this.consoleService.openConsoles > 0) { + this.bottomSheet.open(ConfirmationBottomSheetComponent); + let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; + bottomSheetRef.instance.message = 'Exiting the project will close open consoles, do you want to continue?'; + return bottomSheetRef.afterDismissed(); + } else { + return true; } + } } diff --git a/src/app/handlers/project-web-service-handler.spec.ts b/src/app/handlers/project-web-service-handler.spec.ts index e8cae8f2..9721dd49 100644 --- a/src/app/handlers/project-web-service-handler.spec.ts +++ b/src/app/handlers/project-web-service-handler.spec.ts @@ -15,7 +15,7 @@ describe('ProjectWebServiceHandler', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ProjectWebServiceHandler, NodesDataSource, LinksDataSource, DrawingsDataSource] + providers: [ProjectWebServiceHandler, NodesDataSource, LinksDataSource, DrawingsDataSource], }); ws = new Subject(); diff --git a/src/app/layouts/default-layout/default-layout.component.html b/src/app/layouts/default-layout/default-layout.component.html index 387a69ec..e50813a0 100644 --- a/src/app/layouts/default-layout/default-layout.component.html +++ b/src/app/layouts/default-layout/default-layout.component.html @@ -4,13 +4,17 @@ - + - + - @@ -28,7 +32,6 @@ Help - @@ -36,6 +39,4 @@ -
- GNS3 Web UI © 2020 - v{{ uiVersion }} -
+
GNS3 Web UI © 2020 - v{{ uiVersion }}
diff --git a/src/app/layouts/default-layout/default-layout.component.scss b/src/app/layouts/default-layout/default-layout.component.scss index 53d03477..2765c065 100644 --- a/src/app/layouts/default-layout/default-layout.component.scss +++ b/src/app/layouts/default-layout/default-layout.component.scss @@ -1,8 +1,10 @@ -html, body { +html, +body { height: 100%; } -app-root, app-default-layout { +app-root, +app-default-layout { height: 100%; } @@ -31,12 +33,12 @@ app-default-layout { } header { - box-shadow: 0 3px 5px -1px rgba(0,0,0,.2),0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12); + box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12); z-index: 10; } /*main {*/ - /*height: 100%;*/ +/*height: 100%;*/ /*}*/ .default-header h1 { diff --git a/src/app/layouts/default-layout/default-layout.component.spec.ts b/src/app/layouts/default-layout/default-layout.component.spec.ts index ca101a30..65899496 100644 --- a/src/app/layouts/default-layout/default-layout.component.spec.ts +++ b/src/app/layouts/default-layout/default-layout.component.spec.ts @@ -15,7 +15,6 @@ import { MockedToasterService } from '../../services/toaster.service.spec'; import { Subject } from 'rxjs'; import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service'; - class ElectronServiceMock { public isElectronApp: boolean; } @@ -41,22 +40,22 @@ describe('DefaultLayoutComponent', () => { providers: [ { provide: ElectronService, - useValue: electronServiceMock + useValue: electronServiceMock, }, { provide: ServerManagementService, - useValue: serverManagementService + useValue: serverManagementService, }, { provide: ToasterService, - useClass: MockedToasterService + useClass: MockedToasterService, }, { provide: RecentlyOpenedProjectService, - useClass: RecentlyOpenedProjectService + useClass: RecentlyOpenedProjectService, }, - ProgressService - ] + ProgressService, + ], }).compileComponents(); })); @@ -86,7 +85,7 @@ describe('DefaultLayoutComponent', () => { const toaster: MockedToasterService = TestBed.get(ToasterService); serverManagementService.serverStatusChanged.next({ status: 'errored', - message: 'Message' + message: 'Message', }); expect(toaster.errors).toEqual(['Message']); }); @@ -96,7 +95,7 @@ describe('DefaultLayoutComponent', () => { const toaster: MockedToasterService = TestBed.get(ToasterService); serverManagementService.serverStatusChanged.next({ status: 'errored', - message: 'Message' + message: 'Message', }); expect(toaster.errors).toEqual([]); }); @@ -119,6 +118,4 @@ describe('DefaultLayoutComponent', () => { expect(isClosed).toBeTruthy(); }); }); - - }); diff --git a/src/app/layouts/default-layout/default-layout.component.ts b/src/app/layouts/default-layout/default-layout.component.ts index bb486bf6..443d978b 100644 --- a/src/app/layouts/default-layout/default-layout.component.ts +++ b/src/app/layouts/default-layout/default-layout.component.ts @@ -8,12 +8,11 @@ import { ProgressService } from '../../common/progress/progress.service'; import { version } from './../../version'; import { Router } from '@angular/router'; - @Component({ selector: 'app-default-layout', encapsulation: ViewEncapsulation.None, templateUrl: './default-layout.component.html', - styleUrls: ['./default-layout.component.scss'] + styleUrls: ['./default-layout.component.scss'], }) export class DefaultLayoutComponent implements OnInit, OnDestroy { public isInstalledSoftwareAvailable = false; @@ -22,8 +21,8 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { serverStatusSubscription: Subscription; shouldStopServersOnClosing = true; - recentlyOpenedServerId : string; - recentlyOpenedProjectId : string; + recentlyOpenedServerId: string; + recentlyOpenedProjectId: string; serverIdProjectList: string; constructor( @@ -39,16 +38,16 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { this.recentlyOpenedServerId = this.recentlyOpenedProjectService.getServerId(); this.recentlyOpenedProjectId = this.recentlyOpenedProjectService.getProjectId(); this.serverIdProjectList = this.recentlyOpenedProjectService.getServerIdProjectList(); - + this.isInstalledSoftwareAvailable = this.electronService.isElectronApp; // attach to notification stream when any of running local servers experienced issues this.serverStatusSubscription = this.serverManagement.serverStatusChanged.subscribe((serverStatus) => { - if(serverStatus.status === 'errored') { + if (serverStatus.status === 'errored') { console.error(serverStatus.message); this.toasterService.error(serverStatus.message); } - if(serverStatus.status === 'stderr') { + if (serverStatus.status === 'stderr') { console.error(serverStatus.message); this.toasterService.error(serverStatus.message); } @@ -59,21 +58,23 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy { } listProjects() { - this.router.navigate(['/server', this.serverIdProjectList, 'projects']) - .catch(error => this.toasterService.error('Cannot list projects')); + this.router + .navigate(['/server', this.serverIdProjectList, 'projects']) + .catch((error) => this.toasterService.error('Cannot list projects')); } backToProject() { - this.router.navigate(['/server', this.recentlyOpenedServerId, 'project', this.recentlyOpenedProjectId]) - .catch(error => this.toasterService.error('Cannot navigate to the last opened project')); + this.router + .navigate(['/server', this.recentlyOpenedServerId, 'project', this.recentlyOpenedProjectId]) + .catch((error) => this.toasterService.error('Cannot navigate to the last opened project')); } @HostListener('window:beforeunload', ['$event']) async onBeforeUnload($event) { - if(!this.shouldStopServersOnClosing) { + if (!this.shouldStopServersOnClosing) { return; } - $event.preventDefault() + $event.preventDefault(); $event.returnValue = false; this.progressService.activate(); await this.serverManagement.stopAll(); diff --git a/src/app/material.imports.ts b/src/app/material.imports.ts index 89932d59..3d29c8f6 100644 --- a/src/app/material.imports.ts +++ b/src/app/material.imports.ts @@ -51,5 +51,5 @@ export const MATERIAL_IMPORTS = [ MatTabsModule, MatTreeModule, MatBottomSheetModule, - MatChipsModule + MatChipsModule, ]; diff --git a/src/app/models/adbutler.ts b/src/app/models/adbutler.ts index 00518ab6..bf7d44fa 100644 --- a/src/app/models/adbutler.ts +++ b/src/app/models/adbutler.ts @@ -1,23 +1,23 @@ export interface Placement1 { - banner_id: string; - width: string; - height: string; - alt_text: string; - accompanied_html: string; - target: string; - tracking_pixel: string; - body: string; - redirect_url: string; - refresh_url: string; - refresh_time: string; - image_url: string; + banner_id: string; + width: string; + height: string; + alt_text: string; + accompanied_html: string; + target: string; + tracking_pixel: string; + body: string; + redirect_url: string; + refresh_url: string; + refresh_time: string; + image_url: string; } export interface Placements { - placement_1: Placement1; + placement_1: Placement1; } export interface AdButlerResponse { - status: string; - placements: Placements; + status: string; + placements: Placements; } diff --git a/src/app/models/appliance.ts b/src/app/models/appliance.ts index 132b9944..661fbc01 100644 --- a/src/app/models/appliance.ts +++ b/src/app/models/appliance.ts @@ -1,93 +1,93 @@ export interface Image { - compression? : string; - direct_download_url? : string; - download_url: string; - filename: string; - filesize: any; - md5sum: string; - version: string; + compression?: string; + direct_download_url?: string; + download_url: string; + filename: string; + filesize: any; + md5sum: string; + version: string; } export interface Qemu { - adapter_type: string; - adapters: number; - arch: string; - boot_priority: string; - console_type: string; - hda_disk_interface: string; - hdb_disk_interface: string; - hdc_disk_interface: string; - hdd_disk_interface: string; - kvm: string; - ram: number; + adapter_type: string; + adapters: number; + arch: string; + boot_priority: string; + console_type: string; + hda_disk_interface: string; + hdb_disk_interface: string; + hdc_disk_interface: string; + hdd_disk_interface: string; + kvm: string; + ram: number; } export interface Docker { - adapters: number; - console_type: string; - image: string; + adapters: number; + console_type: string; + image: string; } export interface Dynamips { - chassis: string; - nvram: number; - platform: string; - ram: number; - slot0: string; - slot1: string; - slot2: string; - slot3: string; - slot4: string; - slot5: string; - slot6: string; - slot7: string; - startup_config: string; + chassis: string; + nvram: number; + platform: string; + ram: number; + slot0: string; + slot1: string; + slot2: string; + slot3: string; + slot4: string; + slot5: string; + slot6: string; + slot7: string; + startup_config: string; } export interface Iou { - ethernet_adapters: number; - nvram: number; - ram: number; - serial_adapters: number; - startup_config: string; + ethernet_adapters: number; + nvram: number; + ram: number; + serial_adapters: number; + startup_config: string; } export interface Images { - hda_disk_image: string; - hdb_disk_image: string; + hda_disk_image: string; + hdb_disk_image: string; } export interface Version { - images: Images; - name: string; + images: Images; + name: string; } export interface Appliance { - availability: string; - builtin: boolean; - category: string; - description: string; - documentation_url: string; - first_port_name: string; - images: Image[]; - maintainer: string; - maintainer_email: string; - name: string; - port_name_format: string; - product_name: string; - product_url: string; - registry_version: number; - status: string; - symbol: string; - usage: string; - vendor_name: string; - vendor_url: string; - versions: Version[]; + availability: string; + builtin: boolean; + category: string; + description: string; + documentation_url: string; + first_port_name: string; + images: Image[]; + maintainer: string; + maintainer_email: string; + name: string; + port_name_format: string; + product_name: string; + product_url: string; + registry_version: number; + status: string; + symbol: string; + usage: string; + vendor_name: string; + vendor_url: string; + versions: Version[]; - docker: Docker; - dynamips: Dynamips; - iou: Iou; - qemu: Qemu; + docker: Docker; + dynamips: Dynamips; + iou: Iou; + qemu: Qemu; - emulator?: string; + emulator?: string; } diff --git a/src/app/models/capturingSettings.ts b/src/app/models/capturingSettings.ts index 7cf85ba8..6714e51d 100644 --- a/src/app/models/capturingSettings.ts +++ b/src/app/models/capturingSettings.ts @@ -1,4 +1,4 @@ export class CapturingSettings { - capture_file_name: string; - data_link_type: string; + capture_file_name: string; + data_link_type: string; } diff --git a/src/app/models/compute.ts b/src/app/models/compute.ts index 83c16bf2..9898229c 100644 --- a/src/app/models/compute.ts +++ b/src/app/models/compute.ts @@ -1,19 +1,19 @@ export interface Capabilities { - node_types: string[]; - platform: string; - version: string; + node_types: string[]; + platform: string; + version: string; } export interface Compute { - capabilities: Capabilities; - compute_id: string; - connected: boolean; - cpu_usage_percent: number; - host: string; - last_error?: any; - memory_usage_percent: number; - name: string; - port: number; - protocol: string; - user: string; + capabilities: Capabilities; + compute_id: string; + connected: boolean; + cpu_usage_percent: number; + host: string; + last_error?: any; + memory_usage_percent: number; + name: string; + port: number; + protocol: string; + user: string; } diff --git a/src/app/models/computeStatistics.ts b/src/app/models/computeStatistics.ts index c5d19031..6b65aac3 100644 --- a/src/app/models/computeStatistics.ts +++ b/src/app/models/computeStatistics.ts @@ -1,19 +1,19 @@ export interface Statistics { - cpu_usage_percent: number; - disk_usage_percent: number; - load_average_percent: number[]; - memory_free: number; - memory_total: number; - memory_usage_percent: number; - memory_used: number; - swap_free: number; - swap_total: number; - swap_usage_percent: number; - swap_used: number; + cpu_usage_percent: number; + disk_usage_percent: number; + load_average_percent: number[]; + memory_free: number; + memory_total: number; + memory_usage_percent: number; + memory_used: number; + swap_free: number; + swap_total: number; + swap_usage_percent: number; + swap_used: number; } export interface ComputeStatistics { - compute_id: string; - compute_name: string; - statistics: Statistics; + compute_id: string; + compute_name: string; + statistics: Statistics; } diff --git a/src/app/models/docker/docker-image.ts b/src/app/models/docker/docker-image.ts index fbde09e1..7219c419 100644 --- a/src/app/models/docker/docker-image.ts +++ b/src/app/models/docker/docker-image.ts @@ -1,3 +1,3 @@ export class DockerImage { - image: string; + image: string; } diff --git a/src/app/models/ethernetHub/ports-mapping-enity.ts b/src/app/models/ethernetHub/ports-mapping-enity.ts index ba470929..6995be32 100644 --- a/src/app/models/ethernetHub/ports-mapping-enity.ts +++ b/src/app/models/ethernetHub/ports-mapping-enity.ts @@ -1,11 +1,11 @@ export interface PortsMappingEntity { - ethertype?: string; - interface?: string, - name: string; - port_number: number; - type?: string; - vlan?: number; - rhost?: string; - lport?: number; - rport?: number; + ethertype?: string; + interface?: string; + name: string; + port_number: number; + type?: string; + vlan?: number; + rhost?: string; + lport?: number; + rport?: number; } diff --git a/src/app/models/filter-description.ts b/src/app/models/filter-description.ts index 77238e27..9c49247e 100644 --- a/src/app/models/filter-description.ts +++ b/src/app/models/filter-description.ts @@ -1,14 +1,14 @@ export class FilterDescription { - description: string; - name: string; - parameters: Parameter[]; - type: string; + description: string; + name: string; + parameters: Parameter[]; + type: string; } interface Parameter { - maximum?: number; - minimum?: number; - name: string; - type: string; - unit?: string; + maximum?: number; + minimum?: number; + name: string; + type: string; + unit?: string; } diff --git a/src/app/models/filter.ts b/src/app/models/filter.ts index 5a27c67a..c4a4d0ed 100644 --- a/src/app/models/filter.ts +++ b/src/app/models/filter.ts @@ -1,7 +1,7 @@ export class Filter { - bpf?: string[]; - corrupt?: number[]; - delay?: number[]; - frequency_drop?: number[]; - packet_loss?: number[]; + bpf?: string[]; + corrupt?: number[]; + delay?: number[]; + frequency_drop?: number[]; + packet_loss?: number[]; } diff --git a/src/app/models/gns3vm/gns3vm.ts b/src/app/models/gns3vm/gns3vm.ts index e1443c7f..58df26c0 100644 --- a/src/app/models/gns3vm/gns3vm.ts +++ b/src/app/models/gns3vm/gns3vm.ts @@ -1,10 +1,10 @@ export interface Gns3vm { - enable: boolean; - engine: string; - headless: boolean; - port: number; - ram: number; - vcpus: number; - vmname: string; - when_exit: string; + enable: boolean; + engine: string; + headless: boolean; + port: number; + ram: number; + vcpus: number; + vmname: string; + when_exit: string; } diff --git a/src/app/models/gns3vm/gns3vmEngine.ts b/src/app/models/gns3vm/gns3vmEngine.ts index 4cc9b144..c63d0831 100644 --- a/src/app/models/gns3vm/gns3vmEngine.ts +++ b/src/app/models/gns3vm/gns3vmEngine.ts @@ -1,8 +1,8 @@ export interface Gns3vmEngine { - description: string; - engine_id: string; - name: string; - support_headless: boolean; - support_ram: boolean; - support_when_exit: boolean; + description: string; + engine_id: string; + name: string; + support_headless: boolean; + support_ram: boolean; + support_when_exit: boolean; } diff --git a/src/app/models/gns3vm/vm.ts b/src/app/models/gns3vm/vm.ts index b67b272a..856c98e7 100644 --- a/src/app/models/gns3vm/vm.ts +++ b/src/app/models/gns3vm/vm.ts @@ -1,3 +1,3 @@ export interface VM { - vmname: string; + vmname: string; } diff --git a/src/app/models/images/ios-image.ts b/src/app/models/images/ios-image.ts index f876b75d..ee329321 100644 --- a/src/app/models/images/ios-image.ts +++ b/src/app/models/images/ios-image.ts @@ -1,6 +1,6 @@ export interface IosImage { - filename: string; - filesize: number; - md5sum: string; - path: string; + filename: string; + filesize: number; + md5sum: string; + path: string; } diff --git a/src/app/models/iou/iou-image.ts b/src/app/models/iou/iou-image.ts index 02466d3a..8f7438ce 100644 --- a/src/app/models/iou/iou-image.ts +++ b/src/app/models/iou/iou-image.ts @@ -1,6 +1,6 @@ export class IouImage { - filename: string; - filesize: number; - md5sum: string; - path: string; + filename: string; + filesize: number; + md5sum: string; + path: string; } diff --git a/src/app/models/logEvent.ts b/src/app/models/logEvent.ts index 4f3e7110..43b80ff2 100644 --- a/src/app/models/logEvent.ts +++ b/src/app/models/logEvent.ts @@ -1,4 +1,4 @@ export class LogEvent { - type: string; - message: string; + type: string; + message: string; } diff --git a/src/app/models/message.ts b/src/app/models/message.ts index 3d21b1cc..d6b07c6c 100644 --- a/src/app/models/message.ts +++ b/src/app/models/message.ts @@ -1,4 +1,4 @@ export class Message { - name?: string; - description: string; + name?: string; + description: string; } diff --git a/src/app/models/project-statistics.ts b/src/app/models/project-statistics.ts index c26566ce..b07e1db9 100644 --- a/src/app/models/project-statistics.ts +++ b/src/app/models/project-statistics.ts @@ -1,6 +1,6 @@ export class ProjectStatistics { - drawings: number; - links: number; - nodes: number; - snapshots: number + drawings: number; + links: number; + nodes: number; + snapshots: number; } diff --git a/src/app/models/qemu/qemu-binary.ts b/src/app/models/qemu/qemu-binary.ts index 148dedd9..5233596e 100644 --- a/src/app/models/qemu/qemu-binary.ts +++ b/src/app/models/qemu/qemu-binary.ts @@ -1,4 +1,4 @@ export class QemuBinary { - path: string; - version: string; + path: string; + version: string; } diff --git a/src/app/models/qemu/qemu-custom-adapter.ts b/src/app/models/qemu/qemu-custom-adapter.ts index 35e024e7..aae4d735 100644 --- a/src/app/models/qemu/qemu-custom-adapter.ts +++ b/src/app/models/qemu/qemu-custom-adapter.ts @@ -1,4 +1,4 @@ export class CustomAdapter { - adapter_number: number; - adapter_type: string; + adapter_number: number; + adapter_type: string; } diff --git a/src/app/models/qemu/qemu-image.ts b/src/app/models/qemu/qemu-image.ts index 014b0942..d433f27f 100644 --- a/src/app/models/qemu/qemu-image.ts +++ b/src/app/models/qemu/qemu-image.ts @@ -1,6 +1,6 @@ export class QemuImage { - filename: string; - filesize: number; - md5sum: string; - path: string; + filename: string; + filesize: number; + md5sum: string; + path: string; } diff --git a/src/app/models/qemu/qemu-img.ts b/src/app/models/qemu/qemu-img.ts index c8d8d7d2..a411ee95 100644 --- a/src/app/models/qemu/qemu-img.ts +++ b/src/app/models/qemu/qemu-img.ts @@ -1,12 +1,12 @@ export class QemuImg { - cluster_size: number; - format: string; - lazy_refcounts: string; - path: string; - preallocation: string; - qemu_img: string; - refcount_bits: number; - size: number; - subformat: string; - zeroed_grain: string; + cluster_size: number; + format: string; + lazy_refcounts: string; + path: string; + preallocation: string; + qemu_img: string; + refcount_bits: number; + size: number; + subformat: string; + zeroed_grain: string; } diff --git a/src/app/models/server-settings-models/builtin.ts b/src/app/models/server-settings-models/builtin.ts index a45d695c..0e2cc81f 100644 --- a/src/app/models/server-settings-models/builtin.ts +++ b/src/app/models/server-settings-models/builtin.ts @@ -1,3 +1,3 @@ export class Builtin { - default_nat_interface: string; -} \ No newline at end of file + default_nat_interface: string; +} diff --git a/src/app/models/server-settings-models/docker.ts b/src/app/models/server-settings-models/docker.ts index ade92821..716fc2fe 100644 --- a/src/app/models/server-settings-models/docker.ts +++ b/src/app/models/server-settings-models/docker.ts @@ -1,3 +1,3 @@ export class Docker { - containers: any[]; -} \ No newline at end of file + containers: any[]; +} diff --git a/src/app/models/server-settings-models/dynamips.ts b/src/app/models/server-settings-models/dynamips.ts index cf720c1f..a17836fa 100644 --- a/src/app/models/server-settings-models/dynamips.ts +++ b/src/app/models/server-settings-models/dynamips.ts @@ -1,7 +1,7 @@ export class Dynamips { - allocate_aux_console_ports: string; - dynamips_path: string; - ghost_ios_support: string; - mmap_support: string; - sparse_memory_support: string -} \ No newline at end of file + allocate_aux_console_ports: string; + dynamips_path: string; + ghost_ios_support: string; + mmap_support: string; + sparse_memory_support: string; +} diff --git a/src/app/models/server-settings-models/graphics-view.ts b/src/app/models/server-settings-models/graphics-view.ts index 998c7559..72ef0f56 100644 --- a/src/app/models/server-settings-models/graphics-view.ts +++ b/src/app/models/server-settings-models/graphics-view.ts @@ -1,17 +1,17 @@ export class GraphicsView { - default_label_color: string; - default_label_font: string; - default_note_color: string; - default_note_font: string; - draw_link_status_points: boolean; - draw_rectangle_selected_item: boolean; - grid_size: number; - scene_height: number; - scene_width: 2000; - show_grid: boolean; - show_interface_labels: boolean; - show_interface_labels_on_new_project: boolean; - show_layers: boolean; - snap_to_grid: boolean; - zoom: any -} \ No newline at end of file + default_label_color: string; + default_label_font: string; + default_note_color: string; + default_note_font: string; + draw_link_status_points: boolean; + draw_rectangle_selected_item: boolean; + grid_size: number; + scene_height: number; + scene_width: 2000; + show_grid: boolean; + show_interface_labels: boolean; + show_interface_labels_on_new_project: boolean; + show_layers: boolean; + snap_to_grid: boolean; + zoom: any; +} diff --git a/src/app/models/server-settings-models/iou.ts b/src/app/models/server-settings-models/iou.ts index 23c046d8..a526e9dc 100644 --- a/src/app/models/server-settings-models/iou.ts +++ b/src/app/models/server-settings-models/iou.ts @@ -1,4 +1,4 @@ export class IOU { - iourc_content: ""; - license_check: boolean -} \ No newline at end of file + iourc_content: ''; + license_check: boolean; +} diff --git a/src/app/models/server-settings-models/qemu.ts b/src/app/models/server-settings-models/qemu.ts index 6a49ccd7..1625623f 100644 --- a/src/app/models/server-settings-models/qemu.ts +++ b/src/app/models/server-settings-models/qemu.ts @@ -1,7 +1,7 @@ export class Qemu { - enable_hardware_acceleration: boolean; - enable_kvm: boolean; - require_hardware_acceleration: boolean; - require_kvm: boolean; - vms: any[] -} \ No newline at end of file + enable_hardware_acceleration: boolean; + enable_kvm: boolean; + require_hardware_acceleration: boolean; + require_kvm: boolean; + vms: any[]; +} diff --git a/src/app/models/server-settings-models/virtual-box.ts b/src/app/models/server-settings-models/virtual-box.ts index 4fdf91e5..bb7a784e 100644 --- a/src/app/models/server-settings-models/virtual-box.ts +++ b/src/app/models/server-settings-models/virtual-box.ts @@ -1,3 +1,3 @@ export class VirtualBox { - vboxmanage_path: string; -} \ No newline at end of file + vboxmanage_path: string; +} diff --git a/src/app/models/server-settings-models/vmware.ts b/src/app/models/server-settings-models/vmware.ts index ac36a011..c9f9cb58 100644 --- a/src/app/models/server-settings-models/vmware.ts +++ b/src/app/models/server-settings-models/vmware.ts @@ -1,7 +1,7 @@ export class VMware { - block_host_traffic: boolean; - host_type: string; - vmnet_end_range: number; - vmnet_start_range: number; - vmrun_path: string -} \ No newline at end of file + block_host_traffic: boolean; + host_type: string; + vmnet_end_range: number; + vmnet_start_range: number; + vmrun_path: string; +} diff --git a/src/app/models/server-settings-models/vpcs.ts b/src/app/models/server-settings-models/vpcs.ts index 61306b28..56d5a88a 100644 --- a/src/app/models/server-settings-models/vpcs.ts +++ b/src/app/models/server-settings-models/vpcs.ts @@ -1,3 +1,3 @@ export class VPCS { - vpcs_path: string; -} \ No newline at end of file + vpcs_path: string; +} diff --git a/src/app/models/server.ts b/src/app/models/server.ts index 1275d7fd..c4419de4 100644 --- a/src/app/models/server.ts +++ b/src/app/models/server.ts @@ -1,7 +1,7 @@ export type ServerAuthorization = 'basic' | 'none'; export type ServerLocation = 'local' | 'remote' | 'bundled'; export type ServerStatus = 'stopped' | 'starting' | 'running'; -export type ServerProtocol = 'http:' | 'https:' +export type ServerProtocol = 'http:' | 'https:'; export class Server { id: number; diff --git a/src/app/models/serverSettings.ts b/src/app/models/serverSettings.ts index 5d920a20..891bf877 100644 --- a/src/app/models/serverSettings.ts +++ b/src/app/models/serverSettings.ts @@ -9,14 +9,14 @@ import { VPCS } from './server-settings-models/vpcs'; import { VirtualBox } from './server-settings-models/virtual-box'; export class ServerSettings { - Builtin: Builtin; - Docker: Docker; - Dynamips: Dynamips; - Graphicsview: GraphicsView; - IOU: IOU; - Qemu: Qemu; - VMware: VMware; - VPCS: VPCS; - VirtualBox: VirtualBox; - modification_uuid: string + Builtin: Builtin; + Docker: Docker; + Dynamips: Dynamips; + Graphicsview: GraphicsView; + IOU: IOU; + Qemu: Qemu; + VMware: VMware; + VPCS: VPCS; + VirtualBox: VirtualBox; + modification_uuid: string; } diff --git a/src/app/models/settings/qemu-settings.ts b/src/app/models/settings/qemu-settings.ts index a237f794..6d707940 100644 --- a/src/app/models/settings/qemu-settings.ts +++ b/src/app/models/settings/qemu-settings.ts @@ -1,4 +1,4 @@ export class QemuSettings { - enable_hardware_acceleration: boolean; - require_hardware_acceleration: boolean + enable_hardware_acceleration: boolean; + require_hardware_acceleration: boolean; } diff --git a/src/app/models/software.ts b/src/app/models/software.ts index 6b294480..514fdf90 100644 --- a/src/app/models/software.ts +++ b/src/app/models/software.ts @@ -1,12 +1,12 @@ -export type SoftwareType = "web"; +export type SoftwareType = 'web'; export class Software { - name: string; - locations: string[]; - type: SoftwareType; - resource: string; - binary: string; - sudo: boolean; - installation_arguments: string[]; - installed: boolean; -} \ No newline at end of file + name: string; + locations: string[]; + type: SoftwareType; + resource: string; + binary: string; + sudo: boolean; + installation_arguments: string[]; + installed: boolean; +} diff --git a/src/app/models/symbol.ts b/src/app/models/symbol.ts index a08d1693..df17351e 100644 --- a/src/app/models/symbol.ts +++ b/src/app/models/symbol.ts @@ -1,6 +1,6 @@ export class Symbol { - builtin: boolean; - filename: string; - symbol_id: string; - raw: string; + builtin: boolean; + filename: string; + symbol_id: string; + raw: string; } diff --git a/src/app/models/templates/cloud-template.ts b/src/app/models/templates/cloud-template.ts index 549d6011..12b2a0fc 100644 --- a/src/app/models/templates/cloud-template.ts +++ b/src/app/models/templates/cloud-template.ts @@ -1,17 +1,17 @@ import { PortsMappingEntity } from '../ethernetHub/ports-mapping-enity'; export interface CloudTemplate { - builtin: boolean; - category: string; - compute_id: string; - default_name_format: string; - name: string; - ports_mapping?: PortsMappingEntity[]; - remote_console_host: string; - remote_console_http_path: string; - remote_console_port: number; - remote_console_type: string; - symbol: string; - template_id: string; - template_type: string; + builtin: boolean; + category: string; + compute_id: string; + default_name_format: string; + name: string; + ports_mapping?: PortsMappingEntity[]; + remote_console_host: string; + remote_console_http_path: string; + remote_console_port: number; + remote_console_type: string; + symbol: string; + template_id: string; + template_type: string; } diff --git a/src/app/models/templates/docker-template.ts b/src/app/models/templates/docker-template.ts index 84729980..db700223 100644 --- a/src/app/models/templates/docker-template.ts +++ b/src/app/models/templates/docker-template.ts @@ -1,24 +1,24 @@ import { CustomAdapter } from '../qemu/qemu-custom-adapter'; export class DockerTemplate { - adapters: number; - builtin: boolean; - category: string; - compute_id: string; - console_auto_start: boolean; - console_http_path: string; - console_http_port: number; - console_resolution: string; - console_type: string; - custom_adapters: CustomAdapter[]; - default_name_format: string; - environment: string; - extra_hosts: string; - image: string; - name: string; - start_command: string; - symbol: string; - template_id: string; - template_type: string; - usage: string; + adapters: number; + builtin: boolean; + category: string; + compute_id: string; + console_auto_start: boolean; + console_http_path: string; + console_http_port: number; + console_resolution: string; + console_type: string; + custom_adapters: CustomAdapter[]; + default_name_format: string; + environment: string; + extra_hosts: string; + image: string; + name: string; + start_command: string; + symbol: string; + template_id: string; + template_type: string; + usage: string; } diff --git a/src/app/models/templates/ethernet-hub-template.ts b/src/app/models/templates/ethernet-hub-template.ts index 982e2de2..1171e2a8 100644 --- a/src/app/models/templates/ethernet-hub-template.ts +++ b/src/app/models/templates/ethernet-hub-template.ts @@ -1,13 +1,13 @@ import { PortsMappingEntity } from '../ethernetHub/ports-mapping-enity'; export interface EthernetHubTemplate { - builtin: boolean; - category: string; - compute_id: string; - default_name_format: string; - name: string; - ports_mapping?: PortsMappingEntity[]; - symbol: string; - template_id: string; - template_type: string; + builtin: boolean; + category: string; + compute_id: string; + default_name_format: string; + name: string; + ports_mapping?: PortsMappingEntity[]; + symbol: string; + template_id: string; + template_type: string; } diff --git a/src/app/models/templates/ethernet-switch-template.ts b/src/app/models/templates/ethernet-switch-template.ts index 00ed9458..d4539551 100644 --- a/src/app/models/templates/ethernet-switch-template.ts +++ b/src/app/models/templates/ethernet-switch-template.ts @@ -1,14 +1,14 @@ import { PortsMappingEntity } from '../ethernetHub/ports-mapping-enity'; export interface EthernetSwitchTemplate { - builtin: boolean; - category: string; - compute_id: string; - console_type: string; - default_name_format: string; - name: string; - ports_mapping: PortsMappingEntity[]; - symbol: string; - template_id: string; - template_type: string; + builtin: boolean; + category: string; + compute_id: string; + console_type: string; + default_name_format: string; + name: string; + ports_mapping: PortsMappingEntity[]; + symbol: string; + template_id: string; + template_type: string; } diff --git a/src/app/models/templates/ios-template.ts b/src/app/models/templates/ios-template.ts index 7f9f2fe5..b87063a0 100644 --- a/src/app/models/templates/ios-template.ts +++ b/src/app/models/templates/ios-template.ts @@ -1,43 +1,43 @@ export class IosTemplate { - auto_delete_disks: boolean; - builtin: boolean; - category: string; - chassis?: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - default_name_format: string; - disk0: number; - disk1: number; - exec_area: number; - idlemax: number; - idlepc: string; - idlesleep: number; - image: string; - iomem?: number; - mac_addr: string; - mmap: boolean; - name: string; - nvram: number; - platform: string; - private_config: string; - ram: number; - slot0?: string; - slot1?: string; - slot2?: string; - slot3?: string; - slot4?: string; - slot5?: string; - slot6?: string; - slot7?: string; - sparsemem: boolean; - startup_config: string; - symbol: string; - system_id: string; - template_id: string; - template_type: string; - usage: string; - wic0?: string; - wic1?: string; - wic2?: string; + auto_delete_disks: boolean; + builtin: boolean; + category: string; + chassis?: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + default_name_format: string; + disk0: number; + disk1: number; + exec_area: number; + idlemax: number; + idlepc: string; + idlesleep: number; + image: string; + iomem?: number; + mac_addr: string; + mmap: boolean; + name: string; + nvram: number; + platform: string; + private_config: string; + ram: number; + slot0?: string; + slot1?: string; + slot2?: string; + slot3?: string; + slot4?: string; + slot5?: string; + slot6?: string; + slot7?: string; + sparsemem: boolean; + startup_config: string; + symbol: string; + system_id: string; + template_id: string; + template_type: string; + usage: string; + wic0?: string; + wic1?: string; + wic2?: string; } diff --git a/src/app/models/templates/iou-template.ts b/src/app/models/templates/iou-template.ts index 81b1bd40..1d983887 100644 --- a/src/app/models/templates/iou-template.ts +++ b/src/app/models/templates/iou-template.ts @@ -1,22 +1,22 @@ export class IouTemplate { - builtin: boolean; - category: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - default_name_format: string; - ethernet_adapters: number; - l1_keepalives: boolean; - name: string; - nvram: number; - path: string; - private_config: string; - ram: number; - serial_adapters: number; - startup_config: string; - symbol: string; - template_id: string; - template_type: string; - usage: string; - use_default_iou_values: boolean; + builtin: boolean; + category: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + default_name_format: string; + ethernet_adapters: number; + l1_keepalives: boolean; + name: string; + nvram: number; + path: string; + private_config: string; + ram: number; + serial_adapters: number; + startup_config: string; + symbol: string; + template_id: string; + template_type: string; + usage: string; + use_default_iou_values: boolean; } diff --git a/src/app/models/templates/qemu-template.ts b/src/app/models/templates/qemu-template.ts index c0137df9..1d559bea 100644 --- a/src/app/models/templates/qemu-template.ts +++ b/src/app/models/templates/qemu-template.ts @@ -1,46 +1,46 @@ import { CustomAdapter } from '../qemu/qemu-custom-adapter'; export class QemuTemplate { - adapter_type: string; - adapters: number; - bios_image: string; - boot_priority: string; - builtin: boolean; - category: string; - cdrom_image: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - cpu_throttling: number; - cpus: number; - custom_adapters: CustomAdapter[]; - default_name_format: string; - first_port_name: string; - hda_disk_image: string; - hda_disk_interface: string; - hdb_disk_image: string; - hdb_disk_interface: string; - hdc_disk_image: string; - hdc_disk_interface: string; - hdd_disk_image: string; - hdd_disk_interface: string; - initrd: string; - kernel_command_line: string; - kernel_image: string; - legacy_networking: boolean; - linked_clone: boolean; - mac_address: string; - name: string; - on_close: string; - options: string; - platform: string; - port_name_format: string; - port_segment_size: number; - process_priority: string; - qemu_path: string; - ram: number; - symbol: string; - template_id: string; - template_type: string; - usage: string; + adapter_type: string; + adapters: number; + bios_image: string; + boot_priority: string; + builtin: boolean; + category: string; + cdrom_image: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + cpu_throttling: number; + cpus: number; + custom_adapters: CustomAdapter[]; + default_name_format: string; + first_port_name: string; + hda_disk_image: string; + hda_disk_interface: string; + hdb_disk_image: string; + hdb_disk_interface: string; + hdc_disk_image: string; + hdc_disk_interface: string; + hdd_disk_image: string; + hdd_disk_interface: string; + initrd: string; + kernel_command_line: string; + kernel_image: string; + legacy_networking: boolean; + linked_clone: boolean; + mac_address: string; + name: string; + on_close: string; + options: string; + platform: string; + port_name_format: string; + port_segment_size: number; + process_priority: string; + qemu_path: string; + ram: number; + symbol: string; + template_id: string; + template_type: string; + usage: string; } diff --git a/src/app/models/templates/traceng-template.ts b/src/app/models/templates/traceng-template.ts index 00eeb3c6..955990ec 100644 --- a/src/app/models/templates/traceng-template.ts +++ b/src/app/models/templates/traceng-template.ts @@ -1,12 +1,12 @@ export interface TracengTemplate { - builtin: boolean; - category: string; - compute_id: string; - console_type: string; - default_name_format: string; - ip_address: string; - name: string; - symbol: string; - template_id: string; - template_type: string; + builtin: boolean; + category: string; + compute_id: string; + console_type: string; + default_name_format: string; + ip_address: string; + name: string; + symbol: string; + template_id: string; + template_type: string; } diff --git a/src/app/models/templates/virtualbox-template.ts b/src/app/models/templates/virtualbox-template.ts index 9d63b08a..f72c6648 100644 --- a/src/app/models/templates/virtualbox-template.ts +++ b/src/app/models/templates/virtualbox-template.ts @@ -1,27 +1,27 @@ import { CustomAdapter } from '../qemu/qemu-custom-adapter'; export interface VirtualBoxTemplate { - adapter_type: string; - adapters: number; - builtin: boolean; - category: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - custom_adapters?: CustomAdapter[]; - default_name_format: string; - first_port_name: string; - headless: boolean; - linked_clone: boolean; - name: string; - on_close: string; - port_name_format: string; - port_segment_size: number; - ram: number; - symbol: string; - template_id: string; - template_type: string; - usage: string; - use_any_adapter: boolean; - vmname: string; + adapter_type: string; + adapters: number; + builtin: boolean; + category: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + custom_adapters?: CustomAdapter[]; + default_name_format: string; + first_port_name: string; + headless: boolean; + linked_clone: boolean; + name: string; + on_close: string; + port_name_format: string; + port_segment_size: number; + ram: number; + symbol: string; + template_id: string; + template_type: string; + usage: string; + use_any_adapter: boolean; + vmname: string; } diff --git a/src/app/models/templates/vmware-template.ts b/src/app/models/templates/vmware-template.ts index 0bdd113e..0ab02ade 100644 --- a/src/app/models/templates/vmware-template.ts +++ b/src/app/models/templates/vmware-template.ts @@ -1,26 +1,26 @@ import { CustomAdapter } from '../qemu/qemu-custom-adapter'; export class VmwareTemplate { - adapter_type: string; - adapters: number; - builtin: boolean; - category: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - custom_adapters: CustomAdapter[]; - default_name_format: string; - first_port_name: string; - headless: boolean; - linked_clone: boolean; - name: string; - on_close: string; - port_name_format: string; - port_segment_size: number; - symbol: string; - template_id: string; - template_type: string; - usage: string; - use_any_adapter: boolean; - vmx_path: string; + adapter_type: string; + adapters: number; + builtin: boolean; + category: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + custom_adapters: CustomAdapter[]; + default_name_format: string; + first_port_name: string; + headless: boolean; + linked_clone: boolean; + name: string; + on_close: string; + port_name_format: string; + port_segment_size: number; + symbol: string; + template_id: string; + template_type: string; + usage: string; + use_any_adapter: boolean; + vmx_path: string; } diff --git a/src/app/models/templates/vpcs-template.ts b/src/app/models/templates/vpcs-template.ts index b33fbabd..93e5a90d 100644 --- a/src/app/models/templates/vpcs-template.ts +++ b/src/app/models/templates/vpcs-template.ts @@ -1,13 +1,13 @@ export interface VpcsTemplate { - base_script_file: string; - builtin: boolean; - category: string; - compute_id: string; - console_auto_start: boolean; - console_type: string; - default_name_format: string; - name: string; - symbol: string; - template_id: string; - template_type: string; + base_script_file: string; + builtin: boolean; + category: string; + compute_id: string; + console_auto_start: boolean; + console_type: string; + default_name_format: string; + name: string; + symbol: string; + template_id: string; + template_type: string; } diff --git a/src/app/models/virtualBox/virtual-box-vm.ts b/src/app/models/virtualBox/virtual-box-vm.ts index e49d7e85..038c9ceb 100644 --- a/src/app/models/virtualBox/virtual-box-vm.ts +++ b/src/app/models/virtualBox/virtual-box-vm.ts @@ -1,4 +1,4 @@ export class VirtualBoxVm { - ram: number; - vmname: string; + ram: number; + vmname: string; } diff --git a/src/app/models/vmware/vmware-vm.ts b/src/app/models/vmware/vmware-vm.ts index 21232db1..83942acb 100644 --- a/src/app/models/vmware/vmware-vm.ts +++ b/src/app/models/vmware/vmware-vm.ts @@ -1,4 +1,4 @@ export class VmwareVm { - vmname: string; - vmx_path: string; + vmname: string; + vmx_path: string; } diff --git a/src/app/resolvers/server-resolve.ts b/src/app/resolvers/server-resolve.ts index 6c96d947..25ea6195 100644 --- a/src/app/resolvers/server-resolve.ts +++ b/src/app/resolvers/server-resolve.ts @@ -1,15 +1,13 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { Resolve, ActivatedRouteSnapshot } from '@angular/router'; import { ServerService } from '../services/server.service'; import { Server } from '../models/server'; @Injectable() export class ServerResolve implements Resolve { - constructor( - private serverService: ServerService - ) {} + constructor(private serverService: ServerService) {} - resolve(route: ActivatedRouteSnapshot) { - return this.serverService.get(parseInt(route.params['server_id'])); - } + resolve(route: ActivatedRouteSnapshot) { + return this.serverService.get(parseInt(route.params['server_id'])); + } } diff --git a/src/app/services/appliances.service.ts b/src/app/services/appliances.service.ts index e21a2533..3aa1484e 100644 --- a/src/app/services/appliances.service.ts +++ b/src/app/services/appliances.service.ts @@ -8,21 +8,21 @@ import { Appliance } from '../models/appliance'; @Injectable() export class ApplianceService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getAppliances(server: Server): Observable { - return this.httpServer.get(server, '/appliances') as Observable; - } + getAppliances(server: Server): Observable { + return this.httpServer.get(server, '/appliances') as Observable; + } - getAppliance(server: Server, url): Observable { - return this.httpServer.get(server, url) as Observable; - } + getAppliance(server: Server, url): Observable { + return this.httpServer.get(server, url) as Observable; + } - getUploadPath(server: Server, emulator: string, filename: string) { - return `${server.protocol}//${server.host}:${server.port}/v2/compute/${emulator}/images/${filename}`; - } + getUploadPath(server: Server, emulator: string, filename: string) { + return `${server.protocol}//${server.host}:${server.port}/v2/compute/${emulator}/images/${filename}`; + } - updateAppliances(server: Server): Observable { - return this.httpServer.get(server, '/appliances?update=yes') as Observable; - } + updateAppliances(server: Server): Observable { + return this.httpServer.get(server, '/appliances?update=yes') as Observable; + } } diff --git a/src/app/services/built-in-templates-configuration.service.ts b/src/app/services/built-in-templates-configuration.service.ts index c1526a4a..12c868fc 100644 --- a/src/app/services/built-in-templates-configuration.service.ts +++ b/src/app/services/built-in-templates-configuration.service.ts @@ -1,50 +1,56 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class BuiltInTemplatesConfigurationService { - getCategoriesForCloudNodes() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategoriesForCloudNodes() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getConsoleTypesForCloudNodes() { - return ['telnet', 'none']; - } + getConsoleTypesForCloudNodes() { + return ['telnet', 'none']; + } - getCategoriesForEthernetHubs() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategoriesForEthernetHubs() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getCategoriesForEthernetSwitches() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategoriesForEthernetSwitches() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getConsoleTypesForEthernetSwitches() { - return ['telnet', 'none']; - } + getConsoleTypesForEthernetSwitches() { + return ['telnet', 'none']; + } - getPortTypesForEthernetSwitches() { - return ['access', 'dot1q', 'qinq']; - } + getPortTypesForEthernetSwitches() { + return ['access', 'dot1q', 'qinq']; + } - getEtherTypesForEthernetSwitches() { - return ['0x8100', '0x88A8', '0x9100', '0x9200']; - } + getEtherTypesForEthernetSwitches() { + return ['0x8100', '0x88A8', '0x9100', '0x9200']; + } } diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts index 51781002..ba492374 100644 --- a/src/app/services/built-in-templates.service.spec.ts +++ b/src/app/services/built-in-templates.service.spec.ts @@ -10,150 +10,150 @@ import { CloudTemplate } from '../models/templates/cloud-template'; import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template'; describe('BuiltInTemplatesService', () => { - let httpClient: HttpClient; - let httpTestingController: HttpTestingController; - let httpServer: HttpServer; - let server: Server; + let httpClient: HttpClient; + let httpTestingController: HttpTestingController; + let httpServer: HttpServer; + let server: Server; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, BuiltInTemplatesService] - }); - - httpClient = TestBed.get(HttpClient); - httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); - server = getTestServer(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, BuiltInTemplatesService], }); - afterEach(() => { - httpTestingController.verify(); - }); + httpClient = TestBed.get(HttpClient); + httpTestingController = TestBed.get(HttpTestingController); + httpServer = TestBed.get(HttpServer); + server = getTestServer(); + }); - it('should be created', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - expect(service).toBeTruthy(); - })); + afterEach(() => { + httpTestingController.verify(); + }); - it('should update cloud template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - const cloudtemplate = { - builtin: false, - category: 'guest', - compute_id: 'local', - default_name_format: 'Cloud{0}', - name: '', - ports_mapping: [], - remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', - template_id: '1', - template_type: 'cloud' - } as CloudTemplate; + it('should be created', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + expect(service).toBeTruthy(); + })); - service.saveTemplate(server, cloudtemplate).subscribe(); + it('should update cloud template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + const cloudtemplate = { + builtin: false, + category: 'guest', + compute_id: 'local', + default_name_format: 'Cloud{0}', + name: '', + ports_mapping: [], + remote_console_type: 'none', + symbol: ':/symbols/cloud.svg', + template_id: '1', + template_type: 'cloud', + } as CloudTemplate; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(cloudtemplate); - })); + service.saveTemplate(server, cloudtemplate).subscribe(); - it('should update ethernet hub template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - let ethernethubtemplate: EthernetHubTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - default_name_format: 'Hub{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/hub.svg', - template_id: '2', - template_type: 'ethernet_hub' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(cloudtemplate); + })); - service.saveTemplate(server, ethernethubtemplate).subscribe(); + it('should update ethernet hub template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + let ethernethubtemplate: EthernetHubTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + default_name_format: 'Hub{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/hub.svg', + template_id: '2', + template_type: 'ethernet_hub', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/2'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(ethernethubtemplate); - })); + service.saveTemplate(server, ethernethubtemplate).subscribe(); - it('should update ethernet switch template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - let ethernetswitchtemplate: EthernetHubTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - default_name_format: 'Hub{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/hub.svg', - template_id: '3', - template_type: 'ethernet_hub' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/2'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(ethernethubtemplate); + })); - service.saveTemplate(server, ethernetswitchtemplate).subscribe(); + it('should update ethernet switch template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + let ethernetswitchtemplate: EthernetHubTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + default_name_format: 'Hub{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/hub.svg', + template_id: '3', + template_type: 'ethernet_hub', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/3'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(ethernetswitchtemplate); - })); + service.saveTemplate(server, ethernetswitchtemplate).subscribe(); - it('should add cloud template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - const cloudtemplate = { - builtin: false, - category: 'guest', - compute_id: 'local', - default_name_format: 'Cloud{0}', - name: '', - ports_mapping: [], - remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', - template_id: '1', - template_type: 'cloud' - } as CloudTemplate; + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/3'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(ethernetswitchtemplate); + })); - service.addTemplate(server, cloudtemplate).subscribe(); + it('should add cloud template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + const cloudtemplate = { + builtin: false, + category: 'guest', + compute_id: 'local', + default_name_format: 'Cloud{0}', + name: '', + ports_mapping: [], + remote_console_type: 'none', + symbol: ':/symbols/cloud.svg', + template_id: '1', + template_type: 'cloud', + } as CloudTemplate; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(cloudtemplate); - })); + service.addTemplate(server, cloudtemplate).subscribe(); - it('should add ethernet hub template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - let ethernethubtemplate: EthernetHubTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - default_name_format: 'Hub{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/hub.svg', - template_id: '2', - template_type: 'ethernet_hub' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(cloudtemplate); + })); - service.addTemplate(server, ethernethubtemplate).subscribe(); + it('should add ethernet hub template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + let ethernethubtemplate: EthernetHubTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + default_name_format: 'Hub{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/hub.svg', + template_id: '2', + template_type: 'ethernet_hub', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(ethernethubtemplate); - })); + service.addTemplate(server, ethernethubtemplate).subscribe(); - it('should add ethernet switch template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { - let ethernetswitchtemplate: EthernetHubTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - default_name_format: 'Hub{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/hub.svg', - template_id: '3', - template_type: 'ethernet_hub' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(ethernethubtemplate); + })); - service.addTemplate(server, ethernetswitchtemplate).subscribe(); + it('should add ethernet switch template', inject([BuiltInTemplatesService], (service: BuiltInTemplatesService) => { + let ethernetswitchtemplate: EthernetHubTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + default_name_format: 'Hub{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/hub.svg', + template_id: '3', + template_type: 'ethernet_hub', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(ethernetswitchtemplate); - })); + service.addTemplate(server, ethernetswitchtemplate).subscribe(); + + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(ethernetswitchtemplate); + })); }); diff --git a/src/app/services/built-in-templates.service.ts b/src/app/services/built-in-templates.service.ts index ebda6686..165e038e 100644 --- a/src/app/services/built-in-templates.service.ts +++ b/src/app/services/built-in-templates.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -6,22 +6,25 @@ import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template'; @Injectable() export class BuiltInTemplatesService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - addTemplate(server: Server, builtInTemplate: any): Observable { - return this.httpServer.post(server, `/templates`, builtInTemplate) as Observable; - } + addTemplate(server: Server, builtInTemplate: any): Observable { + return this.httpServer.post(server, `/templates`, builtInTemplate) as Observable; + } - saveTemplate(server: Server, builtInTemplate: any): Observable { - return this.httpServer.put(server, `/templates/${builtInTemplate.template_id}`, builtInTemplate) as Observable; - - } + saveTemplate(server: Server, builtInTemplate: any): Observable { + return this.httpServer.put( + server, + `/templates/${builtInTemplate.template_id}`, + builtInTemplate + ) as Observable; + } } diff --git a/src/app/services/compute.service.ts b/src/app/services/compute.service.ts index 9cc76014..5c270a44 100644 --- a/src/app/services/compute.service.ts +++ b/src/app/services/compute.service.ts @@ -7,17 +7,17 @@ import { ComputeStatistics } from '../models/computeStatistics'; @Injectable() export class ComputeService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getComputes(server: Server): Observable { - return this.httpServer.get(server, '/computes') as Observable; - } + getComputes(server: Server): Observable { + return this.httpServer.get(server, '/computes') as Observable; + } - getUploadPath(server: Server, emulator: string, filename: string) { - return `${server.protocol}//${server.host}:${server.port}/v2/${emulator}/images/${filename}`; - } + getUploadPath(server: Server, emulator: string, filename: string) { + return `${server.protocol}//${server.host}:${server.port}/v2/${emulator}/images/${filename}`; + } - getStatistics(server: Server): Observable { - return this.httpServer.get(server, `/statistics`) - } + getStatistics(server: Server): Observable { + return this.httpServer.get(server, `/statistics`); + } } diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts index d80a51d2..9a7dc7c0 100644 --- a/src/app/services/docker-configuration.service.ts +++ b/src/app/services/docker-configuration.service.ts @@ -1,32 +1,26 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class DockerConfigurationService { - getConsoleTypes() { - return ['telnet', 'vnc', 'http', 'https', 'none']; - } + getConsoleTypes() { + return ['telnet', 'vnc', 'http', 'https', 'none']; + } - getCategories() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getConsoleResolutions() { - let consoleResolutions = [ - '1920x1080', - '1366x768', - '1280x1024', - '1280x800', - '1024x768', - '800x600', - '640x480' - ]; + getConsoleResolutions() { + let consoleResolutions = ['1920x1080', '1366x768', '1280x1024', '1280x800', '1024x768', '800x600', '640x480']; - return consoleResolutions; - } + return consoleResolutions; + } } diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts index ef3ae345..2332061b 100644 --- a/src/app/services/docker.service.ts +++ b/src/app/services/docker.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,26 +7,29 @@ import { DockerImage } from '../models/docker/docker-image'; @Injectable() export class DockerService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - getImages(server: Server): Observable { - return this.httpServer.get(server, '/compute/docker/images') as Observable; - } + getImages(server: Server): Observable { + return this.httpServer.get(server, '/compute/docker/images') as Observable; + } - addTemplate(server: Server, dockerTemplate: any): Observable { - return this.httpServer.post(server, `/templates`, dockerTemplate) as Observable; - } + addTemplate(server: Server, dockerTemplate: any): Observable { + return this.httpServer.post(server, `/templates`, dockerTemplate) as Observable; + } - saveTemplate(server: Server, dockerTemplate: any): Observable { - return this.httpServer.put(server, `/templates/${dockerTemplate.template_id}`, dockerTemplate) as Observable; - - } + saveTemplate(server: Server, dockerTemplate: any): Observable { + return this.httpServer.put( + server, + `/templates/${dockerTemplate.template_id}`, + dockerTemplate + ) as Observable; + } } diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts index c95a10ba..23167709 100644 --- a/src/app/services/drawing.service.spec.ts +++ b/src/app/services/drawing.service.spec.ts @@ -21,7 +21,7 @@ describe('DrawingService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, SvgToDrawingConverter, DrawingService] + providers: [HttpServer, SvgToDrawingConverter, DrawingService], }); httpClient = TestBed.get(HttpClient); @@ -49,7 +49,7 @@ describe('DrawingService', () => { expect(req.request.method).toEqual('PUT'); expect(req.request.body).toEqual({ x: 10, - y: 20 + y: 20, }); })); @@ -64,7 +64,7 @@ describe('DrawingService', () => { expect(req.request.method).toEqual('PUT'); expect(req.request.body).toEqual({ x: 10, - y: 21 + y: 21, }); })); @@ -81,7 +81,7 @@ describe('DrawingService', () => { expect(req.request.body).toEqual({ x: 100, y: 100, - svg: svgSample + svg: svgSample, }); })); @@ -100,7 +100,7 @@ describe('DrawingService', () => { expect(req.request.body).toEqual({ x: 100, y: 101, - svg: svgSample + svg: svgSample, }); } )); @@ -126,7 +126,7 @@ describe('DrawingService', () => { z: 30, rotation: 0, svg: '', - locked: false + locked: false, }); })); @@ -143,13 +143,14 @@ describe('DrawingService', () => { it('should duplicate drawing', inject([DrawingService], (service: DrawingService) => { const drawing = new Drawing(); - drawing.project_id = "project_id_1"; - drawing.drawing_id = "drawing_id_1"; + drawing.project_id = 'project_id_1'; + drawing.drawing_id = 'drawing_id_1'; drawing.x = 100; drawing.y = 90; drawing.z = 1; drawing.rotation = 0; - drawing.svg = ""; + drawing.svg = + ''; service.duplicate(server, drawing.project_id, drawing).subscribe(); @@ -160,7 +161,7 @@ describe('DrawingService', () => { rotation: 0, x: 110, y: 100, - z: 1 + z: 1, }); })); }); diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts index 9c71d620..e2536054 100644 --- a/src/app/services/drawing.service.ts +++ b/src/app/services/drawing.service.ts @@ -10,17 +10,14 @@ import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-con @Injectable() export class DrawingService { - constructor( - private httpServer: HttpServer, - private svgToDrawingConverter: SvgToDrawingConverter - ) {} + constructor(private httpServer: HttpServer, private svgToDrawingConverter: SvgToDrawingConverter) {} add(server: Server, project_id: string, x: number, y: number, svg: string) { return this.httpServer.post(server, `/projects/${project_id}/drawings`, { svg: svg, x: Math.round(x), y: Math.round(y), - z: 1 + z: 1, }); } @@ -30,7 +27,7 @@ export class DrawingService { rotation: drawing.rotation, x: drawing.x + 10, y: drawing.y + 10, - z: drawing.z + z: drawing.z, }); } @@ -41,16 +38,18 @@ export class DrawingService { if (project.snap_to_grid) { drawing.element = this.svgToDrawingConverter.convert(drawing.svg); - xPosition = Math.round((xPosition + drawing.element.width/2) / project.drawing_grid_size) * project.drawing_grid_size; - yPosition = Math.round((yPosition + drawing.element.width/2) / project.drawing_grid_size) * project.drawing_grid_size; + xPosition = + Math.round((xPosition + drawing.element.width / 2) / project.drawing_grid_size) * project.drawing_grid_size; + yPosition = + Math.round((yPosition + drawing.element.width / 2) / project.drawing_grid_size) * project.drawing_grid_size; - xPosition = Math.round(xPosition - drawing.element.width/2); - yPosition = Math.round(yPosition - drawing.element.height/2); + xPosition = Math.round(xPosition - drawing.element.width / 2); + yPosition = Math.round(yPosition - drawing.element.height / 2); } return this.httpServer.put(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { x: xPosition, - y: yPosition + y: yPosition, }); } @@ -58,7 +57,7 @@ export class DrawingService { return this.httpServer.put(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { svg: svg, x: Math.round(x), - y: Math.round(y) + y: Math.round(y), }); } @@ -67,7 +66,7 @@ export class DrawingService { svg: svg, x: Math.round(drawing.x), y: Math.round(drawing.y), - z: drawing.z + z: drawing.z, }); } @@ -78,7 +77,7 @@ export class DrawingService { rotation: drawing.rotation, x: Math.round(drawing.x), y: Math.round(drawing.y), - z: drawing.z + z: drawing.z, }); } diff --git a/src/app/services/external-software-definition.service.spec.ts b/src/app/services/external-software-definition.service.spec.ts index de4b073d..94f9c5a3 100644 --- a/src/app/services/external-software-definition.service.spec.ts +++ b/src/app/services/external-software-definition.service.spec.ts @@ -18,7 +18,6 @@ class PlatformServiceMock { } } - describe('ExternalSoftwareDefinitionService', () => { let platformServiceMock: PlatformServiceMock; let service: ExternalSoftwareDefinitionService; @@ -27,16 +26,15 @@ describe('ExternalSoftwareDefinitionService', () => { platformServiceMock = new PlatformServiceMock(); }); - beforeEach(() => TestBed.configureTestingModule({ - providers: [ - ExternalSoftwareDefinitionService, - { provide: PlatformService, useValue: platformServiceMock} - ] - })); + beforeEach(() => + TestBed.configureTestingModule({ + providers: [ExternalSoftwareDefinitionService, { provide: PlatformService, useValue: platformServiceMock }], + }) + ); beforeEach(() => { service = TestBed.get(ExternalSoftwareDefinitionService); - }) + }); it('should be created', () => { expect(service).toBeTruthy(); @@ -91,7 +89,5 @@ describe('ExternalSoftwareDefinitionService', () => { expect(darwinSpy).toHaveBeenCalled(); expect(linuxSpy).not.toHaveBeenCalled(); }); - - }) - + }); }); diff --git a/src/app/services/external-software-definition.service.ts b/src/app/services/external-software-definition.service.ts index 26fe75b3..f1443a78 100644 --- a/src/app/services/external-software-definition.service.ts +++ b/src/app/services/external-software-definition.service.ts @@ -4,53 +4,46 @@ import { environment } from '../../environments/environment'; @Injectable() export class ExternalSoftwareDefinitionService { - - constructor( - private platformService: PlatformService - ) { } + constructor(private platformService: PlatformService) {} get() { - if(this.platformService.isWindows()) { + if (this.platformService.isWindows()) { return this.getForWindows(); } - if(this.platformService.isDarwin()) { + if (this.platformService.isDarwin()) { return this.getForDarwin(); } return this.getForLinux(); } getForWindows() { - let software = [{ + let software = [ + { name: 'Wireshark', - locations: [ - 'C:\\Program Files\\Wireshark\\Wireshark.exe' - ], + locations: ['C:\\Program Files\\Wireshark\\Wireshark.exe'], type: 'web', resource: 'https://1.na.dl.wireshark.org/win64/all-versions/Wireshark-win64-2.6.3.exe', binary: 'Wireshark.exe', sudo: true, installation_arguments: [], installed: false, - installer: true - } + installer: true, + }, ]; const solarPutty = { name: 'SolarPuTTY', - locations: [ - 'SolarPuTTY.exe', - 'external\\SolarPuTTY.exe' - ], + locations: ['SolarPuTTY.exe', 'external\\SolarPuTTY.exe'], type: 'web', resource: '', binary: 'SolarPuTTY.exe', sudo: false, installation_arguments: ['--only-ask'], installed: false, - installer: false + installer: false, }; - if(environment.solarputty_download_url) { + if (environment.solarputty_download_url) { solarPutty.resource = environment.solarputty_download_url; software.push(solarPutty); } diff --git a/src/app/services/gns3vm.service.ts b/src/app/services/gns3vm.service.ts index 5c83c7c6..5e95ce48 100644 --- a/src/app/services/gns3vm.service.ts +++ b/src/app/services/gns3vm.service.ts @@ -8,21 +8,21 @@ import { VM } from '../models/gns3vm/vm'; @Injectable() export class Gns3vmService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getGns3vm(server: Server): Observable { - return this.httpServer.get(server, '/gns3vm') as Observable; - } + getGns3vm(server: Server): Observable { + return this.httpServer.get(server, '/gns3vm') as Observable; + } - updateGns3vm(server: Server, gns3vm: Gns3vm): Observable { - return this.httpServer.put(server, `/gns3vm`, gns3vm) as Observable; - } + updateGns3vm(server: Server, gns3vm: Gns3vm): Observable { + return this.httpServer.put(server, `/gns3vm`, gns3vm) as Observable; + } - getGns3vmEngines(server: Server): Observable { - return this.httpServer.get(server, '/gns3vm/engines') as Observable; - } + getGns3vmEngines(server: Server): Observable { + return this.httpServer.get(server, '/gns3vm/engines') as Observable; + } - getVms(server: Server, engine: string): Observable { - return this.httpServer.get(server, `/gns3vm/engines/${engine}/vms`) - } + getVms(server: Server, engine: string): Observable { + return this.httpServer.get(server, `/gns3vm/engines/${engine}/vms`); + } } diff --git a/src/app/services/google-analytics.service.ts b/src/app/services/google-analytics.service.ts index 0a963ac7..24511f9d 100644 --- a/src/app/services/google-analytics.service.ts +++ b/src/app/services/google-analytics.service.ts @@ -1,20 +1,17 @@ - import { Injectable } from '@angular/core'; -import {Router, NavigationEnd} from '@angular/router'; +import { Router, NavigationEnd } from '@angular/router'; import { environment } from '../../environments/environment'; -declare var gtag:Function; +declare var gtag: Function; @Injectable() export class GoogleAnalyticsService { - constructor(router: Router) { if (!environment.production) return; - router.events.subscribe(event => { + router.events.subscribe((event) => { if (event instanceof NavigationEnd) { gtag('set', 'page', event.url); gtag('send', 'pageview'); } - }) + }); } - } diff --git a/src/app/services/http-server.service.spec.ts b/src/app/services/http-server.service.spec.ts index 4a4dded6..c96e0cd6 100644 --- a/src/app/services/http-server.service.spec.ts +++ b/src/app/services/http-server.service.spec.ts @@ -26,25 +26,25 @@ describe('ServerError', () => { }); describe('ServerErrorHandler', () => { - it('should handle HttpErrorResponse with status 0', done => { + it('should handle HttpErrorResponse with status 0', (done) => { const error = new HttpErrorResponse({ status: 0 }); const handler = new ServerErrorHandler(); const result = handler.handleError(error); - result.subscribe(null, err => { + result.subscribe(null, (err) => { expect(err.message).toEqual('Server is unreachable'); done(); }); }); - it('should not handle HttpErrorResponse with status!=0', done => { + it('should not handle HttpErrorResponse with status!=0', (done) => { const error = new HttpErrorResponse({ status: 499 }); const handler = new ServerErrorHandler(); const result = handler.handleError(error); - result.subscribe(null, err => { + result.subscribe(null, (err) => { expect(err.message).toEqual('Http failure response for (unknown url): 499 undefined'); done(); }); @@ -60,7 +60,7 @@ describe('HttpServer', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer] + providers: [HttpServer], }); httpClient = TestBed.get(HttpClient); @@ -85,7 +85,7 @@ describe('HttpServer', () => { it('should make GET query for get method and return instance of type', () => { const testData: MyType = { id: 3 }; - service.get(server, '/test').subscribe(data => { + service.get(server, '/test').subscribe((data) => { expect(data instanceof MyType).toBeFalsy(); expect(data).toEqual(testData); }); @@ -100,7 +100,7 @@ describe('HttpServer', () => { it('HttpClient should make GET query for get method and return instance of type', () => { const testData: MyType = { id: 3 }; - httpClient.get('http://localhost/test').subscribe(data => { + httpClient.get('http://localhost/test').subscribe((data) => { // when this condition is true, it would be great expect(data instanceof MyType).toBeFalsy(); expect(data).toEqual(testData); @@ -125,9 +125,9 @@ describe('HttpServer', () => { service .getText(server, '/test', { headers: { - CustomHeader: 'value' + CustomHeader: 'value', }, - responseType: 'text' + responseType: 'text', }) .subscribe(); @@ -205,8 +205,8 @@ describe('HttpServer', () => { service .get(server, '/test', { headers: { - CustomHeader: 'value' - } + CustomHeader: 'value', + }, }) .subscribe(); @@ -224,8 +224,8 @@ describe('HttpServer', () => { service .get(server, '/test', { headers: { - CustomHeader: 'value' - } + CustomHeader: 'value', + }, }) .subscribe(); diff --git a/src/app/services/http-server.service.ts b/src/app/services/http-server.service.ts index e3742a78..e707df46 100644 --- a/src/app/services/http-server.service.ts +++ b/src/app/services/http-server.service.ts @@ -160,7 +160,7 @@ export class HttpServer { private getJsonOptions(options: JsonOptions): JsonOptions { if (!options) { return { - responseType: 'json' + responseType: 'json', }; } return options; @@ -169,7 +169,7 @@ export class HttpServer { private getTextOptions(options: TextOptions): TextOptions { if (!options) { return { - responseType: 'text' + responseType: 'text', }; } return options; @@ -196,7 +196,7 @@ export class HttpServer { return { url: url, - options: options + options: options, }; } } diff --git a/src/app/services/indexed-db.service.spec.ts b/src/app/services/indexed-db.service.spec.ts index 52bfb800..361d75fc 100644 --- a/src/app/services/indexed-db.service.spec.ts +++ b/src/app/services/indexed-db.service.spec.ts @@ -5,7 +5,7 @@ import { IndexedDbService } from './indexed-db.service'; describe('IndexedDbService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [IndexedDbService] + providers: [IndexedDbService], }); }); diff --git a/src/app/services/info.service.ts b/src/app/services/info.service.ts index 6d944159..0589aea4 100644 --- a/src/app/services/info.service.ts +++ b/src/app/services/info.service.ts @@ -1,77 +1,79 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { Node } from '../cartography/models/node'; import { Port } from '../models/port'; import { Server } from '../models/server'; @Injectable() export class InfoService { - getInfoAboutNode(node: Node, server: Server): string[] { - let infoList: string[] = []; - if (node.node_type === 'cloud') { - infoList.push(`Cloud ${node.name} is always on.`); - } else if (node.node_type === 'nat') { - infoList.push(`NAT ${node.name} is always on.`); - } else if (node.node_type === 'ethernet-hub') { - infoList.push(`Ethernet hub ${node.name} is always on.`); - } else if (node.node_type === 'ethernet_switch') { - infoList.push(`Ethernet switch ${node.name} is always on.`); - } else if (node.node_type === 'frame_relay_switch') { - infoList.push(`Frame relay switch ${node.name} is always on.`); - } else if (node.node_type === 'atm_switch') { - infoList.push(`ATM switch ${node.name} is always on.`); - } else if (node.node_type === 'docker') { - infoList.push(`Docker ${node.name} is ${node.status}.`); - } else if (node.node_type === 'dynamips') { - infoList.push(`Dynamips ${node.name} is always on.`); - } else if (node.node_type === 'traceng') { - infoList.push(`TraceNG ${node.name} is always on.`); - } else if (node.node_type === 'virtualbox') { - infoList.push(`VirtualBox VM ${node.name} is ${node.status}.`); - } else if (node.node_type === 'vmware') { - infoList.push(`VMware VM ${node.name} is ${node.status}.`); - } else if (node.node_type === 'qemu') { - infoList.push(`QEMU VM ${node.name} is ${node.status}.`); - } else if (node.node_type === 'iou') { - infoList.push(`IOU ${node.name} is always on.`); - } else if (node.node_type === 'vpcs') { - infoList.push(`Node ${node.name} is ${node.status}.`); - } - infoList.push(`Running on server ${server.name} with port ${server.port}.`); - infoList.push(`Server ID is ${server.id}.`); - if (node.console_type !== 'none' && node.console_type !== 'null') { - infoList.push(`Console is on port ${node.console} and type is ${node.console_type}.`); - } - infoList = infoList.concat(this.getInfoAboutPorts(node.ports)); - return infoList; + getInfoAboutNode(node: Node, server: Server): string[] { + let infoList: string[] = []; + if (node.node_type === 'cloud') { + infoList.push(`Cloud ${node.name} is always on.`); + } else if (node.node_type === 'nat') { + infoList.push(`NAT ${node.name} is always on.`); + } else if (node.node_type === 'ethernet-hub') { + infoList.push(`Ethernet hub ${node.name} is always on.`); + } else if (node.node_type === 'ethernet_switch') { + infoList.push(`Ethernet switch ${node.name} is always on.`); + } else if (node.node_type === 'frame_relay_switch') { + infoList.push(`Frame relay switch ${node.name} is always on.`); + } else if (node.node_type === 'atm_switch') { + infoList.push(`ATM switch ${node.name} is always on.`); + } else if (node.node_type === 'docker') { + infoList.push(`Docker ${node.name} is ${node.status}.`); + } else if (node.node_type === 'dynamips') { + infoList.push(`Dynamips ${node.name} is always on.`); + } else if (node.node_type === 'traceng') { + infoList.push(`TraceNG ${node.name} is always on.`); + } else if (node.node_type === 'virtualbox') { + infoList.push(`VirtualBox VM ${node.name} is ${node.status}.`); + } else if (node.node_type === 'vmware') { + infoList.push(`VMware VM ${node.name} is ${node.status}.`); + } else if (node.node_type === 'qemu') { + infoList.push(`QEMU VM ${node.name} is ${node.status}.`); + } else if (node.node_type === 'iou') { + infoList.push(`IOU ${node.name} is always on.`); + } else if (node.node_type === 'vpcs') { + infoList.push(`Node ${node.name} is ${node.status}.`); } + infoList.push(`Running on server ${server.name} with port ${server.port}.`); + infoList.push(`Server ID is ${server.id}.`); + if (node.console_type !== 'none' && node.console_type !== 'null') { + infoList.push(`Console is on port ${node.console} and type is ${node.console_type}.`); + } + infoList = infoList.concat(this.getInfoAboutPorts(node.ports)); + return infoList; + } - getInfoAboutPorts(ports: Port[]): string { - let response: string = `Ports: ` - ports.forEach(port => { - response += `link_type: ${port.link_type}, - name: ${port.name}; ` - }); - response = response.substring(0, response.length - 2); - return response; - } + getInfoAboutPorts(ports: Port[]): string { + let response: string = `Ports: `; + ports.forEach((port) => { + response += `link_type: ${port.link_type}, + name: ${port.name}; `; + }); + response = response.substring(0, response.length - 2); + return response; + } - getCommandLine(node: Node): string { - if (node.node_type === "cloud" || - node.node_type === "nat" || - node.node_type === "ethernet_hub" || - node.node_type === "ethernet_switch" || - node.node_type === "frame_relay_switch" || - node.node_type === "atm_switch" || - node.node_type === "dynamips" || - node.node_type === "traceng" || - node.node_type === "iou") { - return 'Command line information is not supported for this type of node.'; - } else { - if (node.command_line) { - return node.command_line; - } else { - return 'Please start the node in order to get the command line information.'; - } - } + getCommandLine(node: Node): string { + if ( + node.node_type === 'cloud' || + node.node_type === 'nat' || + node.node_type === 'ethernet_hub' || + node.node_type === 'ethernet_switch' || + node.node_type === 'frame_relay_switch' || + node.node_type === 'atm_switch' || + node.node_type === 'dynamips' || + node.node_type === 'traceng' || + node.node_type === 'iou' + ) { + return 'Command line information is not supported for this type of node.'; + } else { + if (node.command_line) { + return node.command_line; + } else { + return 'Please start the node in order to get the command line information.'; + } } + } } diff --git a/src/app/services/installed-software.service.ts b/src/app/services/installed-software.service.ts index 1e64eef5..f66b4f20 100644 --- a/src/app/services/installed-software.service.ts +++ b/src/app/services/installed-software.service.ts @@ -7,18 +7,18 @@ export class InstalledSoftwareService { constructor( private electronService: ElectronService, private externalSoftwareDefinition: ExternalSoftwareDefinitionService - ) { } + ) {} list() { const softwareDefinition = this.externalSoftwareDefinition.get(); - const installedSoftware = this.electronService.remote.require('./installed-software.js') + const installedSoftware = this.electronService.remote + .require('./installed-software.js') .getInstalledSoftware(softwareDefinition); - + return softwareDefinition.map((software) => { software.installed = installedSoftware[software.name].length > 0; return software; }); } - } diff --git a/src/app/services/ios-configuration.service.ts b/src/app/services/ios-configuration.service.ts index dd3f49c6..8b048980 100644 --- a/src/app/services/ios-configuration.service.ts +++ b/src/app/services/ios-configuration.service.ts @@ -1,277 +1,248 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class IosConfigurationService { - c1700_wics = ["WIC-1T", "WIC-2T", "WIC-1ENET"]; - c2600_wics = ["WIC-1T", "WIC-2T"]; - c3700_wics = ["WIC-1T", "WIC-2T"]; + c1700_wics = ['WIC-1T', 'WIC-2T', 'WIC-1ENET']; + c2600_wics = ['WIC-1T', 'WIC-2T']; + c3700_wics = ['WIC-1T', 'WIC-2T']; - c2600_nms = [ - "NM-1FE-TX", - "NM-1E", - "NM-4E", - "NM-16ESW" - ]; - c3600_nms = [ - "NM-1FE-TX", - "NM-1E", - "NM-4E", - "NM-16ESW", - "NM-4T" - ]; - c3700_nms = [ - "NM-1FE-TX", - "NM-4T", - "NM-16ESW", - ]; - c7200_pas = [ - "PA-A1", - "PA-FE-TX", - "PA-2FE-TX", - "PA-GE", - "PA-4T+", - "PA-8T", - "PA-4E", - "PA-8E", - "PA-POS-OC3", - ]; - c7200_io = [ - "C7200-IO-FE", - "C7200-IO-2FE", - "C7200-IO-GE-E" - ]; + c2600_nms = ['NM-1FE-TX', 'NM-1E', 'NM-4E', 'NM-16ESW']; + c3600_nms = ['NM-1FE-TX', 'NM-1E', 'NM-4E', 'NM-16ESW', 'NM-4T']; + c3700_nms = ['NM-1FE-TX', 'NM-4T', 'NM-16ESW']; + c7200_pas = ['PA-A1', 'PA-FE-TX', 'PA-2FE-TX', 'PA-GE', 'PA-4T+', 'PA-8T', 'PA-4E', 'PA-8E', 'PA-POS-OC3']; + c7200_io = ['C7200-IO-FE', 'C7200-IO-2FE', 'C7200-IO-GE-E']; - getConsoleTypes() { - return ['telnet', 'none']; - } + getConsoleTypes() { + return ['telnet', 'none']; + } - getDefaultRamSettings() { - return { - "c1700": 160, - "c2600": 160, - "c2691": 192, - "c3600": 192, - "c3725": 128, - "c3745": 256, - "c7200": 512 - }; - } + getDefaultRamSettings() { + return { + c1700: 160, + c2600: 160, + c2691: 192, + c3600: 192, + c3725: 128, + c3745: 256, + c7200: 512, + }; + } - getDefaultNvRamSettings() { - return { - "c1700": 128, - "c2600": 128, - "c2691": 256, - "c3600": 192, - "c3620": 192, - "c3640": 192, - "c3660": 192, - "c3725": 256, - "c3745": 256, - "c7200": 512 - }; + getDefaultNvRamSettings() { + return { + c1700: 128, + c2600: 128, + c2691: 256, + c3600: 192, + c3620: 192, + c3640: 192, + c3660: 192, + c3725: 256, + c3745: 256, + c7200: 512, + }; + } + + getAvailablePlatforms() { + return ['c1700', 'c2600', 'c2691', 'c3725', 'c3745', 'c3600', 'c7200']; + } + + getPlatformsWithEtherSwitchRouterOption() { + return { + c1700: false, + c2600: true, + c2691: true, + c3725: true, + c3745: true, + c3600: true, + c7200: false, + }; + } + + getPlatformsWithChassis() { + return { + c1700: true, + c2600: true, + c2691: false, + c3725: false, + c3745: false, + c3600: true, + c7200: false, + }; + } + + getChassis() { + return { + c1700: ['1720', '1721', '1750', '1751', '1760'], + c2600: ['2610', '2611', '2620', '2621', '2610XM', '2611XM', '2620XM', '2621XM', '2650XM', '2651XM'], + c3600: ['3620', '3640', '3660'], + }; + } + + getNetworkModules() { + return { + c1700: { + 0: this.c1700_wics, + 1: this.c1700_wics, + }, + c2600: { + 0: this.c2600_wics, + 1: this.c2600_wics, + 2: this.c2600_wics, + }, + c2691: { + 0: this.c3700_wics, + 1: this.c3700_wics, + 2: this.c3700_wics, + }, + c3725: { + 0: this.c3700_wics, + 1: this.c3700_wics, + 2: this.c3700_wics, + }, + c3745: { + 0: this.c3700_wics, + 1: this.c3700_wics, + 2: this.c3700_wics, + }, + }; + } + + getNetworkAdapters() { + return { + '1720': { + 0: ['C1700-MB-1FE'], + }, + '1721': { + 0: ['C1700-MB-1FE'], + }, + '1750': { + 0: ['C1700-MB-1FE'], + }, + '1751': { + 0: ['C1700-MB-1FE'], + 1: ['C1700-MB-WIC1'], + }, + '1760': { + 0: ['C1700-MB-1FE'], + 1: ['C1700-MB-WIC1'], + }, + '2610': { + 0: ['C2600-MB-1E'], + 1: this.c2600_nms, + }, + '2611': { + 0: ['C2600-MB-2E'], + 1: this.c2600_nms, + }, + '2620': { + 0: ['C2600-MB-1FE'], + 1: this.c2600_nms, + }, + '2621': { + 0: ['C2600-MB-2FE'], + 1: this.c2600_nms, + }, + '2610XM': { + 0: ['C2600-MB-1FE'], + 1: this.c2600_nms, + }, + '2611XM': { + 0: ['C2600-MB-2FE'], + 1: this.c2600_nms, + }, + '2620XM': { + 0: ['C2600-MB-1FE'], + 1: this.c2600_nms, + }, + '2621XM': { + 0: ['C2600-MB-2FE'], + 1: this.c2600_nms, + }, + '2650XM': { + 0: ['C2600-MB-1FE'], + 1: this.c2600_nms, + }, + '2651XM': { + 0: ['C2600-MB-2FE'], + 1: this.c2600_nms, + }, + '3620': { + 0: this.c3600_nms, + 1: this.c3600_nms, + }, + '3640': { + 0: this.c3600_nms, + 1: this.c3600_nms, + 2: this.c3600_nms, + 3: this.c3600_nms, + }, + '3660': { + 0: ['Leopard-2FE'], + 1: this.c3600_nms, + 2: this.c3600_nms, + 3: this.c3600_nms, + 4: this.c3600_nms, + 5: this.c3600_nms, + 6: this.c3600_nms, + }, + }; + } + + getNetworkAdaptersForPlatform() { + let networkAdaptersForPlatform = {}; + networkAdaptersForPlatform['c2691'] = { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + }; + networkAdaptersForPlatform['c3725'] = { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + 2: this.c3700_nms, + }; + networkAdaptersForPlatform['c3745'] = { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + 2: this.c3700_nms, + 3: this.c3700_nms, + 4: this.c3700_nms, + }; + networkAdaptersForPlatform['c7200'] = { + 0: this.c7200_io, + 1: this.c7200_pas, + 2: this.c7200_pas, + 3: this.c7200_pas, + 4: this.c7200_pas, + 5: this.c7200_pas, + 6: this.c7200_pas, }; - getAvailablePlatforms() { - return ["c1700", "c2600", "c2691", "c3725", "c3745", "c3600", "c7200"]; - } - - getPlatformsWithEtherSwitchRouterOption() { - return { - "c1700": false, - "c2600": true, - "c2691": true, - "c3725": true, - "c3745": true, - "c3600": true, - "c7200": false - }; - } - - getPlatformsWithChassis() { - return { - "c1700": true, - "c2600": true, - "c2691": false, - "c3725": false, - "c3745": false, - "c3600": true, - "c7200": false - }; - } - - getChassis() { - return { - "c1700": ["1720", "1721", "1750", "1751", "1760"], - "c2600": ["2610", "2611", "2620", "2621", "2610XM", "2611XM", "2620XM", "2621XM", "2650XM", "2651XM"], - "c3600": ["3620", "3640", "3660"] - }; - } - - getNetworkModules() { - return { - "c1700": { - 0: this.c1700_wics, - 1: this.c1700_wics - }, - "c2600": { - 0: this.c2600_wics, - 1: this.c2600_wics, - 2: this.c2600_wics - }, - "c2691": { - 0: this.c3700_wics, - 1: this.c3700_wics, - 2: this.c3700_wics - }, - "c3725": { - 0: this.c3700_wics, - 1: this.c3700_wics, - 2: this.c3700_wics - }, - "c3745": { - 0: this.c3700_wics, - 1: this.c3700_wics, - 2: this.c3700_wics - } - }; - } - - getNetworkAdapters() { - return { - "1720": { - 0: ["C1700-MB-1FE"] - }, - "1721": { - 0: ["C1700-MB-1FE"] - }, - "1750": { - 0: ["C1700-MB-1FE"] - }, - "1751": { - 0: ["C1700-MB-1FE"], - 1: ["C1700-MB-WIC1"] - }, - "1760": { - 0: ["C1700-MB-1FE"], - 1: ["C1700-MB-WIC1"] - }, - "2610": { - 0: ["C2600-MB-1E"], - 1: this.c2600_nms - }, - "2611": { - 0: ["C2600-MB-2E"], - 1: this.c2600_nms - }, - "2620": { - 0: ["C2600-MB-1FE"], - 1: this.c2600_nms - }, - "2621": { - 0: ["C2600-MB-2FE"], - 1: this.c2600_nms - }, - "2610XM": { - 0: ["C2600-MB-1FE"], - 1: this.c2600_nms - }, - "2611XM": { - 0: ["C2600-MB-2FE"], - 1: this.c2600_nms - }, - "2620XM": { - 0: ["C2600-MB-1FE"], - 1: this.c2600_nms - }, - "2621XM": { - 0: ["C2600-MB-2FE"], - 1: this.c2600_nms - }, - "2650XM": { - 0: ["C2600-MB-1FE"], - 1: this.c2600_nms - }, - "2651XM": { - 0: ["C2600-MB-2FE"], - 1: this.c2600_nms - }, - "3620": { - 0: this.c3600_nms, - 1: this.c3600_nms - }, - "3640": { - 0: this.c3600_nms, - 1: this.c3600_nms, - 2: this.c3600_nms, - 3: this.c3600_nms - }, - "3660": { - 0: ["Leopard-2FE"], - 1: this.c3600_nms, - 2: this.c3600_nms, - 3: this.c3600_nms, - 4: this.c3600_nms, - 5: this.c3600_nms, - 6: this.c3600_nms - } - }; - } - - getNetworkAdaptersForPlatform() { - let networkAdaptersForPlatform = {}; - networkAdaptersForPlatform["c2691"] = { - 0: ["GT96100-FE"], - 1: this.c3700_nms - }; - networkAdaptersForPlatform["c3725"] = { - 0: ["GT96100-FE"], - 1: this.c3700_nms, - 2: this.c3700_nms - }; - networkAdaptersForPlatform["c3745"] = { - 0: ["GT96100-FE"], - 1: this.c3700_nms, - 2: this.c3700_nms, - 3: this.c3700_nms, - 4: this.c3700_nms - }; - networkAdaptersForPlatform["c7200"] = { - 0: this.c7200_io, - 1: this.c7200_pas, - 2: this.c7200_pas, - 3: this.c7200_pas, - 4: this.c7200_pas, - 5: this.c7200_pas, - 6: this.c7200_pas - }; - - return { - "c2691": { - 0: ["GT96100-FE"], - 1: this.c3700_nms - }, - "c3725": { - 0: ["GT96100-FE"], - 1: this.c3700_nms, - 2: this.c3700_nms - }, - "c3745": { - 0: ["GT96100-FE"], - 1: this.c3700_nms, - 2: this.c3700_nms, - 3: this.c3700_nms, - 4: this.c3700_nms - }, - "c7200": { - 0: this.c7200_io, - 1: this.c7200_pas, - 2: this.c7200_pas, - 3: this.c7200_pas, - 4: this.c7200_pas, - 5: this.c7200_pas, - 6: this.c7200_pas - } - }; - } + return { + c2691: { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + }, + c3725: { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + 2: this.c3700_nms, + }, + c3745: { + 0: ['GT96100-FE'], + 1: this.c3700_nms, + 2: this.c3700_nms, + 3: this.c3700_nms, + 4: this.c3700_nms, + }, + c7200: { + 0: this.c7200_io, + 1: this.c7200_pas, + 2: this.c7200_pas, + 3: this.c7200_pas, + 4: this.c7200_pas, + 5: this.c7200_pas, + 6: this.c7200_pas, + }, + }; + } } diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index ae1f0704..8287e899 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,29 +7,33 @@ import { IosImage } from '../models/images/ios-image'; @Injectable() export class IosService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getImages(server: Server): Observable { - return this.httpServer.get(server, '/compute/dynamips/images') as Observable; - } + getImages(server: Server): Observable { + return this.httpServer.get(server, '/compute/dynamips/images') as Observable; + } - getImagePath(server: Server, filename: string): string { - return `${server.protocol}//${server.host}:${server.port}/v2/compute/dynamips/images/${filename}`; - } + getImagePath(server: Server, filename: string): string { + return `${server.protocol}//${server.host}:${server.port}/v2/compute/dynamips/images/${filename}`; + } - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - addTemplate(server: Server, iosTemplate: IosTemplate): Observable { - return this.httpServer.post(server, `/templates`, iosTemplate) as Observable; - } + addTemplate(server: Server, iosTemplate: IosTemplate): Observable { + return this.httpServer.post(server, `/templates`, iosTemplate) as Observable; + } - saveTemplate(server: Server, iosTemplate: IosTemplate): Observable { - return this.httpServer.put(server, `/templates/${iosTemplate.template_id}`, iosTemplate) as Observable; - } + saveTemplate(server: Server, iosTemplate: IosTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${iosTemplate.template_id}`, + iosTemplate + ) as Observable; + } } diff --git a/src/app/services/iou-configuration.service.ts b/src/app/services/iou-configuration.service.ts index 80cbabc8..6f978fab 100644 --- a/src/app/services/iou-configuration.service.ts +++ b/src/app/services/iou-configuration.service.ts @@ -1,18 +1,20 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class IouConfigurationService { - getConsoleTypes() { - return ['telnet', 'none']; - } + getConsoleTypes() { + return ['telnet', 'none']; + } - getCategories() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } } diff --git a/src/app/services/iou.service.ts b/src/app/services/iou.service.ts index 9dd95bed..34353e23 100644 --- a/src/app/services/iou.service.ts +++ b/src/app/services/iou.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,30 +7,33 @@ import { IouImage } from '../models/iou/iou-image'; @Injectable() export class IouService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - getImages(server: Server): Observable { - return this.httpServer.get(server, '/compute/iou/images') as Observable; - } + getImages(server: Server): Observable { + return this.httpServer.get(server, '/compute/iou/images') as Observable; + } - getImagePath(server: Server, filename: string): string { - return `${server.protocol}//${server.host}:${server.port}/v2/compute/iou/images/${filename}`; - } + getImagePath(server: Server, filename: string): string { + return `${server.protocol}//${server.host}:${server.port}/v2/compute/iou/images/${filename}`; + } - addTemplate(server: Server, iouTemplate: any): Observable { - return this.httpServer.post(server, `/templates`, iouTemplate) as Observable; - } + addTemplate(server: Server, iouTemplate: any): Observable { + return this.httpServer.post(server, `/templates`, iouTemplate) as Observable; + } - saveTemplate(server: Server, iouTemplate: any): Observable { - return this.httpServer.put(server, `/templates/${iouTemplate.template_id}`, iouTemplate) as Observable; - - } + saveTemplate(server: Server, iouTemplate: any): Observable { + return this.httpServer.put( + server, + `/templates/${iouTemplate.template_id}`, + iouTemplate + ) as Observable; + } } diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts index e532b615..b93b43e3 100644 --- a/src/app/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -19,7 +19,7 @@ describe('LinkService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, LinkService] + providers: [HttpServer, LinkService], }); httpClient = TestBed.get(HttpClient); @@ -64,11 +64,11 @@ describe('LinkService', () => { adapter_number: 2, label: { rotation: 0, - style: "font-size: 10; font-style: Verdana", + style: 'font-size: 10; font-style: Verdana', text: sourcePort.short_name, x: 0, - y: 0 - } + y: 0, + }, }, { node_id: 'targetid', @@ -76,13 +76,13 @@ describe('LinkService', () => { adapter_number: 4, label: { rotation: 0, - style: "font-size: 10; font-style: Verdana", + style: 'font-size: 10; font-style: Verdana', text: sourcePort.short_name, x: 10, - y: 10 - } - } - ] + y: 10, + }, + }, + ], }); })); }); diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts index b2cdc22f..cc9827b4 100644 --- a/src/app/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -14,8 +14,17 @@ import { CapturingSettings } from '../models/capturingSettings'; export class LinkService { constructor(private httpServer: HttpServer) {} - createLink(server: Server, source_node: Node, source_port: Port, target_node: Node, target_port: Port, - xLabelSourceNode: number, yLabelSourceNode: number, xLabelTargetNode: number, yLabelTargetNode: number) { + createLink( + server: Server, + source_node: Node, + source_port: Port, + target_node: Node, + target_port: Port, + xLabelSourceNode: number, + yLabelSourceNode: number, + xLabelTargetNode: number, + yLabelTargetNode: number + ) { return this.httpServer.post(server, `/projects/${source_node.project_id}/links`, { nodes: [ { @@ -24,11 +33,11 @@ export class LinkService { adapter_number: source_port.adapter_number, label: { rotation: 0, - style: "font-size: 10; font-style: Verdana", + style: 'font-size: 10; font-style: Verdana', text: source_port.short_name, x: xLabelSourceNode, - y: yLabelSourceNode - } + y: yLabelSourceNode, + }, }, { node_id: target_node.node_id, @@ -36,13 +45,13 @@ export class LinkService { adapter_number: target_port.adapter_number, label: { rotation: 0, - style: "font-size: 10; font-style: Verdana", + style: 'font-size: 10; font-style: Verdana', text: target_port.short_name, x: xLabelTargetNode, - y: yLabelTargetNode - } - } - ] + y: yLabelTargetNode, + }, + }, + ], }); } @@ -51,22 +60,25 @@ export class LinkService { } deleteLink(server: Server, link: Link) { - return this.httpServer.delete(server, `/projects/${link.project_id}/links/${link.link_id}`) + return this.httpServer.delete(server, `/projects/${link.project_id}/links/${link.link_id}`); } updateLink(server: Server, link: Link) { link.x = Math.round(link.x); link.y = Math.round(link.y); - + return this.httpServer.put(server, `/projects/${link.project_id}/links/${link.link_id}`, link); } getAvailableFilters(server: Server, link: Link) { - return this.httpServer.get(server, `/projects/${link.project_id}/links/${link.link_id}/available_filters`); + return this.httpServer.get( + server, + `/projects/${link.project_id}/links/${link.link_id}/available_filters` + ); } updateNodes(server: Server, link: Link, nodes: LinkNode[]) { - const requestNodes = nodes.map(linkNode => { + const requestNodes = nodes.map((linkNode) => { return { node_id: linkNode.node_id, port_number: linkNode.port_number, @@ -76,8 +88,8 @@ export class LinkService { style: linkNode.label.style, text: linkNode.label.text, x: linkNode.label.x, - y: linkNode.label.y - } + y: linkNode.label.y, + }, }; }); @@ -93,6 +105,6 @@ export class LinkService { } streamPcap(server: Server, link: Link) { - return this.httpServer.get(server, `/projects/${link.project_id}/links/${link.link_id}/pcap`) + return this.httpServer.get(server, `/projects/${link.project_id}/links/${link.link_id}/pcap`); } } diff --git a/src/app/services/mapScale.service.ts b/src/app/services/mapScale.service.ts index cae1ad87..ee5d1c68 100644 --- a/src/app/services/mapScale.service.ts +++ b/src/app/services/mapScale.service.ts @@ -3,28 +3,26 @@ import { Context } from '../cartography/models/context'; @Injectable() export class MapScaleService { - public currentScale: number; - public scaleChangeEmitter = new EventEmitter(); + public currentScale: number; + public scaleChangeEmitter = new EventEmitter(); - constructor( - private context: Context - ) { - this.currentScale = 1; - } + constructor(private context: Context) { + this.currentScale = 1; + } - getScale() { - return this.currentScale; - } + getScale() { + return this.currentScale; + } - setScale(newScale: number) { - this.currentScale = newScale; - this.context.transformation.k = this.currentScale; - this.scaleChangeEmitter.emit(this.currentScale); - } + setScale(newScale: number) { + this.currentScale = newScale; + this.context.transformation.k = this.currentScale; + this.scaleChangeEmitter.emit(this.currentScale); + } - resetToDefault() { - this.currentScale = 1; - this.context.transformation.k = this.currentScale; - this.scaleChangeEmitter.emit(this.currentScale); - } + resetToDefault() { + this.currentScale = 1; + this.context.transformation.k = this.currentScale; + this.scaleChangeEmitter.emit(this.currentScale); + } } diff --git a/src/app/services/mapsettings.service.ts b/src/app/services/mapsettings.service.ts index a54700c5..664e2b02 100644 --- a/src/app/services/mapsettings.service.ts +++ b/src/app/services/mapsettings.service.ts @@ -1,83 +1,84 @@ -import { Injectable, EventEmitter } from "@angular/core"; +import { Injectable, EventEmitter } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class MapSettingsService { - public symbolScalingSubject : Subject = new Subject(); - - public isScrollDisabled = new Subject(); - public isMapLocked = new Subject(); - public isTopologySummaryVisible: boolean = true; - public isLogConsoleVisible: boolean = false; - public isLayerNumberVisible: boolean = false; - public logConsoleSubject = new Subject(); - public mapRenderedEmitter = new EventEmitter(); + public symbolScalingSubject: Subject = new Subject(); - public showInterfaceLabels: boolean = true; - public integrateLinkLabelsToLinks: boolean = true; + public isScrollDisabled = new Subject(); + public isMapLocked = new Subject(); + public isTopologySummaryVisible: boolean = true; + public isLogConsoleVisible: boolean = false; + public isLayerNumberVisible: boolean = false; + public logConsoleSubject = new Subject(); + public mapRenderedEmitter = new EventEmitter(); - constructor() { - this.isLayerNumberVisible = localStorage.getItem('layersVisibility') === 'true' ? true : false; - if (localStorage.getItem('integrateLinkLabelsToLinks')) this.integrateLinkLabelsToLinks = localStorage.getItem('integrateLinkLabelsToLinks') === 'true' ? true : false; - - let isSymbolScalingEnabled = true; - if (localStorage.getItem('symbolScaling')) { - isSymbolScalingEnabled = localStorage.getItem('symbolScaling') === 'true' ? true : false; - } else { - localStorage.setItem('symbolScaling', 'true'); - } + public showInterfaceLabels: boolean = true; + public integrateLinkLabelsToLinks: boolean = true; + + constructor() { + this.isLayerNumberVisible = localStorage.getItem('layersVisibility') === 'true' ? true : false; + if (localStorage.getItem('integrateLinkLabelsToLinks')) + this.integrateLinkLabelsToLinks = localStorage.getItem('integrateLinkLabelsToLinks') === 'true' ? true : false; + + let isSymbolScalingEnabled = true; + if (localStorage.getItem('symbolScaling')) { + isSymbolScalingEnabled = localStorage.getItem('symbolScaling') === 'true' ? true : false; + } else { + localStorage.setItem('symbolScaling', 'true'); } + } - public getSymbolScaling() : boolean { - return localStorage.getItem('symbolScaling') === 'true' ? true : false; - } + public getSymbolScaling(): boolean { + return localStorage.getItem('symbolScaling') === 'true' ? true : false; + } - public setSymbolScaling(value: boolean) { - if (value) { - localStorage.setItem('symbolScaling', 'true'); - } else { - localStorage.setItem('symbolScaling', 'false'); - } - this.symbolScalingSubject.next(value); + public setSymbolScaling(value: boolean) { + if (value) { + localStorage.setItem('symbolScaling', 'true'); + } else { + localStorage.setItem('symbolScaling', 'false'); } + this.symbolScalingSubject.next(value); + } - changeMapLockValue(value: boolean) { - this.isMapLocked.next(value); - } + changeMapLockValue(value: boolean) { + this.isMapLocked.next(value); + } - setConsoleContextMenuAction(action: string) { - localStorage.setItem('consoleContextMenu', action); - } + setConsoleContextMenuAction(action: string) { + localStorage.setItem('consoleContextMenu', action); + } - getConsoleContextManuAction(): string { - return localStorage.getItem('consoleContextMenu'); - } + getConsoleContextManuAction(): string { + return localStorage.getItem('consoleContextMenu'); + } - toggleTopologySummary(value: boolean) { - this.isTopologySummaryVisible = value; - } + toggleTopologySummary(value: boolean) { + this.isTopologySummaryVisible = value; + } - toggleLogConsole(value: boolean) { - this.isLogConsoleVisible = value; - } + toggleLogConsole(value: boolean) { + this.isLogConsoleVisible = value; + } - toggleLayers(value: boolean) { - this.isLayerNumberVisible = value; - } + toggleLayers(value: boolean) { + this.isLayerNumberVisible = value; + } - toggleShowInterfaceLabels(value: boolean) { - this.showInterfaceLabels = value; - } + toggleShowInterfaceLabels(value: boolean) { + this.showInterfaceLabels = value; + } - toggleIntegrateInterfaceLabels(value: boolean) { - this.integrateLinkLabelsToLinks = value; - localStorage.removeItem('integrateLinkLabelsToLinks'); - if (value) { - localStorage.setItem('integrateLinkLabelsToLinks', 'true'); - } else { - localStorage.setItem('integrateLinkLabelsToLinks', 'false'); - } + toggleIntegrateInterfaceLabels(value: boolean) { + this.integrateLinkLabelsToLinks = value; + localStorage.removeItem('integrateLinkLabelsToLinks'); + if (value) { + localStorage.setItem('integrateLinkLabelsToLinks', 'true'); + } else { + localStorage.setItem('integrateLinkLabelsToLinks', 'false'); } + } } diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts index 44feb302..f1b48866 100644 --- a/src/app/services/node.service.spec.ts +++ b/src/app/services/node.service.spec.ts @@ -22,7 +22,7 @@ describe('NodeService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, NodeService] + providers: [HttpServer, NodeService], }); httpClient = TestBed.get(HttpClient); @@ -64,7 +64,7 @@ describe('NodeService', () => { expect(req.request.body).toEqual({}); })); - it('should suspend node', inject([NodeService], (service:NodeService) => { + it('should suspend node', inject([NodeService], (service: NodeService) => { const node = new Node(); node.project_id = 'myproject'; node.node_id = 'id'; @@ -76,7 +76,7 @@ describe('NodeService', () => { expect(req.request.body).toEqual({}); })); - it('should reload node', inject([NodeService], (service:NodeService) => { + it('should reload node', inject([NodeService], (service: NodeService) => { const node = new Node(); node.project_id = 'myproject'; node.node_id = 'id'; @@ -90,7 +90,7 @@ describe('NodeService', () => { it('should start all nodes', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; service.startAll(server, project).subscribe(); @@ -102,7 +102,7 @@ describe('NodeService', () => { it('should stop all nodes', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; service.stopAll(server, project).subscribe(); @@ -114,7 +114,7 @@ describe('NodeService', () => { it('should suspend all nodes', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; service.suspendAll(server, project).subscribe(); @@ -126,7 +126,7 @@ describe('NodeService', () => { it('should reload all nodes', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; service.reloadAll(server, project).subscribe(); @@ -149,13 +149,13 @@ describe('NodeService', () => { expect(req.request.body).toEqual({ x: 10, y: 20, - compute_id: 'compute' + compute_id: 'compute', }); })); it('should updatePosition of node', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; const node = new Node(); node.project_id = 'myproject'; @@ -167,13 +167,13 @@ describe('NodeService', () => { expect(req.request.method).toEqual('PUT'); expect(req.request.body).toEqual({ x: 10, - y: 20 + y: 20, }); })); it('should updatePosition of node and round to integer', inject([NodeService], (service: NodeService) => { let project = { - project_id: '1' + project_id: '1', } as Project; const node = new Node(); node.project_id = 'myproject'; @@ -185,7 +185,7 @@ describe('NodeService', () => { expect(req.request.method).toEqual('PUT'); expect(req.request.body).toEqual({ x: 10, - y: 21 + y: 21, }); })); @@ -211,8 +211,8 @@ describe('NodeService', () => { style: 'my style', text: 'my text', x: 10, - y: 20 - } + y: 20, + }, }); })); @@ -231,7 +231,7 @@ describe('NodeService', () => { expect(req.request.body).toEqual({ x: 10, y: 20, - z: 30 + z: 30, }); })); @@ -248,12 +248,14 @@ describe('NodeService', () => { it('should duplicate node', inject([NodeService], (service: NodeService) => { const node = new Node(); - node.project_id = "project_id_1"; - node.node_id = "node_id_1"; + node.project_id = 'project_id_1'; + node.node_id = 'node_id_1'; service.duplicate(server, node).subscribe(); - const req = httpTestingController.expectOne(`http://127.0.0.1:3080/v2/projects/${node.project_id}/nodes/${node.node_id}/duplicate`); + const req = httpTestingController.expectOne( + `http://127.0.0.1:3080/v2/projects/${node.project_id}/nodes/${node.node_id}/duplicate` + ); expect(req.request.method).toEqual('POST'); })); }); diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts index 38db62ce..2b18797b 100644 --- a/src/app/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -49,18 +49,25 @@ export class NodeService { return this.httpServer.post(server, `/projects/${project.project_id}/nodes/reload`, {}); } - createFromTemplate(server: Server, project: Project, template: Template, x: number, y: number, compute_id: string): Observable { + createFromTemplate( + server: Server, + project: Project, + template: Template, + x: number, + y: number, + compute_id: string + ): Observable { if (!compute_id) { return this.httpServer.post(server, `/projects/${project.project_id}/templates/${template.template_id}`, { x: Math.round(x), y: Math.round(y), - compute_id: 'local' + compute_id: 'local', }); - } + } return this.httpServer.post(server, `/projects/${project.project_id}/templates/${template.template_id}`, { x: Math.round(x), y: Math.round(y), - compute_id: compute_id + compute_id: compute_id, }); } @@ -69,16 +76,16 @@ export class NodeService { let yPosition: number = Math.round(y); if (project.snap_to_grid) { - xPosition = Math.round((xPosition + node.width/2) / project.grid_size) * project.grid_size; - yPosition = Math.round((yPosition + node.height/2) / project.grid_size) * project.grid_size; + xPosition = Math.round((xPosition + node.width / 2) / project.grid_size) * project.grid_size; + yPosition = Math.round((yPosition + node.height / 2) / project.grid_size) * project.grid_size; - xPosition = Math.round(xPosition - node.width/2); - yPosition = Math.round(yPosition - node.height/2); + xPosition = Math.round(xPosition - node.width / 2); + yPosition = Math.round(yPosition - node.height / 2); } return this.httpServer.put(server, `/projects/${node.project_id}/nodes/${node.node_id}`, { x: xPosition, - y: yPosition + y: yPosition, }); } @@ -89,14 +96,14 @@ export class NodeService { style: label.style, text: label.text, x: Math.round(label.x), - y: Math.round(label.y) - } + y: Math.round(label.y), + }, }); } updateSymbol(server: Server, node: Node, changedSymbol: string): Observable { return this.httpServer.put(server, `/projects/${node.project_id}/nodes/${node.node_id}`, { - symbol: changedSymbol + symbol: changedSymbol, }); } @@ -104,7 +111,7 @@ export class NodeService { return this.httpServer.put(server, `/projects/${node.project_id}/nodes/${node.node_id}`, { x: Math.round(node.x), y: Math.round(node.y), - z: node.z + z: node.z, }); } @@ -114,7 +121,7 @@ export class NodeService { console_auto_start: node.console_auto_start, locked: node.locked, name: node.name, - properties: node.properties + properties: node.properties, }); } @@ -124,7 +131,7 @@ export class NodeService { console_auto_start: node.console_auto_start, custom_adapters: node.custom_adapters, name: node.name, - properties: node.properties + properties: node.properties, }); } @@ -133,11 +140,10 @@ export class NodeService { } duplicate(server: Server, node: Node) { - return this.httpServer.post(server, `/projects/${node.project_id}/nodes/${node.node_id}/duplicate`, - { - "x": node.x + 10, - "y": node.y + 10, - "z": node.z + return this.httpServer.post(server, `/projects/${node.project_id}/nodes/${node.node_id}/duplicate`, { + x: node.x + 10, + y: node.y + 10, + z: node.z, }); } @@ -150,11 +156,19 @@ export class NodeService { } getNetworkConfiguration(server: Server, node: Node) { - return this.httpServer.get(server, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, { responseType: 'text' as 'json'}); + return this.httpServer.get( + server, + `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, + { responseType: 'text' as 'json' } + ); } saveNetworkConfiguration(server: Server, node: Node, configuration: string) { - return this.httpServer.post(server, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, configuration); + return this.httpServer.post( + server, + `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, + configuration + ); } getStartupConfiguration(server: Server, node: Node) { @@ -168,7 +182,7 @@ export class NodeService { urlPath += `/files/configs/i${node.node_id}_startup-config.cfg`; } - return this.httpServer.get(server, urlPath, { responseType: 'text' as 'json'}); + return this.httpServer.get(server, urlPath, { responseType: 'text' as 'json' }); } getPrivateConfiguration(server: Server, node: Node) { @@ -180,11 +194,11 @@ export class NodeService { urlPath += `/files/configs/i${node.node_id}_private-config.cfg`; } - return this.httpServer.get(server, urlPath, { responseType: 'text' as 'json'}); + return this.httpServer.get(server, urlPath, { responseType: 'text' as 'json' }); } saveConfiguration(server: Server, node: Node, configuration: string) { - let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}` + let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'vpcs') { urlPath += '/files/startup.vpc'; @@ -198,7 +212,7 @@ export class NodeService { } savePrivateConfiguration(server: Server, node: Node, configuration: string) { - let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}` + let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'iou') { urlPath += '/files/private-config.cfg'; diff --git a/src/app/services/nodeConsole.service.ts b/src/app/services/nodeConsole.service.ts index 8c5d6aaf..7e316363 100644 --- a/src/app/services/nodeConsole.service.ts +++ b/src/app/services/nodeConsole.service.ts @@ -58,6 +58,6 @@ export class NodeConsoleService { } export interface ConsoleResizedEvent { - width: number, - height: number + width: number; + height: number; } diff --git a/src/app/services/packet-capture.service.ts b/src/app/services/packet-capture.service.ts index b6f36153..0b25dc99 100644 --- a/src/app/services/packet-capture.service.ts +++ b/src/app/services/packet-capture.service.ts @@ -1,13 +1,15 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { Server } from '../models/server'; import { Project } from '../models/project'; import { Link } from '../models/link'; @Injectable() export class PacketCaptureService { - constructor() {} + constructor() {} - startCapture(server: Server, project: Project, link: Link, name: string) { - location.assign(`gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}`); - } + startCapture(server: Server, project: Project, link: Link, name: string) { + location.assign( + `gns3+pcap://${server.host}:${server.port}?project_id=${project.project_id}&link_id=${link.link_id}&name=${name}` + ); + } } diff --git a/src/app/services/platform.service.spec.ts b/src/app/services/platform.service.spec.ts index 7a49f5de..a1e04e38 100644 --- a/src/app/services/platform.service.spec.ts +++ b/src/app/services/platform.service.spec.ts @@ -5,7 +5,7 @@ import { ElectronService } from 'ngx-electron'; class ElectronServiceMock { process = { - platform: 'unknown' + platform: 'unknown', }; } @@ -19,16 +19,13 @@ describe('PlatformService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ - PlatformService, - {provide: ElectronService, useValue: electronServiceMock} - ] + providers: [PlatformService, { provide: ElectronService, useValue: electronServiceMock }], }); }); beforeEach(() => { service = TestBed.get(PlatformService); - }) + }); it('should be created', () => { expect(service).toBeTruthy(); diff --git a/src/app/services/platform.service.ts b/src/app/services/platform.service.ts index 58f6b5df..ac5591b6 100644 --- a/src/app/services/platform.service.ts +++ b/src/app/services/platform.service.ts @@ -3,10 +3,7 @@ import { ElectronService } from 'ngx-electron'; @Injectable() export class PlatformService { - - constructor( - private electronService: ElectronService - ) { } + constructor(private electronService: ElectronService) {} isWindows() { return this.electronService.process.platform === 'win32'; diff --git a/src/app/services/project.service.spec.ts b/src/app/services/project.service.spec.ts index 38a23743..ebc9e3f8 100644 --- a/src/app/services/project.service.spec.ts +++ b/src/app/services/project.service.spec.ts @@ -63,7 +63,12 @@ describe('ProjectService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, ProjectService, RecentlyOpenedProjectService, { provide: SettingsService, useClass: MockedSettingsService }] + providers: [ + HttpServer, + ProjectService, + RecentlyOpenedProjectService, + { provide: SettingsService, useClass: MockedSettingsService }, + ], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts index 8392eacf..3a60aa77 100644 --- a/src/app/services/project.service.ts +++ b/src/app/services/project.service.ts @@ -14,7 +14,7 @@ export class ProjectService { public projectListSubject = new Subject(); constructor( - private httpServer: HttpServer, + private httpServer: HttpServer, private settingsService: SettingsService, private recentlyOpenedProjectService: RecentlyOpenedProjectService ) {} @@ -56,7 +56,7 @@ export class ProjectService { return this.httpServer.post(server, `/projects`, { name: project_name, project_id: project_id }); } - update(server: Server, project: Project) : Observable { + update(server: Server, project: Project): Observable { return this.httpServer.put(server, `/projects/${project.project_id}`, { auto_close: project.auto_close, auto_open: project.auto_open, @@ -66,7 +66,7 @@ export class ProjectService { name: project.name, scene_width: project.scene_width, scene_height: project.scene_height, - show_interface_labels: project.show_interface_labels + show_interface_labels: project.show_interface_labels, }); } @@ -83,13 +83,13 @@ export class ProjectService { } export(server: Server, project_id: string): Observable { - return this.httpServer.get(server, `/projects/${project_id}/export`) + return this.httpServer.get(server, `/projects/${project_id}/export`); } getStatistics(server: Server, project_id: string): Observable { return this.httpServer.get(server, `/projects/${project_id}/stats`); } - + duplicate(server: Server, project_id: string, project_name): Observable { return this.httpServer.post(server, `/projects/${project_id}/duplicate`, { name: project_name }); } diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts index c9fedcf8..c4e8c675 100644 --- a/src/app/services/qemu-configuration.service.ts +++ b/src/app/services/qemu-configuration.service.ts @@ -1,103 +1,106 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class QemuConfigurationService { - getConsoleTypes(){ - return ['telnet', 'vnc', 'spice', 'spice+agent', 'none']; - } + getConsoleTypes() { + return ['telnet', 'vnc', 'spice', 'spice+agent', 'none']; + } - getDiskInterfaces() { - return ['ide', 'sata', 'scsi', 'sd', 'mtd', 'floppy', 'pflash', 'virtio', 'nvme', 'none']; - } + getDiskInterfaces() { + return ['ide', 'sata', 'scsi', 'sd', 'mtd', 'floppy', 'pflash', 'virtio', 'nvme', 'none']; + } - getNetworkTypes() { - // needs extending of custom adapter component - // let networkTypes = [["e1000", "Intel Gigabit Ethernet"], - // ["i82550", "Intel i82550 Ethernet"], - // ["i82551", "Intel i82551 Ethernet"], - // ["i82557a", "Intel i82557A Ethernet"], - // ["i82557b", "Intel i82557B Ethernet"], - // ["i82557c", "Intel i82557C Ethernet"], - // ["i82558a", "Intel i82558A Ethernet"], - // ["i82558b", "Intel i82558B Ethernet"], - // ["i82559a", "Intel i82559A Ethernet"], - // ["i82559b", "Intel i82559B Ethernet"], - // ["i82559c", "Intel i82559C Ethernet"], - // ["i82559er", "Intel i82559ER Ethernet"], - // ["i82562", "Intel i82562 Ethernet"], - // ["i82801", "Intel i82801 Ethernet"], - // ["ne2k_pci", "NE2000 Ethernet"], - // ["pcnet", "AMD PCNet Ethernet"], - // ["rtl8139", "Realtek 8139 Ethernet"], - // ["virtio", "Legacy paravirtualized Network I/O"], - // ["virtio-net-pci", "Paravirtualized Network I/O"], - // ["vmxnet3", "VMWare Paravirtualized Ethernet v3"]]; + getNetworkTypes() { + // needs extending of custom adapter component + // let networkTypes = [["e1000", "Intel Gigabit Ethernet"], + // ["i82550", "Intel i82550 Ethernet"], + // ["i82551", "Intel i82551 Ethernet"], + // ["i82557a", "Intel i82557A Ethernet"], + // ["i82557b", "Intel i82557B Ethernet"], + // ["i82557c", "Intel i82557C Ethernet"], + // ["i82558a", "Intel i82558A Ethernet"], + // ["i82558b", "Intel i82558B Ethernet"], + // ["i82559a", "Intel i82559A Ethernet"], + // ["i82559b", "Intel i82559B Ethernet"], + // ["i82559c", "Intel i82559C Ethernet"], + // ["i82559er", "Intel i82559ER Ethernet"], + // ["i82562", "Intel i82562 Ethernet"], + // ["i82801", "Intel i82801 Ethernet"], + // ["ne2k_pci", "NE2000 Ethernet"], + // ["pcnet", "AMD PCNet Ethernet"], + // ["rtl8139", "Realtek 8139 Ethernet"], + // ["virtio", "Legacy paravirtualized Network I/O"], + // ["virtio-net-pci", "Paravirtualized Network I/O"], + // ["vmxnet3", "VMWare Paravirtualized Ethernet v3"]]; - let networkTypes = ["e1000", - "e1000-82544gc", - "e1000-82545em", - "e1000e", - "rocker", - "Intel Gigabit Ethernet", - "i82550", - "i82551", - "i82557a", - "i82557b", - "i82557c", - "i82558a", - "i82558b", - "i82559a", - "i82559b", - "i82559c", - "i82559er", - "i82562", - "i82801", - "ne2k_pci", - "pcnet", - "rtl8139", - "virtio", - "virtio-net-pci", - "vmxnet3"]; + let networkTypes = [ + 'e1000', + 'e1000-82544gc', + 'e1000-82545em', + 'e1000e', + 'rocker', + 'Intel Gigabit Ethernet', + 'i82550', + 'i82551', + 'i82557a', + 'i82557b', + 'i82557c', + 'i82558a', + 'i82558b', + 'i82559a', + 'i82559b', + 'i82559c', + 'i82559er', + 'i82562', + 'i82801', + 'ne2k_pci', + 'pcnet', + 'rtl8139', + 'virtio', + 'virtio-net-pci', + 'vmxnet3', + ]; - return networkTypes; - } + return networkTypes; + } - getBootPriorities() { - let bootPriorities = [["HDD", "c"], - ["CD/DVD-ROM", "d"], - ["Network", "n"], - ["HDD or Network", "cn"], - ["HDD or CD/DVD-ROM", "cd"]]; + getBootPriorities() { + let bootPriorities = [ + ['HDD', 'c'], + ['CD/DVD-ROM', 'd'], + ['Network', 'n'], + ['HDD or Network', 'cn'], + ['HDD or CD/DVD-ROM', 'cd'], + ]; - return bootPriorities; - } + return bootPriorities; + } - getOnCloseOptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], - ["Save the VM state", "save_vm_state"]]; + getOnCloseOptions() { + let onCloseOptions = [ + ['Power off the VM', 'power_off'], + ['Send the shutdown signal (ACPI)', 'shutdown_signal'], + ['Save the VM state', 'save_vm_state'], + ]; - return onCloseOptions; - } + return onCloseOptions; + } - getCategories() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getPriorities() { - let priorities = ["realtime", - "very high", - "high", - "normal", - "low", - "very low"]; + getPriorities() { + let priorities = ['realtime', 'very high', 'high', 'normal', 'low', 'very low']; - return priorities; - } + return priorities; + } } diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index b8196a7d..5a036aa8 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -9,134 +9,134 @@ import { QemuService } from './qemu.service'; import { QemuTemplate } from '../models/templates/qemu-template'; describe('QemuService', () => { - let httpClient: HttpClient; - let httpTestingController: HttpTestingController; - let httpServer: HttpServer; - let server: Server; + let httpClient: HttpClient; + let httpTestingController: HttpTestingController; + let httpServer: HttpServer; + let server: Server; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, QemuService] - }); - - httpClient = TestBed.get(HttpClient); - httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); - server = getTestServer(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, QemuService], }); - afterEach(() => { - httpTestingController.verify(); - }); + httpClient = TestBed.get(HttpClient); + httpTestingController = TestBed.get(HttpTestingController); + httpServer = TestBed.get(HttpServer); + server = getTestServer(); + }); - it('should be created', inject([QemuService], (service: QemuService) => { - expect(service).toBeTruthy(); - })); + afterEach(() => { + httpTestingController.verify(); + }); - it('should update qemu template', inject([QemuService], (service: QemuService) => { - const template : QemuTemplate = { - adapter_type: 'e1000', - adapters: 4, - bios_image: '', - boot_priority: 'c', - builtin: false, - category: 'guest', - cdrom_image: '', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - cpu_throttling: 0, - cpus: 1, - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - hda_disk_image: '', - hda_disk_interface: 'ide', - hdb_disk_image: '', - hdb_disk_interface: 'ide', - hdc_disk_image: '', - hdc_disk_interface: 'ide', - hdd_disk_image: '', - hdd_disk_interface: 'ide', - initrd: '', - kernel_command_line: '', - kernel_image: '', - legacy_networking: false, - linked_clone: true, - mac_address: '', - name: '', - on_close: 'power_off', - options: '-nographic', - platform: '', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - process_priority: 'normal', - qemu_path: '', - ram: 256, - symbol: ':/symbols/qemu_guest.svg', - template_id: '1', - template_type: 'qemu', - usage: '' - } + it('should be created', inject([QemuService], (service: QemuService) => { + expect(service).toBeTruthy(); + })); - service.saveTemplate(server, template).subscribe(); + it('should update qemu template', inject([QemuService], (service: QemuService) => { + const template: QemuTemplate = { + adapter_type: 'e1000', + adapters: 4, + bios_image: '', + boot_priority: 'c', + builtin: false, + category: 'guest', + cdrom_image: '', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + cpu_throttling: 0, + cpus: 1, + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + hda_disk_image: '', + hda_disk_interface: 'ide', + hdb_disk_image: '', + hdb_disk_interface: 'ide', + hdc_disk_image: '', + hdc_disk_interface: 'ide', + hdd_disk_image: '', + hdd_disk_interface: 'ide', + initrd: '', + kernel_command_line: '', + kernel_image: '', + legacy_networking: false, + linked_clone: true, + mac_address: '', + name: '', + on_close: 'power_off', + options: '-nographic', + platform: '', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + process_priority: 'normal', + qemu_path: '', + ram: 256, + symbol: ':/symbols/qemu_guest.svg', + template_id: '1', + template_type: 'qemu', + usage: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(template); - })); + service.saveTemplate(server, template).subscribe(); - it('should add qemu template', inject([QemuService], (service: QemuService) => { - const template : QemuTemplate = { - adapter_type: 'e1000', - adapters: 4, - bios_image: '', - boot_priority: 'c', - builtin: false, - category: 'guest', - cdrom_image: '', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - cpu_throttling: 0, - cpus: 1, - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - hda_disk_image: '', - hda_disk_interface: 'ide', - hdb_disk_image: '', - hdb_disk_interface: 'ide', - hdc_disk_image: '', - hdc_disk_interface: 'ide', - hdd_disk_image: '', - hdd_disk_interface: 'ide', - initrd: '', - kernel_command_line: '', - kernel_image: '', - legacy_networking: false, - linked_clone: true, - mac_address: '', - name: '', - on_close: 'power_off', - options: '-nographic', - platform: '', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - process_priority: 'normal', - qemu_path: '', - ram: 256, - symbol: ':/symbols/qemu_guest.svg', - template_id: '', - template_type: 'qemu', - usage: '' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(template); + })); - service.addTemplate(server, template).subscribe(); + it('should add qemu template', inject([QemuService], (service: QemuService) => { + const template: QemuTemplate = { + adapter_type: 'e1000', + adapters: 4, + bios_image: '', + boot_priority: 'c', + builtin: false, + category: 'guest', + cdrom_image: '', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + cpu_throttling: 0, + cpus: 1, + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + hda_disk_image: '', + hda_disk_interface: 'ide', + hdb_disk_image: '', + hdb_disk_interface: 'ide', + hdc_disk_image: '', + hdc_disk_interface: 'ide', + hdd_disk_image: '', + hdd_disk_interface: 'ide', + initrd: '', + kernel_command_line: '', + kernel_image: '', + legacy_networking: false, + linked_clone: true, + mac_address: '', + name: '', + on_close: 'power_off', + options: '-nographic', + platform: '', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + process_priority: 'normal', + qemu_path: '', + ram: 256, + symbol: ':/symbols/qemu_guest.svg', + template_id: '', + template_type: 'qemu', + usage: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(template); - })); + service.addTemplate(server, template).subscribe(); + + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(template); + })); }); diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts index f9f94afc..8099618a 100644 --- a/src/app/services/qemu.service.ts +++ b/src/app/services/qemu.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Observable } from 'rxjs'; import { QemuTemplate } from '../models/templates/qemu-template'; @@ -9,37 +9,41 @@ import { QemuImg } from '../models/qemu/qemu-img'; @Injectable() export class QemuService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - getImagePath(server: Server, filename: string): string { - return `${server.protocol}//${server.host}:${server.port}/v2/compute/qemu/images/${filename}`; - } + getImagePath(server: Server, filename: string): string { + return `${server.protocol}//${server.host}:${server.port}/v2/compute/qemu/images/${filename}`; + } - getBinaries(server: Server): Observable { - return this.httpServer.get(server, '/computes/local/qemu/binaries') as Observable; - } + getBinaries(server: Server): Observable { + return this.httpServer.get(server, '/computes/local/qemu/binaries') as Observable; + } - getImages(server: Server): Observable { - return this.httpServer.get(server, '/compute/qemu/images') as Observable; - } + getImages(server: Server): Observable { + return this.httpServer.get(server, '/compute/qemu/images') as Observable; + } - addImage(server: Server, qemuImg: QemuImg): Observable { - return this.httpServer.post(server, '/compute/qemu/img', qemuImg) as Observable; - } - - addTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { - return this.httpServer.post(server, `/templates`, qemuTemplate) as Observable; - } + addImage(server: Server, qemuImg: QemuImg): Observable { + return this.httpServer.post(server, '/compute/qemu/img', qemuImg) as Observable; + } - saveTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { - return this.httpServer.put(server, `/templates/${qemuTemplate.template_id}`, qemuTemplate) as Observable; - } + addTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { + return this.httpServer.post(server, `/templates`, qemuTemplate) as Observable; + } + + saveTemplate(server: Server, qemuTemplate: QemuTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${qemuTemplate.template_id}`, + qemuTemplate + ) as Observable; + } } diff --git a/src/app/services/recentlyOpenedProject.service.ts b/src/app/services/recentlyOpenedProject.service.ts index 4c7e1313..d9753e96 100644 --- a/src/app/services/recentlyOpenedProject.service.ts +++ b/src/app/services/recentlyOpenedProject.service.ts @@ -2,37 +2,36 @@ import { Injectable } from '@angular/core'; @Injectable() export class RecentlyOpenedProjectService { - private serverId: string; - private projectId: string; + private serverId: string; + private projectId: string; - private serverIdProjectList: string; - - setServerId(serverId: string) { - this.serverId = serverId; - } + private serverIdProjectList: string; - setProjectId(projectId: string) { - this.projectId = projectId; - } + setServerId(serverId: string) { + this.serverId = serverId; + } - setServerIdProjectList(serverId: string) { - this.serverIdProjectList = serverId; - } + setProjectId(projectId: string) { + this.projectId = projectId; + } - getServerId() : string { - return this.serverId; - } + setServerIdProjectList(serverId: string) { + this.serverIdProjectList = serverId; + } - getProjectId() : string { - return this.projectId; - } + getServerId(): string { + return this.serverId; + } - getServerIdProjectList() : string { - return this.serverIdProjectList; - } - - removeData() { - this.serverId = '', - this.projectId = '' - } + getProjectId(): string { + return this.projectId; + } + + getServerIdProjectList(): string { + return this.serverIdProjectList; + } + + removeData() { + (this.serverId = ''), (this.projectId = ''); + } } diff --git a/src/app/services/server-management.service.spec.ts b/src/app/services/server-management.service.spec.ts index 68036d60..12a6e785 100644 --- a/src/app/services/server-management.service.spec.ts +++ b/src/app/services/server-management.service.spec.ts @@ -6,7 +6,7 @@ import { Server } from '../models/server'; describe('ServerManagementService', () => { let electronService; - let callbacks + let callbacks; let removed; let server; @@ -20,12 +20,12 @@ describe('ServerManagementService', () => { on: (channel, callback) => { callbacks.push({ channel: channel, - callback: callback + callback: callback, }); }, removeAllListeners: (name) => { removed.push(name); - } + }, }, remote: { require: (file) => { @@ -35,19 +35,18 @@ describe('ServerManagementService', () => { }, stopLocalServer: (serv) => { server = serv; - } - } - } - } + }, + }; + }, + }, }; - }) - - beforeEach(() => TestBed.configureTestingModule({ - providers: [ - { provide: ElectronService, useValue: electronService}, - ServerManagementService - ] - })); + }); + + beforeEach(() => + TestBed.configureTestingModule({ + providers: [{ provide: ElectronService, useValue: electronService }, ServerManagementService], + }) + ); it('should be created', () => { const service: ServerManagementService = TestBed.get(ServerManagementService); @@ -81,13 +80,13 @@ describe('ServerManagementService', () => { it('should start local server', async () => { const service: ServerManagementService = TestBed.get(ServerManagementService); - await service.start({ name: 'test'} as Server); - expect(server).toEqual({ name: 'test'}); + await service.start({ name: 'test' } as Server); + expect(server).toEqual({ name: 'test' }); }); it('should stop local server', async () => { const service: ServerManagementService = TestBed.get(ServerManagementService); - await service.stop({ name: 'test2'} as Server); - expect(server).toEqual({ name: 'test2'}); + await service.stop({ name: 'test2' } as Server); + expect(server).toEqual({ name: 'test2' }); }); }); diff --git a/src/app/services/server-management.service.ts b/src/app/services/server-management.service.ts index 45778732..661e43fd 100644 --- a/src/app/services/server-management.service.ts +++ b/src/app/services/server-management.service.ts @@ -5,19 +5,16 @@ import { Subject } from 'rxjs'; export interface ServerStateEvent { serverName: string; - status: "starting" | "started" | "errored" | "stopped" | "stderr"; + status: 'starting' | 'started' | 'errored' | 'stopped' | 'stderr'; message: string; } @Injectable() export class ServerManagementService implements OnDestroy { - serverStatusChanged = new Subject(); - constructor( - private electronService: ElectronService - ) { - if(this.electronService.isElectronApp) { + constructor(private electronService: ElectronService) { + if (this.electronService.isElectronApp) { this.electronService.ipcRenderer.on(this.statusChannel, (event, data) => { this.serverStatusChanged.next(data); }); @@ -29,10 +26,10 @@ export class ServerManagementService implements OnDestroy { } async start(server: Server) { - var startingEvent : ServerStateEvent = { + var startingEvent: ServerStateEvent = { serverName: server.name, - status: "starting", - message: '' + status: 'starting', + message: '', }; this.serverStatusChanged.next(startingEvent); return await this.electronService.remote.require('./local-server.js').startLocalServer(server); @@ -47,14 +44,14 @@ export class ServerManagementService implements OnDestroy { } getRunningServers() { - if(this.electronService.isElectronApp) { + if (this.electronService.isElectronApp) { return this.electronService.remote.require('./local-server.js').getRunningServers(); } return []; } ngOnDestroy() { - if(this.electronService.isElectronApp) { + if (this.electronService.isElectronApp) { this.electronService.ipcRenderer.removeAllListeners(this.statusChannel); } } diff --git a/src/app/services/server-settings.service.spec.ts b/src/app/services/server-settings.service.spec.ts index 7637cc92..ae934fe0 100644 --- a/src/app/services/server-settings.service.spec.ts +++ b/src/app/services/server-settings.service.spec.ts @@ -8,28 +8,28 @@ import { AppTestingModule } from '../testing/app-testing/app-testing.module'; import { of } from 'rxjs'; export class MockedServerSettingsService { - getSettingsForQemu(server: Server) { - return of([]); - } + getSettingsForQemu(server: Server) { + return of([]); + } - updateSettingsForQemu(server: Server, qemuSettings: QemuSettings) { - return of([]); - } + updateSettingsForQemu(server: Server, qemuSettings: QemuSettings) { + return of([]); + } } describe('ServerSettingsService', () => { - let httpServer: HttpServer; + let httpServer: HttpServer; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, ServerSettingsService] - }); - - httpServer = TestBed.get(HttpServer); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, ServerSettingsService], }); - it('should be created', inject([ServerSettingsService], (service: ServerSettingsService) => { - expect(service).toBeTruthy(); - })); + httpServer = TestBed.get(HttpServer); + }); + + it('should be created', inject([ServerSettingsService], (service: ServerSettingsService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/src/app/services/server-settings.service.ts b/src/app/services/server-settings.service.ts index 6df377f0..2bdbe7d9 100644 --- a/src/app/services/server-settings.service.ts +++ b/src/app/services/server-settings.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { ServerSettings } from '../models/serverSettings'; @@ -6,26 +6,24 @@ import { QemuSettings } from '../models/settings/qemu-settings'; @Injectable() export class ServerSettingsService { - constructor( - private httpServer: HttpServer - ){} + constructor(private httpServer: HttpServer) {} - get(server: Server) { - return this.httpServer.get(server, `/settings`); - } + get(server: Server) { + return this.httpServer.get(server, `/settings`); + } - update(server: Server, serverSettings: ServerSettings) { - return this.httpServer.post(server, `/settings`, serverSettings); - } + update(server: Server, serverSettings: ServerSettings) { + return this.httpServer.post(server, `/settings`, serverSettings); + } - getSettingsForQemu(server: Server) { - return this.httpServer.get(server, `/settings/qemu`); - } + getSettingsForQemu(server: Server) { + return this.httpServer.get(server, `/settings/qemu`); + } - updateSettingsForQemu(server: Server, qemuSettings: QemuSettings) { - return this.httpServer.put(server, `/settings/qemu`, { - enable_hardware_acceleration: qemuSettings.enable_hardware_acceleration, - require_hardware_acceleration: qemuSettings.require_hardware_acceleration - }); - } + updateSettingsForQemu(server: Server, qemuSettings: QemuSettings) { + return this.httpServer.put(server, `/settings/qemu`, { + enable_hardware_acceleration: qemuSettings.enable_hardware_acceleration, + require_hardware_acceleration: qemuSettings.require_hardware_acceleration, + }); + } } diff --git a/src/app/services/server.service.spec.ts b/src/app/services/server.service.spec.ts index c3a15fb3..17ebee5d 100644 --- a/src/app/services/server.service.spec.ts +++ b/src/app/services/server.service.spec.ts @@ -59,10 +59,10 @@ describe('ServerService', () => { TestBed.configureTestingModule({ providers: [ - ServerService, + ServerService, { provide: IndexedDbService, useValue: indexedDbService }, - { provide: HttpServer, useValue: httpServer } - ] + { provide: HttpServer, useValue: httpServer }, + ], }); service = TestBed.get(ServerService); @@ -76,9 +76,9 @@ describe('ServerService', () => { const evnt = { currentTarget: { result: { - createObjectStore: function() {} - } - } + createObjectStore: function () {}, + }, + }, }; spyOn(evnt.currentTarget.result, 'createObjectStore'); @@ -97,29 +97,29 @@ describe('ServerService', () => { record.name = 'test'; }); - it('should create an object', done => { + it('should create an object', (done) => { const created = new Server(); created.id = 22; spyOn(db, 'add').and.returnValue(Promise.resolve(created)); - service.create(record).then(result => { + service.create(record).then((result) => { expect(db.add).toHaveBeenCalledWith('servers', record); done(); }); }); - it('should update an object', done => { + it('should update an object', (done) => { spyOn(db, 'update').and.returnValue(Promise.resolve(record)); - service.update(record).then(result => { + service.update(record).then((result) => { expect(db.update).toHaveBeenCalledWith('servers', record); expect(result).toEqual(record); done(); }); }); - it('should delete an object', done => { + it('should delete an object', (done) => { record.id = 88; spyOn(db, 'delete').and.returnValue(Promise.resolve()); @@ -131,17 +131,17 @@ describe('ServerService', () => { }); }); - it('should call findAll', done => { + it('should call findAll', (done) => { spyOn(db, 'getAll').and.returnValue(Promise.resolve([])); - service.findAll().then(result => { + service.findAll().then((result) => { expect(result).toEqual([]); expect(db.getAll).toHaveBeenCalledWith('servers'); done(); }); }); - it('should create local server when missing', done => { + it('should create local server when missing', (done) => { spyOn(db, 'getAll').and.returnValue(Promise.resolve([])); spyOn(service, 'create').and.returnValue(Promise.resolve(new Server())); @@ -158,7 +158,7 @@ describe('ServerService', () => { }); }); - it('should update local server when found', done => { + it('should update local server when found', (done) => { const server = new Server(); server.name = 'local'; server.host = 'hostname'; diff --git a/src/app/services/server.service.ts b/src/app/services/server.service.ts index a89bafef..55a41784 100644 --- a/src/app/services/server.service.ts +++ b/src/app/services/server.service.ts @@ -13,34 +13,41 @@ export class ServerService { public serviceInitialized: Subject = new Subject(); public isServiceInitialized: boolean; - constructor( - private indexedDbService: IndexedDbService, - private httpServer: HttpServer - ) { - this.ready = this.indexedDbService.get().openDatabase(1, evt => { - evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true }); - }).then(() => { - this.indexedDbService.get().getAll(this.tablename) - .then(() => {}) + constructor(private indexedDbService: IndexedDbService, private httpServer: HttpServer) { + this.ready = this.indexedDbService + .get() + .openDatabase(1, (evt) => { + evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true }); + }) + .then(() => { + this.indexedDbService + .get() + .getAll(this.tablename) + .then(() => {}) + .catch(() => { + this.isIncognitoMode = true; + }); + }) .catch(() => { this.isIncognitoMode = true; + }) + .finally(() => { + this.isServiceInitialized = true; + this.serviceInitialized.next(true); }); - }).catch(() => { - this.isIncognitoMode = true; - }).finally(() => { - this.isServiceInitialized = true; - this.serviceInitialized.next(true); - }); } public tryToCreateDb() { - let promise = new Promise(resolve => { - this.indexedDbService.get().openDatabase(1, evt => { - evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true }); - }).then(() => { - }).catch(() => { - this.isIncognitoMode = true; - }); + let promise = new Promise((resolve) => { + this.indexedDbService + .get() + .openDatabase(1, (evt) => { + evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true }); + }) + .then(() => {}) + .catch(() => { + this.isIncognitoMode = true; + }); }); return promise; } @@ -48,7 +55,7 @@ export class ServerService { public get(id: number): Promise { if (this.isIncognitoMode) { let server: Server = JSON.parse(localStorage.getItem(`server-${id}`)); - let promise = new Promise(resolve => { + let promise = new Promise((resolve) => { resolve(server); }); return promise; @@ -63,7 +70,7 @@ export class ServerService { localStorage.setItem(`server-${server.id}`, JSON.stringify(server)); this.serverIdsInIncognitoMode.push(`server-${server.id}`); - let promise = new Promise(resolve => { + let promise = new Promise((resolve) => { resolve(server); }); return promise; @@ -74,7 +81,7 @@ export class ServerService { this.indexedDbService .get() .add(this.tablename, server) - .then(added => { + .then((added) => { server.id = added.key; resolve(server); }, reject); @@ -88,7 +95,7 @@ export class ServerService { localStorage.removeItem(`server-${server.id}`); localStorage.setItem(`server-${server.id}`, JSON.stringify(server)); - let promise = new Promise(resolve => { + let promise = new Promise((resolve) => { resolve(server); }); return promise; @@ -99,7 +106,7 @@ export class ServerService { this.indexedDbService .get() .update(this.tablename, server) - .then(updated => { + .then((updated) => { resolve(server); }, reject); }); @@ -109,9 +116,9 @@ export class ServerService { public findAll() { if (this.isIncognitoMode) { - let promise = new Promise(resolve => { + let promise = new Promise((resolve) => { let servers: Server[] = []; - this.serverIdsInIncognitoMode.forEach(n => { + this.serverIdsInIncognitoMode.forEach((n) => { let server: Server = JSON.parse(localStorage.getItem(n)); servers.push(server); }); @@ -126,9 +133,9 @@ export class ServerService { public delete(server: Server) { if (this.isIncognitoMode) { localStorage.removeItem(`server-${server.id}`); - this.serverIdsInIncognitoMode = this.serverIdsInIncognitoMode.filter(n => n !== `server-${server.id}`); + this.serverIdsInIncognitoMode = this.serverIdsInIncognitoMode.filter((n) => n !== `server-${server.id}`); - let promise = new Promise(resolve => { + let promise = new Promise((resolve) => { resolve(server.id); }); return promise; @@ -148,12 +155,12 @@ export class ServerService { public getLocalServer(host: string, port: number) { const promise = new Promise((resolve, reject) => { this.findAll().then((servers: Server[]) => { - const local = servers.find(server => server.location === 'bundled'); + const local = servers.find((server) => server.location === 'bundled'); if (local) { local.host = host; local.port = port; local.protocol = location.protocol as ServerProtocol; - this.update(local).then(updated => { + this.update(local).then((updated) => { resolve(updated); }, reject); } else { @@ -163,7 +170,7 @@ export class ServerService { server.port = port; server.location = 'bundled'; server.protocol = location.protocol as ServerProtocol; - this.create(server).then(created => { + this.create(server).then((created) => { resolve(created); }, reject); } @@ -178,15 +185,15 @@ export class ServerService { this.ready.then( () => { query().then( - result => { + (result) => { resolve(result); }, - error => { + (error) => { reject(error); } ); }, - error => { + (error) => { reject(error); } ); diff --git a/src/app/services/settings.service.spec.ts b/src/app/services/settings.service.spec.ts index ec8f9ad7..21998e9c 100644 --- a/src/app/services/settings.service.spec.ts +++ b/src/app/services/settings.service.spec.ts @@ -25,7 +25,7 @@ describe('SettingsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [SettingsService, PersistenceService] + providers: [SettingsService, PersistenceService], }); persistenceService = TestBed.get(PersistenceService); @@ -61,13 +61,13 @@ describe('SettingsService', () => { crash_reports: true, experimental_features: false, angular_map: false, - console_command: undefined + console_command: undefined, }); })); it('should set all values', inject([SettingsService], (service: SettingsService) => { const settings = { - crash_reports: false + crash_reports: false, }; service.setAll(settings); @@ -75,7 +75,7 @@ describe('SettingsService', () => { crash_reports: false, experimental_features: false, angular_map: false, - console_command: undefined + console_command: undefined, }); })); @@ -85,7 +85,7 @@ describe('SettingsService', () => { let changedSettings: Settings; service.set('crash_reports', true); - service.subscribe(settings => { + service.subscribe((settings) => { changedSettings = settings; }); service.set('crash_reports', false); diff --git a/src/app/services/settings.service.ts b/src/app/services/settings.service.ts index 8c287f97..fd4c7a3c 100644 --- a/src/app/services/settings.service.ts +++ b/src/app/services/settings.service.ts @@ -10,14 +10,14 @@ export interface Settings { } @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class SettingsService { static DEFAULTS: Settings = { crash_reports: true, experimental_features: false, angular_map: false, - console_command: undefined + console_command: undefined, }; private settingsSubject: BehaviorSubject; @@ -47,14 +47,14 @@ export class SettingsService { getAll() { const settings = { ...SettingsService.DEFAULTS }; - Object.keys(SettingsService.DEFAULTS).forEach(key => { + Object.keys(SettingsService.DEFAULTS).forEach((key) => { settings[key] = this.get(key); }); return settings; } setAll(settings) { - Object.keys(settings).forEach(key => { + Object.keys(settings).forEach((key) => { this.set(key, settings[key]); }); } @@ -63,7 +63,7 @@ export class SettingsService { return this.get('experimental_features'); } - subscribe(subscriber: ((settings: Settings) => void)) { + subscribe(subscriber: (settings: Settings) => void) { return this.settingsSubject.subscribe(subscriber); } } diff --git a/src/app/services/settings/console.service.spec.ts b/src/app/services/settings/console.service.spec.ts index 07c0ac8a..485e996d 100644 --- a/src/app/services/settings/console.service.spec.ts +++ b/src/app/services/settings/console.service.spec.ts @@ -7,7 +7,7 @@ describe('ConsoleService', () => { beforeEach(() => { let defaultConsoleService = { - get: () => 'default' + get: () => 'default', }; settings = new MockedSettingsService(); service = new ConsoleService(defaultConsoleService as any, settings as any); diff --git a/src/app/services/settings/console.service.ts b/src/app/services/settings/console.service.ts index 0f8a04a2..48dc52e4 100644 --- a/src/app/services/settings/console.service.ts +++ b/src/app/services/settings/console.service.ts @@ -4,15 +4,11 @@ import { SettingsService } from '../settings.service'; @Injectable() export class ConsoleService { - - constructor( - private defaultConsoleService: DefaultConsoleService, - private settingsService: SettingsService - ) { } + constructor(private defaultConsoleService: DefaultConsoleService, private settingsService: SettingsService) {} get command(): string { const command = this.settingsService.get('console_command'); - if(command === undefined) { + if (command === undefined) { return this.defaultConsoleService.get(); } return command; diff --git a/src/app/services/settings/default-console.service.spec.ts b/src/app/services/settings/default-console.service.spec.ts index df89f144..9ee9d5f8 100644 --- a/src/app/services/settings/default-console.service.spec.ts +++ b/src/app/services/settings/default-console.service.spec.ts @@ -1,4 +1,3 @@ - import { DefaultConsoleService } from './default-console.service'; describe('DefaultConsoleService', () => { @@ -8,10 +7,10 @@ describe('DefaultConsoleService', () => { electronService = { isElectronApp: false, isWindows: false, - isLinux: false + isLinux: false, }; }); - + beforeEach(() => { service = new DefaultConsoleService(electronService); }); @@ -29,17 +28,16 @@ describe('DefaultConsoleService', () => { electronService.isElectronApp = true; electronService.isWindows = true; expect(service.get()).toEqual('putty.exe -telnet %h %p -loghost "%d"'); - }) + }); it('should return console for linux', () => { electronService.isElectronApp = true; electronService.isLinux = true; expect(service.get()).toEqual('xfce4-terminal --tab -T "%d" -e "telnet %h %p"'); - }) + }); it('should return undefined for other platforms', () => { electronService.isElectronApp = true; expect(service.get()).toBeUndefined(); - }) - + }); }); diff --git a/src/app/services/settings/default-console.service.ts b/src/app/services/settings/default-console.service.ts index 0120a68b..b18aa29c 100644 --- a/src/app/services/settings/default-console.service.ts +++ b/src/app/services/settings/default-console.service.ts @@ -3,22 +3,19 @@ import { ElectronService } from 'ngx-electron'; @Injectable() export class DefaultConsoleService { - - constructor( - private electronService: ElectronService - ) { } + constructor(private electronService: ElectronService) {} get() { - if(!this.electronService.isElectronApp) { + if (!this.electronService.isElectronApp) { return undefined; } - if(this.electronService.isLinux) { - return 'xfce4-terminal --tab -T "%d" -e "telnet %h %p"' + if (this.electronService.isLinux) { + return 'xfce4-terminal --tab -T "%d" -e "telnet %h %p"'; } - if(this.electronService.isWindows) { - return 'putty.exe -telnet %h %p -loghost "%d"' + if (this.electronService.isWindows) { + return 'putty.exe -telnet %h %p -loghost "%d"'; } return undefined; diff --git a/src/app/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts index b9b354a6..5638d6a0 100644 --- a/src/app/services/snapshot.service.spec.ts +++ b/src/app/services/snapshot.service.spec.ts @@ -19,7 +19,7 @@ describe('SnapshotService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, SnapshotService] + providers: [HttpServer, SnapshotService], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts index 6ef893a6..ed0b41d4 100644 --- a/src/app/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -19,7 +19,7 @@ describe('SymbolService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, SymbolService] + providers: [HttpServer, SymbolService], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts index 9727544e..b0539d9e 100644 --- a/src/app/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -31,11 +31,11 @@ export class SymbolService { } scaleDimensionsForNode(node: Node): SymbolDimension { - let scale = node.width > node.height ? this.maximumSymbolSize/node.width : this.maximumSymbolSize/node.height; + let scale = node.width > node.height ? this.maximumSymbolSize / node.width : this.maximumSymbolSize / node.height; return { width: node.width * scale, - height: node.height * scale - } + height: node.height * scale, + }; } getByFilename(symbol_filename: string) { @@ -44,7 +44,7 @@ export class SymbolService { add(server: Server, symbolName: string, symbol: string) { this.cache = null; - return this.httpServer.post(server, `/symbols/${symbolName}/raw`, symbol) + return this.httpServer.post(server, `/symbols/${symbolName}/raw`, symbol); } load(server: Server): Observable { @@ -52,10 +52,8 @@ export class SymbolService { } list(server: Server) { - if(!this.cache) { - this.cache = this.load(server).pipe( - shareReplay(CACHE_SIZE) - ); + if (!this.cache) { + this.cache = this.load(server).pipe(shareReplay(CACHE_SIZE)); } return this.cache; @@ -69,5 +67,5 @@ export class SymbolService { class SymbolDimension { width: number; - height: number + height: number; } diff --git a/src/app/services/template-mocks.service.ts b/src/app/services/template-mocks.service.ts index 0859739c..19774006 100644 --- a/src/app/services/template-mocks.service.ts +++ b/src/app/services/template-mocks.service.ts @@ -15,285 +15,285 @@ import { TracengTemplate } from '../models/templates/traceng-template'; @Injectable() export class TemplateMocksService { - getTracengTemplate() : TracengTemplate { - let template: TracengTemplate = { - builtin: false, - category: 'guest', - compute_id: 'local', - console_type: 'none', - default_name_format: 'TraceNG{0}', - ip_address: '', - name: '', - symbol: ':/symbols/classic/traceng.svg', - template_id: '', - template_type: 'traceng' - }; + getTracengTemplate(): TracengTemplate { + let template: TracengTemplate = { + builtin: false, + category: 'guest', + compute_id: 'local', + console_type: 'none', + default_name_format: 'TraceNG{0}', + ip_address: '', + name: '', + symbol: ':/symbols/classic/traceng.svg', + template_id: '', + template_type: 'traceng', + }; - return template; - } + return template; + } - getQemuTemplate() : Observable { - let template : QemuTemplate = { - adapter_type: 'e1000', - adapters: 4, - bios_image: '', - boot_priority: 'c', - builtin: false, - category: 'guest', - cdrom_image: '', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - cpu_throttling: 0, - cpus: 1, - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - hda_disk_image: '', - hda_disk_interface: 'ide', - hdb_disk_image: '', - hdb_disk_interface: 'ide', - hdc_disk_image: '', - hdc_disk_interface: 'ide', - hdd_disk_image: '', - hdd_disk_interface: 'ide', - initrd: '', - kernel_command_line: '', - kernel_image: '', - legacy_networking: false, - linked_clone: true, - mac_address: '', - name: '', - on_close: 'power_off', - options: '-nographic', - platform: '', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - process_priority: 'normal', - qemu_path: '', - ram: 256, - symbol: ':/symbols/qemu_guest.svg', - template_id: '', - template_type: 'qemu', - usage: '' - } - - return of(template); - } + getQemuTemplate(): Observable { + let template: QemuTemplate = { + adapter_type: 'e1000', + adapters: 4, + bios_image: '', + boot_priority: 'c', + builtin: false, + category: 'guest', + cdrom_image: '', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + cpu_throttling: 0, + cpus: 1, + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + hda_disk_image: '', + hda_disk_interface: 'ide', + hdb_disk_image: '', + hdb_disk_interface: 'ide', + hdc_disk_image: '', + hdc_disk_interface: 'ide', + hdd_disk_image: '', + hdd_disk_interface: 'ide', + initrd: '', + kernel_command_line: '', + kernel_image: '', + legacy_networking: false, + linked_clone: true, + mac_address: '', + name: '', + on_close: 'power_off', + options: '-nographic', + platform: '', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + process_priority: 'normal', + qemu_path: '', + ram: 256, + symbol: ':/symbols/qemu_guest.svg', + template_id: '', + template_type: 'qemu', + usage: '', + }; - getVpcsTemplate() : Observable { - let template: VpcsTemplate = { - base_script_file: 'vpcs_base_config.txt', - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - default_name_format: 'PC{0}', - name: '', - symbol: ':/symbols/vpcs_guest.svg', - template_id: '', - template_type: 'vpcs' - } + return of(template); + } - return of(template); - } + getVpcsTemplate(): Observable { + let template: VpcsTemplate = { + base_script_file: 'vpcs_base_config.txt', + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + default_name_format: 'PC{0}', + name: '', + symbol: ':/symbols/vpcs_guest.svg', + template_id: '', + template_type: 'vpcs', + }; - getVirtualBoxTemplate() : Observable { - let template: VirtualBoxTemplate = { - adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power_off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - ram: 0, - symbol: ':/symbols/vbox_guest.svg', - template_id: '', - template_type: 'virtualbox', - usage: '', - use_any_adapter: false, - vmname: '' - } + return of(template); + } - return of(template); - } + getVirtualBoxTemplate(): Observable { + let template: VirtualBoxTemplate = { + adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power_off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + ram: 0, + symbol: ':/symbols/vbox_guest.svg', + template_id: '', + template_type: 'virtualbox', + usage: '', + use_any_adapter: false, + vmname: '', + }; - getCloudNodeTemplate() : Observable { - let template = { - builtin: false, - category: 'guest', - compute_id: 'local', - default_name_format: 'Cloud{0}', - name: '', - ports_mapping: [], - remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', - template_id: '', - template_type: 'cloud' - } as CloudTemplate; + return of(template); + } - return of(template); - } + getCloudNodeTemplate(): Observable { + let template = { + builtin: false, + category: 'guest', + compute_id: 'local', + default_name_format: 'Cloud{0}', + name: '', + ports_mapping: [], + remote_console_type: 'none', + symbol: ':/symbols/cloud.svg', + template_id: '', + template_type: 'cloud', + } as CloudTemplate; - getEthernetHubTemplate() : Observable { - let template: EthernetHubTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - default_name_format: 'Hub{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/hub.svg', - template_id: '', - template_type: 'ethernet_hub' - } + return of(template); + } - return of(template); - } + getEthernetHubTemplate(): Observable { + let template: EthernetHubTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + default_name_format: 'Hub{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/hub.svg', + template_id: '', + template_type: 'ethernet_hub', + }; - getEthernetSwitchTemplate() : Observable { - let template: EthernetSwitchTemplate = { - builtin: false, - category: 'switch', - compute_id: 'local', - console_type: 'telnet', - default_name_format: 'Switch{0}', - name: '', - ports_mapping: [], - symbol: ':/symbols/ethernet_switch.svg', - template_id: '', - template_type: 'ethernet_switch' - } + return of(template); + } - return of(template); - } + getEthernetSwitchTemplate(): Observable { + let template: EthernetSwitchTemplate = { + builtin: false, + category: 'switch', + compute_id: 'local', + console_type: 'telnet', + default_name_format: 'Switch{0}', + name: '', + ports_mapping: [], + symbol: ':/symbols/ethernet_switch.svg', + template_id: '', + template_type: 'ethernet_switch', + }; - getIosTemplate() : Observable { - let template: IosTemplate = { - auto_delete_disks: true, - builtin: false, - category: 'router', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - default_name_format: 'R{0}', - disk0: 0, - disk1: 0, - exec_area: 64, - idlemax: 500, - idlepc: '', - idlesleep: 30, - image: '', - mac_addr: '', - mmap: true, - name: '', - nvram: 128, - platform: '', - private_config: '', - ram: 128, - sparsemem: true, - startup_config: '', - symbol: ':/symbols/router.svg', - system_id: 'FTX0945W0MY', - template_id: '', - template_type: 'dynamips', - usage: '' - } + return of(template); + } - return of(template); - } + getIosTemplate(): Observable { + let template: IosTemplate = { + auto_delete_disks: true, + builtin: false, + category: 'router', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + default_name_format: 'R{0}', + disk0: 0, + disk1: 0, + exec_area: 64, + idlemax: 500, + idlepc: '', + idlesleep: 30, + image: '', + mac_addr: '', + mmap: true, + name: '', + nvram: 128, + platform: '', + private_config: '', + ram: 128, + sparsemem: true, + startup_config: '', + symbol: ':/symbols/router.svg', + system_id: 'FTX0945W0MY', + template_id: '', + template_type: 'dynamips', + usage: '', + }; - getVmwareTemplate() : Observable { - let template: VmwareTemplate = { - adapter_type: 'e1000', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power_off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', - template_id: '', - template_type: 'vmware', - usage: '', - use_any_adapter: false, - vmx_path: '' - }; + return of(template); + } - return of(template); - } + getVmwareTemplate(): Observable { + let template: VmwareTemplate = { + adapter_type: 'e1000', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power_off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + symbol: ':/symbols/vmware_guest.svg', + template_id: '', + template_type: 'vmware', + usage: '', + use_any_adapter: false, + vmx_path: '', + }; - getDockerTemplate() : Observable { - let template: DockerTemplate = { - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'vm', - console_auto_start: false, - console_http_path: '/', - console_http_port: 80, - console_resolution: '1024x768', - console_type: 'telnet', - custom_adapters: [], - default_name_format: '{name}-{0}', - environment: '', - extra_hosts: '', - image: '', - name: '', - start_command: '', - symbol: ':/symbols/docker_guest.svg', - template_id: '', - template_type: 'docker', - usage: '' - }; + return of(template); + } - return of(template); - } + getDockerTemplate(): Observable { + let template: DockerTemplate = { + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'vm', + console_auto_start: false, + console_http_path: '/', + console_http_port: 80, + console_resolution: '1024x768', + console_type: 'telnet', + custom_adapters: [], + default_name_format: '{name}-{0}', + environment: '', + extra_hosts: '', + image: '', + name: '', + start_command: '', + symbol: ':/symbols/docker_guest.svg', + template_id: '', + template_type: 'docker', + usage: '', + }; - getIouTemplate() : Observable { - let template: IouTemplate = { - builtin: false, - category: 'switch', - compute_id: 'vm', - console_auto_start: false, - console_type: 'telnet', - default_name_format: 'IOU{0}', - ethernet_adapters: 1, - l1_keepalives: false, - name: '', - nvram: 128, - path: '', - private_config: '', - ram: 256, - serial_adapters: 0, - startup_config: 'iou_l2_base_startup-config.txt', - symbol: ':/symbols/multilayer_switch.svg', - template_id: '', - template_type: 'iou', - usage: '', - use_default_iou_values: true - }; + return of(template); + } - return of(template); - } + getIouTemplate(): Observable { + let template: IouTemplate = { + builtin: false, + category: 'switch', + compute_id: 'vm', + console_auto_start: false, + console_type: 'telnet', + default_name_format: 'IOU{0}', + ethernet_adapters: 1, + l1_keepalives: false, + name: '', + nvram: 128, + path: '', + private_config: '', + ram: 256, + serial_adapters: 0, + startup_config: 'iou_l2_base_startup-config.txt', + symbol: ':/symbols/multilayer_switch.svg', + template_id: '', + template_type: 'iou', + usage: '', + use_default_iou_values: true, + }; + + return of(template); + } } diff --git a/src/app/services/template.service.spec.ts b/src/app/services/template.service.spec.ts index 06924aab..c4a8ea58 100644 --- a/src/app/services/template.service.spec.ts +++ b/src/app/services/template.service.spec.ts @@ -15,7 +15,7 @@ describe('TemplateService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [TemplateService, HttpServer] + providers: [TemplateService, HttpServer], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index d1b19da5..f8336483 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -1,5 +1,5 @@ import { Injectable, EventEmitter } from '@angular/core'; -import { Observable, BehaviorSubject} from 'rxjs'; +import { Observable, BehaviorSubject } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class ThemeService { diff --git a/src/app/services/toaster.service.spec.ts b/src/app/services/toaster.service.spec.ts index 37c94e7e..edee5195 100644 --- a/src/app/services/toaster.service.spec.ts +++ b/src/app/services/toaster.service.spec.ts @@ -11,13 +11,13 @@ export class MockedToasterService { duration: 2000, panelClass: ['snackabar-success'], MatSnackBarHorizontalPosition: 'center', - MatSnackBarVerticalPosition: 'bottom' + MatSnackBarVerticalPosition: 'bottom', }; snackBarConfigForError = { duration: 2000, panelClass: ['snackabar-error'], MatSnackBarHorizontalPosition: 'center', - MatSnackBarVerticalPosition: 'bottom' + MatSnackBarVerticalPosition: 'bottom', }; constructor() { @@ -41,9 +41,7 @@ class MockedSnackBar { describe('ToasterService', () => { beforeEach(() => { TestBed.configureTestingModule({ - providers: [ - ToasterService, - { provide: MatSnackBar, useClass: MockedSnackBar }] + providers: [ToasterService, { provide: MatSnackBar, useClass: MockedSnackBar }], }); }); diff --git a/src/app/services/toaster.service.ts b/src/app/services/toaster.service.ts index 525a7f46..266c2d32 100644 --- a/src/app/services/toaster.service.ts +++ b/src/app/services/toaster.service.ts @@ -7,26 +7,24 @@ export class ToasterService { duration: 4000, panelClass: ['snackabar-success'], MatSnackBarHorizontalPosition: 'center', - MatSnackBarVerticalPosition: 'bottom' + MatSnackBarVerticalPosition: 'bottom', }; snackBarConfigForWarning = { duration: 4000, panelClass: ['snackabar-warning'], MatSnackBarHorizontalPosition: 'center', - MatSnackBarVerticalPosition: 'bottom' + MatSnackBarVerticalPosition: 'bottom', }; snackBarConfigForError = { duration: 10000, panelClass: ['snackabar-error'], MatSnackBarHorizontalPosition: 'center', - MatSnackBarVerticalPosition: 'bottom' + MatSnackBarVerticalPosition: 'bottom', }; - constructor( - private snackbar: MatSnackBar, - private zone: NgZone) {} + constructor(private snackbar: MatSnackBar, private zone: NgZone) {} public error(message: string) { this.zone.run(() => { diff --git a/src/app/services/traceng.service.ts b/src/app/services/traceng.service.ts index 2c33f12e..4a62043e 100644 --- a/src/app/services/traceng.service.ts +++ b/src/app/services/traceng.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,21 +7,25 @@ import { TracengTemplate } from '../models/templates/traceng-template'; @Injectable() export class TracengService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - addTemplate(server: Server, vpcsTemplate: TracengTemplate): Observable { - return this.httpServer.post(server, `/templates`, vpcsTemplate) as Observable; - } + addTemplate(server: Server, vpcsTemplate: TracengTemplate): Observable { + return this.httpServer.post(server, `/templates`, vpcsTemplate) as Observable; + } - saveTemplate(server: Server, vpcsTemplate: TracengTemplate): Observable { - return this.httpServer.put(server, `/templates/${vpcsTemplate.template_id}`, vpcsTemplate) as Observable; - } + saveTemplate(server: Server, vpcsTemplate: TracengTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${vpcsTemplate.template_id}`, + vpcsTemplate + ) as Observable; + } } diff --git a/src/app/services/version.service.spec.ts b/src/app/services/version.service.spec.ts index 544351e1..76729ee3 100644 --- a/src/app/services/version.service.spec.ts +++ b/src/app/services/version.service.spec.ts @@ -27,7 +27,7 @@ describe('VersionService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, VersionService] + providers: [HttpServer, VersionService], }); httpClient = TestBed.get(HttpClient); diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts index 59e1157f..fc0ce89c 100644 --- a/src/app/services/virtual-box-configuration.service.ts +++ b/src/app/services/virtual-box-configuration.service.ts @@ -1,37 +1,43 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() -export class VirtualBoxConfigurationService{ - getConsoleTypes() { - return ['telnet', 'none']; - } +export class VirtualBoxConfigurationService { + getConsoleTypes() { + return ['telnet', 'none']; + } - getOnCloseoptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], - ["Save the VM state", "save_vm_state"]]; + getOnCloseoptions() { + let onCloseOptions = [ + ['Power off the VM', 'power_off'], + ['Send the shutdown signal (ACPI)', 'shutdown_signal'], + ['Save the VM state', 'save_vm_state'], + ]; - return onCloseOptions; - } + return onCloseOptions; + } - getCategories() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getNetworkTypes() { - let networkTypes = ["PCnet-PCI II (Am79C970A)", - "PCNet-FAST III (Am79C973)", - "Intel PRO/1000 MT Desktop (82540EM)", - "Intel PRO/1000 T Server (82543GC)", - "Intel PRO/1000 MT Server (82545EM)", - "Paravirtualized Network (virtio-net)"]; + getNetworkTypes() { + let networkTypes = [ + 'PCnet-PCI II (Am79C970A)', + 'PCNet-FAST III (Am79C973)', + 'Intel PRO/1000 MT Desktop (82540EM)', + 'Intel PRO/1000 T Server (82543GC)', + 'Intel PRO/1000 MT Server (82545EM)', + 'Paravirtualized Network (virtio-net)', + ]; - return networkTypes; - } + return networkTypes; + } } diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts index 885c41b9..7f1143a1 100644 --- a/src/app/services/virtual-box.service.spec.ts +++ b/src/app/services/virtual-box.service.spec.ts @@ -9,103 +9,103 @@ import { VirtualBoxTemplate } from '../models/templates/virtualbox-template'; import { VirtualBoxService } from './virtual-box.service'; describe('VirtualBoxService', () => { - let httpClient: HttpClient; - let httpTestingController: HttpTestingController; - let httpServer: HttpServer; - let server: Server; + let httpClient: HttpClient; + let httpTestingController: HttpTestingController; + let httpServer: HttpServer; + let server: Server; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, VirtualBoxService] - }); - - httpClient = TestBed.get(HttpClient); - httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); - server = getTestServer(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, VirtualBoxService], }); - afterEach(() => { - httpTestingController.verify(); - }); + httpClient = TestBed.get(HttpClient); + httpTestingController = TestBed.get(HttpTestingController); + httpServer = TestBed.get(HttpServer); + server = getTestServer(); + }); - it('should be created', inject([VirtualBoxService], (service: VirtualBoxService) => { - expect(service).toBeTruthy(); - })); + afterEach(() => { + httpTestingController.verify(); + }); - it('should update virtual box template', inject([VirtualBoxService], (service: VirtualBoxService) => { - const template: VirtualBoxTemplate = { - adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power_off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - ram: 0, - symbol: ':/symbols/vbox_guest.svg', - template_id: '1', - template_type: 'virtualbox', - usage: '', - use_any_adapter: false, - vmname: '' - } + it('should be created', inject([VirtualBoxService], (service: VirtualBoxService) => { + expect(service).toBeTruthy(); + })); - service.saveTemplate(server, template).subscribe(); + it('should update virtual box template', inject([VirtualBoxService], (service: VirtualBoxService) => { + const template: VirtualBoxTemplate = { + adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power_off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + ram: 0, + symbol: ':/symbols/vbox_guest.svg', + template_id: '1', + template_type: 'virtualbox', + usage: '', + use_any_adapter: false, + vmname: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(template); - })); + service.saveTemplate(server, template).subscribe(); - it('should add virtual box template', inject([VirtualBoxService], (service: VirtualBoxService) => { - const template: VirtualBoxTemplate = { - adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power_off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - ram: 0, - symbol: ':/symbols/vbox_guest.svg', - template_id: '', - template_type: 'virtualbox', - usage: '', - use_any_adapter: false, - vmname: '' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(template); + })); - service.addTemplate(server, template).subscribe(); + it('should add virtual box template', inject([VirtualBoxService], (service: VirtualBoxService) => { + const template: VirtualBoxTemplate = { + adapter_type: 'Intel PRO/1000 MT Desktop (82540EM)', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power_off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + ram: 0, + symbol: ':/symbols/vbox_guest.svg', + template_id: '', + template_type: 'virtualbox', + usage: '', + use_any_adapter: false, + vmname: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(template); - })); + service.addTemplate(server, template).subscribe(); - it('should get available virtual machines', inject([VirtualBoxService], (service: VirtualBoxService) => { - service.getVirtualMachines(server).subscribe(); + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(template); + })); - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/compute/virtualbox/vms'); - expect(req.request.method).toEqual('GET'); - })); + it('should get available virtual machines', inject([VirtualBoxService], (service: VirtualBoxService) => { + service.getVirtualMachines(server).subscribe(); + + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/compute/virtualbox/vms'); + expect(req.request.method).toEqual('GET'); + })); }); diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts index cdcb0d7d..6bcd3f97 100644 --- a/src/app/services/virtual-box.service.ts +++ b/src/app/services/virtual-box.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,25 +7,36 @@ import { VirtualBoxVm } from '../models/virtualBox/virtual-box-vm'; @Injectable() export class VirtualBoxService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get( + server, + `/templates/${template_id}` + ) as Observable; + } - addTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { - return this.httpServer.post(server, `/templates`, virtualBoxTemplate) as Observable; - } + addTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { + return this.httpServer.post( + server, + `/templates`, + virtualBoxTemplate + ) as Observable; + } - saveTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { - return this.httpServer.put(server, `/templates/${virtualBoxTemplate.template_id}`, virtualBoxTemplate) as Observable; - } + saveTemplate(server: Server, virtualBoxTemplate: VirtualBoxTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${virtualBoxTemplate.template_id}`, + virtualBoxTemplate + ) as Observable; + } - getVirtualMachines(server: Server) : Observable { - return this.httpServer.get(server, '/compute/virtualbox/vms') as Observable; - } + getVirtualMachines(server: Server): Observable { + return this.httpServer.get(server, '/compute/virtualbox/vms') as Observable; + } } diff --git a/src/app/services/vmware-configuration.service.ts b/src/app/services/vmware-configuration.service.ts index 7f9fa6eb..34df5874 100644 --- a/src/app/services/vmware-configuration.service.ts +++ b/src/app/services/vmware-configuration.service.ts @@ -1,39 +1,36 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() -export class VmwareConfigurationService{ - getConsoleTypes() { - return ['telnet', 'none']; - } +export class VmwareConfigurationService { + getConsoleTypes() { + return ['telnet', 'none']; + } - getOnCloseoptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], - ["Save the VM state", "save_vm_state"]]; + getOnCloseoptions() { + let onCloseOptions = [ + ['Power off the VM', 'power_off'], + ['Send the shutdown signal (ACPI)', 'shutdown_signal'], + ['Save the VM state', 'save_vm_state'], + ]; - return onCloseOptions; - } + return onCloseOptions; + } - getCategories() { - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } - getNetworkTypes() { - let networkTypes = ["default", - "e1000", - "e1000e", - "flexible", - "vlance", - "vmxnet", - "vmxnet2", - "vmxnet3"]; + getNetworkTypes() { + let networkTypes = ['default', 'e1000', 'e1000e', 'flexible', 'vlance', 'vmxnet', 'vmxnet2', 'vmxnet3']; - return networkTypes; - } + return networkTypes; + } } diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts index 43506556..450a0446 100644 --- a/src/app/services/vmware.service.spec.ts +++ b/src/app/services/vmware.service.spec.ts @@ -9,101 +9,101 @@ import { VmwareService } from './vmware.service'; import { VmwareTemplate } from '../models/templates/vmware-template'; describe('VmwareService', () => { - let httpClient: HttpClient; - let httpTestingController: HttpTestingController; - let httpServer: HttpServer; - let server: Server; + let httpClient: HttpClient; + let httpTestingController: HttpTestingController; + let httpServer: HttpServer; + let server: Server; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, VmwareService] - }); - - httpClient = TestBed.get(HttpClient); - httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); - server = getTestServer(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, VmwareService], }); - afterEach(() => { - httpTestingController.verify(); - }); + httpClient = TestBed.get(HttpClient); + httpTestingController = TestBed.get(HttpTestingController); + httpServer = TestBed.get(HttpServer); + server = getTestServer(); + }); - it('should be created', inject([VmwareService], (service: VmwareService) => { - expect(service).toBeTruthy(); - })); + afterEach(() => { + httpTestingController.verify(); + }); - it('should update vmware template', inject([VmwareService], (service: VmwareService) => { - const template: VmwareTemplate = { - adapter_type: 'e1000', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power-off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', - template_id: '1', - template_type: 'vmware', - usage: '', - use_any_adapter: false, - vmx_path: '' - }; + it('should be created', inject([VmwareService], (service: VmwareService) => { + expect(service).toBeTruthy(); + })); - service.saveTemplate(server, template).subscribe(); + it('should update vmware template', inject([VmwareService], (service: VmwareService) => { + const template: VmwareTemplate = { + adapter_type: 'e1000', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power-off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + symbol: ':/symbols/vmware_guest.svg', + template_id: '1', + template_type: 'vmware', + usage: '', + use_any_adapter: false, + vmx_path: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(template); - })); + service.saveTemplate(server, template).subscribe(); - it('should add vmware template', inject([VmwareService], (service: VmwareService) => { - const template: VmwareTemplate = { - adapter_type: 'e1000', - adapters: 1, - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'none', - custom_adapters: [], - default_name_format: '{name}-{0}', - first_port_name: '', - headless: false, - linked_clone: false, - name: '', - on_close: 'power-off', - port_name_format: 'Ethernet{0}', - port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', - template_id: '1', - template_type: 'vmware', - usage: '', - use_any_adapter: false, - vmx_path: '' - }; + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(template); + })); - service.addTemplate(server, template).subscribe(); + it('should add vmware template', inject([VmwareService], (service: VmwareService) => { + const template: VmwareTemplate = { + adapter_type: 'e1000', + adapters: 1, + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'none', + custom_adapters: [], + default_name_format: '{name}-{0}', + first_port_name: '', + headless: false, + linked_clone: false, + name: '', + on_close: 'power-off', + port_name_format: 'Ethernet{0}', + port_segment_size: 0, + symbol: ':/symbols/vmware_guest.svg', + template_id: '1', + template_type: 'vmware', + usage: '', + use_any_adapter: false, + vmx_path: '', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(template); - })); + service.addTemplate(server, template).subscribe(); - it('should get available virtual machines', inject([VmwareService], (service: VmwareService) => { - service.getVirtualMachines(server).subscribe(); + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(template); + })); - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/compute/vmware/vms'); - expect(req.request.method).toEqual('GET'); - })); + it('should get available virtual machines', inject([VmwareService], (service: VmwareService) => { + service.getVirtualMachines(server).subscribe(); + + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/compute/vmware/vms'); + expect(req.request.method).toEqual('GET'); + })); }); diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts index 111cf371..e9bd5850 100644 --- a/src/app/services/vmware.service.ts +++ b/src/app/services/vmware.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { Observable } from 'rxjs'; @@ -7,25 +7,29 @@ import { VmwareVm } from '../models/vmware/vmware-vm'; @Injectable() export class VmwareService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - addTemplate(server: Server, vmwareTemplate: VmwareTemplate): Observable { - return this.httpServer.post(server, `/templates`, vmwareTemplate) as Observable; - } + addTemplate(server: Server, vmwareTemplate: VmwareTemplate): Observable { + return this.httpServer.post(server, `/templates`, vmwareTemplate) as Observable; + } - saveTemplate(server: Server, vmwareTemplate: VmwareTemplate): Observable { - return this.httpServer.put(server, `/templates/${vmwareTemplate.template_id}`, vmwareTemplate) as Observable; - } + saveTemplate(server: Server, vmwareTemplate: VmwareTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${vmwareTemplate.template_id}`, + vmwareTemplate + ) as Observable; + } - getVirtualMachines(server: Server) : Observable { - return this.httpServer.get(server, '/compute/vmware/vms') as Observable; - } + getVirtualMachines(server: Server): Observable { + return this.httpServer.get(server, '/compute/vmware/vms') as Observable; + } } diff --git a/src/app/services/vpcs-configuration.service.ts b/src/app/services/vpcs-configuration.service.ts index 2216013a..bc9dd374 100644 --- a/src/app/services/vpcs-configuration.service.ts +++ b/src/app/services/vpcs-configuration.service.ts @@ -1,18 +1,20 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; @Injectable() export class VpcsConfigurationService { - getConsoleTypes(){ - return ['telnet', 'none']; - } + getConsoleTypes() { + return ['telnet', 'none']; + } - getCategories(){ - let categories = [["Default", "guest"], - ["Routers", "router"], - ["Switches", "switch"], - ["End devices", "guest"], - ["Security devices", "firewall"]]; + getCategories() { + let categories = [ + ['Default', 'guest'], + ['Routers', 'router'], + ['Switches', 'switch'], + ['End devices', 'guest'], + ['Security devices', 'firewall'], + ]; - return categories; - } + return categories; + } } diff --git a/src/app/services/vpcs.service.spec.ts b/src/app/services/vpcs.service.spec.ts index c633c751..c1c13860 100644 --- a/src/app/services/vpcs.service.spec.ts +++ b/src/app/services/vpcs.service.spec.ts @@ -9,72 +9,72 @@ import { VpcsService } from './vpcs.service'; import { VpcsTemplate } from '../models/templates/vpcs-template'; describe('VpcsService', () => { - let httpClient: HttpClient; - let httpTestingController: HttpTestingController; - let httpServer: HttpServer; - let server: Server; + let httpClient: HttpClient; + let httpTestingController: HttpTestingController; + let httpServer: HttpServer; + let server: Server; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, AppTestingModule], - providers: [HttpServer, VpcsService] - }); - - httpClient = TestBed.get(HttpClient); - httpTestingController = TestBed.get(HttpTestingController); - httpServer = TestBed.get(HttpServer); - server = getTestServer(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, AppTestingModule], + providers: [HttpServer, VpcsService], }); - afterEach(() => { - httpTestingController.verify(); - }); + httpClient = TestBed.get(HttpClient); + httpTestingController = TestBed.get(HttpTestingController); + httpServer = TestBed.get(HttpServer); + server = getTestServer(); + }); - it('should be created', inject([VpcsService], (service: VpcsService) => { - expect(service).toBeTruthy(); - })); + afterEach(() => { + httpTestingController.verify(); + }); - it('should update vpcs template', inject([VpcsService], (service: VpcsService) => { - const template: VpcsTemplate = { - base_script_file: 'vpcs_base_config.txt', - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - default_name_format: 'PC{0}', - name: '', - symbol: ':/symbols/vpcs_guest.svg', - template_id: '1', - template_type: 'vpcs' - } + it('should be created', inject([VpcsService], (service: VpcsService) => { + expect(service).toBeTruthy(); + })); - service.saveTemplate(server, template).subscribe(); + it('should update vpcs template', inject([VpcsService], (service: VpcsService) => { + const template: VpcsTemplate = { + base_script_file: 'vpcs_base_config.txt', + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + default_name_format: 'PC{0}', + name: '', + symbol: ':/symbols/vpcs_guest.svg', + template_id: '1', + template_type: 'vpcs', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); - expect(req.request.method).toEqual('PUT'); - expect(req.request.body).toEqual(template); - })); + service.saveTemplate(server, template).subscribe(); - it('should add vpcs template', inject([VpcsService], (service: VpcsService) => { - const template: VpcsTemplate = { - base_script_file: 'vpcs_base_config.txt', - builtin: false, - category: 'guest', - compute_id: 'local', - console_auto_start: false, - console_type: 'telnet', - default_name_format: 'PC{0}', - name: '', - symbol: ':/symbols/vpcs_guest.svg', - template_id: '', - template_type: 'vpcs' - } + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates/1'); + expect(req.request.method).toEqual('PUT'); + expect(req.request.body).toEqual(template); + })); - service.addTemplate(server, template).subscribe(); + it('should add vpcs template', inject([VpcsService], (service: VpcsService) => { + const template: VpcsTemplate = { + base_script_file: 'vpcs_base_config.txt', + builtin: false, + category: 'guest', + compute_id: 'local', + console_auto_start: false, + console_type: 'telnet', + default_name_format: 'PC{0}', + name: '', + symbol: ':/symbols/vpcs_guest.svg', + template_id: '', + template_type: 'vpcs', + }; - const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); - expect(req.request.method).toEqual('POST'); - expect(req.request.body).toEqual(template); - })); + service.addTemplate(server, template).subscribe(); + + const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/templates'); + expect(req.request.method).toEqual('POST'); + expect(req.request.body).toEqual(template); + })); }); diff --git a/src/app/services/vpcs.service.ts b/src/app/services/vpcs.service.ts index 3f1e2cc9..6398102e 100644 --- a/src/app/services/vpcs.service.ts +++ b/src/app/services/vpcs.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpServer } from './http-server.service'; import { Server } from '../models/server'; import { VpcsTemplate } from '../models/templates/vpcs-template'; @@ -7,21 +7,25 @@ import { HttpHeaders } from '@angular/common/http'; @Injectable() export class VpcsService { - constructor(private httpServer: HttpServer) {} + constructor(private httpServer: HttpServer) {} - getTemplates(server: Server): Observable { - return this.httpServer.get(server, '/templates') as Observable; - } + getTemplates(server: Server): Observable { + return this.httpServer.get(server, '/templates') as Observable; + } - getTemplate(server: Server, template_id: string): Observable { - return this.httpServer.get(server, `/templates/${template_id}`) as Observable; - } + getTemplate(server: Server, template_id: string): Observable { + return this.httpServer.get(server, `/templates/${template_id}`) as Observable; + } - addTemplate(server: Server, vpcsTemplate: VpcsTemplate): Observable { - return this.httpServer.post(server, `/templates`, vpcsTemplate) as Observable; - } + addTemplate(server: Server, vpcsTemplate: VpcsTemplate): Observable { + return this.httpServer.post(server, `/templates`, vpcsTemplate) as Observable; + } - saveTemplate(server: Server, vpcsTemplate: VpcsTemplate): Observable { - return this.httpServer.put(server, `/templates/${vpcsTemplate.template_id}`, vpcsTemplate) as Observable; - } + saveTemplate(server: Server, vpcsTemplate: VpcsTemplate): Observable { + return this.httpServer.put( + server, + `/templates/${vpcsTemplate.template_id}`, + vpcsTemplate + ) as Observable; + } } diff --git a/src/app/testing/app-testing/app-testing.module.ts b/src/app/testing/app-testing/app-testing.module.ts index 33864fe9..0414a25a 100644 --- a/src/app/testing/app-testing/app-testing.module.ts +++ b/src/app/testing/app-testing/app-testing.module.ts @@ -5,6 +5,6 @@ import { ServerErrorHandler } from '../../services/http-server.service'; @NgModule({ imports: [CommonModule], declarations: [], - providers: [ServerErrorHandler] + providers: [ServerErrorHandler], }) export class AppTestingModule {} diff --git a/src/app/validators/non-negative-validator.ts b/src/app/validators/non-negative-validator.ts index 9b2f5f3a..146571bd 100644 --- a/src/app/validators/non-negative-validator.ts +++ b/src/app/validators/non-negative-validator.ts @@ -3,9 +3,9 @@ import { Injectable } from '@angular/core'; @Injectable() export class NonNegativeValidator { get(control) { - if (+control.value>=0) { + if (+control.value >= 0) { return null; - } + } return { negativeValue: true }; } diff --git a/src/app/validators/project-name-async-validator.ts b/src/app/validators/project-name-async-validator.ts index 6d3f1e2d..a0d8e18d 100644 --- a/src/app/validators/project-name-async-validator.ts +++ b/src/app/validators/project-name-async-validator.ts @@ -5,10 +5,10 @@ import { map, switchMap } from 'rxjs/operators'; import { Server } from '../models/server'; export const projectNameAsyncValidator = (server: Server, projectService: ProjectService) => { - return (control: FormControl) => { - return timer(500).pipe( - switchMap(() => projectService.list(server)), - map(response => (response.find(n => n.name === control.value) ? {projectExist: true} : null)) - ); - } -} + return (control: FormControl) => { + return timer(500).pipe( + switchMap(() => projectService.list(server)), + map((response) => (response.find((n) => n.name === control.value) ? { projectExist: true } : null)) + ); + }; +}; diff --git a/src/app/validators/rotation-validator.ts b/src/app/validators/rotation-validator.ts index a95f3f37..85f33f77 100644 --- a/src/app/validators/rotation-validator.ts +++ b/src/app/validators/rotation-validator.ts @@ -3,9 +3,9 @@ import { Injectable } from '@angular/core'; @Injectable() export class RotationValidator { get(control) { - if (+control.value>-360 && +control.value<=360) { + if (+control.value > -360 && +control.value <= 360) { return null; - } + } return { negativeValue: true }; } diff --git a/src/app/validators/template-name-async-validator.ts b/src/app/validators/template-name-async-validator.ts index 160c10da..05c50475 100644 --- a/src/app/validators/template-name-async-validator.ts +++ b/src/app/validators/template-name-async-validator.ts @@ -5,10 +5,10 @@ import { map, switchMap } from 'rxjs/operators'; import { Server } from '../models/server'; export const templateNameAsyncValidator = (server: Server, templateService: TemplateService) => { - return (control: FormControl) => { - return timer(500).pipe( - switchMap(() => templateService.list(server)), - map(response => (response.find(n => n.name === control.value) ? {templateExist: true} : null)) - ); - } -} + return (control: FormControl) => { + return timer(500).pipe( + switchMap(() => templateService.list(server)), + map((response) => (response.find((n) => n.name === control.value) ? { templateExist: true } : null)) + ); + }; +}; diff --git a/src/environments/environment.electron.prod.ts b/src/environments/environment.electron.prod.ts index b1de21c8..33e05f14 100644 --- a/src/environments/environment.electron.prod.ts +++ b/src/environments/environment.electron.prod.ts @@ -1,5 +1,5 @@ export const environment = { - solarputty_download_url: "", + solarputty_download_url: '', production: true, electron: true, }; diff --git a/src/environments/environment.electron.ts b/src/environments/environment.electron.ts index dd88728a..411afa47 100644 --- a/src/environments/environment.electron.ts +++ b/src/environments/environment.electron.ts @@ -1,5 +1,5 @@ export const environment = { production: false, electron: true, - solarputty_download_url: "", + solarputty_download_url: '', }; diff --git a/src/environments/environment.github.prod.ts b/src/environments/environment.github.prod.ts index 2bf4ad5f..732ed166 100644 --- a/src/environments/environment.github.prod.ts +++ b/src/environments/environment.github.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, electron: false, githubio: true, - solarputty_download_url: "" + solarputty_download_url: '', }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index cd119730..6258b34c 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,5 +2,5 @@ export const environment = { production: true, electron: false, githubio: false, - solarputty_download_url: "", + solarputty_download_url: '', }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b4dfd930..cfed224a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, electron: false, githubio: false, - solarputty_download_url: '' + solarputty_download_url: '', }; /* diff --git a/src/index.html b/src/index.html index 5e219ee4..0332bc23 100644 --- a/src/index.html +++ b/src/index.html @@ -25,7 +25,7 @@