Adding Copy-Metadata step

Author: raquelpanapalen

README.md

@@ -29,7 +29,7 @@ DHIS2 basic app to allow interoperability between DHIS2 and Go.Data instances
     <img src="./images/base-config.png" width="600">
 </p>
 
-+ **Export data and metadata**: There are two possible import sequences. Both ways are equivalent, the only difference is that the *Full transfer* sequence groups *Create outbreaks*, *Copy cases* and *Copy contacts* all in one step. 
++ **Export data and metadata**: There are two possible import sequences. Both ways are equivalent, the only difference is that the *Full transfer* sequence groups *Copy Metadata*, *Create outbreaks*, *Copy cases* and *Copy contacts* all in one step. 
     + Copy Organisation Units: At the end of this step, a pop-up window will appear to download the orgUnits `.json`. This file needs to be saved on the computer and imported on the Go.Data instance following the path: <br />
     `Go.Data → Locations → Quick Actions → Import hierarchical locations → Choose file (organisation-units.json) → Import`    
 

images/step-by-step.png

@@ -72,13 +72,17 @@ const Actions = () => {
                     await copyOrganisationUnits(dhis2, godata, config, { logAction, logDone })()
                     break
                 case 1: 
-                    await createOutbreaks(dhis2, godata, config, { logAction, logDone })()
+                    await copyMetadata(dhis2, godata, config, { logAction, logDone })()
                     break
                 case 2: 
                     await godata.login()
-                    await copyCases(dhis2, godata, config, { logAction, logDone })()
+                    await createOutbreaks(dhis2, godata, config, { logAction, logDone })()
                     break
                 case 3: 
+                    await godata.login()
+                    await copyCases(dhis2, godata, config, { logAction, logDone })()
+                    break
+                case 4: 
                     await godata.login()
                     await copyContacts(dhis2, godata, config, { logAction, logDone })()
                     setDone(true)
@@ -179,7 +183,8 @@ const Actions = () => {
 
                 { done && 
                     <Card className="log">
-                        <p className="p">All steps completed - you're finished</p>
+                        <p className="p">
+                            <span>All steps completed - you're finished</span></p>
                     </Card>
                 }
             </div>

src/api/Actions.js

@@ -14,19 +14,15 @@
 }
 
 .logAction {
-	display: flex;
-	align-content: center;
-	margin-left: 10px;
 	margin-right: 15px;
 	font-weight: 500;
 	font-size: 14px;
 }
-.logAction svg {
-	margin-left: 5px;
-}
 
 .log {
 	height: 50px !important;
+	display: flex !important;
+	align-items: center;
 }
 
 .MuiStepLabel-label.MuiStepLabel-active {

src/styles/Actions.css

@@ -14,18 +14,20 @@ function getFullStepContent(step) {
 }
 
 function getSteps() {
-    return ['Copy Organisation Units', 'Create outbreaks', 'Copy cases', 'Copy contacts']
+    return ['Copy Organisation Units', 'Copy Metadata', 'Create outbreaks', 'Copy cases', 'Copy contacts']
 }
 
 function getStepContent(step) {
     switch (step) {
         case 0:
             return "Get all organisation units from DHIS2, transforms them to fit Go.Data's schema and saves them hierarchally in a json file that needs to be downloaded."
         case 1:
-            return "Create Go.Data outbreaks based on the organisation units and tracked entities of the DHIS2 instance."
+            return "Copy DHIS2 metadata into Go.Data."
         case 2:
-            return "Transfer tracked entities from DHIS2 to Go.Data, transforming the data to fit Go.Data's schema and assigning an outbreak automatically."
+            return "Create Go.Data outbreaks based on the organisation units and tracked entities of the DHIS2 instance."
         case 3:
+            return "Transfer tracked entities from DHIS2 to Go.Data, transforming the data to fit Go.Data's schema and assigning an outbreak automatically."
+        case 4:
             return "Transfer contacts from DHIS2 to Go.Data, adding aditional persons and the relationships among them."    
         default:
             return "Unknown step"