Merge pull request #276 from dhis2/DHIS2-15415/add-scroll-for-workflows

fix: add scroll for workflows [DHIS2-15415]
dhis2 · Aug 8, 2023 · cd8aa4e · cd8aa4e
2 parents b37c1b9 + a978552
commit cd8aa4e
Show file tree

Hide file tree

Showing 12 changed files with 1,594 additions and 1,448 deletions.
diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -83,39 +83,6 @@ jobs:
             - name: Test
               run: yarn d2-app-scripts test
 
-    e2e-v37:
-        runs-on: ubuntu-latest
-        if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
-
-        strategy:
-            fail-fast: false
-            matrix:
-                containers: [1, 2]
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - uses: actions/setup-node@v1
-              with:
-                  node-version: 12.x
-
-            - name: End-to-End tests
-              uses: cypress-io/github-action@v2
-              with:
-                  start: yarn d2-app-scripts start
-                  wait-on: 'http://localhost:3000'
-                  wait-on-timeout: 300
-                  record: true
-                  parallel: true
-              env:
-                  BROWSER: none
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-                  CYPRESS_dhis2BaseUrl: http://localhost:8082
-                  CYPRESS_dhis2ApiVersion: 37
-                  CYPRESS_networkMode: stub
-
     e2e-v38:
         runs-on: ubuntu-latest
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
@@ -184,7 +151,7 @@ jobs:
 
     release:
         runs-on: ubuntu-latest
-        needs: [build, lint, test, e2e-v37]
+        needs: [build, lint, test, e2e-v38]
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
             - uses: actions/checkout@v2

diff --git a/cypress/fixtures/network/38/static_resources.json b/cypress/fixtures/network/38/static_resources.json
diff --git a/cypress/fixtures/network/38/summary.json b/cypress/fixtures/network/38/summary.json
@@ -1,8 +1,8 @@
 {
-    "count": 341,
-    "totalResponseSize": 111449,
-    "duplicates": 234,
-    "nonDeterministicResponses": 12,
+    "count": 349,
+    "totalResponseSize": 114244,
+    "duplicates": 241,
+    "nonDeterministicResponses": 19,
     "apiVersion": 38,
     "fixtureFiles": [
         "static_resources.json",

diff --git a/cypress/fixtures/network/38/users_can_approve,_accept,_unapprove,_and_unaccept_data.json b/cypress/fixtures/network/38/users_can_approve,_accept,_unapprove,_and_unaccept_data.json
diff --git a/...res/network/38/users_can_view_data_set_reports_for_data_sets_connected_to_a_workflow.json b/...res/network/38/users_can_view_data_set_reports_for_data_sets_connected_to_a_workflow.json
diff --git a/cypress/fixtures/network/39/static_resources.json b/cypress/fixtures/network/39/static_resources.json
diff --git a/cypress/fixtures/network/39/summary.json b/cypress/fixtures/network/39/summary.json
@@ -1,8 +1,8 @@
 {
-    "count": 341,
-    "totalResponseSize": 111486,
-    "duplicates": 234,
-    "nonDeterministicResponses": 12,
+    "count": 347,
+    "totalResponseSize": 114519,
+    "duplicates": 239,
+    "nonDeterministicResponses": 25,
     "apiVersion": 39,
     "fixtureFiles": [
         "static_resources.json",

diff --git a/cypress/fixtures/network/39/users_can_approve,_accept,_unapprove,_and_unaccept_data.json b/cypress/fixtures/network/39/users_can_approve,_accept,_unapprove,_and_unaccept_data.json
diff --git a/...res/network/39/users_can_view_data_set_reports_for_data_sets_connected_to_a_workflow.json b/...res/network/39/users_can_view_data_set_reports_for_data_sets_connected_to_a_workflow.json
diff --git a/src/shared/approval-status/get-approval-status.test.js b/src/shared/approval-status/get-approval-status.test.js
@@ -7,7 +7,10 @@ import {
 import { Approved, Ready, Waiting } from './icons.js'
 
 jest.mock('moment', () => {
-    return () => jest.requireActual('moment')('2020-01-01T00:00:00.000Z')
+    const now = new Date()
+    const yearTwoYearsAgo = now.getFullYear() - 2
+    return () =>
+        jest.requireActual('moment')(`${yearTwoYearsAgo}-01-01T00:00:00.000Z`)
 })
 
 describe('getApprovalStatusDisplayData', () => {

diff --git a/src/top-bar/workflow-select/workflow-select.js b/src/top-bar/workflow-select/workflow-select.js
@@ -37,7 +37,7 @@ const WorkflowSelect = () => {
                     )}
                 </div>
             ) : (
-                <Menu>
+                <Menu className={classes.menu}>
                     {dataApprovalWorkflows.map((workflow) => (
                         <WorkflowSelectOption
                             key={workflow.id}

diff --git a/src/top-bar/workflow-select/workflow-select.module.css b/src/top-bar/workflow-select/workflow-select.module.css
@@ -3,3 +3,7 @@
     color: var(--colors-grey700);
     padding: var(--spacers-dp16) var(--spacers-dp8) var(--spacers-dp24);
 }
+.menu {
+    max-height: 70vh;
+    overflow-y: auto;
+}