From 793ce28ff12a989e3b67bd4ebd49552cd382b9d8 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Sun, 7 Jun 2020 22:22:24 -0400 Subject: [PATCH 1/2] Updates sartography-workflow-lib. Adds sentry. --- package-lock.json | 63 +++++++++++++++++++++++-- package.json | 3 +- src/app/app-routing.module.ts | 1 + src/app/app.module.ts | 1 + src/environments/environment.runtime.ts | 1 + src/environments/environment.spec.ts | 6 ++- src/index.html | 1 + 7 files changed, 70 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 35453b7..24fcb56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3138,6 +3138,63 @@ } } }, + "@sentry/browser": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.16.1.tgz", + "integrity": "sha512-uXXKRGLWDqwaKO09K1GTTV0Yj+OfELVs+0cDDYqPDow+DlIXyx0gSnZPd0caCqFllUy8JSxb4S9OprYinvks2A==", + "requires": { + "@sentry/core": "5.16.1", + "@sentry/types": "5.16.1", + "@sentry/utils": "5.16.1", + "tslib": "^1.9.3" + } + }, + "@sentry/core": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.16.1.tgz", + "integrity": "sha512-CDKUAUWefZ+bx7tUGm7pgkuJbwn+onAlwzKkLGVg730IP+N/AWSpVtbvFTPiel2+NPiFhWX5/F0SpxDMLPRKfg==", + "requires": { + "@sentry/hub": "5.16.1", + "@sentry/minimal": "5.16.1", + "@sentry/types": "5.16.1", + "@sentry/utils": "5.16.1", + "tslib": "^1.9.3" + } + }, + "@sentry/hub": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.16.1.tgz", + "integrity": "sha512-Og4zxp0lM9yS6TyKbZ5lQR94f/fNOalodm71Dk4qfBWi0OzfFCVpO4fPOhHtbXEsvMNg5xh0Pe8ezqX3CZ3hTw==", + "requires": { + "@sentry/types": "5.16.1", + "@sentry/utils": "5.16.1", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.16.1.tgz", + "integrity": "sha512-RCwEKLneV5BQlv1MEmsCR3I5jajHgVGusBgwGgnFv+4Cn4cNC7OHWH4QbuZ3IHOEHJl7YS074BeluM+7jn0+Tw==", + "requires": { + "@sentry/hub": "5.16.1", + "@sentry/types": "5.16.1", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.16.1.tgz", + "integrity": "sha512-uERNhBdsiWvWG7qTC9QVsvFmOSL8rFfy8usEXeH3l4oCQao9TvGUvXJv6gRfiWmoiJZ1A0608Lj15CORygdbng==" + }, + "@sentry/utils": { + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.16.1.tgz", + "integrity": "sha512-hn2jTc6ZH1lXGij7yqkV6cGhEYxsdjqB5P4MjfrRHB5bk5opY9R89bsAhs1rpanTdwv6Ul0ieR1z18gdIgUf0g==", + "requires": { + "@sentry/types": "5.16.1", + "tslib": "^1.9.3" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -12299,9 +12356,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sartography-workflow-lib": { - "version": "0.0.249", - "resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.249.tgz", - "integrity": "sha512-XCILdlcZ39j/PQhqYTqdcxJKD1sL8dAgAM6/VAhTfRHCS14YGWBNBScLVCBQWXaUqJ9hFG1F28Zy9h9qOKb2HQ==" + "version": "0.0.261", + "resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.261.tgz", + "integrity": "sha512-K6Jd/xzxah2p8NCE2bbphd88wbUJnl466AmmTA1t5EtOJGMymvaj2iO25SWgi7fxBeFBYHGjpHFw5Bl/xoCIcg==" }, "sass": { "version": "1.23.3", diff --git a/package.json b/package.json index f0d4074..89c9b42 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "@angular/router": "^9.0.7", "@ngx-formly/core": "^5.5.15", "@ngx-formly/material": "^5.5.15", + "@sentry/browser": "^5.16.1", "@yellowspot/ng-truncate": "^1.5.1", "bpmn-js": "^6.4.2", "bpmn-js-properties-panel": "^0.33.2", @@ -54,7 +55,7 @@ "ngx-file-drop": "^8.0.8", "ngx-markdown": "^9.0.0", "rxjs": "~6.5.4", - "sartography-workflow-lib": "0.0.249", + "sartography-workflow-lib": "0.0.261", "tslib": "^1.11.1", "uuid": "^7.0.2", "zone.js": "^0.10.3" diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0e19b29..ca7543e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -16,6 +16,7 @@ export class ThisEnvironment implements AppEnvironment { irbUrl = environment.irbUrl; title = environment.title; googleAnalyticsKey = environment.googleAnalyticsKey; + sentryKey = environment.sentryKey; } const routes: Routes = [ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d8fcd97..e890441 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -59,6 +59,7 @@ export class ThisEnvironment implements AppEnvironment { irbUrl = environment.irbUrl; title = environment.title; googleAnalyticsKey = environment.googleAnalyticsKey; + sentryKey = environment.sentryKey; } /** diff --git a/src/environments/environment.runtime.ts b/src/environments/environment.runtime.ts index d78d92b..d49a424 100644 --- a/src/environments/environment.runtime.ts +++ b/src/environments/environment.runtime.ts @@ -11,4 +11,5 @@ export const environment: AppEnvironment = { irbUrl: _has(ENV, 'irbUrl', '$IRB_URL') ? ENV.irbUrl : 'http://localhost:5001', title: _has(ENV, 'title', '$TITLE') ? ENV.title : 'Research Ramp-Up Toolkit Configurator', googleAnalyticsKey: _has(ENV, 'googleAnalyticsKey', '$GOOGLE_ANALYTICS_KEY') ? ENV.googleAnalyticsKey : 'UA-168203235-5', + sentryKey: _has(ENV, 'sentryKey', '$SENTRY_KEY') ? ENV.sentryKey : undefined, }; diff --git a/src/environments/environment.spec.ts b/src/environments/environment.spec.ts index 7c4126e..d051ea8 100644 --- a/src/environments/environment.spec.ts +++ b/src/environments/environment.spec.ts @@ -3,14 +3,15 @@ import {_has, environment} from './environment.runtime'; declare var ENV; describe('Environments', () => { - it('should have settings for all the environments', () => { + it('should have default values for all the environments', () => { expect(environment).toBeDefined(); expect(environment.production).toEqual(false); expect(environment.api).toEqual('apiRoot'); expect(environment.irbUrl).toEqual('irbUrl'); expect(environment.homeRoute).toEqual('home'); - expect(environment.title).toEqual('Research Ramp-Up Toolkit Configurator'); + expect(environment.title).toEqual('Research Ramp-Up Toolkit'); expect(environment.googleAnalyticsKey).toEqual('UA-168203235-5'); + expect(environment.sentryKey).toEqual(undefined); }); it('should check if environment variables are defined', () => { @@ -21,6 +22,7 @@ describe('Environments', () => { irbUrl: '$IRB_URL', title: '$TITLE', googleAnalyticsKey: '$GOOGLE_ANALYTICS_KEY', + sentryKey: '$SENTRY_KEY', }; expect(_has(env, 'homeRoute', '$HOME_ROUTE')).toBeFalse(); diff --git a/src/index.html b/src/index.html index 1c3c70e..a4580d3 100644 --- a/src/index.html +++ b/src/index.html @@ -12,6 +12,7 @@ irbUrl: '$IRB_URL', baseHref: '$BASE_HREF', googleAnalyticsKey: '$GOOGLE_ANALYTICS_KEY', + sentryKey: '$SENTRY_KEY', }; From 2872fd4ec20121ba89153ec4c8416e6f698954fa Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Sun, 7 Jun 2020 22:42:47 -0400 Subject: [PATCH 2/2] Forgot a word --- src/environments/environment.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.spec.ts b/src/environments/environment.spec.ts index d051ea8..ce06af4 100644 --- a/src/environments/environment.spec.ts +++ b/src/environments/environment.spec.ts @@ -9,7 +9,7 @@ describe('Environments', () => { expect(environment.api).toEqual('apiRoot'); expect(environment.irbUrl).toEqual('irbUrl'); expect(environment.homeRoute).toEqual('home'); - expect(environment.title).toEqual('Research Ramp-Up Toolkit'); + expect(environment.title).toEqual('Research Ramp-Up Toolkit Configurator'); expect(environment.googleAnalyticsKey).toEqual('UA-168203235-5'); expect(environment.sentryKey).toEqual(undefined); });