Merge branch 'release-3.x.x' into TASK-7531

Author: juanfeSanahuja

.eslintrc.json

@@ -21,9 +21,10 @@
   "rules": {
     "indent": ["error", 4, {
       "SwitchCase": 1,
-      "ignoredNodes": ["TemplateLiteral"]
+      "ignoredNodes": ["TemplateLiteral","TaggedTemplateExpression","ObjectExpression","ArrowFunctionExpression"]
       }
     ],
+    "no-multiple-empty-lines":["error",{"max":1}],
     "max-len": ["error", 230],
     "no-console": ["error", { "allow": ["log", "warn", "error", "time", "timeEnd"] }],
     "no-param-reassign": ["warn", { "props": true }],

.github/workflows/build-jsorolla-workflow.yml

@@ -15,8 +15,8 @@ jobs:
       version: ${{ steps.package.outputs.version }}
     steps:
       - name: "Checkout JSorolla"
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "16"
           cache: "npm"

.github/workflows/deploy-docker-jsorolla.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: "Checkout Jsorolla"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           name: build-folder

.github/workflows/develop.yml

@@ -13,9 +13,6 @@ jobs:
   test:
     uses: ./.github/workflows/test.yml
     needs: build
-    with:
-      test_profile: runShortTests
-    secrets: inherit
 
   deploy-docker:
     uses: ./.github/workflows/deploy-docker-jsorolla.yml
@@ -25,8 +22,9 @@ jobs:
     secrets: inherit
 
   deploy-web:
-    uses: ./.github/workflows/deploy-jsorolla-web-workflow.yml
-    needs: [ build, test ]
+    uses: opencb/java-common-libs/.github/workflows/publish-test-report-workflow.yml@develop
+    needs: build
     with:
-      version: ${{ needs.build.outputs.version }}
+      target_path: /var/www/html/iva/builds/${{ needs.build.outputs.version }}
+      content: build-folder
     secrets: inherit

.github/workflows/long-test-execution.yml

@@ -8,6 +8,3 @@ on:
 jobs:
   test:
     uses: ./.github/workflows/test.yml
-    with:
-      test_profile: runShortTests,runMediumTests,runLongTests
-    secrets: inherit

.github/workflows/release.yml

@@ -17,10 +17,11 @@ jobs:
     secrets: inherit
 
   deploy-web:
-    uses: ./.github/workflows/deploy-jsorolla-web-workflow.yml
+    uses: opencb/java-common-libs/.github/workflows/publish-test-report-workflow.yml@develop
     needs: build
     with:
-      version: ${{ needs.build.outputs.version }}
+      target_path: /var/www/html/iva/builds/${{ needs.build.outputs.version }}
+      content: build-folder
     secrets: inherit
 
   release:

.github/workflows/task.yml

@@ -12,9 +12,6 @@ jobs:
   test:
     uses: ./.github/workflows/test.yml
     needs: build
-    with:
-      test_profile: runShortTests
-    secrets: inherit
 
   deploy-docker:
     uses: ./.github/workflows/deploy-docker-jsorolla.yml

.github/workflows/test.yml

@@ -2,23 +2,16 @@ name: "Build and Run tests"
 
 on:
   workflow_call:
-    inputs:
-      test_profile:
-        type: string
-        required: true
-    secrets:
-      SONAR_TOKEN:
-        required: true
 
 jobs:
   test:
     name: "Test and push Sonar analysis"
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: "16"
           cache: "npm"

cypress/e2e/commons/data-form.cy.js

@@ -154,18 +154,18 @@ describe("Data Form Component", () => {
         });
 
         it("should render toggle switch", () => {
-            UtilsTest.getByDataTest("test1-inputToggleSwitch","button")
+            UtilsTest.getByDataTest("test1-inputToggleSwitch","input")
                 .should("have.length",2)
         });
 
         it("should render toggle buttons", () => {
-            UtilsTest.getByDataTest("test1-inputToggleButtons","button")
+            UtilsTest.getByDataTest("test1-inputToggleButtons","input")
                 .should("have.length",3)
         });
     })
 
 
-    context("Complex Field", () => {
+    context.only("Complex Field", () => {
         it("should render object list", () => {
             cy.log("Soon! render object list form");
         });
@@ -235,13 +235,8 @@ describe("Data Form Component", () => {
         });
 
         it("should a table", () => {
-            cy.get("label")
-                .contains("Table Example")
-                .parents("div[class='row form-group ']")
-                .within(() => {
-                    cy.get("table")
-                        .should("be.visible");
-                });
+            UtilsTest.getByDataTest("test1-inputTable", "table")
+                .should("be.visible");
         });
 
         it("should render 3 simple charts", () => {
@@ -267,41 +262,12 @@ describe("Data Form Component", () => {
     // Add element to the list
     // Remove element to the list
     // check require, validation, disable and others for inputc
-
     // test: check if generate correctly url
-    // test: check if generate correctly url
-
-
     // it("when submit is pressed, input display error for empty field", () => {
-    //     // how to identify btn data-form
-    //     cy.get("button[class='btn btn-primary ']").contains("OK").click();
-
-    //     // TODO: search all input with require attr and verify is it visible
-    //     cy.get(".has-error").should("be.visible");
-    // });
-
+    // how to identify btn data-form
+    // search all input with require attr and verify is it visible
     // it("should type the first input field", () => {
-    //     UtilsTest.getByDataTest("test1--id", "input").type("testing input fill");
-    //     // cy.get("div[data-test-id='test1--status.description'] textarea").type("testing input fill");
-
-    //     UtilsTest.getByDataTest("test1--status.description", "textarea").type("testing input fill");
-    //     // cy.get("button[class='btn btn-primary ']").contains("OK").click();
-    // });
-
-    // // Approach #3 to access to type field (More specific field)
-    // it.skip("should type the first input field", () => {
-    //     // cy.get("label").contains("Sample ID").parents("div[class='row form-group ']").within(()=> {
-    //     //     cy.get("input[type='text']").type("testing input fill");
-    //     // });
-    //     UtilsTest.enterField("Sample ID", "testing values");
-    //     UtilsTest.submitForm();
-    // });
-
-    // it("the second field should be disabled", () => {
-    //     // cy.get("textarea").first().should("be.disabled");
-    //     UtilsTest.getByDataTest("test1--description", "textarea")
-    //         .should("be.disabled");
-    // });
+    // Approach #3 to access to type field (More specific field)
 
 });