Merge branch 'main' into ft/data-entry-statistics-app

.github/workflows/ci.yml

@@ -147,3 +147,4 @@ jobs:
       - run: yarn config set npmAuthToken "${NODE_AUTH_TOKEN}" &&  yarn npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+

package.json

@@ -52,7 +52,6 @@
     },
     "peerDependencies": {
         "@openmrs/esm-framework": "*",
-        "dayjs": "1.x",
         "react": "18.x",
         "react-i18next": "11.x",
         "react-router-dom": "6.x",

src/components/data-entry-tile/data-entry-statistics-tile.component.tsx

@@ -213,10 +213,6 @@ const DataEntryStatisticsTile: React.FC = () => {
     if (hasUpdatedParams && !loading) {
       setLoading(false);
       setShowTable(true);
-      console.info(tableData);
-      console.info(encounterData);
-      console.info(paginatedEncounterTypesList);
-      console.info(headers);
     } else {
       setLoading(false);
       setShowTable(false);

src/components/data-entry-tile/data-entry-statistics-tile.scss

@@ -25,7 +25,6 @@
     }
     .actionButton {
         height: 50px;
-        // flex-shrink: 0;
     }
 }
 

translations/en.json

@@ -1,3 +1,6 @@
 {
     "dataEntryStatistics": "Data Entry Statistics"
+    "dataEntryStatistics": "Data Entry Statistics",
+    "encounterUser": "Encounter User",
+    "orderedBy": "Ordered By"
 }

webpack.config.js

@@ -2,8 +2,6 @@ const path = require("path");
 const config = (module.exports = require("openmrs/default-webpack-config"));
 config.scriptRuleConfig.exclude =
   path.sep == "/"
-    ? /(node_modules[^\/@openmrs\/esm\-patient\-common\-lib, ^\/@ugandaemr\-esm\-ugandaemr\-commons\-lib])/
-    : /(node_modules[^\\@openmrs\/esm\-patient\-common\-lib, ^\\@ugandaemr\-esm\-ugandaemr\-commons\-lib])/;
 config.overrides.resolve = {
   extensions: [".tsx", ".ts", ".jsx", ".js", ".scss"],
   alias: {

yarn.lock

@@ -2320,8 +2320,9 @@ __metadata:
 "@humanwhocodes/config-array@npm:^0.11.11":
   version: 0.11.11
   resolution: "@humanwhocodes/config-array@npm:0.11.11"
+
   dependencies:
-    "@humanwhocodes/object-schema": ^1.2.1
+    "@humanwhocodes/object-schema": ^2.0.0
     debug: ^4.1.1
     minimatch: ^3.0.5
   checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19
@@ -2335,10 +2336,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@humanwhocodes/object-schema@npm:1.2.1"
-  checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1
+"@humanwhocodes/object-schema@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@humanwhocodes/object-schema@npm:2.0.0"
+  checksum: e0558acd035198a69adfa3edce33ec385bb664c92478a08a91b3e8082acd2d96ef7bf43189d848e4b0bdd75092f9d494a55a4efaf5bed45101c9e83d28379d83
   languageName: node
   linkType: hard
 
@@ -6384,7 +6385,6 @@ __metadata:
     webpack-cli: ^5.1.4
   peerDependencies:
     "@openmrs/esm-framework": "*"
-    dayjs: 1.x
     react: 18.x
     react-i18next: 11.x
     react-router-dom: 6.x
@@ -21877,8 +21877,8 @@ __metadata:
   linkType: hard
 
 "sshpk@npm:^1.7.0":
-  version: 1.17.0
-  resolution: "sshpk@npm:1.17.0"
+  version: 1.18.0
+  resolution: "sshpk@npm:1.18.0"
   dependencies:
     asn1: ~0.2.3
     assert-plus: ^1.0.0
@@ -21893,7 +21893,7 @@ __metadata:
     sshpk-conv: bin/sshpk-conv
     sshpk-sign: bin/sshpk-sign
     sshpk-verify: bin/sshpk-verify
-  checksum: ba109f65c8e6c35133b8e6ed5576abeff8aa8d614824b7275ec3ca308f081fef483607c28d97780c1e235818b0f93ed8c8b56d0a5968d5a23fd6af57718c7597
+  checksum: 01d43374eee3a7e37b3b82fdbecd5518cbb2e47ccbed27d2ae30f9753f22bd6ffad31225cb8ef013bc3fb7785e686cea619203ee1439a228f965558c367c3cfa
   languageName: node
   linkType: hard