@kenyaemr/esm-bed-management-app 1.0.1-pre.4 → 8.0.2

package/src/bed-administration/new-bed-form.component.tsx

@@ -1,61 +1,45 @@
-import React, { useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import { showToast, showNotification, useConfig } from "@openmrs/esm-framework";
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { showToast, showNotification } from '@openmrs/esm-framework';
 
-import type { InitialData, Mutator } from "../types";
-import { useBedType, saveBed } from "./bed-administration.resource";
-import BedAdministrationForm from "./bed-administration-form.component";
-import { useLocationsByTag } from "../summary/summary.resource";
-import { BedAdministrationData } from "./bed-administration-types";
+import type { BedFormData } from '../types';
+import { useBedType, saveBed } from './bed-administration.resource';
+import BedAdministrationForm from './bed-administration-form.component';
+import { useLocationsWithAdmissionTag } from '../summary/summary.resource';
+import { type BedAdministrationData } from './bed-administration-types';
 
 interface NewBedFormProps {
   showModal: boolean;
   onModalChange: (showModal: boolean) => void;
-  mutate: Mutator;
+  mutate: () => any;
 }
 
-const NewBedForm: React.FC<NewBedFormProps> = ({
-  showModal,
-  onModalChange,
-  mutate,
-}) => {
+const NewBedForm: React.FC<NewBedFormProps> = ({ showModal, onModalChange, mutate }) => {
   const { t } = useTranslation();
-  const { admissionLocationTagUuid } = useConfig();
-  const { data: admissionLocations } = useLocationsByTag(
-    admissionLocationTagUuid
-  );
-  const headerTitle = t("createNewBed", "Create a new bed");
-  const occupancyStatuses = ["Available", "Occupied"];
+  const { data: admissionLocations } = useLocationsWithAdmissionTag();
+  const headerTitle = t('createNewBed', 'Create a new bed');
+  const occupancyStatuses = ['Available', 'Occupied'];
   const { bedTypes } = useBedType();
   const availableBedTypes = bedTypes ? bedTypes : [];
 
-  const initialData: InitialData = {
-    uuid: "",
-    bedNumber: "",
-    status: "",
-    description: "",
+  const initialData: BedFormData = {
+    id: 0,
+    uuid: '',
+    bedNumber: '',
+    status: null,
+    description: '',
     row: 0,
     column: 0,
     location: {
-      display: "",
-      uuid: "",
-    },
-    bedType: {
-      name: "",
+      display: '',
+      uuid: '',
     },
+    bedType: null,
   };
 
   const handleCreateQuestion = useCallback(
     (formData: BedAdministrationData) => {
-      const {
-        bedId,
-        description,
-        occupancyStatus,
-        bedRow,
-        bedColumn,
-        location,
-        bedType,
-      } = formData;
+      const { bedId, description, occupancyStatus, bedRow, bedColumn, location, bedType } = formData;
 
       const bedObject = {
         bedNumber: bedId,
@@ -70,8 +54,8 @@ const NewBedForm: React.FC<NewBedFormProps> = ({
       saveBed({ bedPayload: bedObject })
         .then(() => {
           showToast({
-            title: t("formCreated", "New bed created"),
-            kind: "success",
+            title: t('formCreated', 'New bed created'),
+            kind: 'success',
             critical: true,
             description: `Bed ${bedId} was created successfully.`,
           });
@@ -81,8 +65,8 @@ const NewBedForm: React.FC<NewBedFormProps> = ({
         })
         .catch((error) => {
           showNotification({
-            title: t("errorCreatingForm", "Error creating bed"),
-            kind: "error",
+            title: t('errorCreatingForm', 'Error creating bed'),
+            kind: 'error',
             critical: true,
             description: error?.message,
           });
@@ -90,7 +74,7 @@ const NewBedForm: React.FC<NewBedFormProps> = ({
         });
       onModalChange(false);
     },
-    [onModalChange, mutate, t]
+    [onModalChange, mutate, t],
   );
 
   return (

package/src/bed-tag/bed-tag-administration-table.component.tsx

@@ -0,0 +1,192 @@
+import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  Button,
+  DataTable,
+  DataTableSkeleton,
+  InlineLoading,
+  Pagination,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+  Tile,
+} from '@carbon/react';
+import { Add, Edit } from '@carbon/react/icons';
+import { ErrorState, isDesktop as desktopLayout, useLayoutType } from '@openmrs/esm-framework';
+import type { BedTagData } from '../types';
+import { useBedTag } from '../summary/summary.resource';
+import Header from '../header/header.component';
+import styles from '../bed-administration/bed-administration-table.scss';
+import { CardHeader } from '../card-header/card-header.component';
+import BedTagForm from './new-tag-form.component';
+import EditBedTagForm from './edit-tag-form.component';
+
+const BedTagAdministrationTable: React.FC = () => {
+  const { t } = useTranslation();
+  const headerTitle = t('bedTag', 'Bed Tag');
+  const layout = useLayoutType();
+  const isTablet = layout === 'tablet';
+  const responsiveSize = isTablet ? 'lg' : 'sm';
+  const isDesktop = desktopLayout(layout);
+  const [isBedDataLoading] = useState(false);
+  const [showBedTagsModal, setAddBedTagsModal] = useState(false);
+  const [showEditBedModal, setShowEditBedModal] = useState(false);
+  const [editData, setEditData] = useState<BedTagData>();
+  const [currentPage, setCurrentPage] = useState(1);
+  const { bedTypeData, isError, loading, validate, mutate } = useBedTag();
+  const [pageSize, setPageSize] = useState(10);
+
+  const tableHeaders = [
+    {
+      header: t('ids', 'Id'),
+      key: 'ids',
+    },
+    {
+      header: t('name', 'Name'),
+      key: 'name',
+    },
+    {
+      header: t('actions', 'Actions'),
+      key: 'actions',
+    },
+  ];
+
+  const tableRows = useMemo(() => {
+    return bedTypeData?.map((entry) => ({
+      id: entry.uuid,
+      ids: entry.id,
+      name: entry?.name,
+      actions: (
+        <>
+          <Button
+            enterDelayMs={300}
+            renderIcon={Edit}
+            onClick={(e) => {
+              e.preventDefault();
+              setEditData(entry);
+              setShowEditBedModal(true);
+              setAddBedTagsModal(false);
+            }}
+            kind={'ghost'}
+            iconDescription={t('editBedTag', 'Edit Bed Tag')}
+            hasIconOnly
+            size={responsiveSize}
+            tooltipAlignment="start"
+          />
+        </>
+      ),
+    }));
+  }, [responsiveSize, bedTypeData, t]);
+
+  if (isBedDataLoading || loading) {
+    return (
+      <>
+        <Header route="Bed Tag" />
+        <div className={styles.widgetCard}>
+          <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
+        </div>
+      </>
+    );
+  }
+
+  if (isError) {
+    return (
+      <>
+        <Header route="Bed Tag" />
+        <div className={styles.widgetCard}>
+          <ErrorState error={isError} headerTitle={headerTitle} />
+        </div>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <Header route="Bed Tag" />
+
+      <div className={styles.widgetCard}>
+        {showBedTagsModal ? (
+          <BedTagForm onModalChange={setAddBedTagsModal} showModal={showBedTagsModal} mutate={mutate} />
+        ) : null}
+        {showEditBedModal ? (
+          <EditBedTagForm
+            onModalChange={setShowEditBedModal}
+            showModal={showEditBedModal}
+            editData={editData}
+            mutate={mutate}
+          />
+        ) : null}
+        <CardHeader title={headerTitle}>
+          <span className={styles.backgroundDataFetchingIndicator}>
+            <span>{validate ? <InlineLoading /> : null}</span>
+          </span>
+          {bedTypeData?.length ? (
+            <Button
+              kind="ghost"
+              renderIcon={(props) => <Add size={16} {...props} />}
+              onClick={() => setAddBedTagsModal(true)}>
+              {t('addBedTag', 'Add Bed Tag')}
+            </Button>
+          ) : null}
+        </CardHeader>
+        <DataTable rows={tableRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
+          {({ rows, headers, getTableProps }) => (
+            <TableContainer>
+              <Table {...getTableProps()}>
+                <TableHead>
+                  <TableRow>
+                    {headers.map((header) => (
+                      <TableHeader>{header.header?.content ?? header.header}</TableHeader>
+                    ))}
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {rows.map((row) => (
+                    <TableRow key={row.id}>
+                      {row.cells.map((cell) => (
+                        <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
+                      ))}
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+              {rows.length === 0 ? (
+                <div className={styles.tileContainer}>
+                  <Tile className={styles.tile}>
+                    <div className={styles.tileContent}>
+                      <p className={styles.content}>{t('No data', 'No data to display')}</p>
+                      <p className={styles.helper}>{t('checkFilters', 'Check the filters above')}</p>
+                    </div>
+                    <p className={styles.separator}>{t('or', 'or')}</p>
+                    <Button
+                      kind="ghost"
+                      size="sm"
+                      renderIcon={(props) => <Add size={16} {...props} />}
+                      onClick={() => setAddBedTagsModal(true)}>
+                      {t('bedTag', 'Add Bed Tag')}
+                    </Button>
+                  </Tile>
+                </div>
+              ) : null}
+              <Pagination
+                page={currentPage}
+                pageSize={pageSize}
+                pageSizes={[10, 20, 30, 40, 50]}
+                totalItems={bedTypeData.length}
+                onChange={({ page, pageSize }) => {
+                  setCurrentPage(page);
+                  setPageSize(pageSize);
+                }}
+              />
+            </TableContainer>
+          )}
+        </DataTable>
+      </div>
+    </>
+  );
+};
+export default BedTagAdministrationTable;

package/src/bed-tag/bed-tags-admin-form.component.tsx

@@ -0,0 +1,127 @@
+import React, { useState } from 'react';
+import { z } from 'zod';
+import { useForm, Controller } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import {
+  Button,
+  ComposedModal,
+  Form,
+  FormGroup,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  Stack,
+  TextInput,
+  InlineNotification,
+} from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { getCoreTranslation, type Location } from '@openmrs/esm-framework';
+import type { BedTagData } from '../types';
+
+const BedTagAdministrationSchema = z.object({
+  name: z.string().max(255),
+});
+
+interface BedTagAdministrationFormProps {
+  showModal: boolean;
+  onModalChange: (showModal: boolean) => void;
+  availableBedTypes: Array<BedTagData>;
+  allLocations: Location[];
+  handleCreateQuestion?: (formData: BedTagData) => void;
+  handleDeleteBedTag?: () => void;
+  headerTitle: string;
+  initialData: BedTagData;
+}
+
+interface ErrorType {
+  message: string;
+}
+
+const BedTagsAdministrationForm: React.FC<BedTagAdministrationFormProps> = ({
+  showModal,
+  onModalChange,
+  handleCreateQuestion,
+  headerTitle,
+  initialData,
+}) => {
+  const { t } = useTranslation();
+
+  const [showErrorNotification, setShowErrorNotification] = useState(false);
+  const [formStateError, setFormStateError] = useState('');
+
+  const {
+    handleSubmit,
+    control,
+    formState: { isDirty },
+  } = useForm<BedTagData>({
+    mode: 'all',
+    resolver: zodResolver(BedTagAdministrationSchema),
+    defaultValues: {
+      name: initialData.name || '',
+    },
+  });
+
+  const onSubmit = (formData: BedTagData) => {
+    const result = BedTagAdministrationSchema.safeParse(formData);
+    if (result.success) {
+      setShowErrorNotification(false);
+      handleCreateQuestion(formData);
+    }
+  };
+
+  const onError = (error: { [key: string]: ErrorType }) => {
+    setFormStateError(Object.entries(error)[0][1].message);
+    setShowErrorNotification(true);
+  };
+
+  return (
+    <ComposedModal open={showModal} onClose={() => onModalChange(false)} preventCloseOnClickOutside>
+      <ModalHeader title={headerTitle} />
+      <ModalBody hasScrollingContent>
+        <Form>
+          <Stack gap={3}>
+            <FormGroup legendText={''}>
+              <Controller
+                name="name"
+                control={control}
+                render={({ field, fieldState }) => (
+                  <>
+                    <TextInput
+                      id="bedTag"
+                      labelText={t('bedTag', 'Bed Tag Name')}
+                      placeholder={t('bedTagPlaceholder', '')}
+                      invalidText={fieldState.error?.message}
+                      {...field}
+                    />
+                  </>
+                )}
+              />
+            </FormGroup>
+
+            {showErrorNotification && (
+              <InlineNotification
+                lowContrast
+                title={t('error', 'Error')}
+                style={{ minWidth: '100%', margin: '0', padding: '0' }}
+                role="alert"
+                kind="error"
+                subtitle={t('pleaseFillField', formStateError) + '.'}
+                onClose={() => setShowErrorNotification(false)}
+              />
+            )}
+          </Stack>
+        </Form>
+      </ModalBody>
+      <ModalFooter>
+        <Button onClick={() => onModalChange(false)} kind="secondary">
+          {getCoreTranslation('cancel', 'Cancel')}
+        </Button>
+        <Button disabled={!isDirty} onClick={handleSubmit(onSubmit, onError)}>
+          <span>{t('save', 'Save')}</span>
+        </Button>
+      </ModalFooter>
+    </ComposedModal>
+  );
+};
+
+export default BedTagsAdministrationForm;

package/src/bed-tag/edit-tag-form.component.tsx

@@ -0,0 +1,72 @@
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { showToast, showNotification, useConfig } from '@openmrs/esm-framework';
+
+import { editBedTag, useBedTag } from '../summary/summary.resource';
+import { type BedTagDataAdministration } from '../bed-administration/bed-administration-types';
+import BedTagsAdministrationForm from './bed-tags-admin-form.component';
+import { type BedTagData, type Mutator } from '../types';
+
+interface EditBedTagFormProps {
+  showModal: boolean;
+  onModalChange: (showModal: boolean) => void;
+  editData: BedTagData;
+  mutate: Mutator;
+}
+
+const EditBedTagForm: React.FC<EditBedTagFormProps> = ({ showModal, onModalChange, editData, mutate }) => {
+  const { t } = useTranslation();
+
+  const headerTitle = t('editBed', 'Edit Tag');
+  const { bedTypeData } = useBedTag();
+  const availableBedTypes = bedTypeData ? bedTypeData : [];
+
+  const handleCreateQuestion = useCallback(
+    (formData: BedTagDataAdministration) => {
+      const bedUuid = editData.uuid;
+      const { name } = formData;
+      const bedTagPayload = {
+        name,
+      };
+      editBedTag({ bedTagPayload, bedTagId: bedUuid })
+        .then(() => {
+          showToast({
+            title: t('formSaved', 'Bed Tag'),
+            kind: 'success',
+            critical: true,
+            description: bedTagPayload.name + ' ' + t('saveSuccessMessage', 'was saved successfully.'),
+          });
+
+          mutate();
+          onModalChange(false);
+        })
+        .catch((error) => {
+          showNotification({
+            title: t('errorCreatingForm', 'Error creating bed'),
+            kind: 'error',
+            critical: true,
+            description: error?.message,
+          });
+          onModalChange(false);
+        });
+      onModalChange(false);
+    },
+    [onModalChange, mutate, editData, t],
+  );
+
+  return (
+    <>
+      <BedTagsAdministrationForm
+        onModalChange={onModalChange}
+        availableBedTypes={availableBedTypes}
+        showModal={showModal}
+        handleCreateQuestion={handleCreateQuestion}
+        headerTitle={headerTitle}
+        initialData={editData}
+        allLocations={[]}
+      />
+    </>
+  );
+};
+
+export default EditBedTagForm;

package/src/bed-tag/new-tag-form.component.tsx

@@ -0,0 +1,76 @@
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { showToast, showNotification, useConfig } from '@openmrs/esm-framework';
+import { useBedType } from '../bed-administration/bed-administration.resource';
+import BedTagsAdministrationForm from './bed-tags-admin-form.component';
+import { saveBedTag, useLocationsWithAdmissionTag } from '../summary/summary.resource';
+import { type BedTagData, type Mutator } from '../types';
+
+interface BedTagFormProps {
+  showModal: boolean;
+  onModalChange: (showModal: boolean) => void;
+  mutate: () => any;
+}
+
+const NewTagForm: React.FC<BedTagFormProps> = ({ showModal, onModalChange, mutate }) => {
+  const { t } = useTranslation();
+  const { data: admissionLocations } = useLocationsWithAdmissionTag();
+  const headerTitle = t('addBedTag', 'Create Bed Tag');
+  const { bedTypes } = useBedType();
+  const availableBedTypes = bedTypes ? bedTypes : [];
+
+  const initialData: BedTagData = {
+    uuid: '',
+    name: '',
+  };
+
+  const handleCreateQuestion = useCallback(
+    (formData: BedTagData) => {
+      const { name } = formData;
+
+      const bedTagPayload = {
+        name,
+      };
+
+      saveBedTag({ bedTagPayload })
+        .then(() => {
+          showToast({
+            title: t('formCreated', 'Add Bed Tag'),
+            kind: 'success',
+            critical: true,
+            description: `Tag ${name} was created successfully.`,
+          });
+
+          mutate();
+          onModalChange(false);
+        })
+        .catch((error) => {
+          showNotification({
+            title: t('errorCreatingForm', 'Error creating bed'),
+            kind: 'error',
+            critical: true,
+            description: error?.message,
+          });
+          onModalChange(false);
+        });
+      onModalChange(false);
+    },
+    [onModalChange, mutate, t],
+  );
+
+  return (
+    <>
+      <BedTagsAdministrationForm
+        onModalChange={onModalChange}
+        allLocations={admissionLocations}
+        availableBedTypes={availableBedTypes}
+        showModal={showModal}
+        handleCreateQuestion={handleCreateQuestion}
+        headerTitle={headerTitle}
+        initialData={initialData}
+      />
+    </>
+  );
+};
+
+export default NewTagForm;