Merge branch 'main' into O3-4970

Author: UjjawalPrabhat

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 ## Requirements
 
 - [ ] This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a [conventional commit](https://o3-docs.openmrs.org/docs/frontend-modules/contributing.en-US#contributing-guidelines) label. See existing PR titles for inspiration.
-- [ ] My work is based on designs, which are linked or shown either in the Jira ticket or the description below.
+- [ ] My work is based on designs, which are linked or shown either in the Jira ticket or the description below. (See also: [Styleguide](http://om.rs/o3ui))
 - [ ] My work includes tests or is validated by existing tests.
 
 ## Summary

packages/esm-patient-medications-app/src/add-drug-order/drug-order-form.component.tsx

@@ -131,17 +131,19 @@ export function DrugOrderForm({
   allowSelectingDrug,
 }: DrugOrderFormProps) {
   const { t } = useTranslation();
-  const config = useConfig<ConfigObject>();
+  const { daysDurationUnit, prescriberProviderRoles } = useConfig<ConfigObject>();
   const isTablet = useLayoutType() === 'tablet';
   const { orderConfigObject, error: errorFetchingOrderConfig } = useOrderConfig();
 
   const isProviderManagementModuleInstalled = useFeatureFlag('providermanagement-module');
   const allowAndSupportSelectingPrescribingClinician =
     isProviderManagementModuleInstalled && allowSelectingPrescribingClinician;
 
-  const { data: providers, isLoading: isLoadingProviders } = useProviders(
-    allowAndSupportSelectingPrescribingClinician ? config.prescriberProviderRoles : null,
-  );
+  const {
+    data: providers,
+    isLoading: isLoadingProviders,
+    error: errorLoadingProviders,
+  } = useProviders(allowAndSupportSelectingPrescribingClinician ? prescriberProviderRoles : null);
   const [isSaving, setIsSaving] = useState(false);
 
   const { currentProvider } = useSession();
@@ -234,11 +236,11 @@ export function DrugOrderForm({
     () =>
       orderConfigObject?.durationUnits ?? [
         {
-          valueCoded: config?.daysDurationUnit?.uuid,
-          value: config?.daysDurationUnit?.display,
+          valueCoded: daysDurationUnit?.uuid,
+          value: daysDurationUnit?.display,
         },
       ],
-    [orderConfigObject, config?.daysDurationUnit],
+    [orderConfigObject, daysDurationUnit],
   );
 
   const orderFrequencies: Array<MedicationFrequency> = useMemo(() => {
@@ -329,32 +331,41 @@ export function DrugOrderForm({
                     />
                   </InputWrapper>
                 )}
-                {allowAndSupportSelectingPrescribingClinician && !isLoadingProviders && providers.length === 0 && (
-                  <InlineNotification
-                    kind="warning"
-                    lowContrast
-                    className={styles.inlineNotification}
-                    title={t('noCliniciansFound', 'No clinicians found')}
-                    subtitle={t(
-                      'noCliniciansFoundDescription',
-                      'Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.',
-                    )}
-                  />
-                )}
-                {allowAndSupportSelectingPrescribingClinician && !isLoadingProviders && (
-                  <ControlledFieldInput
-                    control={control}
-                    name="orderer"
-                    type="comboBox"
-                    getValues={getValues}
-                    id="orderer"
-                    shouldFilterItem={filterItemsByProviderName}
-                    placeholder={t('prescribingClinician', 'Prescribing Clinician')}
-                    titleText={t('prescribingClinician', 'Prescribing Clinician')}
-                    items={providers}
-                    itemToString={(item: Provider) => item?.person?.display}
-                  />
-                )}
+                {allowAndSupportSelectingPrescribingClinician &&
+                  !isLoadingProviders &&
+                  (providers?.length > 0 ? (
+                    <ControlledFieldInput
+                      control={control}
+                      name="orderer"
+                      type="comboBox"
+                      getValues={getValues}
+                      id="orderer"
+                      shouldFilterItem={filterItemsByProviderName}
+                      placeholder={t('prescribingClinician', 'Prescribing Clinician')}
+                      titleText={t('prescribingClinician', 'Prescribing Clinician')}
+                      items={providers}
+                      itemToString={(item: Provider) => item?.person?.display}
+                    />
+                  ) : errorLoadingProviders ? (
+                    <InlineNotification
+                      kind="warning"
+                      lowContrast
+                      className={styles.inlineNotification}
+                      title={t('errorLoadingProviders', 'Error loading clinicians list')}
+                      subtitle={t('tryReopeningTheForm', 'Please try launching the form again')}
+                    />
+                  ) : (
+                    <InlineNotification
+                      kind="warning"
+                      lowContrast
+                      className={styles.inlineNotification}
+                      title={t('noCliniciansFound', 'No clinicians found')}
+                      subtitle={t(
+                        'noCliniciansFoundDescription',
+                        'Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.',
+                      )}
+                    />
+                  ))}
               </Stack>
             </section>
           )}