@openmrs/esm-fast-data-entry-app 1.0.0-pre.48 → 1.0.0-pre.51

package/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  "extends": [
+    "eslint:recommended",
+    "ts-react-important-stuff",
+    "plugin:prettier/recommended",
+    'react-app',
+    'plugin:@typescript-eslint/recommended',
+  ],
+  "parser": "@typescript-eslint/parser",
+}

package/.husky/pre-push

@@ -0,0 +1 @@
+yarn verify

package/README.md

@@ -14,8 +14,11 @@ The Forms page lists all forms able to be seen by a user, filtered by that user'
 Forms can be entered quickly with the Form Entry Workflow. This workflow depends on a state machine managed by the [FormWorkflowReducer](src/context/FormWorkflowReducer.ts).
 
 See the video below of a normal workflow.
-![Form Workflow Movie](docs/fde-workflow.mov)
+
+https://user-images.githubusercontent.com/5445264/181378774-341b2a2f-3ecc-4052-b960-d61ba07980fb.mov
+
 State diagram for the Form Workflow.
+
 ![Form Workflow State Diagram](docs/form-workflow-state-diagram.png)
 
 ## Running this code

package/dist/openmrs-esm-fast-data-entry-app.js.buildmanifest.json

@@ -5,9 +5,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 93704,
+      "size": 94054,
       "sizes": {
-        "javascript": 93704
+        "javascript": 94054
       },
       "names": [],
       "idHints": [],
@@ -18,7 +18,7 @@
         "61.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "34793f4c5b80e9bbd78b",
+      "hash": "6d75057e80778c7da82c",
       "childrenByOrder": {}
     },
     {
@@ -275,9 +275,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 364,
+      "size": 397,
       "sizes": {
-        "javascript": 364
+        "javascript": 397
       },
       "names": [],
       "idHints": [],
@@ -288,7 +288,7 @@
         "776.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "6e66cb877869f3408d72",
+      "hash": "272eaf44225e70b8c5af",
       "childrenByOrder": {}
     },
     {
@@ -366,9 +366,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 44076,
+      "size": 44083,
       "sizes": {
-        "javascript": 44034,
+        "javascript": 44041,
         "consume-shared": 42
       },
       "names": [],
@@ -380,7 +380,7 @@
         "990.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "70a1838bac7961d64f3f",
+      "hash": "9693925128d586be8781",
       "childrenByOrder": {}
     }
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-fast-data-entry-app",
-  "version": "1.0.0-pre.48",
+  "version": "1.0.0-pre.51",
   "license": "MPL-2.0",
   "description": "An OpenMRS 3.x microfrontend",
   "browser": "dist/openmrs-esm-fast-data-entry-app.js",
@@ -11,7 +11,7 @@
     "serve": "webpack serve --mode=development",
     "build": "webpack --mode production",
     "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "eslint src --ext js,jsx,ts,tsx",
+    "lint": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" --fix --max-warnings=0 -c .eslintrc.js",
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\"",
     "typescript": "tsc",
     "test": "jest --config jest.config.json --passWithNoTests",
@@ -80,10 +80,11 @@
     "babel-jest": "^27.0.2",
     "babel-preset-minify": "^0.5.1",
     "concurrently": "^6.2.0",
-    "eslint": "^7.27.0",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.3.0",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-config-ts-react-important-stuff": "^3.0.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.4.2",

package/src/FormBootstrap.tsx

@@ -69,7 +69,7 @@ export interface Observation {
       display: string;
     };
   }>;
-  value: any;
+  value: unknown;
   obsDatetime: string;
 }
 
@@ -131,7 +131,7 @@ const FormBootstrap = ({
             patientUuid,
             patient,
             encounterUuid: encounterUuid ?? "",
-            closeWorkspace: () => {},
+            closeWorkspace: () => undefined,
             handlePostResponse,
             showDiscardSubmitButtons: false,
           }}

package/src/config-schema.ts

@@ -1,4 +1,4 @@
-import { Type, validator } from "@openmrs/esm-framework";
+import { Type } from "@openmrs/esm-framework";
 
 /**
  * This is the config schema.
@@ -68,11 +68,11 @@ export type Form = {
 };
 
 export type Category = {
-  name: String;
+  name: string;
   forms: Array<Form>;
 };
 
 export type Config = {
   formCategories: Array<Category>;
-  formCategoriesToShow: Array<String>;
+  formCategoriesToShow: Array<string>;
 };

package/src/context/FormWorkflowContext.tsx

@@ -12,13 +12,13 @@ const initialState = {
   activeEncounterUuid: null,
   encounters: {},
   workflowState: null,
-  addPatient: (uuid: string | number) => {},
-  openPatientSearch: () => {},
-  saveEncounter: (encounterUuid: string | number) => {},
-  editEncounter: (patientUuid: string | number) => {},
-  submitForNext: () => {},
-  submitForReview: () => {},
-  goToReview: () => {},
+  addPatient: (uuid: string | number) => undefined,
+  openPatientSearch: () => undefined,
+  saveEncounter: (encounterUuid: string | number) => undefined,
+  editEncounter: (patientUuid: string | number) => undefined,
+  submitForNext: () => undefined,
+  submitForReview: () => undefined,
+  goToReview: () => undefined,
 };
 
 const FormWorkflowContext = React.createContext(initialState);

package/src/form-entry-workflow/FormEntryWorkflow.tsx

@@ -17,10 +17,6 @@ import FormWorkflowContext, {
 } from "../context/FormWorkflowContext";
 import WorkflowReview from "../workflow-review";
 
-interface ParamTypes {
-  formUuid: string;
-}
-
 const formStore = getGlobalStore("ampath-form-state");
 
 const WorkflowNavigationButtons = () => {

package/src/forms-app-menu-link.tsx

@@ -5,6 +5,7 @@ import { ConfigurableLink } from "@openmrs/esm-framework";
 export default function OfflineToolsAppMenuLink() {
   const { t } = useTranslation();
   return (
+    // eslint-disable-next-line
     <ConfigurableLink to="${openmrsSpaBase}/forms">
       {t("formsAppMenuLink", "Forms")}
     </ConfigurableLink>

package/src/forms-page/FormsPage.tsx

@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
 // helper function useful for debugging
 // given a list of forms, it will organize into permissions
 // and list which forms are associated with that permission
-const getFormPermissions = (forms) => {
+export const getFormPermissions = (forms) => {
   const output = {};
   forms?.forEach(
     (form) =>

package/src/hooks/useGetEncounter.ts

@@ -1,5 +1,4 @@
-import { fetchCurrentPatient, openmrsFetch } from "@openmrs/esm-framework";
-import { useEffect, useState } from "react";
+import { openmrsFetch } from "@openmrs/esm-framework";
 import useSWR from "swr";
 
 const encounterUrl = "/ws/rest/v1/encounter/";

package/src/patient-card/PatientCard.tsx

@@ -8,7 +8,7 @@ const CardContainer = ({ active, onClick, children }) => {
   return (
     <div
       className={`${styles.cardContainer} ${!active && styles.inactiveCard}`}
-      onClick={active ? onClick : () => {}}
+      onClick={active ? onClick : () => undefined}
       role="button"
       tabIndex={0}
     >
@@ -26,7 +26,7 @@ const PatientCard = ({ patientUuid }) => {
 
   if (!patient) {
     return (
-      <CardContainer onClick={() => {}} active={true}>
+      <CardContainer onClick={() => undefined} active={true}>
         <SkeletonText className={styles.skeletonText} />
       </CardContainer>
     );

package/src/workflow-review/WorkflowReview.tsx

@@ -3,7 +3,6 @@ import React, { useContext } from "react";
 import { useHistory } from "react-router-dom";
 import FormWorkflowContext from "../context/FormWorkflowContext";
 import FormReviewCard from "../form-review-card";
-import PatientCard from "../patient-card";
 import styles from "./styles.scss";
 
 const WorkflowReview = () => {

package/.eslintrc

@@ -1,4 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "extends": ["ts-react-important-stuff", "plugin:prettier/recommended"]
-}