@openmrs/esm-fast-data-entry-app 1.0.0-pre.17 → 1.0.0-pre.23

package/src/Root.tsx

@@ -1,16 +1,16 @@
 import React from "react";
 import { BrowserRouter, Route, Switch } from "react-router-dom";
 import { appPath } from "./constant";
-const FormsRoot = React.lazy(() => import("./forms/FormsRoot"));
-const FormWorkflow = React.lazy(() => import("./forms/FormWorkflow"));
+const FormsPage = React.lazy(() => import("./forms-page"));
+const FormEntryWorkflow = React.lazy(() => import("./form-entry-workflow"));
 
 const Root = () => {
   return (
     <main>
       <BrowserRouter basename={appPath}>
         <Switch>
-          <Route exact path="/" children={<FormsRoot />} />
-          <Route path="/:formUuid?" children={<FormWorkflow />} />
+          <Route exact path="/" children={<FormsPage />} />
+          <Route path="/:formUuid?" children={<FormEntryWorkflow />} />
         </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/form-entry-workflow/FormEntryWorkflow.tsx

@@ -0,0 +1,98 @@
+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, useHistory, useParams } from "react-router-dom";
+import FormBootstrap from "../FormBootstrap";
+import PatientCard from "../patient-card/PatientCard";
+import PatientBanner from "../patient-banner";
+import styles from "./styles.scss";
+import PatientSearchHeader from "../patient-search-header";
+import { useTranslation } from "react-i18next";
+
+interface ParamTypes {
+  formUuid: string;
+}
+
+const FormEntryWorkflow = () => {
+  const { formUuid } = useParams() as ParamTypes;
+  const history = useHistory();
+  const [patientUuids, setPatientUuids] = useState([]);
+  const [activePatientUuid, setActivePatientUuid] = useState(null);
+  const [encounterUuids, setEncounterUuids] = useState([]);
+  const { t } = useTranslation();
+
+  const saveEncounter = (uuid) => {
+    setEncounterUuids((encounterUuids) => [...encounterUuids, uuid]);
+  };
+
+  const handlePostResponse = (encounter) => {
+    if (
+      encounter &&
+      encounter.uuid &&
+      !encounterUuids.includes(encounter.uuid)
+    ) {
+      saveEncounter(encounter.uuid);
+    }
+  };
+
+  return (
+    <div>
+      <div className={styles.breadcrumbsContainer}>
+        <ExtensionSlot extensionSlotName="breadcrumbs-slot" />
+      </div>
+      {!activePatientUuid && (
+        <PatientSearchHeader
+          {...{ patientUuids, setPatientUuids, setActivePatientUuid }}
+        />
+      )}
+      {activePatientUuid && <PatientBanner patientUuid={activePatientUuid} />}
+      <div className={styles.workspaceWrapper}>
+        <div className={styles.workspace}>
+          {!patientUuids.length && (
+            <div className={styles.selectPatientMessage}>
+              {t("selectPatientFirst", "Please select a patient first")}
+            </div>
+          )}
+          {!!patientUuids.length && (
+            <div className={styles.formMainContent}>
+              <div className={styles.formContainer}>
+                <FormBootstrap
+                  patientUuid={activePatientUuid}
+                  {...{
+                    formUuid,
+                    handlePostResponse,
+                  }}
+                />
+              </div>
+              <div className={styles.rightPanel}>
+                <h4>Forms filled</h4>
+                <div className={styles.patientCardsSection}>
+                  {patientUuids.map((patientUuid) => (
+                    <PatientCard patientUuid={patientUuid} key={patientUuid} />
+                  ))}
+                </div>
+                <div className={styles.rightPanelActionButtons}>
+                  <Button
+                    kind="primary"
+                    onClick={() => setActivePatientUuid(null)}
+                  >
+                    {t("nextPatient", "Next Patient")}
+                  </Button>
+                  <Button kind="secondary" disabled>
+                    {t("reviewSave", "Review & Save")}
+                  </Button>
+                  <Button kind="tertiary" onClick={() => history.push("/")}>
+                    {t("cancel", "Cancel")}
+                  </Button>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default FormEntryWorkflow;

package/src/form-entry-workflow/index.ts

@@ -0,0 +1,3 @@
+import FormEntryWorkflow from "./FormEntryWorkflow";
+
+export default FormEntryWorkflow;

package/src/form-entry-workflow/styles.scss

@@ -0,0 +1,59 @@
+@import "~@openmrs/esm-styleguide/src/vars";
+@import "~carbon-components/src/globals/scss/vars";
+@import "~carbon-components/src/globals/scss/mixins";
+
+
+.breadcrumbsContainer > div > div > nav {
+  background-color: white;
+  padding: 0.5rem;
+  border-bottom: 1px solid $openmrs-background-grey;
+}
+
+.workspaceWrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.workspace {
+  width: 1100px;
+}
+
+.selectPatientMessage {
+  @include carbon--type-style('productive-heading-03');
+  margin: $spacing-07;
+  text-align: center;
+}
+
+.formMainContent {
+  display: flex;
+  text-align: center;
+  margin-top: 1rem;
+}
+
+.formContainer {
+  flex-grow: 1;
+  max-height: calc(100vh - 14rem);
+}
+
+.rightPanel {
+  width: 13rem;
+  text-align: left;
+}
+
+.patientCardsSection {
+  margin: 1rem 0;
+  border-bottom: 1px solid $carbon--gray-10;
+}
+
+.rightPanelActionButtons {
+  display: flex;
+  flex-direction: column;
+  row-gap: 0.5rem;
+  & button {
+    width: 100%;
+    text-decoration: "none";
+    & :hover {
+      background-color: $carbon--gray-30;
+    }
+  }
+}

package/src/forms-page/FormsPage.tsx

@@ -0,0 +1,54 @@
+import { useConfig } from "@openmrs/esm-framework";
+import { Tab, Tabs } from "carbon-components-react";
+import React from "react";
+import { Config } from "../config-schema";
+import { useGetAllForms } from "../hooks";
+import FormsTable from "../forms-table";
+import styles from "./styles.scss";
+import { useTranslation } from "react-i18next";
+
+const cleanForms = (rawFormData) => {
+  if (rawFormData) {
+    return rawFormData?.map((form) => ({
+      ...form,
+      id: form.uuid,
+    }));
+  }
+  return null;
+};
+
+const FormsPage = () => {
+  const config = useConfig() as Config;
+  const { t } = useTranslation();
+  const { formCategories, formCategoriesToShow } = config;
+  const { forms, isLoading, error } = useGetAllForms();
+  const cleanRows = cleanForms(forms);
+
+  const categoryRows = formCategoriesToShow.map((name) => {
+    const category = formCategories.find((category) => category.name === name);
+    let rows = [];
+    if (category && cleanRows && cleanRows.length) {
+      const uuids = category.forms?.map((form) => form.formUUID);
+      rows = cleanRows.filter((row) => uuids.includes(row.uuid));
+    }
+    return { ...{ name, rows } };
+  });
+
+  return (
+    <div className={styles.mainContent}>
+      <h3 className={styles.pageTitle}>{t("forms", "Forms")}</h3>
+      <Tabs type="container">
+        <Tab label={t("allForms", "All Forms")}>
+          <FormsTable rows={cleanRows} {...{ error, isLoading }} />
+        </Tab>
+        {categoryRows?.map((category, index) => (
+          <Tab label={category.name} key={index}>
+            <FormsTable rows={category.rows} {...{ error, isLoading }} />
+          </Tab>
+        ))}
+      </Tabs>
+    </div>
+  );
+};
+
+export default FormsPage;

package/src/forms-page/index.ts

@@ -0,0 +1,3 @@
+import FormsPage from "./FormsPage";
+
+export default FormsPage;

package/src/forms-page/styles.scss

@@ -0,0 +1,11 @@
+@import "~@openmrs/esm-styleguide/src/vars";
+@import "~carbon-components/src/globals/scss/vars";
+@import "~carbon-components/src/globals/scss/mixins";
+
+.mainContent {
+  padding: $spacing-07;
+}
+
+.pageTitle {
+  margin-bottom: $spacing-06;
+}

package/src/{forms → forms-table}/FormsTable.tsx

@@ -13,26 +13,61 @@ import {
   TableToolbarSearch,
 } from "carbon-components-react";
 import React from "react";
+import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
+import EmptyState from "../empty-state/EmptyState";
+import styles from "./styles.scss";
 
-const formsHeader = [
-  {
-    key: "name",
-    header: "Form name",
-  },
-  {
-    key: "actions",
-    header: "Actions",
-  },
-];
+const FormsTable = ({ rows, error, isLoading }) => {
+  const { t } = useTranslation();
+
+  const formsHeader = [
+    {
+      key: "name",
+      header: t("formName", "Form Name"),
+    },
+    {
+      key: "actions",
+      header: t("actions", "Actions"),
+    },
+    {
+      key: "actions2",
+      header: "",
+    },
+  ];
 
-const FormsTable = ({ rows }) => {
   const augmenteRows = rows?.map((row) => ({
     ...row,
-    actions: <Link to={row.uuid}>Fill Form</Link>,
+    actions: <Link to={row.uuid}>{t("fillForm", "Fill Form")}</Link>,
+    actions2: (
+      <Link to="#" className={styles.inactiveLink}>
+        {t("startGroupSession", "Start Group Session")}
+      </Link>
+    ),
   }));
-  if (!rows || !rows?.length) {
-    return <DataTableSkeleton />;
+
+  if (isLoading) return <DataTableSkeleton />;
+  if (error) {
+    return (
+      <EmptyState
+        headerTitle={t("errorLoadingData", "Error Loading Data")}
+        displayText={`${t(
+          "dataErrorMessage",
+          "Something went wrong loading data from the server."
+        )} "${error?.response?.status}: ${error?.response?.statusText}"`}
+      />
+    );
+  }
+  if (augmenteRows.length === 0) {
+    return (
+      <EmptyState
+        headerTitle={t("noFormsFound", "No Forms To Show")}
+        displayText={t(
+          "noFormsFoundMessage",
+          "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>
@@ -46,15 +81,8 @@ const FormsTable = ({ rows }) => {
       }) => {
         return (
           <TableContainer>
-            <div
-              style={{
-                position: "relative",
-                display: "flex",
-                height: "3rem",
-                justifyContent: "flex-end",
-              }}
-            >
-              <TableToolbar style={{ width: "20%", minWidth: "200px" }}>
+            <div className={styles.toolbarWrapper}>
+              <TableToolbar className={styles.tableToolbar}>
                 <TableToolbarContent>
                   <TableToolbarSearch onChange={onInputChange} />
                 </TableToolbarContent>

package/src/forms-table/index.ts

@@ -0,0 +1,3 @@
+import FormsTable from "./FormsTable";
+
+export default FormsTable;

package/src/forms-table/styles.scss

@@ -0,0 +1,20 @@
+@import "~@openmrs/esm-styleguide/src/vars";
+@import "~carbon-components/src/globals/scss/vars";
+@import "~carbon-components/src/globals/scss/mixins";
+
+.toolbarWrapper {
+  position: relative;
+  display: flex;
+  height: $spacing-09;
+  justify-content: flex-end;
+}
+
+.tableToolbar {
+  width: 20%;
+  min-width: 12.5rem;
+}
+
+.inactiveLink {
+  color: $carbon--gray-40;
+  cursor: not-allowed;
+}

package/src/hooks/index.ts

@@ -0,0 +1,4 @@
+import useGetAllForms from "./useGetAllForms";
+import useGetPatient from "./useGetPatient";
+
+export { useGetAllForms, useGetPatient };

package/src/hooks/useGetAllForms.ts

@@ -0,0 +1,31 @@
+import { openmrsFetch } from "@openmrs/esm-framework";
+import useSWR from "swr";
+
+const customFormRepresentation =
+  "(uuid,name,display,encounterType:(uuid,name,viewPrivilege,editPrivilege),version,published,retired,resources:(uuid,name,dataType,valueReference))";
+
+const formEncounterUrl = `/ws/rest/v1/form?v=custom:${customFormRepresentation}`;
+const formEncounterUrlPoc = `/ws/rest/v1/form?v=custom:${customFormRepresentation}&q=poc`;
+
+export function useGetAllForms(cachedOfflineFormsOnly = false) {
+  const showHtmlFormEntryForms = true;
+  const url = showHtmlFormEntryForms ? formEncounterUrl : formEncounterUrlPoc;
+  const { data, error } = useSWR([url, cachedOfflineFormsOnly], async () => {
+    const res = await openmrsFetch(url);
+    // show published forms and hide component forms
+    const forms =
+      res.data?.results?.filter(
+        (form) => form.published && !/component/i.test(form.name)
+      ) ?? [];
+
+    return forms;
+  });
+
+  return {
+    forms: data,
+    isLoading: !error && !data,
+    error,
+  };
+}
+
+export default useGetAllForms;

package/src/{forms/PatientInfo.test.tsx → patient-banner/PatientBanner.test.tsx}

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

package/src/{forms/PatientInfo.tsx → patient-banner/PatientBanner.tsx}

@@ -10,11 +10,11 @@ import {
   SkeletonText,
 } from "carbon-components-react";
 import React, { useState } from "react";
-import styles from "./patient-info.scss";
+import styles from "./styles.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";
+import useGetPatient from "../hooks/useGetPatient";
 interface PatientInfoProps {
   patientUuid: string;
 }

package/src/patient-banner/index.ts

@@ -0,0 +1,3 @@
+import PatientBanner from "./PatientBanner";
+
+export default PatientBanner;

package/src/{forms → patient-card}/PatientCard.tsx

@@ -1,6 +1,6 @@
 import { SkeletonText } from "carbon-components-react";
 import React from "react";
-import useGetPatient from "./useGetPatient";
+import useGetPatient from "../hooks/useGetPatient";
 
 const CardContainer = ({ children }) => {
   return <div style={{ padding: "1rem" }}>{children}</div>;

package/src/patient-card/index.ts

@@ -0,0 +1,3 @@
+import PatientCard from "./PatientCard";
+
+export default PatientCard;

package/src/patient-search-header/PatientSearchHeader.tsx

@@ -0,0 +1,49 @@
+import { Add20, Close20 } from "@carbon/icons-react";
+import { ExtensionSlot } from "@openmrs/esm-framework";
+import { Button } from "carbon-components-react";
+import React from "react";
+import { Link } from "react-router-dom";
+import styles from "./styles.scss";
+
+const PatientSearchHeader = ({
+  patientUuids,
+  setPatientUuids,
+  setActivePatientUuid,
+}) => {
+  const handleSelectPatient = (uuid) => {
+    setPatientUuids([...patientUuids, uuid]), setActivePatientUuid(uuid);
+  };
+
+  return (
+    <div className={styles.searchHeaderContainer}>
+      <span className={styles.padded}>Next patient:</span>
+      <span className={styles.searchBarWrapper}>
+        <ExtensionSlot
+          extensionSlotName="patient-search-bar-slot"
+          state={{
+            selectPatientAction: handleSelectPatient,
+            buttonProps: {
+              kind: "primary",
+            },
+          }}
+        />
+      </span>
+      <span className={styles.padded}>or</span>
+      <span>
+        <Button disabled>
+          Create new patient <Add20 />
+        </Button>
+      </span>
+      <span style={{ flexGrow: 1 }} />
+      <span>
+        <Link to="">
+          <Button kind="ghost">
+            Cancel <Close20 />
+          </Button>
+        </Link>
+      </span>
+    </div>
+  );
+};
+
+export default PatientSearchHeader;

package/src/patient-search-header/index.ts

@@ -0,0 +1,3 @@
+import PatientSearchHeader from "./PatientSearchHeader";
+
+export default PatientSearchHeader;