Merge branch 'develop' into TASK-4255

opencb · Jul 13, 2023 · a9d3f0a · a9d3f0a
2 parents 006a619 + acd4033
commit a9d3f0a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 101 deletions.
diff --git a/.github/workflows/build-jsorolla-workflow.yml b/.github/workflows/build-jsorolla-workflow.yml
@@ -21,21 +21,12 @@ jobs:
           node-version: "16"
           cache: "npm"
           cache-dependency-path: "package.json"
-#      - uses: actions/cache@v3
-#        env:
-#          cache-name: cache-node-modules
-#        with:
-#          ## npm cache files are stored in `~/.npm` on Linux/macOS
-#          path: ~/.npm
-#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-#          restore-keys: |
-#            ${{ runner.os }}-build-${{ env.cache-name }}-
-#            ${{ runner.os }}-build-
-#            ${{ runner.os }}-
       - run: npm install
       - run: npm run build
       - id: package
-        uses: tyankatsu0105/read-package-version-actions@v1
+        name: Get project version
+        run: |
+          echo "version=`cat package.json | grep -w version | cut -d : -f 2 | cut -d \\" -f 2`" >> $GITHUB_OUTPUT
       - uses: actions/upload-artifact@v3
         with:
           name: build-folder

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -1,4 +1,4 @@
-name: "Main development workflow"
+name: "Develop branch workflow"
 
 on:
   push:
@@ -13,10 +13,9 @@ jobs:
   test:
     uses: ./.github/workflows/test.yml
     needs: build
-    secrets: inherit
     with:
       test_profile: runShortTests
-      report_context: development
+    secrets: inherit
 
   deploy-docker:
     uses: ./.github/workflows/deploy-docker-jsorolla.yml

diff --git a/.github/workflows/long-test-execution.yml b/.github/workflows/long-test-execution.yml
@@ -10,5 +10,4 @@ jobs:
     uses: ./.github/workflows/test.yml
     with:
       test_profile: runShortTests,runMediumTests,runLongTests
-      report_context: development
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: "New Release Workflow"
+name: "Release workflow"
 
 on:
   push:
@@ -9,14 +9,6 @@ jobs:
   build:
     uses: ./.github/workflows/build-jsorolla-workflow.yml
 
-  test:
-    uses: ./.github/workflows/test.yml
-    needs: build
-    with:
-      test_profile: runShortTests
-      report_context: xetabase
-    secrets: inherit
-
   deploy-docker:
     uses: ./.github/workflows/deploy-docker-jsorolla.yml
     needs: test

diff --git a/.github/workflows/task.yml b/.github/workflows/task.yml
@@ -1,4 +1,4 @@
-name: "Task Workflow for Task branches"
+name: "Task workflow for TASK-* branches"
 
 on:
   push:
@@ -14,7 +14,6 @@ jobs:
     needs: build
     with:
       test_profile: runShortTests
-      report_context: development
     secrets: inherit
 
   deploy-docker:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,28 +1,14 @@
-name: "Build and test the project"
+name: "Build and Run tests"
 
 on:
   workflow_call:
     inputs:
       test_profile:
         type: string
         required: true
-      report_context:
-        type: string
-        required: true
     secrets:
       SONAR_TOKEN:
         required: true
-      SSH_TESTING_SERVER_HOST:
-        required: true
-      SSH_TESTING_SERVER_PORT:
-        required: true
-      SSH_TESTING_SERVER_USER:
-        required: true
-      SSH_TESTING_SERVER_PASSWORD:
-        required: true
-
-env:
-  xb_version: "1.7.0"
 
 jobs:
   test:
@@ -48,29 +34,9 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: workdir
+          name: cypress-report
           path: |
-            cypress/reports
+            cypress/reports/assets
+            cypress/reports/*.html
             cypress/screenshots
             cypress/videos
-
-  publish-test:
-    name: Publish test results
-    runs-on: ubuntu-22.04
-    needs: test
-    steps:
-      - name: Download result dir
-        uses: actions/download-artifact@v3
-        with:
-          name: workdir
-          path: cypress
-      - name: Deploy unit tests web recursively to remote
-        uses: garygrossgarten/github-action-scp@release
-        with:
-          local: cypress
-          remote: /var/www/html/reports/${{ inputs.report_context }}/${{ env.xb_version }}/${{ github.ref_name }}/jsorolla/${{ github.sha }}/unit/${{ matrix.module }}
-          host: ${{ secrets.SSH_TESTING_SERVER_HOST}}
-          port: ${{ secrets.SSH_TESTING_SERVER_PORT}}
-          username: ${{ secrets.SSH_TESTING_SERVER_USER }}
-          password: ${{ secrets.SSH_TESTING_SERVER_PASSWORD }}
-          concurrency: 2
diff --git a/src/sites/test-app/test-app.js b/src/sites/test-app/test-app.js
@@ -200,41 +200,19 @@ class TestApp extends LitElement {
     }
 
     initProjectMock() {
-        this.opencgaSession = {
-            project: {
-                id: "family",
-                name: "Family Studies GRCh38",
-                fqn: "demo@family",
-                description: "Project description",
-                organism: {
-                    scientificName: "hsapiens",
-                    commonName: "",
-                    assembly: "GRCh38"
-                },
-                cellbase: {
-                    url: "https://uk.ws.zettagenomics.com/cellbase/",
-                    version: "v5.1",
-                    dataRelease: "3"
-
-                }
-            }
-        };
-
-        // TODO
-        // JSZip.loadAsync(UtilsNew.importBinaryFile(opencgasession.data.zip))
-        //     .then(zip => {
-        //         zip.file(filename).async("string")
-        //             .then(content => {
-        //                 this.opencgaSession = JSON.parse(content);
-        //                 this.requestUpdate();
-        //             });
-        //     }).catch(err => {
-        //     console.error("File not exist", err);
-        // });
-        // this.opencgaSession.projects = this.opencgaSession.user.projects;
-        // this.opencgaSession.project = this.opencgaSession.projects[0];
-        // this.opencgaSession.study = this.opencgaSession.project.studies[0];
-        // this.mutate();
+        UtilsNew.importJSONFile(`./test-data/${this.testDataVersion}/opencga-session.json`)
+            .then(content => {
+                this.opencgaSession = content;
+
+                // Initialise opencgaSession
+                this.opencgaSession.projects = content.user.projects;
+                this.opencgaSession.project = content.user.projects[0];
+                this.opencgaSession.study = content.user.projects[0].studies[0];
+                this.requestUpdate();
+            })
+            .catch(err => {
+                console.log(err);
+            });
     }
 
 

diff --git a/src/sites/test-app/webcomponents/variant-browser-grid-test.js b/src/sites/test-app/webcomponents/variant-browser-grid-test.js
@@ -114,7 +114,8 @@ class VariantBrowserGridTest extends LitElement {
         if (this.isLoading) {
             return html`<loading-spinner></loading-spinner>`;
         }
-
+        this.opencgaSession
+debugger
         return html`
         <variant-browser-grid
             .variants="${this.variants}"