update for triage.testing.datim.org #5705, including clean up for #45

pepfar-datim · Dec 4, 2019 · e0c576f · e0c576f
1 parent 1cca4ae
commit e0c576f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/current/package.json b/current/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datim-mechanism-finder",
-  "version": "0.1.0",
+  "version": "30.3.1",
   "private": true,
   "dependencies": {
     "@dhis2/d2-ui-header-bar": "5.3.11",

diff --git a/current/public/manifest.webapp b/current/public/manifest.webapp
@@ -8,7 +8,7 @@
   },
   "appType": "APP",
   "name": "Mechanism Finder",
-  "version": "30.3.0",
+  "version": "30.3.1",
   "description": "DATIM application to find a mechanism",
   "developer": {
     "name": "Thomas Zemp",

diff --git a/current/src/components/DataReactTable.js b/current/src/components/DataReactTable.js
@@ -14,10 +14,6 @@ function getData(array) {
 	return newData;
 }
 
-function MyCell(column) {
-  return <span title={column}>{column}</span>
-}
-
 function organizeColumns(columnRow, dataRow) {
 	var idealOrder = ["Date","OU","OU Country Code","FY","Reporting Cycle","HQ ID","IM","Agency","Award Number","Partner Name","Partner DUNS","Start Date","End Date","Active","Partner Country","Indigenous Partner","Organization Type","Legacy ID","Legacy Partner Name","Legacy Partner ID","Legacy Partner Organization Type ID"];
 
@@ -48,7 +44,6 @@ function organizeColumns(columnRow, dataRow) {
 }
 
 function getColumns(columnRow, dataRow) {
-	const headerStyle = "{white-space: pre-line !important;word-wrap: break-word;}"
 	var wideColumns = {"Legacy Partner Name": true, "IM": true};
 
 	columnRow = organizeColumns(columnRow, dataRow);
@@ -114,4 +109,4 @@ function DataReactTable(props) {
 	);
 }
 
-export default DataReactTable;
+export default DataReactTable;
diff --git a/current/src/index.js b/current/src/index.js
@@ -8,7 +8,6 @@ import "./index.css";
 import NetworkError from "./utils/networkError.component";
 
 function Dhis2Wrapper(props){
-    console.log(props.d2);
     if (!props.d2) return null;
     return (
         <React.Fragment>

diff --git a/current/src/services/logicTestProdToggle.service.js b/current/src/services/logicTestProdToggle.service.js
@@ -3,7 +3,7 @@ export function logicTestProdToggle(environment, host) {
 		if (
 			/datim\.org$/.test(host) &&
 			host !== "www.datim.org" &&
-			host !== "triage.datim.org"
+			host !== "triage.testing.datim.org"
 		) {
 			return true;
 		}

diff --git a/releases/30.3.1/mechanism-finder.zip b/releases/30.3.1/mechanism-finder.zip