@openmrs/esm-stock-management-app 1.0.1-pre.717 → 1.0.1-pre.726

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

@@ -134,10 +134,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5411900,
+      "size": 5414017,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5389951,
+        "javascript": 5392068,
         "share-init": 252,
         "runtime": 21445
       },
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "9697fc9a02d6f62c",
+      "hash": "716c84c3a59e3ee3",
       "childrenByOrder": {}
     },
     {
@@ -348,9 +348,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 16572,
+      "size": 16573,
       "sizes": {
-        "javascript": 16572
+        "javascript": 16573
       },
       "names": [],
       "idHints": [],
@@ -364,7 +364,7 @@
       "auxiliaryFiles": [
         "606.js.map"
       ],
-      "hash": "35104a430eb0ea12",
+      "hash": "4645f30c4d9bba07",
       "childrenByOrder": {}
     },
     {
@@ -607,9 +607,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1753028,
+      "size": 1755145,
       "sizes": {
-        "javascript": 1752818,
+        "javascript": 1754935,
         "consume-shared": 210
       },
       "names": [],
@@ -623,7 +623,7 @@
       "auxiliaryFiles": [
         "973.js.map"
       ],
-      "hash": "8ad05a0d4ce03e40",
+      "hash": "320c5101238daf8b",
       "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.717"}
+{"$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.726"}

package/package.json

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

package/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx

@@ -48,16 +48,16 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
 
   const [requiresDispatchAcknowledgement, setRequiresDispatchAcknowledgement] = useState(false);
 
-  const currentStockOperationType = types?.results?.find((p) => p.operationType === props.model?.operationType);
+  const currentStockOperationType = types?.results?.find((p) => p.operationType === props?.model?.operationType);
 
   useEffect(() => {
     if (
       currentStockOperationType?.operationType === OperationType.REQUISITION_OPERATION_TYPE ||
-      props.model?.operationType === OperationType.REQUISITION_OPERATION_TYPE
+      props?.model?.operationType === OperationType.REQUISITION_OPERATION_TYPE
     ) {
-      setRequisition(props.model?.uuid);
+      setRequisition(props?.model?.uuid);
     }
-  }, [currentStockOperationType, props.model?.operationType, props.model?.uuid]);
+  }, [currentStockOperationType, props?.model?.operationType, props?.model?.uuid]);
 
   useEffect(() => {
     if (
@@ -110,8 +110,8 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
           {...props}
           isEditing={props?.operation?.name === 'Stock Issue' ? !isEditing : isEditing}
           setup={result}
-          canEdit={props?.operation?.name === 'Stock Issue' ? !canEdit : canEdit}
-          model={isEditing ? props?.model : props?.operation?.name === 'Stock Issue' ? props?.model : result?.dto} // check if type is stockIssue and pass requisition data
+          canEdit={canEdit}
+          model={isEditing ? props?.model : props?.operation?.name === 'Stock Issue' ? props?.model : result?.dto}
           onSave={async () => {
             setManageStockItems(true);
             setSelectedIndex(1);
@@ -291,7 +291,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
           <h6 style={{ color: '#24a148' }}>Related Transactions:</h6>
           {operationLinks.map(
             (item) =>
-              (props.model?.uuid === item?.parentUuid || currentStockOperationType.uuid === item?.parentUuid) && (
+              (props?.model?.uuid === item?.parentUuid || currentStockOperationType?.uuid === item?.parentUuid) && (
                 <>
                   <span>{item?.childOperationTypeName}</span>
                   <span className={item?.childVoided ? 'voided' : ''}>

package/src/stock-operations/add-stock-operation/base-operation-details.component.tsx

@@ -91,8 +91,6 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
       setIsSaving(false);
     }
   };
-
-  const isCompleteStatus = model?.status === 'COMPLETED';
   const sourceTags =
     operation?.stockOperationTypeLocationScopes
       ?.filter((p) => operation?.hasSource && p.isSource)
@@ -125,7 +123,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
   return (
     <div style={{ margin: '10px' }}>
       <form className={`${styles.formContainer} ${styles.verticalForm}`}>
-        {isCompleteStatus ? (
+        {!canEdit || operationType === 'stockissue' ? (
           <>
             {model?.operationDate && (
               <TextInput
@@ -146,7 +144,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             {model?.atLocationName && (
               <TextInput
                 id="sourceLbl"
-                value={model.atLocationName}
+                value={operationType === 'stockissue' ? issueStockOperation.sourceName : model?.sourceName ?? ''}
                 readOnly={true}
                 labelText={t('source', 'Source')}
               />
@@ -154,7 +152,9 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             {model?.destinationName && (
               <TextInput
                 id="destinationLbl"
-                value={model.destinationName}
+                value={
+                  operationType === 'stockissue' ? issueStockOperation.destinationName : model?.destinationName ?? ''
+                }
                 readOnly={true}
                 labelText={t('destination', 'Destination')}
               />
@@ -173,6 +173,20 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             {model?.remarks && (
               <TextInput id="remarksLbl" value={model.remarks} readOnly={true} labelText={t('remarks', 'Remarks')} />
             )}
+            {operationType === 'stockissue' && (
+              <div style={{ display: 'flex', flexDirection: 'row-reverse' }}>
+                <Button
+                  name="save"
+                  type="button"
+                  className="submitButton"
+                  onClick={handleSubmit(handleSave)}
+                  kind="primary"
+                  renderIcon={ArrowRight}
+                >
+                  {isSaving ? <InlineLoading /> : t('next', 'Next')}
+                </Button>
+              </div>
+            )}
           </>
         ) : (
           <>

package/src/stock-operations/add-stock-operation/stock-operation-reference.component.tsx

@@ -15,10 +15,11 @@ const StockOperationReference = (props: StockOperationReferenceProps) => {
   const { types } = useStockOperationTypes();
 
   let model: StockOperationDTO;
-
-  getStockOperation(props?.operationUuid).then((resp) => {
-    model = resp.data;
-  });
+  if (props?.operationUuid) {
+    getStockOperation(props?.operationUuid).then((resp) => {
+      model = resp?.data;
+    });
+  }
 
   const handleEdit = () => {
     const operation = types.results?.find((op) => op?.uuid === model?.operationTypeUuid);

package/src/stock-operations/add-stock-operation/stock-operation-submission.component.tsx

@@ -49,7 +49,6 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
             name="rbgApprovelRequired"
             legendText={t('doesThisTransactionRequireApproval', 'Does the transaction require approval ?')}
             onChange={handleRadioButtonChange}
-            defaultSelected={model?.approvalRequired === null ? false : approvalRequired}
           >
             <RadioButton value={true} id="rbgApprovelRequired-true" labelText={t('yes', 'Yes')} />
             <RadioButton value={false} id="rbgApprovelRequired-false" labelText={t('no', 'No')} />
@@ -115,7 +114,6 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                   }}
                   renderIcon={Departure}
                 >
-                  {t('dispatch', 'Dispatch')}
                   {isSaving ? (
                     <InlineLoading description={t('dispatching', 'Dispatching')} />
                   ) : (

package/src/stock-operations/stock-operation.utils.tsx

@@ -30,6 +30,7 @@ export const addOrEditStockOperation = async (
       delete payload.operationTypeUuid;
       delete payload.permission;
       delete payload.locked;
+
       payload['operationTypeUuid'] = stockIssueOpsTypeUuid;
     }
     const response: FetchResponse<StockOperationDTO> = await (isEditing ? updateStockOperation : createStockOperation)(

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

@@ -43,7 +43,7 @@ const StockOperationDialog: React.FC<StockOperationDialogProps> = ({ title, requ
       case 'complete':
         actionName = 'COMPLETE';
         break;
-      case 'completedispatch':
+      case 'complete dispatch':
         actionName = 'COMPLETE';
         break;
       case 'cancel':

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

@@ -8,7 +8,6 @@ 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);
 

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

@@ -58,18 +58,23 @@ export function getStockOperationLinks(filter: string) {
 }
 
 // getStockOperation
-export function useStockOperation(id: string) {
-  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}`;
-  const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(apiUrl, openmrsFetch);
+
+export function useStockOperation(id: string | null) {
+  const apiUrl = id ? `${restBaseUrl}/stockmanagement/stockoperation/${id}` : null;
+  const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(apiUrl, apiUrl ? openmrsFetch : null);
   return {
-    items: data.data ? data.data : {},
+    items: data?.data || {},
     isLoading,
     error,
   };
-} // getStockOperation
+}
+
+// getStockOperation
 export function getStockOperation(id: string): Promise<FetchResponse<StockOperationDTO>> {
+  if (!id) {
+    return;
+  }
   const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}?v=full`;
-
   return openmrsFetch(apiUrl);
 }
 

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

@@ -100,6 +100,11 @@ const StockReports: React.FC = () => {
         header: t('status', 'Status'),
         key: 'status',
       },
+      {
+        id: 5,
+        header: t('timeTaken', 'Time Taken'),
+        key: 'timeTaken',
+      },
       {
         id: 8,
         header: t('actions', 'Actions'),
@@ -131,9 +136,13 @@ const StockReports: React.FC = () => {
       )),
       status: (
         <>
-          {batchJob.status === BatchJobStatusPending && (
-            <InlineLoading status="active" iconDescription="Loading" description="Generating report..." />
-          )}
+          {batchJob.status === BatchJobStatusPending ? (
+            <InlineLoading
+              status={batchJob.status === BatchJobStatusPending ? 'active' : 'inactive'}
+              iconDescription="Loading"
+              description={batchJob.status === BatchJobStatusPending ? 'Generating report...' : ''}
+            />
+          ) : null}
           {batchJob.status === BatchJobStatusFailed && (
             <WarningAltFilled className="report-failed" title={batchJob.status} />
           )}
@@ -148,6 +157,7 @@ const StockReports: React.FC = () => {
           )}
         </>
       ),
+      timeTaken: formatDuration(batchJob.dateCreated, batchJob.endTime),
       actions: (
         <div key={`${batchJob?.uuid}-actions`} style={{ display: 'inline-block', whiteSpace: 'nowrap' }}>
           {batchJob.outputArtifactViewable && batchJob.batchJobType === 'hide' && (
@@ -301,4 +311,19 @@ const StockReports: React.FC = () => {
   );
 };
 
+const formatDuration = (start: string, end: string) => {
+  const startDate = new Date(start).getTime();
+  const endDate = new Date(end).getTime();
+
+  if (!startDate || !endDate) return '';
+
+  const durationInMillis = endDate - startDate;
+  const totalSeconds = Math.floor(durationInMillis / 1000);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+
+  return [hours, minutes, seconds].map((unit) => String(unit).padStart(2, '0')).join(':');
+};
+
 export default StockReports;

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

@@ -14,11 +14,16 @@ export function useReportTypes() {
 }
 export function useGetReports() {
   const apiUrl = `${restBaseUrl}/stockmanagement/batchjob?batchJobType=Report&v=default&limit=10&totalCount=true`;
-  const { data, error, isLoading } = useSWR<{ data: { results: any } }, Error>(apiUrl, openmrsFetch);
+
+  const { data, error, isLoading, mutate } = useSWR<{ data: { results: any } }, Error>(apiUrl, openmrsFetch, {
+    refreshInterval: 1000,
+    dedupingInterval: 1000,
+  });
+
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);
-
   const { goTo, results: paginatedItems, currentPage } = usePagination(data?.data?.results, currentPageSize);
+
   return {
     reports: data?.data?.results ?? [],
     isLoading,
@@ -31,5 +36,6 @@ export function useGetReports() {
     goTo,
     pageSizes,
     setPageSize,
+    mutate,
   };
 }