fix TRS ID "copy button" bug

https://ucsc-cgl.atlassian.net/browse/DOCK-2594 dockstore/dockstore#6024
dockstore · Oct 24, 2024 · c9ff712 · c9ff712
1 parent d7fa51d
commit c9ff712
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/app/workflow/info-tab/info-tab.component.ts b/src/app/workflow/info-tab/info-tab.component.ts
@@ -194,6 +194,7 @@ export class InfoTabComponent extends EntryTab implements OnInit, OnChanges {
       this.authors = null;
       this.description = null;
     }
+    this.displayTextForButton = this.infoTabService.getTRSId(this.workflow);
   }
 
   ngOnInit() {
@@ -208,9 +209,6 @@ export class InfoTabComponent extends EntryTab implements OnInit, OnChanges {
     this.infoTabService.defaultTestFilePathEditing$
       .pipe(takeUntil(this.ngUnsubscribe))
       .subscribe((editing) => (this.defaultTestFilePathEditing = editing));
-    this.entryType$
-      .pipe(takeUntil(this.ngUnsubscribe))
-      .subscribe((entryType) => (this.displayTextForButton = this.infoTabService.getTRSId(this.workflow, entryType)));
     this.infoTabService.forumUrlEditing$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((editing) => (this.forumUrlEditing = editing));
   }
   /**

diff --git a/src/app/workflow/info-tab/info-tab.service.spec.ts b/src/app/workflow/info-tab/info-tab.service.spec.ts
@@ -10,7 +10,7 @@ import { WorkflowsService } from 'app/shared/openapi';
 import { ExtendedWorkflowQuery } from 'app/shared/state/extended-workflow.query';
 import { WorkflowService } from 'app/shared/state/workflow.service';
 import { WorkflowsStubService, WorkflowStubService } from 'app/test/service-stubs';
-import { sampleWorkflow3 } from '../../test/mocked-objects';
+import { sampleWorkflow3, appToolEntryTypeMetadata, serviceEntryTypeMetadata, notebookEntryTypeMetadata } from '../../test/mocked-objects';
 import { InfoTabService } from './info-tab.service';
 
 describe('ValueService', () => {
@@ -54,10 +54,15 @@ describe('ValueService', () => {
   it(`getTRSId should work for tools and workflows`, () => {
     service = TestBed.inject(InfoTabService);
     const fullWorkflowPath = sampleWorkflow3.full_workflow_path;
-    expect(service.getTRSId(sampleWorkflow3, EntryType.BioWorkflow)).toBe(`#workflow/${fullWorkflowPath}`);
-    expect(service.getTRSId(sampleWorkflow3, EntryType.AppTool)).toBe(fullWorkflowPath);
-    expect(service.getTRSId(sampleWorkflow3, EntryType.Service)).toBe(`#service/${fullWorkflowPath}`);
-    expect(service.getTRSId(null, EntryType.BioWorkflow)).toBe('');
+    const clone = Object.assign({}, sampleWorkflow3);
+    expect(service.getTRSId(clone)).toBe(`#workflow/${fullWorkflowPath}`);
+    clone.entryTypeMetadata = appToolEntryTypeMetadata;
+    expect(service.getTRSId(clone)).toBe(fullWorkflowPath);
+    clone.entryTypeMetadata = serviceEntryTypeMetadata;
+    expect(service.getTRSId(clone)).toBe(`#service/${fullWorkflowPath}`);
+    clone.entryTypeMetadata = notebookEntryTypeMetadata;
+    expect(service.getTRSId(clone)).toBe(`#notebook/${fullWorkflowPath}`);
+    expect(service.getTRSId(null)).toBe('');
   });
 
   it(`getTRSPlainType should work for various descriptor types`, () => {

diff --git a/src/app/workflow/info-tab/info-tab.service.ts b/src/app/workflow/info-tab/info-tab.service.ts
@@ -187,11 +187,12 @@ export class InfoTabService {
     );
   }
 
-  getTRSId(workflow: Workflow | undefined, entryType: EntryType): string {
-    if (!workflow) {
+  getTRSId(workflow: Workflow | undefined): string {
+    if (workflow) {
+      return workflow.entryTypeMetadata.trsPrefix + workflow.full_workflow_path;
+    } else {
       return '';
     }
-    return this.getTRSIDFromPath(workflow.full_workflow_path, entryType);
   }
 
   private getTRSIDFromPath(fullWorkflowPath: string, entryType: EntryType): string {