@openmrs/esm-stock-management-app 3.1.1-pre.941 → 3.1.1-pre.946
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/5125.js +1 -1
- package/dist/5125.js.map +1 -1
- package/dist/5333.js +1 -1
- package/dist/5333.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json +9 -9
- package/dist/routes.json +1 -1
- package/package.json +1 -1
- package/src/config-schema.ts +6 -0
- package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.component.tsx +11 -3
- package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.test.tsx +3 -3
- package/src/stock-operations/stock-operations-forms/steps/base-operation-details-form-step.tsx +1 -1
@@ -895,9 +895,9 @@
|
|
895
895
|
"initial": false,
|
896
896
|
"entry": false,
|
897
897
|
"recorded": false,
|
898
|
-
"size":
|
898
|
+
"size": 1193670,
|
899
899
|
"sizes": {
|
900
|
-
"javascript":
|
900
|
+
"javascript": 1193628,
|
901
901
|
"consume-shared": 42
|
902
902
|
},
|
903
903
|
"names": [],
|
@@ -911,7 +911,7 @@
|
|
911
911
|
"auxiliaryFiles": [
|
912
912
|
"5125.js.map"
|
913
913
|
],
|
914
|
-
"hash": "
|
914
|
+
"hash": "95f80541aa9e26ac",
|
915
915
|
"childrenByOrder": {}
|
916
916
|
},
|
917
917
|
{
|
@@ -963,9 +963,9 @@
|
|
963
963
|
"initial": false,
|
964
964
|
"entry": false,
|
965
965
|
"recorded": false,
|
966
|
-
"size":
|
966
|
+
"size": 334993,
|
967
967
|
"sizes": {
|
968
|
-
"javascript":
|
968
|
+
"javascript": 334993
|
969
969
|
},
|
970
970
|
"names": [],
|
971
971
|
"idHints": [],
|
@@ -979,7 +979,7 @@
|
|
979
979
|
"auxiliaryFiles": [
|
980
980
|
"5333.js.map"
|
981
981
|
],
|
982
|
-
"hash": "
|
982
|
+
"hash": "131480481d40bf8e",
|
983
983
|
"childrenByOrder": {}
|
984
984
|
},
|
985
985
|
{
|
@@ -1540,10 +1540,10 @@
|
|
1540
1540
|
"initial": true,
|
1541
1541
|
"entry": true,
|
1542
1542
|
"recorded": false,
|
1543
|
-
"size":
|
1543
|
+
"size": 5542265,
|
1544
1544
|
"sizes": {
|
1545
1545
|
"consume-shared": 210,
|
1546
|
-
"javascript":
|
1546
|
+
"javascript": 5520037,
|
1547
1547
|
"share-init": 336,
|
1548
1548
|
"runtime": 21682
|
1549
1549
|
},
|
@@ -1560,7 +1560,7 @@
|
|
1560
1560
|
"auxiliaryFiles": [
|
1561
1561
|
"main.js.map"
|
1562
1562
|
],
|
1563
|
-
"hash": "
|
1563
|
+
"hash": "824312fb4f9a5fd6",
|
1564
1564
|
"childrenByOrder": {}
|
1565
1565
|
},
|
1566
1566
|
{
|
package/dist/routes.json
CHANGED
@@ -1 +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-operations-modal","component":"stockOperationsModal"},{"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.1.1-pre.
|
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-operations-modal","component":"stockOperationsModal"},{"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.1.1-pre.946"}
|
package/package.json
CHANGED
package/src/config-schema.ts
CHANGED
@@ -30,6 +30,11 @@ export const configSchema = {
|
|
30
30
|
_description: 'UUID for the stock adjustment reasons',
|
31
31
|
_default: '47f0825e-8648-47c2-b847-d3197ed6bb72',
|
32
32
|
},
|
33
|
+
stockTakeReasonUUID: {
|
34
|
+
_type: Type.ConceptUuid,
|
35
|
+
_description: 'UUID for the stock take reasons',
|
36
|
+
_default: '47f0825e-8648-47c2-b847-d3197ed6bb72',
|
37
|
+
},
|
33
38
|
stockSourceTypeUUID: {
|
34
39
|
_type: Type.ConceptUuid,
|
35
40
|
_description: 'UUID for the stock source types',
|
@@ -85,4 +90,5 @@ export type ConfigObject = {
|
|
85
90
|
alt: string;
|
86
91
|
name: string;
|
87
92
|
};
|
93
|
+
stockTakeReasonUUID;
|
88
94
|
};
|
@@ -6,15 +6,23 @@ import { useTranslation } from 'react-i18next';
|
|
6
6
|
import { type ConfigObject } from '../../../config-schema';
|
7
7
|
import { type Concept } from '../../../core/api/types/concept/Concept';
|
8
8
|
import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
|
9
|
+
import { OperationType } from '../../../core/api/types/stockOperation/StockOperationType';
|
10
|
+
|
11
|
+
type StockOperationReasonSelectorProps = {
|
12
|
+
stockOperationType: string;
|
13
|
+
};
|
14
|
+
|
15
|
+
const StockOperationReasonSelector: React.FC<StockOperationReasonSelectorProps> = ({ stockOperationType }) => {
|
16
|
+
const { stockAdjustmentReasonUUID, stockTakeReasonUUID } = useConfig<ConfigObject>();
|
17
|
+
const operationReason =
|
18
|
+
stockOperationType === OperationType.STOCK_TAKE_OPERATION_TYPE ? stockTakeReasonUUID : stockAdjustmentReasonUUID;
|
9
19
|
|
10
|
-
const StockOperationReasonSelector = () => {
|
11
|
-
const { stockAdjustmentReasonUUID } = useConfig<ConfigObject>();
|
12
20
|
const form = useFormContext<{ reasonUuid: string }>();
|
13
21
|
const {
|
14
22
|
isLoading,
|
15
23
|
error,
|
16
24
|
items: { answers: reasons },
|
17
|
-
} = useConcept(
|
25
|
+
} = useConcept(operationReason);
|
18
26
|
const { t } = useTranslation();
|
19
27
|
if (isLoading) return <SelectSkeleton role="progressbar" />;
|
20
28
|
|
@@ -64,7 +64,7 @@ describe('StockoperationReasonSelector', () => {
|
|
64
64
|
error: null,
|
65
65
|
});
|
66
66
|
|
67
|
-
render(<StockOperationReasonSelector />);
|
67
|
+
render(<StockOperationReasonSelector stockOperationType={''} />);
|
68
68
|
|
69
69
|
expect(screen.getByRole('progressbar')).toBeInTheDocument();
|
70
70
|
});
|
@@ -77,7 +77,7 @@ describe('StockoperationReasonSelector', () => {
|
|
77
77
|
error: new Error(errorMessahe),
|
78
78
|
});
|
79
79
|
|
80
|
-
render(<StockOperationReasonSelector />);
|
80
|
+
render(<StockOperationReasonSelector stockOperationType={''} />);
|
81
81
|
|
82
82
|
expect(screen.getByRole('status')).toBeInTheDocument();
|
83
83
|
expect(screen.getByText(errorMessahe)).toBeInTheDocument();
|
@@ -86,7 +86,7 @@ describe('StockoperationReasonSelector', () => {
|
|
86
86
|
it('renders ComboBox with reasons', async () => {
|
87
87
|
const user = userEvent.setup();
|
88
88
|
|
89
|
-
render(<StockOperationReasonSelector />);
|
89
|
+
render(<StockOperationReasonSelector stockOperationType={''} />);
|
90
90
|
|
91
91
|
const combobox = screen.getByRole('combobox');
|
92
92
|
await user.click(combobox);
|
package/src/stock-operations/stock-operations-forms/steps/base-operation-details-form-step.tsx
CHANGED
@@ -223,7 +223,7 @@ const BaseOperationDetailsFormStep: FC<BaseOperationDetailsFormStepProps> = ({
|
|
223
223
|
<UsersSelector />
|
224
224
|
{operationTypePermision.requiresStockAdjustmentReason && (
|
225
225
|
<Column>
|
226
|
-
<StockOperationReasonSelector />
|
226
|
+
<StockOperationReasonSelector stockOperationType={stockOperationType?.operationType} />
|
227
227
|
</Column>
|
228
228
|
)}
|
229
229
|
<Column>
|