about to fix 966

pepfar-datim · Aug 30, 2021 · bcc1c34 · bcc1c34
1 parent 35fe5cc
commit bcc1c34
Show file tree

Hide file tree

Showing 8 changed files with 32,195 additions and 29,362 deletions.
diff --git a/cypress.json b/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:3003",
+  "baseUrl": "http://localhost:3000",
   "watchForFileChanges": false,
   "defaultCommandTimeout": 10000
 }
diff --git a/cypress/integration/approvalProcess/4.interAgencyAccept.test.js b/cypress/integration/approvalProcess/4.interAgencyAccept.test.js
@@ -21,7 +21,7 @@ describe('Approval Process #4 - Inter-Agency ACCEPT', ()=>{
         cy.goHome();
         cy.searchMechanisms('MER Results','2019Q3','Asia Region');
         cy.get('.cy_list_results').containsAll([
-            '86 mechanisms',
+            '65 mechanisms',
             '16566 - AID386A1400007 - Orphans and Vulnerable Children Project',
         ]);
         cy.get('[placeholder="Search"]').type('17350');

diff --git a/cypress/integration/approvalProcess/6.globalAccept.test.js b/cypress/integration/approvalProcess/6.globalAccept.test.js
@@ -29,7 +29,7 @@ describe('Approval Process #6 - Global ACCEPT', ()=>{
         cy.goHome();
         cy.searchMechanisms('MER Results','2019Q3','Asia Region');
         cy.get('.cy_list_results').containsAll([    
-            '86 mechanisms',
+            '76 mechanisms',
             '16566 - AID386A1400007 - Orphans and Vulnerable Children Project',
         ]);
         cy.get('[placeholder="Search"]').type('17350');

diff --git a/cypress/integration/list/mechanismList.test.js b/cypress/integration/list/mechanismList.test.js
@@ -42,6 +42,8 @@ describe('Mechanism List', function() {
 
     it('Should have tabs', ()=>{
         cy.get('#cy_mechanismListTab_return').click();
+        cy.get('[title="Next Page"]').click();
+        cy.get('[title="Next Page"]').click();
         cy.get('.cy_list_results').containsAll([
             '10000 - NU2GGH001140 - HAIVN',
         ]);
@@ -52,7 +54,7 @@ describe('Mechanism List', function() {
     it('Should have pagination', ()=>{
         cy.get('[title="Next Page"]').click();
         cy.get('.cy_list_results').containsAll([
-            /21-40 of 1.../,
+            /61-80 of 1.../,
             '10557 - GH001561 - Mekelle'
         ]);
         cy.get('[title="Previous Page"]').click();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,25 +3,25 @@
   "version": "2.1.3",
   "private": true,
   "dependencies": {
-    "@dhis2/app-runtime": "^2.0.4",
-    "@dhis2/d2-i18n": "^1.0.6",
+    "@dhis2/app-runtime": "^2.9.2",
+    "@dhis2/d2-i18n": "^1.1.0",
     "@dhis2/d2-ui-header-bar": "^6.5.6",
-    "@dhis2/ui-core": "^4.1.1",
-    "@dhis2/ui-widgets": "^2.0.5",
-    "@material-ui/core": "^4.7.2",
-    "@material-ui/icons": "^4.5.1",
-    "@types/jest": "^24.0.23",
-    "@types/node": "^12.12.17",
-    "@types/react": "^16.9.16",
-    "@types/react-dom": "^16.9.4",
+    "@dhis2/ui-core": "^6.19.0",
+    "@dhis2/ui-widgets": "^6.19.0",
+    "@material-ui/core": "^4.12.3",
+    "@material-ui/icons": "^4.11.2",
+    "@types/jest": "^27.0.1",
+    "@types/node": "^16.7.7",
+    "@types/react": "^17.0.19",
+    "@types/react-dom": "^17.0.9",
     "d2": "^31.8.0",
-    "material-table": "^1.54.1",
-    "query-string": "^6.9.0",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-router-dom": "^5.1.2",
-    "react-scripts": "3.3.0",
-    "styled-jsx": "^3.2.4",
+    "material-table": "^1.69.3",
+    "query-string": "^7.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^5.2.1",
+    "react-scripts": "4.0.3",
+    "styled-jsx": "^4.0.1",
     "typescript": "3.4.5",
     "wait-until": "0.0.2"
   },
@@ -47,6 +47,6 @@
     ]
   },
   "devDependencies": {
-    "cypress": "^6.5.0"
+    "cypress": "^8.3.1"
   }
 }
diff --git a/src/modules/list/components/results/resultsTable.component.tsx b/src/modules/list/components/results/resultsTable.component.tsx
@@ -78,7 +78,7 @@ function extractOrig(cb){
     }
 }
 
-function ResultsTable({mechanisms, onMechanismsSelected}:{mechanisms: MechanismModel[], onMechanismsSelected: (mechanisms:MechanismModel[])=>void}) {
+export default function ResultsTable({mechanisms, onMechanismsSelected}:{mechanisms: MechanismModel[], onMechanismsSelected: (mechanisms:MechanismModel[])=>void}) {
     return <MaterialTable
         columns={tableColumns}
         data={tranformMechanisms(mechanisms)}
@@ -91,4 +91,5 @@ function ResultsTable({mechanisms, onMechanismsSelected}:{mechanisms: MechanismM
     />;
 }
 
-export default React.memo(ResultsTable);
+// export default React.memo(ResultsTable);
+// export default ResultsTable;
diff --git a/tsconfig.json b/tsconfig.json
@@ -17,8 +17,9 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "preserve",
-    "downlevelIteration": true
+    "jsx": "react",
+    "downlevelIteration": true,
+    "noFallthroughCasesInSwitch": true
   },
   "include": [
     "src"