@openmrs/esm-stock-management-app 1.0.1-pre.692 → 1.0.1-pre.702

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

@@ -134,10 +134,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5407793,
+      "size": 5408566,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5385844,
+        "javascript": 5386617,
         "share-init": 252,
         "runtime": 21445
       },
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "b6ba4ea06ac17137",
+      "hash": "bde00c76e90fc524",
       "childrenByOrder": {}
     },
     {
@@ -326,9 +326,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11501,
+      "size": 11531,
       "sizes": {
-        "javascript": 11501
+        "javascript": 11531
       },
       "names": [],
       "idHints": [],
@@ -340,7 +340,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "b881a6484ecb0d98",
+      "hash": "882eba03e470bb3e",
       "childrenByOrder": {}
     },
     {
@@ -607,9 +607,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1748921,
+      "size": 1749694,
       "sizes": {
-        "javascript": 1748711,
+        "javascript": 1749484,
         "consume-shared": 210
       },
       "names": [],
@@ -623,7 +623,7 @@
       "auxiliaryFiles": [
         "973.js.map"
       ],
-      "hash": "f060b14379d6e58f",
+      "hash": "4e40bb4e6400af3e",
       "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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.692"}
+{"$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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.702"}

package/package.json

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

package/src/stock-operations/stock-operations-table.component.tsx

@@ -133,48 +133,55 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
   );
 
   const tableRows = useMemo(() => {
-    return items?.map((stockOperation, index) => ({
-      ...stockOperation,
-      id: stockOperation?.uuid,
-      key: `key-${stockOperation?.uuid}`,
-      operationTypeName: `${stockOperation?.operationTypeName}`,
-      operationNumber: (
-        <EditStockOperationActionMenu
-          model={stockOperation}
-          operations={operations}
-          operationUuid={operation.uuid}
-          operationNumber={''}
-          onEdit={() => handleEditClick(stockOperation, true)}
-          showIcon={false}
-          showprops={true}
-        />
-      ),
-      status: `${stockOperation?.status}`,
-      source: `${stockOperation?.sourceName ?? ''}`,
-      destination: `${stockOperation?.destinationName ?? ''}`,
-      location: (
-        <>
-          {stockOperation?.sourceName ?? ''}
-          {stockOperation?.sourceName && stockOperation?.destinationName ? <ArrowRight size={16} /> : ''}{' '}
-          {stockOperation?.destinationName ?? ''}
-        </>
-      ),
-      responsiblePerson: `${
-        stockOperation?.responsiblePersonFamilyName ?? stockOperation?.responsiblePersonOther ?? ''
-      } ${stockOperation?.responsiblePersonGivenName ?? ''}`,
-      operationDate: formatDisplayDate(stockOperation?.operationDate),
-      actions: (
-        <EditStockOperationActionMenu
-          model={stockOperation}
-          operations={operations}
-          operationUuid={operation.uuid}
-          operationNumber={''}
-          onEdit={() => handleEditClick(stockOperation, true)}
-          showIcon={true}
-          showprops={false}
-        />
-      ),
-    }));
+    return items?.map((stockOperation, index) => {
+      const commonNames = stockOperation?.stockOperationItems
+        ? stockOperation?.stockOperationItems.map((item) => item.commonName).join(', ')
+        : '';
+
+      return {
+        ...stockOperation,
+        id: stockOperation?.uuid,
+        key: `key-${stockOperation?.uuid}`,
+        operationTypeName: `${stockOperation?.operationTypeName}`,
+        operationNumber: (
+          <EditStockOperationActionMenu
+            model={stockOperation}
+            operations={operations}
+            operationUuid={operation.uuid}
+            operationNumber={''}
+            onEdit={() => handleEditClick(stockOperation, true)}
+            showIcon={false}
+            showprops={true}
+          />
+        ),
+        stockOperationItems: commonNames,
+        status: `${stockOperation?.status}`,
+        source: `${stockOperation?.sourceName ?? ''}`,
+        destination: `${stockOperation?.destinationName ?? ''}`,
+        location: (
+          <>
+            {stockOperation?.sourceName ?? ''}
+            {stockOperation?.sourceName && stockOperation?.destinationName ? <ArrowRight size={16} /> : ''}{' '}
+            {stockOperation?.destinationName ?? ''}
+          </>
+        ),
+        responsiblePerson: `${
+          stockOperation?.responsiblePersonFamilyName ?? stockOperation?.responsiblePersonOther ?? ''
+        } ${stockOperation?.responsiblePersonGivenName ?? ''}`,
+        operationDate: formatDisplayDate(stockOperation?.operationDate),
+        actions: (
+          <EditStockOperationActionMenu
+            model={stockOperation}
+            operations={operations}
+            operationUuid={operation.uuid}
+            operationNumber={''}
+            onEdit={() => handleEditClick(stockOperation, true)}
+            showIcon={true}
+            showprops={false}
+          />
+        ),
+      };
+    });
   }, [items, operations, handleEditClick, operation]);
 
   if (isLoading && !filterApplied) {

package/src/stock-operations/stock-operations-table.resource.tsx

@@ -8,6 +8,7 @@ export function useStockOperationPages(filter: StockOperationFilter) {
 
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);
+  console.log(items.results);
 
   const { goTo, results: paginatedItems, currentPage } = usePagination(items.results, currentPageSize);
 
@@ -27,26 +28,31 @@ export function useStockOperationPages(filter: StockOperationFilter) {
       },
       {
         id: 2,
+        header: t('stockOperationItems', 'Items'),
+        key: 'stockOperationItems',
+      },
+      {
+        id: 3,
         header: t('status', 'Status'),
         key: 'status',
       },
       {
-        id: 3,
+        id: 4,
         header: t('location', 'Location'),
         key: 'location',
       },
       {
-        id: 4,
+        id: 5,
         header: t('responsiblePerson', 'Responsible Person'),
         key: 'responsiblePerson',
       },
       {
-        id: 5,
+        id: 6,
         header: t('date', 'Date'),
         key: 'operationDate',
       },
       {
-        id: 6,
+        id: 7,
         key: 'details',
       },
       { key: 'actions', header: '' },

package/src/stock-reports/generate-report/create-stock-report.component.tsx

@@ -22,7 +22,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { StockReportSchema, reportSchema } from '../report-validation-schema';
 import { useConcept, useStockTagLocations } from '../../stock-lookups/stock-lookups.resource';
-import { ConfigObject, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { ConfigObject, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
 import { Concept } from '../../core/api/types/concept/Concept';
 import { createBatchJob } from '../../stock-batch/stock-batch.resource';
 import {
@@ -34,6 +34,7 @@ import {
 } from '../ReportType';
 import { formatDisplayDate } from '../../core/utils/datetimeUtils';
 import { BatchJobTypeReport } from '../../core/api/types/BatchJob';
+import { handleMutate } from '../../utils';
 interface CreateReportProps {
   model?: ReportModel;
 }
@@ -319,6 +320,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
               subtitle: t('BatchJobSuccess', 'Batch job created successfully'),
               kind: 'success',
             });
+            handleMutate(`${restBaseUrl}/stockmanagement/batchjob?batchJobType=Report&v=default`);
           } else {
             showSnackbar({
               title: t('BatchJobErrorTitle', 'Batch job'),

package/src/stock-reports/report-list/stock-reports.component.tsx

@@ -59,7 +59,7 @@ const StockReports: React.FC = () => {
   const { t } = useTranslation();
 
   const handleRefresh = () => {
-    handleMutate(`${restBaseUrl}/stockmanagement/report?v=default`);
+    handleMutate(`${restBaseUrl}/stockmanagement/batchjob?batchJobType=Report&v=default`);
   };
   const { reports, isLoading, currentPage, pageSizes, totalItems, goTo, currentPageSize, setPageSize } =
     useGetReports();

package/translations/en.json

@@ -298,5 +298,6 @@
   "user": "User",
   "view": "View",
   "whoIsThePreferredVendor": "Who is the preferred vendor?",
-  "yes": "Yes"
+  "yes": "Yes",
+  "stockOperationItems": "Items"
 }