From 90c8f84ea48c3885eced217a26656f26972b7b2d Mon Sep 17 00:00:00 2001 From: alicia pritchett Date: Mon, 27 Sep 2021 10:55:46 -0400 Subject: [PATCH] libraries are kept in dialog data but data is manipulated outside of the dialog --- .../workflow-spec-dialog.component.ts | 10 ++++++++++ .../workflow-spec-list/workflow-spec-list.component.ts | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/_dialogs/workflow-spec-dialog/workflow-spec-dialog.component.ts b/src/app/_dialogs/workflow-spec-dialog/workflow-spec-dialog.component.ts index 23c5936..57f4bc2 100644 --- a/src/app/_dialogs/workflow-spec-dialog/workflow-spec-dialog.component.ts +++ b/src/app/_dialogs/workflow-spec-dialog/workflow-spec-dialog.component.ts @@ -89,6 +89,16 @@ export class WorkflowSpecDialogComponent { required: true, }, }, + { + key: 'standalone', + defaultValue: this.data.standalone ? this.data.standalone : false, + hideExpression: true, + }, + { + key: 'library', + defaultValue: this.data.library ? this.data.library : false, + hideExpression: true, + }, ]; }); } diff --git a/src/app/workflow-spec-list/workflow-spec-list.component.ts b/src/app/workflow-spec-list/workflow-spec-list.component.ts index dad6002..6514dd2 100644 --- a/src/app/workflow-spec-list/workflow-spec-list.component.ts +++ b/src/app/workflow-spec-list/workflow-spec-list.component.ts @@ -112,7 +112,7 @@ export class WorkflowSpecListComponent implements OnInit { } canSaveWorkflowSpec(proposed: WorkflowSpecDialogData){ - console.log(proposed); + // Can possibly remove or bypass this method alltogether if ((this.selectedSpec.parents.length > 0) && (!proposed.library)){ this.snackBar.open('This Workflow Specification is still being used as a Library. Please remove references first!', 'Ok', { duration: 5000 }); return false; @@ -135,7 +135,7 @@ export class WorkflowSpecListComponent implements OnInit { category_id: selectedSpec ? selectedSpec.category_id : null, display_order: hasDisplayOrder ? selectedSpec.display_order : 0, standalone: selectedSpec ? selectedSpec.standalone : null, - library: selectedSpec ? selectedSpec.library : null, + library: selectedSpec ? selectedSpec.library : (state === 'library' ? true : null), }; // Open new filename/workflow spec dialog @@ -302,7 +302,6 @@ export class WorkflowSpecListComponent implements OnInit { display_name: data.display_name, description: data.description, category_id: data.category_id, - // display_order: data.display_order, standalone: data.standalone, library: data.library, };