@openmrs/esm-fast-data-entry-app 1.0.0-pre.11 → 1.0.0-pre.21

package/src/FormEntry.tsx

@@ -0,0 +1,42 @@
+import React from "react";
+import { ExtensionSlot } from "@openmrs/esm-framework";
+import useGetPatient from "./forms/useGetPatient";
+interface FormParams {
+  formUuid: string;
+  patientUuid: string;
+  visitUuid?: string;
+  visitTypeUuid?: string;
+  encounterUuid?: string;
+}
+
+const FormEntry = ({
+  formUuid,
+  patientUuid,
+  visitUuid,
+  visitTypeUuid,
+  encounterUuid,
+}: FormParams) => {
+  const patient = useGetPatient(patientUuid);
+
+  return (
+    <div>
+      {formUuid && patientUuid && patient && (
+        <ExtensionSlot
+          extensionSlotName="form-widget-slot"
+          state={{
+            view: "form",
+            formUuid,
+            visitUuid: visitUuid ?? "",
+            visitTypeUuid: visitTypeUuid ?? "",
+            patientUuid,
+            patient,
+            encounterUuid: encounterUuid ?? "",
+            closeWorkspace: () => {},
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default FormEntry;

package/src/Loader.tsx

@@ -0,0 +1,16 @@
+import React from "react";
+import styles from "./loader.scss";
+import { InlineLoading } from "carbon-components-react";
+import { useTranslation } from "react-i18next";
+
+const Loader: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <InlineLoading
+      className={styles.loading}
+      description={`${t("loading", "Loading")} ...`}
+    />
+  );
+};
+
+export default Loader;

package/src/Root.tsx

@@ -1,13 +1,17 @@
 import React from "react";
-import { BrowserRouter, Route } from "react-router-dom";
+import { BrowserRouter, Route, Switch } from "react-router-dom";
 import { appPath } from "./constant";
-import FormsRoot from "./forms/FormsRoot";
+const FormsRoot = React.lazy(() => import("./forms/FormsRoot"));
+const FormWorkflow = React.lazy(() => import("./forms/FormWorkflow"));
 
 const Root = () => {
   return (
     <main>
       <BrowserRouter basename={appPath}>
-        <Route path="/:tab?" component={FormsRoot} />
+        <Switch>
+          <Route exact path="/" children={<FormsRoot />} />
+          <Route path="/:formUuid?" children={<FormWorkflow />} />
+        </Switch>
       </BrowserRouter>
     </main>
   );

package/src/empty-state/EmptyDataIllustration.tsx

@@ -0,0 +1,51 @@
+import React from "react";
+
+export const EmptyDataIllustration = ({ width = "64", height = "64" }) => {
+  return (
+    <svg width={width} height={height} viewBox="0 0 64 64">
+      <title>Empty data illustration</title>
+      <g fill="none" fillRule="evenodd">
+        <path
+          d="M38.133 13.186H21.947c-.768.001-1.39.623-1.39 1.391V50.55l-.186.057-3.97 1.216a.743.743 0 01-.927-.493L3.664 12.751a.742.742 0 01.492-.926l6.118-1.874 17.738-5.43 6.119-1.873a.741.741 0 01.926.492L38.076 13l.057.186z"
+          fill="#F4F4F4"
+        />
+        <path
+          d="M41.664 13L38.026 1.117A1.576 1.576 0 0036.056.07l-8.601 2.633-17.737 5.43-8.603 2.634a1.578 1.578 0 00-1.046 1.97l12.436 40.616a1.58 1.58 0 001.969 1.046l5.897-1.805.185-.057v-.194l-.185.057-5.952 1.822a1.393 1.393 0 01-1.737-.923L.247 12.682a1.39 1.39 0 01.923-1.738L9.772 8.31 27.51 2.881 36.112.247a1.393 1.393 0 011.737.923L41.47 13l.057.186h.193l-.057-.185z"
+          fill="#8D8D8D"
+        />
+        <path
+          d="M11.378 11.855a.836.836 0 01-.798-.59L9.385 7.361a.835.835 0 01.554-1.042l16.318-4.996a.836.836 0 011.042.554l1.195 3.902a.836.836 0 01-.554 1.043l-16.318 4.995a.831.831 0 01-.244.037z"
+          fill="#C6C6C6"
+        />
+        <circle fill="#C6C6C6" cx={17.636} cy={2.314} r={1.855} />
+        <circle
+          fill="#FFF"
+          fillRule="nonzero"
+          cx={17.636}
+          cy={2.314}
+          r={1.175}
+        />
+        <path
+          d="M55.893 53.995H24.544a.79.79 0 01-.788-.789V15.644a.79.79 0 01.788-.788h31.349a.79.79 0 01.788.788v37.562a.79.79 0 01-.788.789z"
+          fill="#F4F4F4"
+        />
+        <path
+          d="M41.47 13H21.948a1.579 1.579 0 00-1.576 1.577V52.4l.185-.057V14.577c.001-.768.623-1.39 1.391-1.39h19.581L41.471 13zm17.02 0H21.947a1.579 1.579 0 00-1.576 1.577v42.478c0 .87.706 1.576 1.576 1.577H58.49a1.579 1.579 0 001.576-1.577V14.577a1.579 1.579 0 00-1.576-1.576zm1.39 44.055c0 .768-.622 1.39-1.39 1.392H21.947c-.768-.001-1.39-.624-1.39-1.392V14.577c0-.768.622-1.39 1.39-1.39H58.49c.768 0 1.39.622 1.39 1.39v42.478z"
+          fill="#8D8D8D"
+        />
+        <path
+          d="M48.751 17.082H31.686a.836.836 0 01-.835-.835v-4.081c0-.46.374-.834.835-.835H48.75c.461 0 .834.374.835.835v4.08c0 .462-.374.835-.835.836z"
+          fill="#C6C6C6"
+        />
+        <circle fill="#C6C6C6" cx={40.218} cy={9.755} r={1.855} />
+        <circle
+          fill="#FFF"
+          fillRule="nonzero"
+          cx={40.218}
+          cy={9.755}
+          r={1.13}
+        />
+      </g>
+    </svg>
+  );
+};

package/src/empty-state/EmptyState.tsx

@@ -0,0 +1,29 @@
+import React from "react";
+import { Tile } from "carbon-components-react";
+import styles from "./styles.scss";
+import { useLayoutType } from "@openmrs/esm-framework";
+import { EmptyDataIllustration } from "./EmptyDataIllustration";
+
+export interface EmptyStateProps {
+  headerTitle: string;
+  displayText: string;
+}
+const EmptyState: React.FC<EmptyStateProps> = ({
+  headerTitle,
+  displayText,
+}) => {
+  const isTablet = useLayoutType() === "tablet";
+
+  return (
+    <Tile light className={styles.tile}>
+      <div className={isTablet ? styles.tabletHeading : styles.desktopHeading}>
+        <h4>{headerTitle}</h4>
+      </div>
+      <EmptyDataIllustration />
+      <p className={styles.content}>{displayText}</p>
+    </Tile>
+  );
+};
+
+export default EmptyState;
+export { EmptyState };

package/src/empty-state/styles.scss

@@ -0,0 +1,55 @@
+@import "~@openmrs/esm-styleguide/src/vars";
+@import "~carbon-components/src/globals/scss/vars";
+@import "~carbon-components/src/globals/scss/mixins";
+
+.action {
+  margin-bottom: $spacing-03;
+}
+
+.content {
+  @include carbon--type-style("productive-heading-01");
+  color: $text-02;
+  margin-top: $spacing-05;
+  margin-bottom: $spacing-03;
+}
+
+.desktopHeading {
+  h4 {
+    @include carbon--type-style('productive-heading-02');
+    color: $text-02;
+  }
+}
+
+.tabletHeading {
+  h4 {
+    @include carbon--type-style('productive-heading-03');
+    color: $text-02;
+  }
+}
+
+.desktopHeading, .tabletHeading {
+  text-align: left;
+  text-transform: capitalize;
+  margin-bottom: $spacing-05;
+
+  h4:after {
+    content: "";
+    display: block;
+    width: 2rem;
+    padding-top: 0.188rem;
+    border-bottom: 0.375rem solid var(--brand-03);
+  }
+}
+
+.heading:after {
+  content: "";
+  display: block;
+  width: 2rem;
+  padding-top: 0.188rem;
+  border-bottom: 0.375rem solid var(--brand-03);
+}
+
+.tile {
+  text-align: center;
+  border: 1px solid $ui-03;
+}

package/src/forms/FormWorkflow.tsx

@@ -0,0 +1,135 @@
+import { Add20, Close20 } from "@carbon/icons-react";
+import { ExtensionSlot } from "@openmrs/esm-framework";
+import { Button } from "carbon-components-react";
+import React, { useState } from "react";
+import { Link, useParams } from "react-router-dom";
+import FormEntry from "../FormEntry";
+import PatientCard from "./PatientCard";
+import PatientInfo from "./PatientInfo";
+import styles from "./styles.scss";
+
+const PatientSearchHeader = ({
+  patientUuids,
+  setPatientUuids,
+  setActivePatientUuid,
+}) => {
+  const handleSelectPatient = (uuid) => {
+    setPatientUuids([...patientUuids, uuid]), setActivePatientUuid(uuid);
+  };
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        backgroundColor: "white",
+        padding: "2rem 1rem",
+      }}
+    >
+      <span style={{ padding: "1rem" }}>Next patient:</span>
+      <span style={{ minWidth: "35rem" }}>
+        <ExtensionSlot
+          extensionSlotName="patient-search-bar-slot"
+          state={{
+            selectPatientAction: handleSelectPatient,
+            buttonProps: {
+              kind: "primary",
+            },
+          }}
+        />
+      </span>
+      <span style={{ padding: "1rem" }}>or</span>
+      <span>
+        <Button disabled>
+          Create new patient <Add20 />
+        </Button>
+      </span>
+      <span style={{ flexGrow: 1 }} />
+      <span>
+        <Button kind="ghost" href={`${window.spaBase}/forms`}>
+          Cancel <Close20 />
+        </Button>
+      </span>
+    </div>
+  );
+};
+
+interface ParamTypes {
+  formUuid: string;
+}
+
+const FormWorkflow = () => {
+  const { formUuid } = useParams() as ParamTypes;
+  const [patientUuids, setPatientUuids] = useState([]);
+  const [activePatientUuid, setActivePatientUuid] = useState(null);
+
+  return (
+    <div>
+      <div className={styles.breadcrumbsContainer}>
+        <ExtensionSlot extensionSlotName="breadcrumbs-slot" />
+      </div>
+      {!activePatientUuid && (
+        <PatientSearchHeader
+          {...{ patientUuids, setPatientUuids, setActivePatientUuid }}
+        />
+      )}
+      {activePatientUuid && <PatientInfo patientUuid={activePatientUuid} />}
+      <div style={{ display: "flex", justifyContent: "center" }}>
+        <div style={{ width: "1100px" }}>
+          {!patientUuids.length && (
+            <div style={{ margin: "2rem", textAlign: "center" }}>
+              Please select a patient first
+            </div>
+          )}
+          {!!patientUuids.length && (
+            <div className={styles.formContainer}>
+              <div style={{ flexGrow: 1 }}>
+                <FormEntry
+                  patientUuid={activePatientUuid}
+                  {...{
+                    formUuid,
+                  }}
+                />
+              </div>
+              <div style={{ width: "13rem", textAlign: "left" }}>
+                <h4>Forms filled</h4>
+                <div
+                  style={{
+                    margin: "1rem 0",
+                    borderBottom: "1px solid #f4f4f4",
+                  }}
+                >
+                  {patientUuids.map((patientUuid) => (
+                    <PatientCard patientUuid={patientUuid} key={patientUuid} />
+                  ))}
+                </div>
+                <div
+                  style={{
+                    display: "flex",
+                    flexDirection: "column",
+                    rowGap: "0.5rem",
+                  }}
+                >
+                  <Button
+                    kind="primary"
+                    onClick={() => setActivePatientUuid(null)}
+                    style={{ width: "100%" }}
+                  >
+                    Next Patient
+                  </Button>
+                  <Button kind="secondary" disabled style={{ width: "100%" }}>
+                    Review & Save
+                  </Button>
+                  <Button kind="tertiary" disabled style={{ width: "100%" }}>
+                    Cancel
+                  </Button>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default FormWorkflow;

package/src/forms/FormsRoot.tsx

@@ -1,11 +1,9 @@
 import { openmrsFetch, useConfig } from "@openmrs/esm-framework";
 import { Tab, Tabs } from "carbon-components-react";
 import React from "react";
-import { from } from "rxjs";
 import useSWR from "swr";
 import { Config } from "../config-schema";
 import FormsTable from "./FormsTable";
-import { tableData } from "./mockData";
 
 export const customFormRepresentation =
   "(uuid,name,display,encounterType:(uuid,name,viewPrivilege,editPrivilege),version,published,retired,resources:(uuid,name,dataType,valueReference))";
@@ -16,8 +14,7 @@ export const formEncounterUrlPoc = `/ws/rest/v1/form?v=custom:${customFormRepres
 export function useFormEncounters(cachedOfflineFormsOnly = false) {
   const showHtmlFormEntryForms = true;
   const url = showHtmlFormEntryForms ? formEncounterUrl : formEncounterUrlPoc;
-
-  return useSWR([url, cachedOfflineFormsOnly], async () => {
+  const { data, error } = useSWR([url, cachedOfflineFormsOnly], async () => {
     const res = await openmrsFetch(url);
     // show published forms and hide component forms
     const forms =
@@ -27,6 +24,12 @@ export function useFormEncounters(cachedOfflineFormsOnly = false) {
 
     return forms;
   });
+
+  return {
+    forms: data,
+    isLoading: !error && !data,
+    error,
+  };
 }
 
 const cleanForms = (rawFormData) => {
@@ -36,14 +39,13 @@ const cleanForms = (rawFormData) => {
       id: form.uuid,
     }));
   }
+  return null;
 };
 
-const FormsRoot = ({ match }) => {
-  const { tab } = match?.params;
+const FormsRoot = () => {
   const config = useConfig() as Config;
   const { formCategories, formCategoriesToShow } = config;
-  const { data: forms } = useFormEncounters();
-  const { rows: mockRows } = tableData;
+  const { forms, isLoading, error } = useFormEncounters();
   const cleanRows = cleanForms(forms);
 
   const categoryRows = formCategoriesToShow.map((name) => {
@@ -61,11 +63,11 @@ const FormsRoot = ({ match }) => {
       <h3 style={{ marginBottom: "1.5rem" }}>Forms</h3>
       <Tabs type="container">
         <Tab label="All Forms">
-          <FormsTable rows={cleanRows} />
+          <FormsTable rows={cleanRows} {...{ error, isLoading }} />
         </Tab>
         {categoryRows?.map((category) => (
           <Tab label={category.name}>
-            <FormsTable rows={category.rows} />
+            <FormsTable rows={category.rows} {...{ error, isLoading }} />
           </Tab>
         ))}
       </Tabs>

package/src/forms/FormsTable.tsx

@@ -1,3 +1,4 @@
+import { ErrorState } from "@openmrs/esm-framework";
 import {
   DataTable,
   DataTableSkeleton,
@@ -13,7 +14,8 @@ import {
   TableToolbarSearch,
 } from "carbon-components-react";
 import React from "react";
-import { tableData } from "./mockData";
+import { Link } from "react-router-dom";
+import EmptyState from "../empty-state/EmptyState";
 
 const formsHeader = [
   {
@@ -26,13 +28,28 @@ const formsHeader = [
   },
 ];
 
-const FormsTable = ({ rows }) => {
+const FormsTable = ({ rows, error, isLoading }) => {
   const augmenteRows = rows?.map((row) => ({
     ...row,
-    actions: "Fill Form",
+    actions: <Link to={row.uuid}>Fill Form</Link>,
   }));
-  if (!rows || !rows?.length) {
-    return <DataTableSkeleton />;
+
+  if (isLoading) return <DataTableSkeleton />;
+  if (error) {
+    return (
+      <EmptyState
+        headerTitle="Error Loading Data"
+        displayText={`Something went wrong loading data from the server. "${error?.response?.status}: ${error?.response?.statusText}"`}
+      />
+    );
+  }
+  if (augmenteRows.length === 0) {
+    return (
+      <EmptyState
+        headerTitle="No Forms To Show"
+        displayText="No forms could be found for this category. Please double check the form concept uuids and access permissions."
+      />
+    );
   }
   return (
     <DataTable rows={augmenteRows} headers={formsHeader} isSortable>

package/src/forms/PatientCard.tsx

@@ -0,0 +1,37 @@
+import { SkeletonText } from "carbon-components-react";
+import React from "react";
+import useGetPatient from "./useGetPatient";
+
+const CardContainer = ({ children }) => {
+  return <div style={{ padding: "1rem" }}>{children}</div>;
+};
+
+const PatientCard = ({ patientUuid }) => {
+  const patient = useGetPatient(patientUuid);
+  const givenName = patient?.name?.[0]?.given?.[0];
+  const familyName = patient?.name?.[0]?.family;
+  const identifier = patient?.identifier?.[0]?.value;
+
+  if (!patient) {
+    return (
+      <CardContainer>
+        <SkeletonText style={{ maxWidth: "8rem" }} />
+      </CardContainer>
+    );
+  }
+
+  return (
+    <CardContainer>
+      <div
+        style={{ fontWeight: 300, fontSize: "0.8rem", lineHeight: "0.9rem" }}
+      >
+        {identifier}
+      </div>
+      <div style={{ fontWeight: "bold" }}>
+        {givenName} {familyName}
+      </div>
+    </CardContainer>
+  );
+};
+
+export default PatientCard;

package/src/forms/PatientInfo.test.tsx

@@ -0,0 +1,9 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import PatientInfo from "./PatientInfo";
+
+describe("PatientInfo", () => {
+  it("renders placeholder information when no data is present", () => {
+    render(<PatientInfo patientUuid={null} />);
+  });
+});

package/src/forms/PatientInfo.tsx

@@ -0,0 +1,140 @@
+import {
+  age,
+  ExtensionSlot,
+  formatDate,
+  parseDate,
+} from "@openmrs/esm-framework";
+import {
+  Button,
+  SkeletonPlaceholder,
+  SkeletonText,
+} from "carbon-components-react";
+import React, { useState } from "react";
+import styles from "./patient-info.scss";
+import ChevronDown16 from "@carbon/icons-react/es/chevron--down/16";
+import ChevronUp16 from "@carbon/icons-react/es/chevron--up/16";
+import { useTranslation } from "react-i18next";
+import useGetPatient from "./useGetPatient";
+interface PatientInfoProps {
+  patientUuid: string;
+}
+
+const SkeletonPatientInfo = () => {
+  return (
+    <div className={styles.container}>
+      <div className={styles.patientInfoContainer}>
+        <SkeletonPlaceholder />
+        <div className={styles.patientInfoContent}>
+          <div className={styles.patientInfoRow}>
+            <span className={styles.patientName}>
+              <SkeletonText />
+            </span>
+          </div>
+          <div className={styles.patientInfoRow}>
+            <div className={styles.demographics}>
+              <span>
+                <SkeletonText />
+              </span>
+              <span>
+                <SkeletonText />
+              </span>
+              <span>
+                <SkeletonText />
+              </span>
+            </div>
+          </div>
+          <div className={styles.patientInfoRow}>
+            <span className={styles.identifier}>
+              <SkeletonText />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const PatientInfo: React.FC<PatientInfoProps> = ({ patientUuid }) => {
+  const patient = useGetPatient(patientUuid);
+  const { t } = useTranslation();
+  const [showContactDetails, setShowContactDetails] = useState<boolean>(false);
+  const patientName = `${patient?.name?.[0].given?.join(" ")} ${
+    patient?.name?.[0]?.family
+  }`;
+
+  const patientPhotoSlotState = React.useMemo(
+    () => ({ patientUuid: patient?.id, patientName }),
+    [patient?.id, patientName]
+  );
+
+  const toggleShowMore = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    setShowContactDetails((prevState) => !prevState);
+  };
+
+  if (!patient) {
+    return <SkeletonPatientInfo />;
+  }
+
+  return (
+    <div className={styles.container}>
+      <div
+        className={`${
+          showContactDetails
+            ? styles.activePatientInfoContainer
+            : styles.patientInfoContainer
+        }`}
+      >
+        <ExtensionSlot
+          extensionSlotName="patient-photo-slot"
+          state={patientPhotoSlotState}
+        />
+        <div className={styles.patientInfoContent}>
+          <div className={styles.patientInfoRow}>
+            <span className={styles.patientName}>{patientName}</span>
+          </div>
+          <div className={styles.patientInfoRow}>
+            <div className={styles.demographics}>
+              <span>
+                {(patient.gender ?? t("unknown", "Unknown")).replace(
+                  /^\w/,
+                  (c) => c.toUpperCase()
+                )}{" "}
+                &middot;{" "}
+              </span>
+              <span>{age(patient.birthDate)} &middot; </span>
+              <span>
+                {formatDate(parseDate(patient.birthDate), {
+                  mode: "wide",
+                  time: false,
+                })}
+              </span>
+            </div>
+          </div>
+          <div className={styles.patientInfoRow}>
+            <span className={styles.identifier}>
+              {patient.identifier.length
+                ? patient.identifier
+                    .map((identifier) => identifier.value)
+                    .join(", ")
+                : "--"}
+            </span>
+            <Button
+              kind="ghost"
+              renderIcon={showContactDetails ? ChevronUp16 : ChevronDown16}
+              iconDescription="Toggle contact details"
+              onClick={(e) => toggleShowMore(e)}
+              disabled
+            >
+              {showContactDetails
+                ? t("showLess", "Show less")
+                : t("showAllDetails", "Show all details")}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PatientInfo;