@kenyaemr/esm-admin-app 5.4.2-pre.2203 → 5.4.2-pre.2223

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"adminLeftPanelLink","name":"admin-left-panel-link","slot":"admin-left-panel-slot"},{"component":"userManagementLeftPannelLink","name":"user-management-left-panel-link","slot":"admin-left-panel-slot"},{"component":"etlAdministrationLeftPannelLink","name":"etl-administration-left-panel-link","slot":"admin-left-panel-slot"},{"component":"facilitySetupLeftPanelLink","name":"facility-setup-left-panel-link","slot":"admin-left-panel-slot"}],"workspaces":[{"name":"manage-user-workspace","component":"manageUserWorkspace","title":"Manage User Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"user-role-scope-workspace","component":"userRoleScopeWorkspace","title":"User Rple Scope Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"}],"modals":[{"component":"operationConfirmationModal","name":"operation-confirmation-modal"},{"component":"hwrConfirmationModal","name":"hwr-confirmation-modal"},{"component":"hwrEmptyModal","name":"hwr-empty-modal"},{"component":"hwrSyncModal","name":"hwr-syncing-modal"}],"pages":[{"component":"root","route":"admin"}],"version":"5.4.2-pre.2203"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"adminLeftPanelLink","name":"admin-left-panel-link","slot":"admin-left-panel-slot"},{"component":"userManagementLeftPannelLink","name":"user-management-left-panel-link","slot":"admin-left-panel-slot"},{"component":"etlAdministrationLeftPannelLink","name":"etl-administration-left-panel-link","slot":"admin-left-panel-slot"},{"component":"facilitySetupLeftPanelLink","name":"facility-setup-left-panel-link","slot":"admin-left-panel-slot"}],"workspaces":[{"name":"manage-user-workspace","component":"manageUserWorkspace","title":"Manage User Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"user-role-scope-workspace","component":"userRoleScopeWorkspace","title":"User Rple Scope Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"}],"modals":[{"component":"operationConfirmationModal","name":"operation-confirmation-modal"},{"component":"hwrConfirmationModal","name":"hwr-confirmation-modal"},{"component":"hwrEmptyModal","name":"hwr-empty-modal"},{"component":"hwrSyncModal","name":"hwr-syncing-modal"}],"pages":[{"component":"root","route":"admin"}],"version":"5.4.2-pre.2223"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-admin-app",
-  "version": "5.4.2-pre.2203",
+  "version": "5.4.2-pre.2223",
   "description": "Facilitates the management of ETL tables",
   "browser": "dist/kenyaemr-esm-admin-app.js",
   "main": "src/index.ts",
@@ -48,5 +48,8 @@
     "react-router-dom": "6.x",
     "swr": "2.x"
   },
+  "devDependencies": {
+    "webpack": "^5.99.9"
+  },
   "stableVersion": "5.4.1"
 }

package/src/components/dashboard/dashboard.component.tsx

@@ -86,9 +86,7 @@ const Dashboard: React.FC = () => {
             description={t('etlsOperationsLoading', 'Please wait {{currentOperation}} is in progress...', {
               currentOperation,
             })}
-            size="md"
             className={styles.loading}
-            withOverlay
           />
         ) : (
           <ComboButton tooltipAlignment="left" label={t('etlOperation', 'ETL operations')} size="md">

package/src/components/facility-setup/facility-info.component.tsx

@@ -86,9 +86,7 @@ const FacilityInfo: React.FC = () => {
           {isShaFacilityLoading || isLocalFacilityLoading ? (
             <InlineLoading
               description={t('synchronizingFacilityData', 'Please wait, Synchronizing Info.')}
-              size="md"
               className={styles.loading}
-              withOverlay
             />
           ) : (
             <Button kind="primary" onClick={synchronizeFacilityData}>

package/src/components/modal/hwr-sync.modal.tsx

@@ -168,6 +168,7 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
           <Column className={styles.identifierTypeColumn}>
             <span className={styles.identifierTypeHeader}>{t('identifierNumber', 'Identifier number*')}</span>
             <Search
+              labelText={t('enterIdentifierNumber', 'Enter identifier number')}
               className={styles.formSearch}
               value={searchHWR.identifier}
               placeholder={t('enterIdentifierNumber', 'Enter identifier number')}

package/src/components/users/manage-users/manage-user-role-scope/user-role-scope-list/user-role-scope-list.component.tsx

@@ -11,20 +11,13 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-  Button,
   OverflowMenu,
   OverflowMenuItem,
+  InlineLoading,
 } from '@carbon/react';
-import { AddAlt, ArrowDownLeft, ArrowLeft } from '@carbon/react/icons';
+import { ArrowDownLeft, ArrowLeft } from '@carbon/react/icons';
 import styles from '../../manage-user.scss';
-import {
-  isDesktop,
-  launchWorkspace,
-  restBaseUrl,
-  showModal,
-  showSnackbar,
-  WorkspaceContainer,
-} from '@openmrs/esm-framework';
+import { restBaseUrl, showModal, showSnackbar } from '@openmrs/esm-framework';
 import { deleteUserRoleScopes, handleMutation, useUserRoleScopes } from '../../../../../user-management.resources';
 import { User, UserRoleScope } from '../../../../../types';
 
@@ -34,17 +27,13 @@ interface StockUserRoleScopesListProps {
   onAddUserRoleScope?: (isAddRoleScope: boolean) => void;
 }
 
-const StockUserRoleScopesList: React.FC<StockUserRoleScopesListProps> = ({
-  user,
-  onEditUserRoleScope,
-  onAddUserRoleScope,
-}) => {
+const StockUserRoleScopesList: React.FC<StockUserRoleScopesListProps> = ({ user, onEditUserRoleScope }) => {
   const { t } = useTranslation();
 
   // Fetch user role scopes
-  const { items: userRoleScopes, loadingRoleScope } = useUserRoleScopes();
+  const { items: userRoleScopes, loadingRoleScope, isValidating } = useUserRoleScopes();
   const [deletingUserScope, setDeletingUserScope] = useState(false);
-  const size = 'mid';
+  const size = 'md';
 
   const tableHeaders = useMemo(
     () => [
@@ -134,14 +123,16 @@ const StockUserRoleScopesList: React.FC<StockUserRoleScopesListProps> = ({
   }, [userRoleScopes, t, user.uuid, showDeleteUserRoleScopeModal, onEditUserRoleScope]);
 
   if (loadingRoleScope) {
-    return <DataTableSkeleton role="progressbar" />;
+    return <DataTableSkeleton />;
   }
 
   return (
     <div>
-      <CardHeader title="Manage User Role Scope" children={''}></CardHeader>
+      <CardHeader title="Manage User Role Scope">
+        {isValidating && <InlineLoading description={t('refreshingUserScopes', 'Refreshing user scopes...')} />}
+      </CardHeader>
       <div className={styles.dataTable}>
-        <DataTable useZebraStyle size={size} rows={tableRows} headers={tableHeaders}>
+        <DataTable useZebraStyles size={size} rows={tableRows} headers={tableHeaders}>
           {({ rows, headers, getHeaderProps, getRowProps, getTableProps }) => (
             <TableContainer>
               <Table {...getTableProps()} aria-label="user role scope table">

package/src/components/users/manage-users/manage-user-role-scope/user-role-scope-workspace/user-role-scope-fields.component.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { Control, Controller, useFormContext, UseFormReturn } from 'react-hook-form';
+import { Control, Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import styles from './user-role-fields.scss';
 import { formatDatetime, ResponsiveWrapper } from '@openmrs/esm-framework';
@@ -82,7 +82,7 @@ const UserRoleScopeFormFields: React.FC<UserRoleScopeFields> = ({
               onChange={({ selectedItem }) => {
                 field.onChange(selectedItem ? selectedItem.display.trim() : '');
               }}
-              disabled={userRoleScopeInitialValues}
+              disabled={!!userRoleScopeInitialValues}
             />
           )}
         />
@@ -156,17 +156,13 @@ const UserRoleScopeFormFields: React.FC<UserRoleScopeFields> = ({
                         value={[value?.activeFrom, value?.activeTo]}>
                         <DatePickerInput
                           id="date-picker-input-id-start"
-                          name="activeFrom"
                           placeholder={DATE_PICKER_FORMAT}
                           labelText={t('activeFrom', 'Active From')}
-                          value={value?.activeFrom}
                         />
                         <DatePickerInput
                           id="date-picker-input-id-finish"
-                          name="activeTo"
                           placeholder={DATE_PICKER_FORMAT}
                           labelText={t('activeTo', 'Active To')}
-                          value={value?.activeTo}
                         />
                       </DatePicker>
                     );
@@ -178,7 +174,7 @@ const UserRoleScopeFormFields: React.FC<UserRoleScopeFields> = ({
         </Column>
       </ResponsiveWrapper>
       <ResponsiveWrapper>
-        <Column key={t('stockOperation', 'Stock Operation')} xsm={8} md={12} lg={12} className={styles.checkBoxColumn}>
+        <Column xsm={8} md={12} lg={12} className={styles.checkBoxColumn}>
           <CheckboxGroup legendText={t('stockOperation', 'Stock Operation')} className={styles.checkboxGroupGrid}>
             {loadingStock ? (
               <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />
@@ -234,7 +230,7 @@ const UserRoleScopeFormFields: React.FC<UserRoleScopeFields> = ({
         </Column>
       </ResponsiveWrapper>
       <ResponsiveWrapper>
-        <Column key={t('stockLocation', 'Stock Location')} xsm={8} md={12} lg={12} className={styles.checkBoxColumn}>
+        <Column xsm={8} md={12} lg={12} className={styles.checkBoxColumn}>
           <CheckboxGroup legendText={t('stockLocation', 'Stock Location')} className={styles.checkboxGroupGrid}>
             {loadingStock ? (
               <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />

package/src/components/users/manage-users/manage-user-role-scope/user-role-scope-workspace/user-role-scope.workspace.tsx

@@ -289,7 +289,7 @@ const UserRoleScopeWorkspace: React.FC<UserRoleScopeWorkspaceProps> = ({
               </Stack>
             </div>
             <ButtonSet className={classNames({ [styles.tablet]: isTablet, [styles.desktop]: !isTablet })}>
-              <Button style={{ maxWidth: '50%' }} kind="secondary" onClick={closeWorkspace}>
+              <Button style={{ maxWidth: '50%' }} kind="secondary" onClick={() => closeWorkspace()}>
                 {t('cancel', 'Cancel')}
               </Button>
               <Button

package/src/components/users/manage-users/user-list/user-list.component.tsx

@@ -299,6 +299,8 @@ const UserList: React.FC = () => {
           <div className={styles.buttonContainer}>
             <p className={styles.filterByText}>{t('filterBy', 'Filter by:')}</p>
             <Dropdown
+              hideLabel={true}
+              titleText={t('filter', 'Filter')}
               id="filter-dropdown"
               label={t('filter', 'Filter')}
               className={styles.dropDownFilter}
@@ -310,7 +312,7 @@ const UserList: React.FC = () => {
                 { id: 'unlicensed', label: t('Unlicensed', 'Unlicensed') },
               ]}
               itemToString={(item) => (item ? item.label : '')}
-              onChange={({ selectedItem }) => setSelectedFilter(selectedItem.id)}
+              onChange={({ selectedItem }) => setSelectedFilter(selectedItem.id as FilterType)}
               selectedItem={{ id: selectedFilter, label: t(selectedFilter, selectedFilter) }}
               size={isDesktop(layout) ? 'lg' : 'sm'}
             />

package/src/components/users/manage-users/user-management.workspace.tsx

@@ -6,7 +6,6 @@ import {
   restBaseUrl,
   showSnackbar,
   useLayoutType,
-  formatDatetime,
   useConfig,
   showModal,
   parseDate,
@@ -30,7 +29,6 @@ import {
   ComboBox,
   DatePickerInput,
   DatePicker,
-  Tile,
   Search,
   Row,
 } from '@carbon/react';
@@ -41,15 +39,12 @@ import {
   createUser,
   handleMutation,
   useRoles,
-  usePersonAttribute,
   useProvider,
   useProviderAttributeType,
-  useLocation,
   createProvider,
 } from '../../../user-management.resources';
 import UserManagementFormSchema from '../userManagementFormSchema';
-import { CardHeader, EmptyState } from '@openmrs/esm-patient-common-lib/src';
-import { ChevronSortUp, Query, ChevronRight } from '@carbon/react/icons';
+import { ChevronLeft, Query, ChevronRight } from '@carbon/react/icons';
 import { useSystemUserRoleConfigSetting } from '../../hook/useSystemRoleSetting';
 import { type PractitionerResponse, Provider, User } from '../../../types';
 import { searchHealthCareWork } from '../../hook/searchHealthCareWork';
@@ -550,9 +545,9 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
   const getSubmitButtonText = () =>
     t(isSaveAndClose() ? 'saveAndClose' : 'next', isSaveAndClose() ? 'Save & close' : 'Next');
 
-  const getSubmitButtonType = () => (isSaveAndClose() ? 'submit' : '');
+  const getSubmitButtonType = () => (isSaveAndClose() ? 'submit' : 'button');
 
-  const getSubmitButtonIcon = () => (isSaveAndClose() ? '' : ChevronRight);
+  const getSubmitButtonIcon = () => (isSaveAndClose() ? ChevronLeft : ChevronRight);
 
   const handleBackClick = () => {
     if (hasDemographicInfo) {
@@ -577,7 +572,7 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
         <div className={styles.leftLayout}>
           <ProgressIndicator
             currentIndex={currentIndex}
-            spaceEquality={true}
+            spaceEqually={true}
             vertical={true}
             className={styles.progressIndicator}
             onChange={(newIndex) => {
@@ -603,7 +598,6 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                         {searchHWR.isHWRLoading ? (
                           <InlineLoading
                             className={styles.formLoading}
-                            active={searchHWR.isHWRLoading}
                             description={t('pullDetailsfromHWR', 'Pulling data from Health worker registry...')}
                           />
                         ) : (
@@ -628,6 +622,7 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                 </span>
                                 <Row className={styles.formRow}>
                                   <Search
+                                    labelText={t('enterIdentifierNumber', 'Enter identifier number')}
                                     className={styles.formSearch}
                                     defaultValue={searchHWR.identifier}
                                     placeholder={t('enterIdentifierNumber', 'Enter identifier number')}
@@ -936,7 +931,6 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                     className={styles.multilineCheckboxLabel}>
                                     <Checkbox
                                       className={styles.checkboxLabelSingleLine}
-                                      {...field}
                                       id="isEditProvider"
                                       labelText={t('EditProviderDetails', 'Edit provider details?')}
                                       checked={field.value || false}
@@ -958,7 +952,6 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                   className={styles.multilineCheckboxLabel}>
                                   <Checkbox
                                     className={styles.checkboxLabelSingleLine}
-                                    {...field}
                                     id="providerIdentifiersa"
                                     labelText={t('providerIdentifiers', 'Create a Provider account for this user')}
                                     checked={field.value || false}
@@ -1051,13 +1044,12 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                 className={styles.checkboxGroupGrid}>
                                 <Checkbox
                                   className={styles.multilineCheckboxLabel}
-                                  {...field}
                                   id="forcePasswordChange"
                                   labelText={t(
                                     'forcePasswordChangeHelper',
                                     'Optionally require this user to change their password on next login',
                                   )}
-                                  checked={field.value || false}
+                                  checked={!!field.value || false}
                                   onChange={(e) => field.onChange(e.target.checked)}
                                 />
                               </CheckboxGroup>

package/src/declarations.d.ts

@@ -1,15 +1,2 @@
 declare module '*.css';
 declare module '*.scss';
-declare module '@carbon/react';
-declare module 'react-aria' {
-  export const I18nProvider: (...args: any) => JSX.Element;
-  export { DateValue } from '@react-types/datepicker';
-  export const mergeProps: any;
-  export const useLocale: any;
-  export const useDateField: any;
-  export const useDatePicker: any;
-  export const useDateSegment: any;
-  export const useFocusRing: any;
-  export const useHover: any;
-  export const useObjectRef: any;
-}

package/src/user-management.resources.ts

@@ -183,11 +183,15 @@ export function useStockTagLocations() {
 
 export const useUserRoleScopes = () => {
   const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope?v=full`;
-  const { data, error, isLoading } = useSWR<{ data: PageableResult<UserRoleScope> }, Error>(apiUrl, openmrsFetch);
+  const { data, error, isLoading, isValidating } = useSWR<{ data: PageableResult<UserRoleScope> }, Error>(
+    apiUrl,
+    openmrsFetch,
+  );
   return {
     items: data?.data,
     loadingRoleScope: isLoading,
     userRoleScopeError: error,
+    isValidating,
   };
 };
 

package/translations/en.json

@@ -73,6 +73,7 @@
   "recreateTables": "Recreate tables",
   "refreshDwapi": "Refresh DWAPI tables",
   "refreshed": "refreshed",
+  "refreshingUserScopes": "Refreshing user scopes...",
   "refreshTables": "Refresh tables",
   "registrationNumber": "Registration number",
   "remove": "Remove",

package/dist/2.js

@@ -1 +0,0 @@
-"use strict";(globalThis.webpackChunk_kenyaemr_esm_admin_app=globalThis.webpackChunk_kenyaemr_esm_admin_app||[]).push([[2,372],{3372:(a,e,n)=>{n.r(e),n.d(e,{default:()=>s,immutable:()=>i});var l=n(446),t=n(1709);const i=a=>(e,n,l)=>(l.revalidateOnFocus=!1,l.revalidateIfStale=!1,l.revalidateOnReconnect=!1,a(e,n,l)),s=(0,t.xD)(l.ZP,i)}}]);

package/dist/2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"2.js","mappings":"oNAGA,MAAMA,EAAaC,GAAa,CAACC,EAAKC,EAASC,KAEvCA,EAAOC,mBAAoB,EAC3BD,EAAOE,mBAAoB,EAC3BF,EAAOG,uBAAwB,EACxBN,EAAWC,EAAKC,EAASC,IAElCI,GAAkB,QAAe,KAAQR,E","sources":["webpack://@kenyaemr/esm-admin-app/../../node_modules/swr/dist/immutable/index.mjs"],"names":["immutable","useSWRNext","key","fetcher","config","revalidateOnFocus","revalidateIfStale","revalidateOnReconnect","useSWRImmutable"],"sourceRoot":""}