Merge branch 'master' into emergency-backup-zip

Author: euanmillar

.travis.yml

@@ -27,6 +27,8 @@ jobs:
           packages:
             - libgconf-2-4
       script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - ./node_modules/.bin/ts-node rebuild-only-changed-images.ts
         - yarn global add wait-on
         - yarn dev:secrets:gen
         - docker swarm init

package.json

@@ -52,9 +52,11 @@
   },
   "devDependencies": {
     "@types/dotenv": "^6.1.0",
+    "@types/js-yaml": "^3.12.1",
     "bundlesize": "^0.18.0",
     "concurrently": "^3.5.1",
     "husky": "1.0.0-rc.13",
+    "js-yaml": "^3.13.1",
     "lerna": "^3.18.3",
     "lint-staged": "^7.1.0",
     "prettier": "^1.15.2"
@@ -64,6 +66,7 @@
     "license-check-and-add": "^3.0.3",
     "opener": "^1.5.1",
     "patch-package": "^6.1.2",
-    "postinstall-postinstall": "^2.0.0"
+    "postinstall-postinstall": "^2.0.0",
+    "ts-node": "^8.5.2"
   }
 }

packages/client/src/views/Settings/PasswordChangeModal.tsx

@@ -337,7 +337,13 @@ class PasswordChangeModalComp extends React.Component<IFullProps, State> {
                     <span>
                       {intl.formatMessage(
                         messages.passwordLengthCharacteristicsForPasswordUpdateForm,
-                        { min: 8 }
+                        {
+                          min: intl.formatMessage({
+                            defaultMessage: '8',
+                            description: 'Minimum length password',
+                            id: 'number.eight'
+                          })
+                        }
                       )}
                     </span>
                   </div>
@@ -400,7 +406,13 @@ class PasswordChangeModalComp extends React.Component<IFullProps, State> {
                 <span>
                   {intl.formatMessage(
                     messages.passwordLengthCharacteristicsForPasswordUpdateForm,
-                    { min: 8 }
+                    {
+                      min: intl.formatMessage({
+                        defaultMessage: '8',
+                        description: 'Minimum length password',
+                        id: 'number.eight'
+                      })
+                    }
                   )}
                 </span>
               </div>

packages/client/src/views/Settings/SettingsPage.tsx

@@ -266,7 +266,7 @@ class SettingsView extends React.Component<IProps, IState> {
         items: [
           {
             label: intl.formatMessage(constantsMessages.labelPassword),
-            placeHolder: 'Last change 4 days ago',
+            placeHolder: '********',
             action: {
               id: 'BtnChangePassword',
               label: intl.formatMessage(buttonMessages.change),
@@ -275,7 +275,7 @@ class SettingsView extends React.Component<IProps, IState> {
           },
           {
             label: intl.formatMessage(constantsMessages.labelPin),
-            placeHolder: 'Last change 4 days ago',
+            placeHolder: '****',
             action: {
               label: intl.formatMessage(buttonMessages.change),
               disabled: true

packages/resources/src/bgd/features/languages/generated/register.json

@@ -416,6 +416,16 @@
         "countries.ZAF": "South Africa",
         "countries.ZMB": "Zambia",
         "countries.ZWE": "Zimbabwe",
+        "number.zero": "0",
+        "number.one": "1",
+        "number.two": "2",
+        "number.three": "3",
+        "number.four": "4",
+        "number.five": "5",
+        "number.six": "6",
+        "number.seven": "7",
+        "number.eight": "8",
+        "number.nine": "9",
         "create.validate.application.action.decription": "{completeApplication, select, true {By sending for approval you confirm that the information has been reviewed by the applicant and that it is ready to register.} false {Mandatory information is missing. Please add this information so that you can send to register.}}",
         "createPIN.createDescription": "Choose a PIN that doesn't have 4 repeating digits or sequential numbers.",
         "createPIN.createTitle": "Create a PIN",
@@ -1486,6 +1496,16 @@
         "countries.ZAF": "দক্ষিন আফ্রিকা",
         "countries.ZMB": "জাম্বিয়া",
         "countries.ZWE": "জিম্বাবুয়ে",
+        "number.zero": "০",
+        "number.one": "১",
+        "number.two": "২",
+        "number.three": "৩",
+        "number.four": "৪",
+        "number.five": "৫",
+        "number.six": "৬",
+        "number.seven": "৭",
+        "number.eight": "৮",
+        "number.nine": "৯",
         "create.validate.application.action.decription": "{completeApplication, select, true {অনুমোদন পাঠানোর মাধ্যমে আপনি নিশ্চিত হন যে তথ্যটি আবেদনকারীর দ্বারা পর্যালোচনা করা হয়েছে এবং এটি নিবন্ধন করার জন্য প্রস্তুত।} false {বাধ্যতামূলক তথ্য অনুপস্থিত। নিবন্ধটি পাঠাতে তথ্যগুলো যোগ করুন}}",
         "createPIN.createDescription": "Choose a PIN that doesn't have 4 repeating digits or sequential numbers.",
         "createPIN.createTitle": "Create a PIN",

rebuild-only-changed-images.ts

@@ -0,0 +1,133 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS
+ * graphic logo are (registered/a) trademark(s) of Plan International.
+ */
+
+import * as yaml from 'js-yaml'
+import { readFileSync, writeFileSync } from 'fs'
+import fetch from 'node-fetch'
+import * as cp from 'child_process'
+import { promisify } from 'util'
+
+const exec = promisify(cp.exec.bind(cp))
+
+const { DOCKER_USERNAME, DOCKER_PASSWORD } = process.env
+
+async function getToken() {
+  const response = await fetch('https://hub.docker.com/v2/users/login/', {
+    method: 'POST',
+    body: JSON.stringify({
+      username: DOCKER_USERNAME,
+      password: DOCKER_PASSWORD
+    }),
+
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+
+  const body = await response.json()
+  return body.token
+}
+
+async function getLatestTag(token: string, repository: string) {
+  const response = await fetch(
+    `https://hub.docker.com/v2/repositories/${repository}/tags`,
+    {
+      headers: {
+        Authorization: `JWT ${token}`
+      }
+    }
+  )
+  const body = await response.json()
+
+  if (!body.results) {
+    return null
+  }
+
+  const latest = body.results.find(({ name }) => name === 'latest')
+  return body.results.find(
+    ({ name, images }) =>
+      name !== 'latest' && images[0].digest === latest.images[0].digest
+  )
+}
+
+const IMAGE_NAME_TO_DIRECTORY = {
+  styleguide: 'components'
+}
+
+async function preventBuildImageFromBeingBuilt() {
+  const pkg = JSON.parse(readFileSync('./package.json', 'utf8'))
+  pkg.scripts['build:image'] = 'echo "Skipping build image creation..."'
+  writeFileSync('./package.json', JSON.stringify(pkg))
+}
+async function ignoreFromBuild(packages: string[]) {
+  const pkg = JSON.parse(readFileSync('./package.json', 'utf8'))
+  pkg.scripts['build'] =
+    pkg.scripts['build'] +
+    ' ' +
+    packages.map(directory => `--ignore ${directory}`).join(' ')
+  writeFileSync('./package.json', JSON.stringify(pkg))
+}
+
+async function run() {
+  const compose = yaml.safeLoad(readFileSync('./docker-compose.yml', 'utf8'))
+
+  const token = await getToken()
+
+  // Not sure why but docker hub's API sometimes fails if you query it right after getting a token
+  await new Promise(resolve => setTimeout(resolve, 1000))
+
+  const serviceNames = Object.keys(compose.services)
+
+  const packagesThatAreUpToDate = []
+
+  for (const serviceName of serviceNames) {
+    const service = compose.services[serviceName]
+    const { image } = service
+    const repository = image.split(':')[0]
+    const imageName = repository.replace('jembi/ocrvs-', '')
+    const directory = IMAGE_NAME_TO_DIRECTORY[imageName] || imageName
+
+    const latestGitHash = (await exec(
+      `git --no-pager log -n 1 --format="%h" -- "packages/${directory}"`
+    )).trim()
+
+    const latestTag = await getLatestTag(token, repository)
+    if (!latestTag) {
+      console.log('⚠️ ', serviceName, ': no tags found!')
+      continue
+    }
+
+    const imageHash = latestTag.name
+
+    try {
+      // Check that image hash is newer or the same as the latest commit of this package
+      await exec(`git merge-base --is-ancestor ${latestGitHash} ${imageHash}`)
+      console.log('✅ ', serviceName, ': no rebuild needed')
+      service.image = `${repository}:latest`
+      delete service.build
+      packagesThatAreUpToDate.push(directory)
+    } catch {
+      console.log('♻️ ', serviceName, ': rebuilding...')
+    }
+  }
+  writeFileSync('./docker-compose.yml', yaml.safeDump(compose))
+
+  // All services can be fetched from docker hub
+  if (packagesThatAreUpToDate.length === serviceNames.length) {
+    console.log('No packages to rebuild. Removing build image creation step.')
+    await preventBuildImageFromBeingBuilt()
+  } else {
+    await ignoreFromBuild(packagesThatAreUpToDate)
+  }
+}
+
+run()

yarn.lock

@@ -3039,6 +3039,11 @@
   resolved "https://registry.yarnpkg.com/@types/joi/-/joi-14.3.3.tgz#f251aa8150fc0b6a7ce9feab21802a28473de335"
   integrity sha512-6gAT/UkIzYb7zZulAbcof3lFxpiD5EI6xBeTvkL1wYN12pnFQ+y/+xl9BvnVgxkmaIDN89xWhGZLD9CvuOtZ9g==
 
+"@types/js-yaml@^3.12.1":
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656"
+  integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==
+
 "@types/json2csv@^4.2.0", "@types/json2csv@^4.4.0":
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/@types/json2csv/-/json2csv-4.5.0.tgz#f846edb5239969942a1aa6fbc470e13e69ae971d"
@@ -4300,6 +4305,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/arg/-/arg-2.0.0.tgz#c06e7ff69ab05b3a4a03ebe0407fac4cba657545"
   integrity sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==
 
+arg@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.2.tgz#e70c90579e02c63d80e3ad4e31d8bfdb8bd50064"
+  integrity sha512-+ytCkGcBtHZ3V2r2Z06AncYO8jz46UEamcspGoU8lHcEbpn6J77QK0vdWvChsclg/tM5XIJC5tnjmPp7Eq6Obg==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -8601,6 +8611,11 @@ [email protected], diff@^3.1.0, diff@^3.2.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -22460,6 +22475,17 @@ ts-node@^7.0.1:
     source-map-support "^0.5.6"
     yn "^2.0.0"
 
+ts-node@^8.5.2:
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.5.2.tgz#434f6c893bafe501a30b32ac94ee36809ba2adce"
+  integrity sha512-W1DK/a6BGoV/D4x/SXXm6TSQx6q3blECUzd5TN+j56YEMX3yPVMpHsICLedUw3DvGF3aTQ8hfdR9AKMaHjIi+A==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.6"
+    yn "^3.0.0"
+
 [email protected], ts-pnp@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552"
@@ -24411,6 +24437,11 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
+yn@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 zen-observable-ts@^0.8.18:
   version "0.8.18"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz#ade44b1060cc4a800627856ec10b9c67f5f639c8"