merging in changes from dev

This commit is contained in:
Dan 2022-03-23 11:33:17 -04:00
commit 5ccdcbdf44
4 changed files with 12 additions and 11 deletions

14
package-lock.json generated
View File

@ -43,7 +43,7 @@
"ngx-markdown": "^12.0.1", "ngx-markdown": "^12.0.1",
"protractor": "^7.0.0", "protractor": "^7.0.0",
"rxjs": "^6.5.3", "rxjs": "^6.5.3",
"sartography-workflow-lib": "0.0.613", "sartography-workflow-lib": "0.0.614",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
@ -16906,9 +16906,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"node_modules/sartography-workflow-lib": { "node_modules/sartography-workflow-lib": {
"version": "0.0.613", "version": "0.0.614",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.613.tgz", "resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.614.tgz",
"integrity": "sha512-mR6QLCZgei6TmmS7AoMbF3nY5Kux9AdnIwJEdyn7azSVpZHavG/O0zYjiH2QyEep7qscxExTGp36ewy/nX4VSg==", "integrity": "sha512-T1zjzZpO8GrhjMyqV1JLT3pqGfl9zMsOQkIqcOPXMdGqbv1OiCZHkBg/IZAIJ8wMZsvGYiEJOhNl3F2zdjU+Ww==",
"dependencies": { "dependencies": {
"tslib": "^2.2.0" "tslib": "^2.2.0"
} }
@ -33428,9 +33428,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"sartography-workflow-lib": { "sartography-workflow-lib": {
"version": "0.0.613", "version": "0.0.614",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.613.tgz", "resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.614.tgz",
"integrity": "sha512-mR6QLCZgei6TmmS7AoMbF3nY5Kux9AdnIwJEdyn7azSVpZHavG/O0zYjiH2QyEep7qscxExTGp36ewy/nX4VSg==", "integrity": "sha512-T1zjzZpO8GrhjMyqV1JLT3pqGfl9zMsOQkIqcOPXMdGqbv1OiCZHkBg/IZAIJ8wMZsvGYiEJOhNl3F2zdjU+Ww==",
"requires": { "requires": {
"tslib": "^2.2.0" "tslib": "^2.2.0"
} }

View File

@ -63,7 +63,7 @@
"ngx-markdown": "^12.0.1", "ngx-markdown": "^12.0.1",
"protractor": "^7.0.0", "protractor": "^7.0.0",
"rxjs": "^6.5.3", "rxjs": "^6.5.3",
"sartography-workflow-lib": "0.0.613", "sartography-workflow-lib": "0.0.614",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"zone.js": "~0.11.4" "zone.js": "~0.11.4"

View File

@ -197,11 +197,11 @@ export class ModelerComponent implements AfterViewInit {
}); });
dialogRef.afterClosed().subscribe(dialogResult => { dialogRef.afterClosed().subscribe(dialogResult => {
if (dialogResult) { if (dialogResult) {
this.router.navigate(['/modeler', this.workflowSpecId, b.id]); this.router.navigate(['/modeler', this.workflowSpecId, 'file', b.name]);
} }
}); });
} else { } else {
this.router.navigate(['/modeler', this.workflowSpecId, b.id]) this.router.navigate(['/modeler', this.workflowSpecId, 'file', b.name])
} }
} }

View File

@ -416,7 +416,8 @@ describe('WorkflowSpecListComponent', () => {
task_data: {}, task_data: {},
line_number: 12, line_number: 12,
offset: 0, offset: 0,
error_line: 'x != y' error_line: 'x != y',
task_trace: []
}; };
invalidReq.flush([mockError]); invalidReq.flush([mockError]);
expect(bottomSheetSpy).toHaveBeenCalled(); expect(bottomSheetSpy).toHaveBeenCalled();