@kenyaemr/esm-service-queues-app 8.1.1-pre.129 → 8.1.2-pre.154

package/src/patient-search/search-results.component.tsx

@@ -1,75 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { Dropdown } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { SearchTypes } from '../types';
-import PatientInfo from '../patient-info/patient-info.component';
-import styles from './search-results.scss';
-
-interface SearchResultsProps {
-  patients: Array<fhir.Patient>;
-  hidePanel?: any;
-  toggleSearchType: (searchMode: SearchTypes, patientUuid: string) => void;
-}
-
-type SortingCriteria = 'firstNameFirst' | 'lastNameFirst' | 'oldest' | 'youngest';
-
-const SearchResults: React.FC<SearchResultsProps> = ({ patients, toggleSearchType }) => {
-  const { t } = useTranslation();
-  const [selectedSortingCriteria, setSelectedSortingCriteria] = useState<SortingCriteria>('firstNameFirst');
-
-  const sortedPatient = useMemo(() => {
-    return patients.sort((patientA, patientB) => {
-      if (selectedSortingCriteria === 'oldest') {
-        return new Date(patientA.birthDate).getTime() - new Date(patientB.birthDate).getTime();
-      }
-      if (selectedSortingCriteria === 'youngest') {
-        return new Date(patientB.birthDate).getTime() - new Date(patientA.birthDate).getTime();
-      }
-      if (selectedSortingCriteria === 'firstNameFirst') {
-        return patientA.name?.[0].given?.join('') < patientB.name?.[0].given?.join('') ? -1 : 0;
-      }
-      if (selectedSortingCriteria === 'lastNameFirst') {
-        return patientA?.name?.[0].family < patientB?.name?.[0].family ? -1 : 0;
-      }
-    });
-  }, [patients, selectedSortingCriteria]);
-
-  const sortingCriteria = [
-    { id: 'firstNameFirst', label: t('firstNameSort', 'First name (a-z)') },
-    { id: 'lastNameFirst', label: t('lastNameSort', 'Last name (a-z)') },
-    { id: 'oldest', label: t('oldest', 'Oldest first') },
-    { id: 'youngest', label: t('youngest', 'Youngest first') },
-  ];
-
-  return (
-    <>
-      <div className={styles.sortingCriteriaSelect}>
-        <Dropdown
-          aria-label="sortBy"
-          id="sortingCriteriaDropdown"
-          items={sortingCriteria}
-          initialSelectedItem={sortingCriteria[0]}
-          label={`${t('sortBy', 'Sort by')}:`}
-          titleText={`${t('sortBy', 'Sort by')}:`}
-          type="inline"
-          size="sm"
-          onChange={({ selectedItem }) => setSelectedSortingCriteria(selectedItem.id as SortingCriteria)}
-        />
-      </div>
-      {sortedPatient.map((patient, index) => (
-        <div key={`search-result-${index}`} className={styles.patientChart}>
-          <div className={styles.container}>
-            <PatientInfo
-              patient={patient}
-              handlePatientInfoClick={() => {
-                toggleSearchType(SearchTypes.SCHEDULED_VISITS, patient.id);
-              }}
-            />
-          </div>
-        </div>
-      ))}
-    </>
-  );
-};
-
-export default SearchResults;

package/src/patient-search/search-results.scss

@@ -1,80 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@openmrs/esm-styleguide/src/vars' as *;
-
-.patientChart {
-  text-decoration: none;
-}
-
-:global(.omrs-breakpoint-gt-tablet) .patientChart {
-  background-color: $ui-02;
-}
-
-.container {
-  & .patientBanner {
-    background-color: red !important;
-  }
-}
-
-.patientBanner {
-  display: flex;
-}
-
-.patientName {
-  @include type.type-style('heading-03');
-}
-
-.patientAvatar {
-  width: layout.$spacing-11;
-  height: layout.$spacing-11;
-  margin: layout.$spacing-05 layout.$spacing-05 0;
-  border-radius: 1px;
-}
-
-.patientInfo {
-  width: 100%;
-  display: flex;
-  flex-flow: column wrap;
-  margin: layout.$spacing-05 0;
-  cursor: pointer;
-}
-
-.demographics {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  margin: 0.3rem 0;
-}
-
-.identifiers {
-  @include type.type-style('body-compact-02');
-  color: $ui-04;
-}
-
-.actionsContainer {
-  padding-top: layout.$spacing-03;
-  margin-top: layout.$spacing-05;
-}
-
-.sortingCriteriaSelect {
-  display: flex;
-  width: 100%;
-  justify-content: flex-end;
-  @include type.type-style('body-compact-02');
-  width: 100%;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: layout.$spacing-05;
-  }
-
-  :global(.cds--list-box__menu) {
-    left: -7.5rem;
-  }
-
-  :global(.cds--label) {
-    margin-right: layout.$spacing-02;
-  }
-}

package/src/patient-search/search-results.test.tsx

@@ -1,69 +0,0 @@
-import React from 'react';
-import { screen, render } from '@testing-library/react';
-import { age } from '@openmrs/esm-framework';
-import SearchResults from './search-results.component';
-
-const mockAge = jest.mocked(age);
-
-const patients = [
-  {
-    id: 'b73bee73-7bf0-4872-9657-ba9de0d93478',
-    name: [{ given: ['John'], family: 'Smith' }],
-    person: {
-      gender: 'Male',
-      age: 2,
-      birthdate: '2020-02-01T00:00:00.000+0000',
-      birthdateEstimated: true,
-      personName: {
-        display: 'John Smith',
-        uuid: '27698bff-4056-430c-824c-cb18cf9329d8',
-        givenName: 'John',
-        middleName: null,
-        familyName: 'Smith',
-        familyName2: null,
-        voided: false,
-      },
-      addresses: [
-        {
-          display: 'Bom Jesus Street',
-          uuid: '7eab94da-4b33-4da9-b352-da21a571221a',
-          preferred: true,
-          address1: 'Bom Jesus Street',
-          address2: null,
-          cityVillage: 'Recife',
-          stateProvince: 'Pernambuco',
-          country: 'Brazil',
-          postalCode: '50030-310',
-          countyDistrict: null,
-        },
-      ],
-      display: 'John Smith',
-      dead: false,
-      deathDate: null,
-    },
-    gender: 'Male',
-    birthDate: '2020-02-01T00:00:00.000+0000',
-    deceasedDateTime: null,
-    identifier: [{ value: '10001F0' }],
-    address: [{ city: 'Recife', country: 'Brazil', postalCode: '50030-310', state: 'Pernambuco', use: 'home' }],
-    telecom: [],
-    patientIdentifier: { identifier: [{ value: '10001F0' }] },
-  },
-];
-
-const mockToggleSearchType = jest.fn();
-
-describe('Search Results', () => {
-  it('should search results page', () => {
-    mockAge.mockReturnValue('35');
-    renderSearchResults();
-    expect(screen.getByText(/John Smith/)).toBeInTheDocument();
-    expect(screen.getByText(/35/)).toBeInTheDocument();
-    expect(screen.getByText(/Male/)).toBeInTheDocument();
-    expect(screen.getByText(/01 — Feb — 2020/i)).toBeInTheDocument();
-  });
-});
-
-const renderSearchResults = () => {
-  render(<SearchResults patients={patients} toggleSearchType={mockToggleSearchType} />);
-};

package/src/patient-search/search.resource.ts

@@ -1,10 +0,0 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-
-export function findPatients(query: string, objectVersion: string, controller: AbortController, includeDead: boolean) {
-  const url = `${restBaseUrl}/patient?q=${query}&v=${objectVersion}&includeDead=${includeDead}`;
-
-  return openmrsFetch(url, {
-    method: 'GET',
-    signal: controller.signal,
-  });
-}

package/src/patient-search/visit-form/existing-visit-form.component.tsx

@@ -1,112 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { Button, ButtonSet, Form, Row } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  type ConfigObject,
-  ExtensionSlot,
-  showSnackbar,
-  useConfig,
-  useLayoutType,
-  type Visit,
-} from '@openmrs/esm-framework';
-import { postQueueEntry } from '../../active-visits/active-visits-table.resource';
-import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
-import styles from './visit-form.scss';
-import classNames from 'classnames';
-import VisitFormQueueFields from '../visit-form-queue-fields/visit-form-queue-fields.component';
-
-interface ExistingVisitFormProps {
-  closeWorkspace: () => void;
-  visit: Visit;
-}
-
-const ExistingVisitForm: React.FC<ExistingVisitFormProps> = ({ visit, closeWorkspace }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const config = useConfig<ConfigObject>();
-  const visitQueueNumberAttributeUuid = config.visitQueueNumberAttributeUuid;
-  const { mutateQueueEntries } = useMutateQueueEntries();
-  const [{ service, priority, status, sortWeight, queueLocation }, setVisitFormFields] = useState({
-    service: null,
-    priority: null,
-    status: null,
-    sortWeight: null,
-    queueLocation: null,
-  });
-
-  const handleSubmit = useCallback(
-    (event) => {
-      event.preventDefault();
-
-      setIsSubmitting(true);
-
-      postQueueEntry(
-        visit.uuid,
-        service,
-        visit.patient.uuid,
-        priority,
-        status,
-        sortWeight,
-        queueLocation,
-        visitQueueNumberAttributeUuid,
-      ).then(
-        ({ status }) => {
-          if (status === 201) {
-            showSnackbar({
-              kind: 'success',
-              isLowContrast: true,
-              title: t('addPatientToQueue', 'Add patient to queue'),
-              subtitle: t('queueEntryAddedSuccessfully', 'Queue entry added successfully'),
-            });
-            closeWorkspace();
-            setIsSubmitting(false);
-            mutateQueueEntries();
-          }
-        },
-        (error) => {
-          let subtitle = error?.message;
-          const err = error?.responseBody?.error?.message;
-          if (err && err === '[queue.entry.duplicate.patient]') {
-            subtitle = t('patientAlreadyInQueue', 'Patient is already in the queue');
-          }
-          showSnackbar({
-            title: t('queueEntryError', 'Error adding patient to the queue'),
-            kind: 'error',
-            subtitle,
-          });
-          setIsSubmitting(false);
-        },
-      );
-    },
-    [closeWorkspace, mutateQueueEntries, visit, t, visitQueueNumberAttributeUuid],
-  );
-
-  return visit ? (
-    <>
-      {isTablet && (
-        <Row className={styles.headerGridRow}>
-          <ExtensionSlot
-            name="visit-form-header-slot"
-            className={styles.dataGridRow}
-            state={{ patientUuid: visit.patient.uuid }}
-          />
-        </Row>
-      )}
-      <Form className={classNames(styles.form, styles.container)} onSubmit={handleSubmit}>
-        <VisitFormQueueFields setFormFields={setVisitFormFields} />
-        <ButtonSet className={isTablet ? styles.tablet : styles.desktop}>
-          <Button className={styles.button} kind="secondary" onClick={closeWorkspace}>
-            {t('discard', 'Discard')}
-          </Button>
-          <Button className={styles.button} disabled={isSubmitting} kind="primary" type="submit">
-            {t('addPatientToQueue', 'Add patient to queue')}
-          </Button>
-        </ButtonSet>
-      </Form>
-    </>
-  ) : null;
-};
-
-export default ExistingVisitForm;

package/src/patient-search/visit-form/queue.resource.ts

@@ -1,64 +0,0 @@
-import { openmrsFetch, restBaseUrl, toDateObjectStrict, toOmrsIsoString } from '@openmrs/esm-framework';
-import { generateVisitQueueNumber } from '../../active-visits/active-visits-table.resource';
-import { type Appointment } from '../../types';
-
-export async function postQueueEntry(
-  visitUuid: string,
-  patientUuid: string,
-  priority: string,
-  status: string,
-  queueServiceUuid: string,
-  appointment: Appointment,
-  locationUuid: string,
-  visitQueueNumberAttributeUuid: string,
-) {
-  const abortController = new AbortController();
-
-  await Promise.all([
-    saveAppointment(appointment),
-    generateVisitQueueNumber(locationUuid, visitUuid, queueServiceUuid, visitQueueNumberAttributeUuid),
-  ]);
-
-  return openmrsFetch(`${restBaseUrl}/visit-queue-entry`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    signal: abortController.signal,
-    body: {
-      visit: visitUuid,
-      queueEntry: {
-        status: status,
-        priority: priority,
-        queue: queueServiceUuid,
-        patient: patientUuid,
-        startedAt: new Date(),
-      },
-    },
-  });
-}
-
-export async function saveAppointment(appointment: Appointment) {
-  const abortController = new AbortController();
-
-  await openmrsFetch(`${restBaseUrl}/appointment`, {
-    method: 'POST',
-    signal: abortController.signal,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: {
-      patientUuid: appointment?.patient.uuid,
-      serviceUuid: appointment?.service?.uuid,
-      startDateTime: appointment?.startDateTime,
-      endDateTime: appointment?.endDateTime,
-      appointmentKind: appointment?.appointmentKind,
-      locationUuid: appointment?.location?.uuid,
-      comments: appointment?.comments,
-      status: 'CheckedIn',
-      appointmentNumber: appointment?.appointmentNumber,
-      uuid: appointment?.uuid,
-      providerUuid: appointment?.provider?.uuid,
-    },
-  });
-}