@openmrs/esm-patient-flags-app 11.3.0 → 11.3.1-patch.9310

package/src/flags/flags-highlight-bar.test.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
 import { mockPatient } from 'tools';
 import { mockPatientFlags } from '__mocks__';
 import { usePatientFlags } from './hooks/usePatientFlags';
 import FlagsHighlightBar from './flags-highlight-bar.component';
 
 const mockUsePatientFlags = jest.mocked(usePatientFlags);
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
 
 jest.mock('./hooks/usePatientFlags', () => {
   const originalModule = jest.requireActual('./hooks/usePatientFlags');

package/src/flags/flags-list.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { mockPatient } from 'tools';
 import { mockPatientFlags } from '__mocks__';
@@ -27,11 +27,18 @@ it('renders an Edit form that enables users to toggle flags on or off', async ()
   render(
     <FlagsList
       closeWorkspace={jest.fn()}
-      closeWorkspaceWithSavedChanges={jest.fn()}
-      patientUuid={mockPatient.id}
-      patient={mockPatient}
-      promptBeforeClosing={jest.fn()}
-      setTitle={jest.fn()}
+      groupProps={{
+        patientUuid: mockPatient.id,
+        patient: mockPatient,
+        visitContext: null,
+        mutateVisitContext: null,
+      }}
+      workspaceProps={{}}
+      windowProps={{}}
+      workspaceName=""
+      launchChildWorkspace={null}
+      windowName={''}
+      isRootWorkspace={false}
     />,
   );
 
@@ -59,11 +66,18 @@ it('sorts by active and retired correctly via controlled dropdown', async () =>
   render(
     <FlagsList
       closeWorkspace={jest.fn()}
-      closeWorkspaceWithSavedChanges={jest.fn()}
-      patientUuid={mockPatient.id}
-      patient={mockPatient}
-      promptBeforeClosing={jest.fn()}
-      setTitle={jest.fn()}
+      groupProps={{
+        patientUuid: mockPatient.id,
+        patient: mockPatient,
+        visitContext: null,
+        mutateVisitContext: null,
+      }}
+      workspaceProps={{}}
+      windowProps={{}}
+      workspaceName=""
+      launchChildWorkspace={null}
+      windowName={''}
+      isRootWorkspace={false}
     />,
   );
 

package/src/flags/flags.component.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, Tag, Toggletip, ToggletipButton, ToggletipContent } from '@carbon/react';
-import { CloseIcon, EditIcon, launchWorkspace } from '@openmrs/esm-framework';
+import { CloseIcon, EditIcon, launchWorkspace2 } from '@openmrs/esm-framework';
 import { usePatientFlags } from './hooks/usePatientFlags';
 import styles from './flags.scss';
 
@@ -18,7 +18,7 @@ const Flags: React.FC<FlagsProps> = ({ patientUuid, onHandleCloseHighlightBar, s
   const { flags, isLoading, error } = usePatientFlags(patientUuid);
   const filteredFlags = flags.filter((flag: FlagWithPriority) => !flag.voided);
 
-  const handleClickEditFlags = useCallback(() => launchWorkspace('patient-flags-workspace'), []);
+  const handleClickEditFlags = useCallback(() => launchWorkspace2('patient-flags-workspace'), []);
 
   const renderFlag = (flag: FlagWithPriority) => {
     const hasPriority = flag.flagWithPriority?.priority?.name;

package/src/flags/flags.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
-import { launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
 import { mockPatient } from 'tools';
 import { mockPatientFlags } from '__mocks__';
 import { usePatientFlags } from './hooks/usePatientFlags';
@@ -10,7 +10,7 @@ import Flags from './flags.component';
 type FlagWithPriority = ReturnType<typeof usePatientFlags>['flags'][0];
 
 const mockUsePatientFlags = jest.mocked(usePatientFlags);
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
 
 jest.mock('./hooks/usePatientFlags', () => {
   const originalModule = jest.requireActual('./hooks/usePatientFlags');

package/src/flags/patient-flags.workspace.tsx

@@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react';
 import { orderBy } from 'lodash-es';
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonSet, Dropdown, Form, InlineLoading, Search, Tile, Toggle, Stack } from '@carbon/react';
-import { type DefaultPatientWorkspaceProps } from '@openmrs/esm-patient-common-lib';
+import { type PatientWorkspace2DefinitionProps } from '@openmrs/esm-patient-common-lib';
 import { useLayoutType, showSnackbar, parseDate, formatDate, ResponsiveWrapper } from '@openmrs/esm-framework';
 import { usePatientFlags, enablePatientFlag, disablePatientFlag } from './hooks/usePatientFlags';
 import { getFlagType } from './utils';
@@ -10,10 +10,9 @@ import styles from './flags-list.scss';
 
 type SortKey = 'alpha' | 'active' | 'retired';
 
-const FlagsList: React.FC<DefaultPatientWorkspaceProps> = ({
-  patientUuid,
+const FlagsList: React.FC<PatientWorkspace2DefinitionProps<{}, {}>> = ({
   closeWorkspace,
-  closeWorkspaceWithSavedChanges,
+  groupProps: { patientUuid },
 }) => {
   const { t } = useTranslation();
   const { flags, isLoading, error, mutate } = usePatientFlags(patientUuid);
@@ -219,7 +218,7 @@ const FlagsList: React.FC<DefaultPatientWorkspaceProps> = ({
           disabled={isEnabling || isDisabling}
           kind="primary"
           type="submit"
-          onClick={() => closeWorkspaceWithSavedChanges()}
+          onClick={() => closeWorkspace({ discardUnsavedChanges: true })}
         >
           {(() => {
             if (isEnabling) return t('enablingFlag', 'Enabling flag...');

package/src/index.ts

@@ -1,7 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
-import flagTagsComponent from './flags/flags-highlight-bar.component';
-import flagsOverviewComponent from './flags/flags.component';
 
 const moduleName = '@openmrs/esm-patient-flags-app';
 
@@ -11,12 +9,12 @@ export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 }
 
-export const flagTags = getSyncLifecycle(flagTagsComponent, {
+export const flagTags = getAsyncLifecycle(() => import('./flags/flags-highlight-bar.component'), {
   featureName: 'patient-flag-tags',
   moduleName,
 });
 
-export const flagsOverview = getSyncLifecycle(flagsOverviewComponent, {
+export const flagsOverview = getAsyncLifecycle(() => import('./flags/flags.component'), {
   featureName: 'patient-flags-overview',
   moduleName,
 });

package/src/routes.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "webservices.rest": "^2.2.0"
+    "webservices.rest": ">=2.2.0"
   },
   "extensions": [
     {

package/translations/fr.json

@@ -1,9 +1,9 @@
 {
   "activeFirst": "Actif en premier",
   "alphabetically": "A - Z",
-  "assigned": "Assigned",
+  "assigned": "Assigné",
   "clearSearch": "Effacer la recherche",
-  "clinical": "Clinical",
+  "clinical": "Clinique",
   "closeFlagsBar": "Fermer la barre des drapeaux",
   "disableFlagError": "Erreur de désactivation du drapeau",
   "disablingFlag": "Désactivation du drapeau en cours...",
@@ -30,5 +30,5 @@
   "riskFlag": "Risk flag",
   "saveAndClose": "Sauvegarder et fermer",
   "searchForAFlag": "Rechercher un drapeau",
-  "sortBy": "Sort by"
+  "sortBy": "Trier par"
 }

package/translations/it.json

@@ -1,9 +1,9 @@
 {
   "activeFirst": "Attivi per primi",
   "alphabetically": "A - Z",
-  "assigned": "Assigned",
+  "assigned": "Assegnato",
   "clearSearch": "Cancella ricerca",
-  "clinical": "Clinical",
+  "clinical": "Clinico",
   "closeFlagsBar": "Chiudi barra segnalazioni",
   "disableFlagError": "Errore nella disattivazione della segnalazione",
   "disablingFlag": "Disattivazione della segnalazione in corso...",
@@ -12,7 +12,7 @@
   "editFlags": "Modifica segnalazioni",
   "editPatientFlags": "Modifica segnalazioni paziente",
   "enabledFlag": "Segnalazione attivata",
-  "enableFlagError": "Enable flag error",
+  "enableFlagError": "Errore nell'attivazione della segnalazione",
   "enablingFlag": "Attivazione della segnalazione in corso...",
   "flagCount_one": "{{count}} segnalazione di rischio",
   "flagCount_other": "{{count}} segnalazioni di rischio",
@@ -21,14 +21,14 @@
   "flagDisableError": "Errore nella disattivazione della segnalazione",
   "flagEnabledSuccessfully": "Segnalazione attivata con successo",
   "flagEnableError": "Errore nell'attivazione della segnalazione",
-  "infoFlag": "Info flag",
+  "infoFlag": "Segnalazione di informazione",
   "loading": "Caricamento in corso",
   "matchesForSearchTerm_one": "{{count}} segnalazione",
   "matchesForSearchTerm_other": "{{count}} segnalazioni",
   "noFlagsFound": "Spiacente, nessuna segnalazione trovata corrispondente alla ricerca",
   "retiredFirst": "Disattivati per primi",
-  "riskFlag": "Risk flag",
+  "riskFlag": "Segnalazione di rischio",
   "saveAndClose": "Salva e chiudi",
   "searchForAFlag": "Cerca una segnalazione",
-  "sortBy": "Sort by"
+  "sortBy": "Ordina per"
 }