@openmrs/esm-stock-management-app 3.0.1-pre.853 → 3.0.1-pre.864

package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json

@@ -30,9 +30,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1235998,
+      "size": 1236498,
       "sizes": {
-        "javascript": 1235830,
+        "javascript": 1236330,
         "consume-shared": 168
       },
       "names": [],
@@ -46,7 +46,7 @@
       "auxiliaryFiles": [
         "14.js.map"
       ],
-      "hash": "f5a48af402e466e9",
+      "hash": "d9d4b3c843b1cae5",
       "childrenByOrder": {}
     },
     {
@@ -252,10 +252,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5612543,
+      "size": 5613043,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5591013,
+        "javascript": 5591513,
         "share-init": 210,
         "runtime": 21110
       },
@@ -272,7 +272,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "c16398c853a201ae",
+      "hash": "7949965be8675f6a",
       "childrenByOrder": {}
     },
     {
@@ -466,9 +466,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 13491,
+      "size": 13639,
       "sizes": {
-        "javascript": 13491
+        "javascript": 13639
       },
       "names": [],
       "idHints": [],
@@ -480,7 +480,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "190c255666a90aed",
+      "hash": "6dc63a99d2c7bbd8",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.853"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.864"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "3.0.1-pre.853",
+  "version": "3.0.1-pre.864",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",

package/src/stock-lookups/stock-lookups.resource.ts

@@ -1,3 +1,6 @@
+import { useMemo } from 'react';
+import { uniqBy } from 'lodash-es';
+import useSWR from 'swr';
 import {
   type FetchResponse,
   type OpenmrsResource,
@@ -6,30 +9,24 @@ import {
   useSession,
   restBaseUrl,
 } from '@openmrs/esm-framework';
-import { type ResourceFilterCriteria, toQueryParams } from '../core/api/api';
-import { type PageableResult } from '../core/api/types/PageableResult';
-import { type OpenMRSLocation, type OpenMRSLocationTag } from '../core/api/types/Location';
-import useSWR from 'swr';
-import { type Role } from '../core/api/types/identity/Role';
-import { type User } from '../core/api/types/identity/User';
-import { type StockOperationType } from '../core/api/types/stockOperation/StockOperationType';
 import { type Concept } from '../core/api/types/concept/Concept';
-import { type Party } from '../core/api/types/Party';
 import { type Drug } from '../core/api/types/concept/Drug';
+import { type OpenMRSLocation, type OpenMRSLocationTag } from '../core/api/types/Location';
+import { type PageableResult } from '../core/api/types/PageableResult';
+import { type Party } from '../core/api/types/Party';
 import { type Patient } from '../core/api/types/identity/Patient';
-import { useMemo } from 'react';
-import { uniqBy } from 'lodash-es';
+import { type ResourceFilterCriteria, toQueryParams } from '../core/api/api';
+import { type Role } from '../core/api/types/identity/Role';
+import { type StockOperationType } from '../core/api/types/stockOperation/StockOperationType';
+import { type User } from '../core/api/types/identity/User';
 import { type UserRoleScope } from '../core/api/types/identity/UserRoleScope';
 
+export type ConceptFilterCriteria = ResourceFilterCriteria;
+export type DrugFilterCriteria = ResourceFilterCriteria;
+export type LocationFilterCriteria = ResourceFilterCriteria;
 export type PatientFilterCriteria = ResourceFilterCriteria;
-
 export type UserFilterCriteria = ResourceFilterCriteria;
 
-export type DrugFilterCriteria = ResourceFilterCriteria;
-
-export type ConceptFilterCriteria = ResourceFilterCriteria;
-
-export type LocationFilterCriteria = ResourceFilterCriteria;
 interface FHIRResponse {
   entry: Array<{ resource: fhir.Location }>;
   total: number;
@@ -190,10 +187,12 @@ export function useConcept(conceptUuid: string) {
       data: Concept;
     },
     Error
-  >(conceptUuid ? apiUrl : null, openmrsFetch);
+  >(conceptUuid ? apiUrl : null, openmrsFetch, {
+    errorRetryCount: 2,
+  });
 
   return {
-    items: data?.data,
+    items: data?.data || <Concept>{},
     isLoading,
     error,
   };
@@ -208,6 +207,7 @@ export function useParties() {
     },
     Error
   >(apiUrl, openmrsFetch);
+
   return {
     items: data?.data || <PageableResult<Party>>{},
     isLoading,

package/src/stock-sources/stock-sources-filter/stock-sources-filter.component.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Dropdown, DropdownSkeleton } from '@carbon/react';
 import { showSnackbar, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject } from '../../config-schema';
@@ -8,8 +9,8 @@ import styles from './stock-sources-filter.scss';
 const StockSourcesFilter: React.FC<{
   onFilterChange: (selectedSourceType: string) => void;
 }> = ({ onFilterChange }) => {
+  const { t } = useTranslation();
   const { stockSourceTypeUUID } = useConfig<ConfigObject>();
-
   const { items, isLoading, error } = useConcept(stockSourceTypeUUID);
 
   if (isLoading) {
@@ -18,27 +19,29 @@ const StockSourcesFilter: React.FC<{
 
   if (error) {
     showSnackbar({
-      title: 'Error fetching stock sources',
+      title: t('errorFetchingStockSourceTypes', 'Error fetching stock source types'),
+      subtitle: error.message,
       kind: 'error',
       isLowContrast: true,
     });
   }
 
-  if (!items) {
+  if (Object.keys(items).length === 0) {
     return null;
   }
 
   return (
     <div className={styles.filterContainer}>
       <Dropdown
-        id="stockSourcesFiter"
-        items={[...items.answers]}
-        initialSelectedItem={items.answers[0]}
-        itemToString={(item) => (item ? item.display : 'Not Set')}
-        titleText="Filter: "
-        type="inline"
-        size="sm"
+        id="stockSourcesFilter"
+        initialSelectedItem={items?.answers?.[0]}
+        items={[...(items?.answers || [])]}
+        itemToString={(item) => (item ? item.display : t('notSet', 'Not Set'))}
+        label=""
         onChange={({ selectedItem }) => onFilterChange(selectedItem?.display)}
+        size="sm"
+        titleText={t('selectSourceType', 'Select source type')}
+        type="inline"
       />
     </div>
   );

package/src/stock-sources/stock-sources-items-table.test.tsx

@@ -2,9 +2,13 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { renderHook, act, render, screen, waitFor } from '@testing-library/react';
 import { type StockSource } from '../core/api/types/stockOperation/StockSource';
+import { type Concept } from '../core/api/types/concept/Concept';
+import { useConcept } from '../stock-lookups/stock-lookups.resource';
 import useStockSourcesPage from './stock-sources-items-table.resource';
 import StockSourcesItems from './stock-sources-items-table.component';
+
 const mockUseStockSourcesPage = jest.mocked(useStockSourcesPage);
+const mockUseConcept = jest.mocked(useConcept);
 
 jest.mock('./stock-sources-items-table.resource', () => ({
   __esModule: true,
@@ -12,6 +16,10 @@ jest.mock('./stock-sources-items-table.resource', () => ({
   useStockSourcesPage: jest.fn(),
 }));
 
+jest.mock('../stock-lookups/stock-lookups.resource', () => ({
+  useConcept: jest.fn(),
+}));
+
 describe('StockSourcesItems', () => {
   const mockFilter = {};
   const mockItems = {
@@ -35,7 +43,19 @@ describe('StockSourcesItems', () => {
   };
 
   beforeEach(() => {
-    mockUseStockSourcesPage.mockClear();
+    mockUseConcept.mockReturnValue({
+      items: {
+        uuid: '1',
+        display: 'Source Types',
+        answers: [
+          { uuid: '1', display: 'All' },
+          { uuid: '2', display: 'Internal' },
+          { uuid: '3', display: 'External' },
+        ] as Concept[],
+      } as Concept,
+      isLoading: false,
+      error: null,
+    });
   });
 
   it('should return initial values', () => {

package/translations/en.json

@@ -112,6 +112,7 @@
   "errorDeletingSource": "Error deleting a source",
   "errorDeletingUserScope": "Error deleting a user scope",
   "errorEditingStockItem": "Error editing a stock Item",
+  "errorFetchingStockSourceTypes": "Error fetching stock source types",
   "errorLoadingStockOperation": "Error loading stock operation",
   "errorLoadingStockOperationTypes": "Error loading stock operation types",
   "errorPrintingStockOperation": "Error printing stock operation",
@@ -277,10 +278,12 @@
   "saveStockItemReferenceErrorTitle": "StockItem Reference",
   "saveStockItemReferenceMessage": "Stock Item Reference saved successfully",
   "search": "Search",
+  "searchStockItems": "Search stock items",
   "searchStockOperations": "Search stock operations",
   "searchThisList": "Search this list",
   "selectFile": "Select file",
   "SelectOption": "Select an option",
+  "selectSourceType": "Select Source Type",
   "selectTags": "Select tag(s)",
   "source": "Source",
   "sourceType": "Source Type",