From c366d0362bbdba218a5a8b8320f094981cd688e9 Mon Sep 17 00:00:00 2001
From: Yemitan Isaiah Olurotimi <yemitanisaiah@gmail.com>
Date: Thu, 17 Nov 2022 20:53:27 +0100
Subject: [PATCH 1/3] refactor: remove service type input and state from
 appointments form

---
 .../appointments-form.component.tsx           | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form.component.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form.component.tsx
index a0288263ae..15f60e4653 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form.component.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form.component.tsx
@@ -34,7 +34,6 @@ const AppointmentsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeW
   const [appointmentNote, setAppointmentNote] = useState('');
   const [selectedAppointmentType, setSelectedAppointmentType] = useState('');
   const [selectedService, setSelectedService] = useState('');
-  const [selectedServiceType, setSelectedServiceType] = useState('');
   const [startDate, setStartDate] = useState(new Date());
   const [startTime, setStartTime] = useState(dayjs(new Date()).format('hh:mm'));
   const [timeFormat, setTimeFormat] = useState<amPm>(new Date().getHours() >= 12 ? 'PM' : 'AM');
@@ -46,14 +45,7 @@ const AppointmentsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeW
 
   const { data: services, isLoading } = useAppointmentService();
 
-  let serviceTypes;
-  if (services?.length) {
-    [{ serviceTypes }] = services;
-  }
-
   const handleSubmit = () => {
-    const serviceType = serviceTypes.find((service) => service.name === selectedServiceType);
-
     const serviceUuid = services.find((service) => service.name === selectedService)?.uuid;
     const serviceDuration = services.find((service) => service.name === selectedService)?.durationMins;
 
@@ -189,7 +181,7 @@ const AppointmentsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeW
             labelText={t('selectService', 'Select a service')}
             light={isTablet}
             onChange={(event) => setSelectedService(event.target.value)}
-            value={selectedServiceType}
+            value={selectedService}
           >
             {!selectedService ? <SelectItem text={t('chooseService', 'Select service')} value="" /> : null}
             {services?.length > 0 &&
@@ -200,25 +192,6 @@ const AppointmentsForm: React.FC<DefaultWorkspaceProps> = ({ patientUuid, closeW
               ))}
           </Select>
         </section>
-        <section className={styles.formGroup}>
-          <span>{t('serviceType', 'Service Type')}</span>
-          <Select
-            id="serviceType"
-            invalidText="Required"
-            labelText="Select the type of service"
-            light={isTablet}
-            onChange={(event) => setSelectedServiceType(event.target.value)}
-            value={selectedServiceType}
-          >
-            {!selectedServiceType ? <SelectItem text={t('chooseService', 'Select service type')} value="" /> : null}
-            {serviceTypes?.length > 0 &&
-              serviceTypes.map((serviceType) => (
-                <SelectItem key={serviceType.uuid} text={serviceType.name} value={serviceType.name}>
-                  {serviceType.name}
-                </SelectItem>
-              ))}
-          </Select>
-        </section>
         <section className={styles.formGroup}>
           <span>{t('appointmentType', 'Appointment Type')}</span>
           <Select

From d78771fda2be77f9462a190f99b2f51eda51c8c2 Mon Sep 17 00:00:00 2001
From: Yemitan Isaiah Olurotimi <yemitanisaiah@gmail.com>
Date: Thu, 17 Nov 2022 20:55:25 +0100
Subject: [PATCH 2/3] refactor: remove service type related tests

---
 .../src/appointments/appointments-form.test.tsx              | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/esm-patient-appointments-app/src/appointments/appointments-form.test.tsx b/packages/esm-patient-appointments-app/src/appointments/appointments-form.test.tsx
index 4f43e65935..1dfbf434f9 100644
--- a/packages/esm-patient-appointments-app/src/appointments/appointments-form.test.tsx
+++ b/packages/esm-patient-appointments-app/src/appointments/appointments-form.test.tsx
@@ -51,7 +51,6 @@ describe('AppointmentForm', () => {
     expect(screen.getByLabelText(/Select a location/i)).toBeInTheDocument();
     expect(screen.getByLabelText(/Date/i)).toBeInTheDocument();
     expect(screen.getByLabelText(/Select a service/i)).toBeInTheDocument();
-    expect(screen.getByLabelText(/Select the type of service/i)).toBeInTheDocument();
     expect(screen.getByLabelText(/Select the type of appointment/i)).toBeInTheDocument();
     expect(screen.getByLabelText(/Write an additional note/i)).toBeInTheDocument();
     expect(screen.getByPlaceholderText(/Write any additional points here/i)).toBeInTheDocument();
@@ -99,7 +98,6 @@ describe('AppointmentForm', () => {
     const timeInput = screen.getByRole('textbox', { name: /Time/i });
     const timeFormat = screen.getByRole('combobox', { name: /Time/i });
     const serviceSelect = screen.getByRole('combobox', { name: /Select a service/i });
-    const serviceTypeSelect = screen.getByRole('combobox', { name: /Select the type of service/i });
     const appointmentTypeSelect = screen.getByRole('combobox', { name: /Select the type of appointment/i });
 
     expect(saveButton).toBeDisabled();
@@ -110,7 +108,6 @@ describe('AppointmentForm', () => {
     await waitFor(() => user.type(timeInput, '09:30'));
     await waitFor(() => user.selectOptions(timeFormat, 'AM'));
     await waitFor(() => user.selectOptions(serviceSelect, ['Outpatient']));
-    await waitFor(() => user.selectOptions(serviceTypeSelect, ['Chemotherapy']));
     await waitFor(() => user.selectOptions(appointmentTypeSelect, ['Scheduled']));
 
     expect(saveButton).not.toBeDisabled();
@@ -164,7 +161,6 @@ describe('AppointmentForm', () => {
     const timeInput = screen.getByRole('textbox', { name: /Time/i });
     const timeFormat = screen.getByRole('combobox', { name: /Time/i });
     const serviceSelect = screen.getByRole('combobox', { name: /Select a service/i });
-    const serviceTypeSelect = screen.getByRole('combobox', { name: /Select the type of service/i });
     const appointmentTypeSelect = screen.getByRole('combobox', { name: /Select the type of appointment/i });
 
     await waitFor(() => user.clear(dateInput));
@@ -173,7 +169,6 @@ describe('AppointmentForm', () => {
     await waitFor(() => user.type(timeInput, '09:30'));
     await waitFor(() => user.selectOptions(timeFormat, 'AM'));
     await waitFor(() => user.selectOptions(serviceSelect, ['Outpatient']));
-    await waitFor(() => user.selectOptions(serviceTypeSelect, ['Chemotherapy']));
     await waitFor(() => user.selectOptions(appointmentTypeSelect, ['Scheduled']));
     await waitFor(() => user.click(saveButton));
 

From 7c327201701e7d05f37d6ca5c85c02f8ff47c237 Mon Sep 17 00:00:00 2001
From: Yemitan Isaiah Olurotimi <yemitanisaiah@gmail.com>
Date: Thu, 17 Nov 2022 20:56:22 +0100
Subject: [PATCH 3/3] refactor: remove service type from translation file

---
 packages/esm-patient-appointments-app/translations/en.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/esm-patient-appointments-app/translations/en.json b/packages/esm-patient-appointments-app/translations/en.json
index 3930127254..e94614c848 100644
--- a/packages/esm-patient-appointments-app/translations/en.json
+++ b/packages/esm-patient-appointments-app/translations/en.json
@@ -24,7 +24,6 @@
   "selectLocation": "Select a location",
   "selectService": "Select service",
   "service": "Service",
-  "serviceType": "Service type",
   "time": "Time",
   "upcoming": "Upcoming"
 }