Merge pull request #575 from EyeSeeTea/development

Release 2.2.1

Author: Ramon-Jimenez

.github/workflows/main.yml

@@ -1,43 +1,12 @@
-name: Application testing
-on:
-    push:
-    workflow_dispatch:
-jobs:
-    unit-tests:
-        name: Unit tests
-        runs-on: self-hosted
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v2
-
-            - name: Setup Node
-              uses: actions/setup-node@v1
-              with:
-                  node-version: "12.x"
-
-            - name: Install yarn
-              run: npm install -g yarn
-
-            - name: Get yarn cache directory path
-              id: yarn-cache-dir-path
-              run: echo "::set-output name=dir::$(yarn cache dir)"
+name: "Shared Master Workflow"
 
-            - name: Cache yarn dependencies
-              uses: actions/cache@v2
-              id: yarn-cache
-              with:
-                  path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-yarn-
-            - name: Installing Dependencies
-              run: yarn install --frozen-lockfile --silent
-
-            - name: Install translations
-              run: yarn localize
-
-            - name: Run jest tests
-              run: yarn test
+on:
+  push:
+    branches: ["master", "development"]
+  pull_request:
+    branches: [ "master", "development" ]
+  workflow_dispatch:
 
-            - name: Run typescript tests
-              run: npx tsc
+jobs:
+  master-workflow:
+    uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master

package.json

@@ -1,7 +1,7 @@
 {
     "name": "data-management-app",
     "description": "DHIS2 Data Management App",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",
@@ -37,7 +37,7 @@
         "font-awesome": "^4.7.0",
         "lodash": "4.17.21",
         "luxon": "^3.7.1",
-        "md5": "^2.2.1",
+        "md5.js": "1.3.5",
         "moment": "2.29.1",
         "postcss-rtl": "^1.3.2",
         "prop-types": "^15",
@@ -100,7 +100,6 @@
         "@types/jest": "26.0.20",
         "@types/lodash": "4.14.168",
         "@types/luxon": "^3.6.2",
-        "@types/md5": "2.2.1",
         "@types/node": "16",
         "@types/react": "17.0.0",
         "@types/react-dom": "17.0.0",

public/index.html

@@ -4,16 +4,22 @@
         <meta charset="utf-8" />
         <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
 
-        <script src="//code.jquery.com/jquery-latest.min.js"></script>
+        <script
+            src="https://code.jquery.com/jquery-1.11.1.min.js"
+            integrity="sha256-VAvG3sHdS5LqTT+5A/aeq/bZGa/Uj04xKxY8KM/w9EE="
+            crossorigin="anonymous"
+        ></script>
         <link
             type="text/css"
             rel="stylesheet"
             href="%PUBLIC_URL%/includes/material-design-icons/material-icons.css"
         />
         <link type="text/css" rel="stylesheet" href="%PUBLIC_URL%/includes/roboto-font.css" />
         <link
-            href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"
+            href="https://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"
+            integrity="sha384-X7L1bhgb36bF1iFvaqvhgpaGpayKM+vXNNYRlF89BFA5s3vi1qZ8EX9086RlZjy1"
             rel="stylesheet"
+            crossorigin="anonymous"
         />
 
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />

src/models/dev-project.ts

@@ -1,4 +1,6 @@
-import md5 from "md5";
+// @ts-ignore
+import MD5 from "md5.js";
+
 import { D2Api, DataValueSetsPostRequest } from "../types/d2-api";
 import _ from "lodash";
 import Project from "./Project";
@@ -103,7 +105,7 @@ export async function saveDataValues(api: D2Api, project: Project) {
 
                 return cocs.map(coc => {
                     const key = [de.id, coc.id, info.attrCoc, period.id].join("-");
-                    const md5hash = md5(key);
+                    const md5hash = new MD5(key);
                     const value = (parseInt(md5hash.slice(0, 8), 16) % 9) + 1;
 
                     const dataValue: DataValue = {

src/pages/report/TableBodyGrouped.tsx

@@ -37,6 +37,8 @@ export default function TableBodyGrouped<Row extends Ref>(props: RowProps<Row>):
 
 const useStyles = makeStyles({
     row: {
-        borderBottom: "3px solid #E0E0E0",
+        "& td": {
+            borderBottom: "2px solid #C0C0C0",
+        },
     },
 });

src/utils/dhis2.ts

@@ -1,5 +1,6 @@
 import _ from "lodash";
-import md5 from "md5";
+// @ts-ignore
+import MD5 from "md5.js";
 
 import { D2Api, Ref, Id, MetadataPayload, PostOptions } from "../types/d2-api";
 import { runPromises } from "./promises";
@@ -67,7 +68,7 @@ const maxHashValue = _(uidStructure)
 /* Return pseudo-random UID from seed prefix/key */
 export function getUid(prefix: string, key: string): string {
     const seed = prefix + key;
-    const md5hash = md5(seed);
+    const md5hash: string = new MD5().update(seed).digest("hex");
     const nHashChars = Math.ceil(Math.log(maxHashValue) / Math.log(16));
     const hashInteger = parseInt(md5hash.slice(0, nHashChars), 16);
     const result = uidStructure.reduce(

yarn.lock

@@ -4419,13 +4419,6 @@
   resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.6.2.tgz#be6536931801f437eafcb9c0f6d6781f72308041"
   integrity sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==
 
-"@types/[email protected]":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@types/md5/-/md5-2.2.1.tgz#0e2d65d8f6cc91aafbc9be5a4c08fee9250406ce"
-  integrity sha512-bZB0jqBL7JETFqvRKyuDETFceFaVcLm2MBPP5LFEEL/SZuqLnyvzF37tXmMERDncC3oeEj/fOUw88ftJeMpZaw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -6680,11 +6673,6 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-[email protected]:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
-
 check-more-types@^2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
@@ -7365,11 +7353,6 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-[email protected]:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -10774,7 +10757,7 @@ is-boolean-object@^1.0.1, is-boolean-object@^1.1.0:
   dependencies:
     call-bind "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.6:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
@@ -12693,7 +12676,7 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-md5.js@^1.3.4:
+md5.js@1.3.5, md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
   integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
@@ -12702,15 +12685,6 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-md5@^2.2.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
 [email protected]:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"