@kenyaemr/esm-admin-app 5.4.4-pre.50 → 5.4.4-pre.502

package/src/components/locations/forms/search-location/search-location.workspace.tsx

@@ -1,27 +1,29 @@
-import { Button, ButtonSet, FilterableMultiSelect, Form, FormGroup, InlineLoading, Stack } from '@carbon/react';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { mutate } from 'swr';
+import classNames from 'classnames';
+import { z } from 'zod';
+import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import {
-  type DefaultWorkspaceProps,
+  Workspace2,
+  Workspace2DefinitionProps,
+  useLayoutType,
   ResponsiveWrapper,
   restBaseUrl,
   showSnackbar,
-  useLayoutType,
 } from '@openmrs/esm-framework';
-import classNames from 'classnames';
-import React, { useEffect, useState } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { mutate } from 'swr';
-import { z } from 'zod';
+import { Button, ButtonSet, FilterableMultiSelect, Form, FormGroup, InlineLoading, Stack } from '@carbon/react';
+
 import { LocationAutosuggest } from '../../auto-suggest/location-autosuggest.component';
 import ResultsTile from '../../common/results-tile.component';
-import { extractErrorMessagesFromResponse } from '../../helpers';
-import { saveOrUpdateLocation } from '../../hooks/useLocation';
 import { useLocationTags } from '../../hooks/useLocationTags';
+import { saveOrUpdateLocation } from '../../hooks/useLocation';
+import { extractErrorMessagesFromResponse } from '../../helpers';
 import { LocationResponse } from '../../types';
 import styles from './search-location.workspace.scss';
 
-type AddLocationWorkspaceProps = DefaultWorkspaceProps & {
+type AddLocationWorkspaceProps = {
   location?: LocationResponse;
 };
 
@@ -37,17 +39,15 @@ const locationFormSchema = z.object({
 
 type LocationFormType = z.infer<typeof locationFormSchema>;
 
-const SearchLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
+const SearchLocationWorkspace: React.FC<Workspace2DefinitionProps<AddLocationWorkspaceProps, {}, {}>> = ({
   closeWorkspace,
-  closeWorkspaceWithSavedChanges,
-  promptBeforeClosing,
-  location,
+  workspaceProps: { location = {} as LocationResponse },
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const { locationTagList: Tags } = useLocationTags();
   const [selectedLocation, setSelectedLocation] = useState<LocationResponse | null>(null);
-
+  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
   const handleMutation = () => {
     const url = `${restBaseUrl}/location`;
     mutate((key) => typeof key === 'string' && key.startsWith(url), undefined, { revalidate: true });
@@ -56,7 +56,6 @@ const SearchLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
   const {
     handleSubmit,
     control,
-    getValues,
     setValue,
     reset,
     formState: { isSubmitting, isDirty, errors },
@@ -89,7 +88,7 @@ const SearchLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
       });
 
       handleMutation();
-      closeWorkspaceWithSavedChanges();
+      closeWorkspace({ discardUnsavedChanges: true });
     } catch (error: any) {
       console.error('Error saving location:', error);
       const errorMessages = extractErrorMessagesFromResponse(error);
@@ -137,78 +136,84 @@ const SearchLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
   };
 
   useEffect(() => {
-    promptBeforeClosing(() => isDirty);
-  }, [isDirty, promptBeforeClosing]);
+    setHasUnsavedChanges(true);
+  }, [isDirty, setHasUnsavedChanges]);
 
   const isFormReady = (selectedLocation || location) && isDirty;
 
   return (
-    <Form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
-      <div className={styles.formContainer}>
-        <Stack gap={3}>
-          <ResponsiveWrapper>
-            <FormGroup legendText="">
-              {!selectedLocation ? (
-                <LocationAutosuggest
-                  onLocationSelected={handleLocationSelected}
-                  labelText={t('searchForLocation', 'Search for location')}
-                  placeholder={t('searchParentLocation', 'Search for location...')}
-                />
-              ) : (
-                renderSelectedLocationTile()
-              )}
-            </FormGroup>
-          </ResponsiveWrapper>
-
-          <ResponsiveWrapper>
-            <FormGroup legendText="">
-              <Controller
-                control={control}
-                name="tags"
-                render={({ field: { onChange, value, ref } }) => (
-                  <FilterableMultiSelect
-                    id="locationTags"
-                    titleText={t('selectTags', 'Select tag(s)')}
-                    placeholder={t('selectTagPlaceholder', 'Select a tag')}
-                    items={Tags || []}
-                    selectedItems={(value || []).map(
-                      (selected) => Tags?.find((tag) => tag.uuid === selected.uuid) || selected,
-                    )}
-                    onChange={({ selectedItems }) => onChange(selectedItems || [])}
-                    itemToString={(item) => (item && typeof item === 'object' ? item.display : '')}
-                    selectionFeedback="top-after-reopen"
-                    invalid={!!errors.tags?.message}
-                    invalidText={errors.tags?.message}
-                    disabled={!Tags?.length}
-                    ref={ref}
+    <Workspace2 title={t('searchLocation', 'Search Location')} hasUnsavedChanges={hasUnsavedChanges}>
+      <Form onSubmit={handleSubmit(onSubmit)} className={styles.form}>
+        <div className={styles.formContainer}>
+          <Stack gap={3}>
+            <ResponsiveWrapper>
+              <FormGroup legendText="">
+                {!selectedLocation ? (
+                  <LocationAutosuggest
+                    onLocationSelected={handleLocationSelected}
+                    labelText={t('searchForLocation', 'Search for location')}
+                    placeholder={t('searchParentLocation', 'Search for location...')}
                   />
+                ) : (
+                  renderSelectedLocationTile()
                 )}
-              />
-            </FormGroup>
-          </ResponsiveWrapper>
-        </Stack>
-      </div>
-
-      <ButtonSet
-        className={classNames({
-          [styles.tablet]: isTablet,
-          [styles.desktop]: !isTablet,
-        })}>
-        <Button className={styles.buttonContainer} kind="secondary" onClick={() => closeWorkspace()}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button className={styles.buttonContainer} disabled={isSubmitting || !isFormReady} kind="primary" type="submit">
-          {isSubmitting ? (
-            <span className={styles.inlineLoading}>
-              {t('submitting', 'Submitting' + '...')}
-              <InlineLoading status="active" iconDescription="Loading" />
-            </span>
-          ) : (
-            t('saveAndClose', 'Save & close')
-          )}
-        </Button>
-      </ButtonSet>
-    </Form>
+              </FormGroup>
+            </ResponsiveWrapper>
+
+            <ResponsiveWrapper>
+              <FormGroup legendText="">
+                <Controller
+                  control={control}
+                  name="tags"
+                  render={({ field: { onChange, value, ref } }) => (
+                    <FilterableMultiSelect
+                      id="locationTags"
+                      titleText={t('selectTags', 'Select tag(s)')}
+                      placeholder={t('selectTagPlaceholder', 'Select a tag')}
+                      items={Tags || []}
+                      selectedItems={(value || []).map(
+                        (selected) => Tags?.find((tag) => tag.uuid === selected.uuid) || selected,
+                      )}
+                      onChange={({ selectedItems }) => onChange(selectedItems || [])}
+                      itemToString={(item) => (item && typeof item === 'object' ? item.display : '')}
+                      selectionFeedback="top-after-reopen"
+                      invalid={!!errors.tags?.message}
+                      invalidText={errors.tags?.message}
+                      disabled={!Tags?.length}
+                      ref={ref}
+                    />
+                  )}
+                />
+              </FormGroup>
+            </ResponsiveWrapper>
+          </Stack>
+        </div>
+
+        <ButtonSet
+          className={classNames({
+            [styles.tablet]: isTablet,
+            [styles.desktop]: !isTablet,
+          })}>
+          <Button className={styles.buttonContainer} kind="secondary" onClick={() => closeWorkspace()}>
+            {t('cancel', 'Cancel')}
+          </Button>
+          <Button
+            className={styles.buttonContainer}
+            disabled={isSubmitting || !isFormReady}
+            kind="primary"
+            type="submit">
+            {isSubmitting ? (
+              <span className={styles.inlineLoading}>
+                {t('submitting', 'Submitting' + '...')}
+                <InlineLoading status="active" iconDescription="Loading" />
+              </span>
+            ) : (
+              t('saveAndClose', 'Save & close')
+            )}
+          </Button>
+        </ButtonSet>
+      </Form>
+    </Workspace2>
   );
 };
 

package/src/components/locations/tables/locations-table.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState, useEffect } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -18,7 +18,7 @@ import {
   Tag,
 } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
-import { WorkspaceContainer, isDesktop as desktopLayout, launchWorkspace, useLayoutType } from '@openmrs/esm-framework';
+import { launchWorkspace2, useLayoutType } from '@openmrs/esm-framework';
 import styles from './locations-table.scss';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
 import { useFacilitiesTagged } from './locations-table.resource';
@@ -28,23 +28,26 @@ const LocationsTable: React.FC = () => {
   const { t } = useTranslation();
   const layout = useLayoutType();
   const isTablet = layout === 'tablet';
-  const isDesktop = desktopLayout(layout);
   const [pageSize, setPageSize] = useState(10);
   const [searchTerm, setSearchTerm] = useState('');
   const [currentPage, setCurrentPage] = useState(1);
 
-  const { locationTagList, isLoading: tagsLoading, error: tagsError } = useLocationTags();
+  const { locationTagList, isLoading: tagsLoading } = useLocationTags();
   const { facilityList, isLoading: taggedLoading } = useFacilitiesTagged({ results: locationTagList });
 
   const handleAddLocationWorkspace = () => {
-    launchWorkspace('add-location-workspace', {
-      workspaceTitle: t('addLocation', 'Add Location'),
+    launchWorkspace2('add-location-workspace', {
+      workspaceProps: {
+        workspaceTitle: t('addLocation', 'Add Location'),
+      },
     });
   };
 
   const handleSearchLocationWorkspace = () => {
-    launchWorkspace('search-location-workspace', {
-      workspaceTitle: t('tagLocation', 'Tag Location'),
+    launchWorkspace2('search-location-workspace', {
+      workspaceProps: {
+        workspaceTitle: t('tagLocation', 'Tag Location'),
+      },
     });
   };
 
@@ -117,126 +120,119 @@ const LocationsTable: React.FC = () => {
 
   if (tagsLoading || (taggedLoading && !facilityList.length)) {
     return (
-      <>
-        <div className={styles.widgetCard}>
-          <DataTableSkeleton role="progressbar" compact={isDesktop} zebra />
-        </div>
-      </>
+      <div className={styles.widgetCard}>
+        <DataTableSkeleton role="progressbar" zebra />
+      </div>
     );
   }
 
   return (
-    <>
-      <div className={styles.widgetCard}>
-        <CardHeader title={t('locations', 'Locations')}>
-          <span className={styles.backgroundDataFetchingIndicator}>
-            <span>{tagsLoading ? <InlineLoading /> : null}</span>
-          </span>
-          <div className={styles.headerActions}>
-            <>
-              <div className={styles.filterContainer}>
-                <Search
-                  onChange={(e) => {
-                    setSearchTerm(e.target.value);
-                    setCurrentPage(1);
-                  }}
-                  placeholder={t('search', 'Search location')}
-                  value={searchTerm}
-                  labelText={t('search', 'Search location')}
-                />
-              </div>
-              <Button
-                kind="ghost"
-                renderIcon={(props) => <Add size={16} {...props} />}
-                onClick={handleAddLocationWorkspace}>
-                {t('addLocation', 'Add Location')}
-              </Button>
-              <Button
-                kind="ghost"
-                renderIcon={(props) => <Add size={16} {...props} />}
-                onClick={handleSearchLocationWorkspace}>
-                {t('tagLocation', 'Tag Location')}
-              </Button>
-            </>
+    <div className={styles.widgetCard}>
+      <CardHeader title={t('locations', 'Locations')}>
+        <span className={styles.backgroundDataFetchingIndicator}>
+          <span>{tagsLoading ? <InlineLoading /> : null}</span>
+        </span>
+        <div className={styles.headerActions}>
+          <div className={styles.filterContainer}>
+            <Search
+              onChange={(e) => {
+                setSearchTerm(e.target.value);
+                setCurrentPage(1);
+              }}
+              placeholder={t('search', 'Search location')}
+              value={searchTerm}
+              labelText={t('search', 'Search location')}
+            />
           </div>
-        </CardHeader>
-
-        <DataTable rows={paginatedRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
-          {({ rows, headers, getTableProps }) => {
-            return (
-              <TableContainer>
-                <Table {...getTableProps()}>
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key}>{header.header}</TableHeader>
+          <Button
+            kind="ghost"
+            renderIcon={(props) => <Add size={16} {...props} />}
+            onClick={handleAddLocationWorkspace}>
+            {t('addLocation', 'Add Location')}
+          </Button>
+          <Button
+            kind="ghost"
+            renderIcon={(props) => <Add size={16} {...props} />}
+            onClick={handleSearchLocationWorkspace}>
+            {t('tagLocation', 'Tag Location')}
+          </Button>
+        </div>
+      </CardHeader>
+
+      <DataTable rows={paginatedRows} headers={tableHeaders} isSortable size={isTablet ? 'lg' : 'sm'} useZebraStyles>
+        {({ rows, headers, getTableProps }) => {
+          return (
+            <TableContainer>
+              <Table {...getTableProps()}>
+                <TableHead>
+                  <TableRow>
+                    {headers.map((header) => (
+                      <TableHeader key={header.key}>{header.header}</TableHeader>
+                    ))}
+                  </TableRow>
+                </TableHead>
+                <TableBody>
+                  {rows.map((row) => (
+                    <TableRow key={row.id}>
+                      {row.cells.map((cell) => (
+                        <TableCell key={cell.id}>
+                          {cell.id.includes('tags') && cell.value !== 'No tags' ? (
+                            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px' }}>
+                              {cell.value.split(', ').map((tag, index) => (
+                                <Tag key={index} type="blue" size="sm">
+                                  {tag}
+                                </Tag>
+                              ))}
+                            </div>
+                          ) : (
+                            cell.value
+                          )}
+                        </TableCell>
                       ))}
                     </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow key={row.id}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>
-                            {cell.id.includes('tags') && cell.value !== 'No tags' ? (
-                              <div style={{ display: 'flex', flexWrap: 'wrap', gap: '4px' }}>
-                                {cell.value.split(', ').map((tag, index) => (
-                                  <Tag key={index} type="blue" size="sm">
-                                    {tag}
-                                  </Tag>
-                                ))}
-                              </div>
-                            ) : (
-                              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}>
-                          {searchTerm
-                            ? t('noSearchResults', `No results found for "${searchTerm}"`)
-                            : t('noData', 'No data to display')}
-                        </p>
-                        <p className={styles.helper}>
-                          {searchTerm
-                            ? t('tryDifferentSearch', 'Try a different search term')
-                            : t('checkFilters', 'Check the filters above')}
-                        </p>
-                      </div>
-                    </Tile>
-                  </div>
-                ) : null}
-                <Pagination
-                  backwardText="Previous page"
-                  forwardText="Next page"
-                  page={currentPage}
-                  pageSize={pageSize}
-                  pageSizes={[10, 20, 30, 40, 50]}
-                  totalItems={filteredRows.length}
-                  onChange={({ pageSize: newPageSize, page }) => {
-                    if (newPageSize !== pageSize) {
-                      setPageSize(newPageSize);
-                      setCurrentPage(1);
-                    }
-                    if (page !== currentPage) {
-                      setCurrentPage(page);
-                    }
-                  }}
-                />
-              </TableContainer>
-            );
-          }}
-        </DataTable>
-      </div>
-      <WorkspaceContainer contextKey="locations" />
-    </>
+                  ))}
+                </TableBody>
+              </Table>
+              {rows.length === 0 ? (
+                <div className={styles.tileContainer}>
+                  <Tile className={styles.tile}>
+                    <div className={styles.tileContent}>
+                      <p className={styles.content}>
+                        {searchTerm
+                          ? t('noSearchResults', `No results found for "${searchTerm}"`)
+                          : t('noData', 'No data to display')}
+                      </p>
+                      <p className={styles.helper}>
+                        {searchTerm
+                          ? t('tryDifferentSearch', 'Try a different search term')
+                          : t('checkFilters', 'Check the filters above')}
+                      </p>
+                    </div>
+                  </Tile>
+                </div>
+              ) : null}
+              <Pagination
+                backwardText="Previous page"
+                forwardText="Next page"
+                page={currentPage}
+                pageSize={pageSize}
+                pageSizes={[10, 20, 30, 40, 50]}
+                totalItems={filteredRows.length}
+                onChange={({ pageSize: newPageSize, page }) => {
+                  if (newPageSize !== pageSize) {
+                    setPageSize(newPageSize);
+                    setCurrentPage(1);
+                  }
+                  if (page !== currentPage) {
+                    setCurrentPage(page);
+                  }
+                }}
+              />
+            </TableContainer>
+          );
+        }}
+      </DataTable>
+    </div>
   );
 };