@openmrs/esm-stock-management-app 1.0.1-pre.508 → 1.0.1-pre.510

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

@@ -85,9 +85,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1732683,
+      "size": 1733627,
       "sizes": {
-        "javascript": 1732473,
+        "javascript": 1733417,
         "consume-shared": 210
       },
       "names": [],
@@ -101,7 +101,7 @@
       "auxiliaryFiles": [
         "157.js.map"
       ],
-      "hash": "5b44bb3f16f9f06b",
+      "hash": "2bdfef68656abb81",
       "childrenByOrder": {}
     },
     {
@@ -109,10 +109,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5401110,
+      "size": 5402054,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5379160,
+        "javascript": 5380104,
         "share-init": 252,
         "runtime": 21446
       },
@@ -129,7 +129,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "d1e1410dc5cdf2f4",
+      "hash": "ce8d6a466f812c73",
       "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-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.508"}
+{"$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-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.510"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.508",
+  "version": "1.0.1-pre.510",
   "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/base-operation-details.component.tsx

@@ -33,7 +33,7 @@ import { InitializeResult } from "./types";
 import { ResourceRepresentation } from "../../core/api/api";
 import { useStockOperationPages } from "../stock-operations-table.resource";
 import { createBaseOperationPayload } from "./add-stock-utils";
-import { showSnackbar } from "@openmrs/esm-framework";
+import { showSnackbar, useSession } from "@openmrs/esm-framework";
 
 import rootStyles from "../../root.scss";
 
@@ -67,6 +67,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
   });
   const operationType = operationFromString(operation?.operationType);
   const issueStockOperation = mapIssueStockLocations(model);
+  const { user } = useSession();
+  const defaultLoggedUserUuid = user.uuid;
 
   const {
     handleSubmit,
@@ -98,7 +100,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
       await onSave(payload);
     } catch (e) {
       showSnackbar({
-        title: t("errorSavingBaseOperation", "Erro saving base operation"),
+        title: t("errorSavingBaseOperation", "Error saving base operation"),
         isLowContrast: true,
         kind: "error",
       });
@@ -181,17 +183,22 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
         )}
 
         {(!canEdit || isEditing || lockSource) && (
-          <TextInput
-            id="sourceUuidLbl"
-            value={
-              operationType === "stockissue"
-                ? issueStockOperation.sourceName
-                : model?.sourceName ?? ""
+          <PartySelector
+            controllerName="sourceUuid"
+            name="sourceUuid"
+            control={control}
+            title={operation?.hasDestination ? "From" : "Location"}
+            placeholder={
+              operation.hasDestination
+                ? t("chooseASource", "Choose a source")
+                : t("chooseALocation", "Choose a location")
             }
-            readOnly={true}
-            labelText={operation?.hasDestination ? "From" : "From"}
+            invalid={!!errors.sourceUuid}
+            invalidText={errors.sourceUuid && errors?.sourceUuid?.message}
+            parties={sourcePartyList || []}
           />
         )}
+
         {canEdit && !lockDestination && operation?.hasDestination && (
           <PartySelector
             controllerName="destinationUuid"
@@ -212,15 +219,21 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
         )}
 
         {(!canEdit || isEditing || lockDestination) && (
-          <TextInput
-            id="destinationUuidLbl"
-            value={
-              operationType === "stockissue"
-                ? issueStockOperation.destinationName
-                : model?.destinationName ?? ""
+          <PartySelector
+            controllerName="destinationUuid"
+            name="destinationUuid"
+            control={control}
+            title={operation?.hasSource ? "To" : "Location"}
+            placeholder={
+              operation?.hasSource
+                ? t("chooseADestination", "Choose a destination")
+                : "Location"
             }
-            readOnly={true}
-            labelText={operation?.hasSource ? "To" : "To"}
+            invalid={!!errors.destinationUuid}
+            invalidText={
+              errors.destinationUuid && errors?.destinationUuid?.message
+            }
+            parties={destinationPartyList || []}
           />
         )}
 
@@ -232,6 +245,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             title={t("responsiblePerson:", "Responsible Person")}
             placeholder={t("filter", "Filter ...")}
             invalid={!!errors.responsiblePersonUuid}
+            userUuid={defaultLoggedUserUuid}
             invalidText={
               errors.responsiblePersonUuid &&
               errors?.responsiblePersonUuid?.message
@@ -239,6 +253,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             onUserChanged={(user) => {
               if (user?.uuid === otherUser.uuid) {
                 setIsOtherUser(true);
+              } else {
+                setIsOtherUser(false);
               }
             }}
           />
@@ -264,16 +280,24 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
         )}
 
         {!canEdit && (
-          <TextInput
-            id="responsiblePersonLbl"
-            value={
-              (model?.responsiblePersonUuid &&
-              model?.responsiblePersonUuid !== otherUser.uuid
-                ? `${model?.responsiblePersonFamilyName} ${model?.responsiblePersonGivenName}`
-                : model?.responsiblePersonOther) ?? ""
+          <UsersSelector
+            controllerName="responsiblePersonUuid"
+            name="responsiblePersonUuid"
+            control={control}
+            title={t("responsiblePerson:", "Responsible Person")}
+            placeholder={t("filter", "Filter ...")}
+            invalid={!!errors.responsiblePersonUuid}
+            invalidText={
+              errors.responsiblePersonUuid &&
+              errors?.responsiblePersonUuid?.message
             }
-            readOnly={true}
-            labelText={"Responsible Person"}
+            onUserChanged={(user) => {
+              if (user?.uuid === otherUser.uuid) {
+                setIsOtherUser(true);
+              } else {
+                setIsOtherUser(false);
+              }
+            }}
           />
         )}