merge branch hotfix/2.7.2

* Add Cavatica button for CWL workflows * Update launch-third-party.component.html Add missing bracket for img Co-authored-by: stefanijaorbovic <[email protected]> Co-authored-by: Charles Overbeck <[email protected]> (cherry picked from commit ae571a1) Co-authored-by: StefanijaO <[email protected]> Co-authored-by: Charles Overbeck <[email protected]> Co-authored-by: StefanijaO <[email protected]>
dockstore · Feb 2, 2021 · ad280c5 · ad280c5
1 parent 60b2027
commit ad280c5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/app/shared/dockstore.model.ts b/src/app/shared/dockstore.model.ts
@@ -36,6 +36,7 @@ export class Dockstore {
   static ANVIL_IMPORT_URL = 'https://anvil.terra.bio/#import-tool/dockstore';
   static BD_CATALYST_SEVEN_BRIDGES_IMPORT_URL = 'https://sb.biodatacatalyst.nhlbi.nih.gov/integration/trs/import';
   static BD_CATALYST_TERRA_IMPORT_URL = 'https://terra.biodatacatalyst.nhlbi.nih.gov/#import-tool/dockstore';
+  static CAVATICA_IMPORT_URL = 'https://cavatica.sbgenomics.com/integration/trs/import';
 
   static GITHUB_CLIENT_ID = 'will be filled in by configuration.service';
   static GITHUB_AUTH_URL = 'https://github.com/login/oauth/authorize';

diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.html b/src/app/workflow/launch-third-party/launch-third-party.component.html
@@ -95,6 +95,18 @@ <h3>Launch with</h3>
               >NHLBI BioData Catalyst</a
             >
           </div>
+          <div fxFlex="100%" *ngIf="workflow?.descriptorType === 'CWL'">
+            <a
+              mat-raised-button
+              [matTooltip]="cavaticaTooltip$ | async"
+              target="_blank"
+              rel="noopener"
+              [attr.href]="config.CAVATICA_IMPORT_URL + '?trs=' + trsUrl"
+              [disabled]="disableSevenBridgesPlatform$ | async"
+              color="primary"
+              ><img src="../assets/images/thirdparty/cavatica.png" /> Cavatica
+            </a>
+          </div>
         </div>
       </div>
     </div>

diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.ts b/src/app/workflow/launch-third-party/launch-third-party.component.ts
@@ -179,6 +179,10 @@ export class LaunchThirdPartyComponent extends Base implements OnChanges, OnInit
     map(([hasContent, hasFileImports]) => !hasContent || (hasFileImports && !this.isGitHubWorkflow()))
   );
 
+  cavaticaTooltip$: Observable<string> = combineLatest([this.hasContent$, this.hasHttpImports$]).pipe(
+    map(([hasContent, hasHttpImports]) => this.sevenBridgesTooltip(hasContent, hasHttpImports, 'Cavatica'))
+  );
+
   constructor(
     private workflowsService: WorkflowsService,
     private descriptorTypeCompatService: DescriptorTypeCompatService,

diff --git a/src/assets/images/thirdparty/cavatica.png b/src/assets/images/thirdparty/cavatica.png