sartography
/
cr-connect-bpmn
mirror of https://github.com/sartography/cr-connect-bpmn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rrt/staging' into rrt/production

This commit is contained in:
Aaron Louie 2020-06-07 22:25:33 -04:00
parent 1cc47d7677 40ba390a92
commit cf6d4ee7e5
7 changed files with 70 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
package-lock.json generated
View File

@ -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",

3
package.json
View File

@ -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"

1
src/app/app-routing.module.ts
View File

@ -16,6 +16,7 @@ export class ThisEnvironment implements AppEnvironment {
irbUrl = environment.irbUrl;
title = environment.title;
googleAnalyticsKey = environment.googleAnalyticsKey;
sentryKey = environment.sentryKey;
}
const routes: Routes = [

1
src/app/app.module.ts
View File

@ -59,6 +59,7 @@ export class ThisEnvironment implements AppEnvironment {
irbUrl = environment.irbUrl;
title = environment.title;
googleAnalyticsKey = environment.googleAnalyticsKey;
sentryKey = environment.sentryKey;
}
/**

1
src/environments/environment.runtime.ts
View File

@ -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,
};

6
src/environments/environment.spec.ts
View File

@ -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();

1
src/index.html
View File

@ -12,6 +12,7 @@
irbUrl: '$IRB_URL',
baseHref: '$BASE_HREF',
googleAnalyticsKey: '$GOOGLE_ANALYTICS_KEY',
sentryKey: '$SENTRY_KEY',
};
</script>
<meta content="width=device-width, initial-scale=1" name="viewport">