Merge branch 'hotfix/2.8.1'

package.json

@@ -3,7 +3,7 @@
   "version": "2.8.0",
   "license": "Apache License 2.0",
   "config": {
-    "webservice_version": "1.11.3"
+    "webservice_version": "1.11.6"
   },
   "scripts": {
     "ng": "npx ng",

scripts/generate-openapi-script.sh

@@ -11,7 +11,7 @@ GENERATOR_VERSION="4.3.0"
 # Uncomment this to use the actual Dockstore webservice release from the package.json
 BASE_PATH="https://raw.githubusercontent.com/dockstore/dockstore/$npm_package_config_webservice_version"
 # Uncomment this to use the CircleCI swagger/openapi instead
-# CIRCLE_CI_PATH="https://11124-33383826-gh.circle-artifacts.com/0/tmp/artifacts"
+# CIRCLE_CI_PATH="https://13342-33383826-gh.circle-artifacts.com/0/tmp/artifacts"
 # DOCKSTORE-2428 - demo how to add new workflow language, generate from local copy of swagger
 # Uncomment this to use your local copy of swagger instead
 # BASE_PATH="../dockstore"

scripts/run-webservice-script.sh

@@ -4,9 +4,9 @@ set -o pipefail
 set -o nounset
 set -o xtrace
 # Uncomment this to use the actual Dockstore webservice from the package.json
- JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar"
+JAR_PATH="https://artifacts.oicr.on.ca/artifactory/collab-release/io/dockstore/dockstore-webservice/${npm_package_config_webservice_version}/dockstore-webservice-${npm_package_config_webservice_version}.jar"
 # Uncomment this to use the CircleCI jar
-# JAR_PATH="https://10918-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.0-alpha.3-SNAPSHOT.jar"
+# JAR_PATH="https://13342-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.11.6.jar"
 
 wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH}
 chmod u+x dockstore-webservice.jar

src/app/footer/footer.component.html

@@ -131,11 +131,13 @@
                 <small>Help Desk</small>
               </a>
             </li>
+            <!-- https://github.com/dockstore/dockstore/issues/4375 disable until we have an email or ticket system aside from discourse help desk
             <li class="m-0">
               <a [href]="" target="_self" rel="noopener noreferrer" class="footer-link">
                 <small>Contact Us</small>
               </a>
             </li>
+            -->
             <li class="m-0">
               <a routerLink="/sitemap" target="_self" rel="noopener noreferrer" class="footer-link">
                 <small>Sitemap</small>

src/app/workflow/snapshot-exporter-modal/snapshot-exporter-modal.service.ts

@@ -20,12 +20,13 @@ export class SnapshotExporterModalService {
   ) {}
 
   public snapshotWorkflowVersion(workflow: Workflow, version: WorkflowVersion): Observable<void> {
-    this.alertService.start(`Snapshotting workflow ${workflow.workflowName} version ${version.name}`);
+    const workflowName: string = workflow.workflowName || workflow.repository;
+    this.alertService.start(`Snapshotting workflow ${workflowName} version ${version.name}`);
     const snapshot: WorkflowVersion = { ...version, frozen: true };
     return this.workflowsService.updateWorkflowVersion(workflow.id, [snapshot]).pipe(
       map((workflowVersions: Array<WorkflowVersion>) => {
         this.alertService.detailedSuccess(`A snapshot was created for workflow
-                                       "${workflow.workflowName}" version "${version.name}"!`);
+                                       "${workflowName}" version "${version.name}"!`);
         const selectedWorkflow = { ...this.workflowQuery.getActive() };
         if (selectedWorkflow.id === workflow.id) {
           this.workflowService.setWorkflow({ ...selectedWorkflow, workflowVersions: workflowVersions });
@@ -43,17 +44,15 @@ export class SnapshotExporterModalService {
   }
 
   public requestDOI(workflow: Workflow, version: WorkflowVersion): Observable<void> {
+    const workflowName: string = workflow.workflowName || workflow.repository;
     this.alertService.start(`A Digital Object Identifier (DOI) is being requested for workflow
-                                       "${workflow.workflowName}" version "${version.name}"!`);
+                                       "${workflowName}" version "${version.name}"!`);
     return this.workflowsService.requestDOIForWorkflowVersion(workflow.id, version.id).pipe(
       map((versions) => {
         const selectedWorkflow = { ...this.workflowQuery.getActive() };
         if (selectedWorkflow.id === workflow.id) {
           this.workflowService.setWorkflow({ ...selectedWorkflow, workflowVersions: versions });
         }
-
-        const workflowName: string = workflow.workflowName || workflow.repository;
-
         this.alertService.detailedSuccess(`A Digital Object Identifier (DOI) was created for workflow
                                        "${workflowName}" version "${version.name}"!`);
       }),
@@ -64,10 +63,11 @@ export class SnapshotExporterModalService {
   }
 
   public exportToOrcid(workflow: Workflow, version: WorkflowVersion): Observable<void> {
-    this.alertService.start(`Exporting workflow ${workflow.workflowName} version ${version.name} to ORCID`);
+    const workflowName: string = workflow.workflowName || workflow.repository;
+    this.alertService.start(`Exporting workflow ${workflowName} version ${version.name} to ORCID`);
     return this.entriesService.exportToORCID(workflow.id, version.id).pipe(
       map((result) => {
-        this.alertService.detailedSuccess(`Exported workflow ${workflow.workflowName} version ${version.name} to ORCID`);
+        this.alertService.detailedSuccess(`Exported workflow ${workflowName} version ${version.name} to ORCID`);
       }),
       catchError((error) => {
         this.alertService.detailedError(error);