Merge pull request #317 from EyeSeeTea/development-malaria

Release 0.6.1

.travis.yml

@@ -1,19 +1,39 @@
 language: node_js
 node_js:
   - 12.13.0
+dist: bionic
 cache:
   directories:
     - "$HOME/.cache"
 before_install:
   - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+  # Install python dependencies
+  - sudo apt-get update
+  - sudo apt-get install python3 python python3-setuptools docker.io docker-compose
+  #  Install d2-docker
+  - git clone https://github.com/EyeSeeTea/d2-docker.git
+  - cd d2-docker/
+  - sudo python3 setup.py install
+  - d2-docker --help
+  # Hack to not be prompted in the terminal
+  - sudo apt-get remove golang-docker-credential-helpers
+  # Start docker service
+  - sudo systemctl unmask docker.service
+  - sudo systemctl unmask docker.socket
+  - sudo systemctl start docker.service
+  # Login to docker
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  # Start docker service
+  - d2-docker start eyeseetea/dhis2-data:2.30-datasync-sender -d
 install:
   - yarn install --frozen-lockfile
   - yarn cy:verify
   - yarn build
 script:
-  - PORT=8081 REACT_APP_DHIS2_BASE_URL=http://dev2.eyeseetea.com:8083 REACT_APP_CYPRESS=true yarn start &
+  - PORT=8081 REACT_APP_DHIS2_BASE_URL=http://localhost:8080 REACT_APP_CYPRESS=true yarn start &
+  - yarn wait-on http-get://localhost:8080
   - yarn wait-on http-get://localhost:8081
-  - CYPRESS_EXTERNAL_API=http://dev2.eyeseetea.com:8083 CYPRESS_ROOT_URL=http://localhost:8081 yarn cy:e2e:run --key $CYPRESS_KEY
+  - CYPRESS_EXTERNAL_API=http://localhost:8080 CYPRESS_ROOT_URL=http://localhost:8081 yarn cy:e2e:run
   - kill $(jobs -p) || true
 addons:
   apt:

i18n/en.pot

@@ -5,11 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2020-01-02T17:19:20.540Z\n"
-"PO-Revision-Date: 2020-01-02T17:19:20.540Z\n"
-
-msgid "Search by name"
-msgstr ""
+"POT-Creation-Date: 2020-01-09T12:11:29.305Z\n"
+"PO-Revision-Date: 2020-01-09T12:11:29.305Z\n"
 
 msgid "<No value>"
 msgstr ""
@@ -38,6 +35,9 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+msgid "Search by name"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -311,6 +311,21 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
+msgid "Excluded elements"
+msgstr ""
+
+msgid "All events"
+msgstr ""
+
+msgid "{{total}} selected events"
+msgstr ""
+
+msgid "Category Option Combo"
+msgstr ""
+
+msgid "All attribute category options"
+msgstr ""
+
 msgid "Start date"
 msgstr ""
 
@@ -392,7 +407,7 @@ msgstr ""
 msgid "Network error {{error}}, check if server is up and CORS is enabled"
 msgstr ""
 
-msgid "Metadata & Data Synchronization"
+msgid "MetaData Synchronization"
 msgstr ""
 
 msgid "Metadata Synchronization History"
@@ -535,40 +550,24 @@ msgstr ""
 msgid "Manual sync"
 msgstr ""
 
-msgid ""
-"Manually synchronise metadata like data elements, organisation units and "
-"program indicators and groups and group sets."
-msgstr ""
-
-msgid "Sync rules"
-msgstr ""
-
-msgid ""
-"Create, modify, delete, execute and schedule sync rules for metadata like "
-"data elements, organisation units and program indicators and groups and "
-"group sets."
-msgstr ""
-
-msgid "History"
-msgstr ""
-
-msgid ""
-"View and analyse the status and results of the metadata manual syncs and "
-"sync rules executions."
-msgstr ""
-
 msgid ""
 "Manually synchronise aggregated data by selecting the data sets, data "
 "elements or their groups and group sets together with the organisation "
 "unit, period and category options."
 msgstr ""
 
+msgid "Sync rules"
+msgstr ""
+
 msgid ""
 "Create, modify, delete, execute and schedule sync rules for aggregated data "
 "by selecting the data sets, data elements or their groups and group sets "
 "together with the organisation unit, period and category options."
 msgstr ""
 
+msgid "History"
+msgstr ""
+
 msgid ""
 "View and analyse the status and results of the aggregated data manual syncs "
 "and sync rules executions."
@@ -590,6 +589,22 @@ msgid ""
 "rules executions."
 msgstr ""
 
+msgid ""
+"Manually synchronise metadata like data elements, organisation units and "
+"program indicators and groups and group sets."
+msgstr ""
+
+msgid ""
+"Create, modify, delete, execute and schedule sync rules for metadata like "
+"data elements, organisation units and program indicators and groups and "
+"group sets."
+msgstr ""
+
+msgid ""
+"View and analyse the status and results of the metadata manual syncs and "
+"sync rules executions."
+msgstr ""
+
 msgid "Deleted objects"
 msgstr ""
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "metadata-synchronization",
   "description": "Advanced metadata & data synchronization utility",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "GPL-3.0",
   "author": "EyeSeeTea team",
   "homepage": ".",
@@ -27,7 +27,7 @@
     "d2": "^31.1.1",
     "d2-api": "^0.0.2-beta.9",
     "d2-manifest": "^1.0.0",
-    "d2-ui-components": "^1.0.1",
+    "d2-ui-components": "^1.0.2",
     "downshift": "^3.3.4",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
@@ -74,6 +74,7 @@
     "@babel/core": "^7.7.5",
     "@babel/preset-typescript": "^7.7.4",
     "@types/cryptr": "^4.0.0",
+    "@types/file-saver": "^2.0.1",
     "@types/jest": "^24.0.23",
     "@types/lodash": "^4.14.149",
     "@types/node": "^12.12.14",
@@ -101,7 +102,7 @@
     "wait-on": "^3.3.0"
   },
   "manifest.webapp": {
-    "name": "Metadata Synchronization",
+    "name": "MetaData Synchronization",
     "description": "Advanced metadata synchronization utility",
     "icons": {
       "48": "icon.png"

public/index.html

@@ -18,7 +18,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Metadata & Data Synchronization</title>
+    <title>MetaData Synchronization</title>
 
     <script src="//code.jquery.com/jquery-latest.min.js"></script>
     <script src="%PUBLIC_URL%/feedback-tool/feedback.min.js"></script>