From fbe0c7258ac81bd9476b3690050bdb2251c45c47 Mon Sep 17 00:00:00 2001 From: Gary Luu Date: Wed, 27 May 2020 13:28:02 -0400 Subject: [PATCH] CollectionEntry and My Workflows Optimization (#980) * Use new CollectionEntry object in template (not typed though) * Update package.json to 1.8.5 * Temporarily use CircleCI JAR. MUST REMOVE. --- cypress/integration/group2/organizations.ts | 2 +- package.json | 2 +- scripts/generate-openapi-script.sh | 3 ++ scripts/run-webservice-script.sh | 5 ++- .../collection/collection.component.html | 34 +++---------------- 5 files changed, 14 insertions(+), 32 deletions(-) diff --git a/cypress/integration/group2/organizations.ts b/cypress/integration/group2/organizations.ts index 07728a30a3..1493a9710f 100644 --- a/cypress/integration/group2/organizations.ts +++ b/cypress/integration/group2/organizations.ts @@ -252,7 +252,7 @@ describe('Dockstore Organizations', () => { it('be able to remove an entry from a collection', () => { cy.visit('/organizations/Potatoe/collections/veryFakeCollectionName'); cy.contains('quay.io/garyluu/dockstore-cgpmap/cgpmap-cramOut'); - cy.get('#removeToolButton').click(); + cy.get('#removeEntryButton').click(); cy.get('#accept-remove-entry-from-org').click(); cy.contains('This collection has no associated entries'); cy.visit('/organizations/Potatoe'); diff --git a/package.json b/package.json index 516aac33a4..9c33c590e7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "2.3.0", "license": "Apache License 2.0", "config": { - "webservice_version": "1.8.1-rc.0" + "webservice_version": "1.8.5" }, "scripts": { "ng": "npx ng", diff --git a/scripts/generate-openapi-script.sh b/scripts/generate-openapi-script.sh index 2b6f1eb2f9..5622d90413 100755 --- a/scripts/generate-openapi-script.sh +++ b/scripts/generate-openapi-script.sh @@ -8,11 +8,14 @@ GENERATOR_VERSION="3.3.4" BASE_PATH="https://raw.githubusercontent.com/dockstore/dockstore/$npm_package_config_webservice_version" # DOCKSTORE-2428 - demo how to add new workflow language, generate from local copy of swagger # BASE_PATH="../dockstore" +#CIRCLE_CI_PATH="https://3855-33383826-gh.circle-artifacts.com/0/tmp/artifacts" wget --no-verbose https://repo.maven.apache.org/maven2/org/openapitools/openapi-generator-cli/${GENERATOR_VERSION}/openapi-generator-cli-${GENERATOR_VERSION}.jar -O openapi-generator-cli.jar rm -Rf src/app/shared/swagger rm -Rf src/app/shared/openapi java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/swagger.yaml -l typescript-angular -o src/app/shared/swagger -c swagger-config.json java -jar openapi-generator-cli.jar generate -i ${BASE_PATH}/dockstore-webservice/src/main/resources/openapi3/openapi.yaml -l typescript-angular -o src/app/shared/openapi -c swagger-config.json +#java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/swagger.yaml -l typescript-angular -o src/app/shared/swagger -c swagger-config.json +#java -jar openapi-generator-cli.jar generate -i ${CIRCLE_CI_PATH}/openapi.yaml -l typescript-angular -o src/app/shared/openapi -c swagger-config.json rm openapi-generator-cli.jar diff --git a/scripts/run-webservice-script.sh b/scripts/run-webservice-script.sh index 36a1eadc61..ca109121e1 100755 --- a/scripts/run-webservice-script.sh +++ b/scripts/run-webservice-script.sh @@ -4,7 +4,10 @@ set -o pipefail set -o nounset set -o xtrace -wget -O dockstore-webservice.jar --no-verbose --tries=10 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" +JAR_PATH="https://3855-33383826-gh.circle-artifacts.com/0/tmp/artifacts/dockstore-webservice-1.8.6-SNAPSHOT.jar" + +wget -O dockstore-webservice.jar --no-verbose --tries=10 ${JAR_PATH} chmod u+x dockstore-webservice.jar psql -h localhost -c "create user dockstore with password 'dockstore' createdb;" -U postgres psql -h localhost -c "ALTER USER dockstore WITH superuser;" -U postgres diff --git a/src/app/organizations/collection/collection.component.html b/src/app/organizations/collection/collection.component.html index a50f48583f..a8ef9cd58f 100644 --- a/src/app/organizations/collection/collection.component.html +++ b/src/app/organizations/collection/collection.component.html @@ -87,48 +87,24 @@

- - - {{ entry.full_workflow_path }} - - - - {{ entry.full_workflow_path }} - - - - - {{ entry.tool_path }} + + {{ entry.entryPath }}

Last updated {{ entry.dbUpdateDate | date }} - - + - - -