Merge branch 'hotfix/2.8.5'

dockstore · Feb 14, 2022 · 9add415 · 9add415
2 parents 5642f1f + f2aabd6
commit 9add415
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "2.8.0",
   "license": "Apache License 2.0",
   "config": {
-    "webservice_version": "1.11.10"
+    "webservice_version": "1.11.12"
   },
   "scripts": {
     "ng": "npx ng",

diff --git a/src/app/home-page/home-logged-out/home.component.html b/src/app/home-page/home-logged-out/home.component.html
@@ -132,12 +132,14 @@ <h3><span class="title-strong">Use</span> in many analysis environments.</h3>
               </li>
               <li>
                 Download and install the
-                <a target="_blank" rel="noopener noreferrer" [href]="Dockstore.DOCUMENTATION_URL + '/launch-with/launch.html#dockstore-cli'"
+                <a [routerLink]="['/quick-start']"
                   >Dockstore CLI</a
                 >
-                and set up the <a [routerLink]="['/quick-start']">configuration file</a>.
+                and set up the configuration file.
+              </li>
+              <li>
+                Run the following launch commands.
               </li>
-              <li>Run the following launch commands.</li>
             </ul>
           </div>
           <div fxFlex>

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
@@ -89,18 +89,19 @@
           </div>
           <ng-template #oldWdlLaunch>
             <div fxLayout="column" fxLayoutAlign="space-between center" fxLayoutGap="0.625rem">
-              <a
-                mat-raised-button
-                class="old-launch-with-button"
-                [matTooltip]="!(hasContent$ | async) ? 'The WDL workflow has no content.' : ''"
-                target="_blank"
-                rel="noopener"
-                [attr.href]="config.DNASTACK_IMPORT_URL + '?descriptorType=wdl&path=' + workflowPathAsQueryValue"
-                [disabled]="!(hasContent$ | async)"
-                color="primary"
-                data-cy="dnastackLaunchWith"
-                ><img class="partner-icon" src="../assets/images/thirdparty/dnastack.png" alt="DNAstack icon" /> DNAstack &raquo;</a
-              >
+              <!--              Commenting out as part of https://ucsc-cgl.atlassian.net/browse/SEAB-3800. We can keep this around in case DNAStack spins up another instance.-->
+              <!--              <a-->
+              <!--                mat-raised-button-->
+              <!--                class="old-launch-with-button"-->
+              <!--                [matTooltip]="!(hasContent$ | async) ? 'The WDL workflow has no content.' : ''"-->
+              <!--                target="_blank"-->
+              <!--                rel="noopener"-->
+              <!--                [attr.href]="config.DNASTACK_IMPORT_URL + '?descriptorType=wdl&path=' + workflowPathAsQueryValue"-->
+              <!--                [disabled]="!(hasContent$ | async)"-->
+              <!--                color="primary"-->
+              <!--                data-cy="dnastackLaunchWith"-->
+              <!--              ><img class="partner-icon" src="../assets/images/thirdparty/dnastack.png" alt="DNAstack icon" /> DNAstack &raquo;</a-->
+              <!--              >-->
               <a
                 mat-raised-button
                 class="old-launch-with-button"

diff --git a/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts b/src/app/workflow/launch-third-party/launch-third-party.component.spec.ts
@@ -56,14 +56,17 @@ describe('LaunchThirdPartyComponent', () => {
     const nativeElement: HTMLElement = fixture.nativeElement;
 
     // Verify urls are correct; got these from prod (except for Terra, which is new) to verify there is no breakage.
+    // This test was removed as part of: https://ucsc-cgl.atlassian.net/browse/SEAB-3800
+    // tslint:disable:max-line-length
+    // if (!Dockstore.FEATURES.enableMultiCloudLaunchWithDNAstack) {
+    //   expect(
+    //     nativeElement.querySelector(
+    //       'a[href="https://app.dnastack.com/#/app/workflow/import/dockstore?descriptorType=wdl&path=github.com/DataBiosphere/topmed-workflows/UM_aligner_wdl"]'
+    //     )
+    //   ).toBeTruthy();
+    // }
+
     // tslint:disable:max-line-length
-    if (!Dockstore.FEATURES.enableMultiCloudLaunchWithDNAstack) {
-      expect(
-        nativeElement.querySelector(
-          'a[href="https://app.dnastack.com/#/app/workflow/import/dockstore?descriptorType=wdl&path=github.com/DataBiosphere/topmed-workflows/UM_aligner_wdl"]'
-        )
-      ).toBeTruthy();
-    }
     // https://platform.dnanexus.com/panx/tools/import-workflow?source=https://dockstore.org:443/api/api/ga4gh/v2/tools/%23workflow%2Fgithub.com%2FDataBiosphere%2Ftopmed-workflows%2FUM_aligner_wdl/versions/master
     expect(
       nativeElement.querySelector(