Merge branch 'dev' into feature/git-repo

This commit is contained in:
alicia pritchett 2022-03-15 14:50:49 -04:00
commit 259dfd9bf0
4 changed files with 20730 additions and 19 deletions

20736
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -88,7 +88,7 @@ export class FileListComponent implements OnInit, OnChanges {
}
downloadFile(fm: FileMeta) {
this.api.getFileData(fm.id).subscribe(response => {
this.api.getSpecFileData(this.workflowSpec, fm.name).subscribe(response => {
const blob = new Blob([response.body], {type: fm.content_type});
fileSaver.saveAs(blob, fm.name);
});

View File

@ -106,10 +106,10 @@ export class WorkflowSpecListComponent implements OnInit {
}
setCatByID(cat_id: string) {
if (cat_id) {
if (cat_id != '') {
this.api.getWorkflowSpecCategory(cat_id).subscribe(cat => {
this.selectedCat = cat;
})
});
}
}
@ -300,7 +300,6 @@ export class WorkflowSpecListComponent implements OnInit {
}
private _loadWorkflowSpecs(selectedSpecName: string = null, searchSpecName: string = null) {
this.api.getWorkflowSpecList().subscribe(wfs => {
this.workflowSpecs = wfs;
// Populate categories with their specs
@ -432,8 +431,8 @@ export class WorkflowSpecListComponent implements OnInit {
private _updateWorkflowSpec(specId: string, newSpec: WorkflowSpec) {
this.api.updateWorkflowSpecification(specId, newSpec).subscribe(_ => {
this._loadWorkflowLibraries();
this._loadWorkflowSpecs();
this._loadWorkflowLibraries(newSpec.id);
this._loadWorkflowSpecs(newSpec.id);
this._displayMessage('Saved changes to workflow spec.');
});
}