@openmrs/esm-stock-management-app 3.0.1-pre.805 → 3.0.1-pre.826
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/.eslintrc +10 -1
- package/dist/10.js +1 -0
- package/dist/10.js.map +1 -0
- package/dist/165.js +1 -1
- package/dist/165.js.map +1 -1
- package/dist/20.js +1 -1
- package/dist/20.js.map +1 -1
- package/dist/606.js.map +1 -1
- package/dist/642.js +1 -0
- package/dist/642.js.map +1 -0
- package/dist/675.js +1 -0
- package/dist/675.js.map +1 -0
- package/dist/{880.js → 727.js} +1 -1
- package/dist/727.js.map +1 -0
- package/dist/780.js +1 -0
- package/dist/780.js.map +1 -0
- package/dist/793.js +1 -1
- package/dist/793.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 +1 -1
- package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json +132 -59
- package/dist/openmrs-esm-stock-management-app.js.map +1 -1
- package/dist/routes.json +1 -1
- package/package.json +3 -2
- package/src/core/api/api.ts +1 -1
- package/src/core/api/types/Auditable.ts +2 -2
- package/src/core/api/types/BaseOpenmrsData.ts +2 -2
- package/src/core/api/types/BaseOpenmrsMetadata.ts +2 -2
- package/src/core/api/types/BaseOpenmrsObject.ts +1 -1
- package/src/core/api/types/BatchJob.ts +1 -1
- package/src/core/api/types/LocationTree.ts +1 -1
- package/src/core/api/types/OpenmrsData.ts +3 -3
- package/src/core/api/types/OpenmrsMetadata.ts +3 -3
- package/src/core/api/types/Retireable.ts +2 -2
- package/src/core/api/types/Voidable.ts +2 -2
- package/src/core/api/types/concept/Concept.ts +4 -4
- package/src/core/api/types/concept/ConceptName.ts +2 -2
- package/src/core/api/types/concept/Drug.ts +2 -2
- package/src/core/api/types/identity/Patient.ts +1 -1
- package/src/core/api/types/identity/Privilege.ts +1 -1
- package/src/core/api/types/identity/Session.ts +3 -3
- package/src/core/api/types/identity/User.ts +2 -2
- package/src/core/api/types/identity/UserRoleScope.ts +3 -3
- package/src/core/api/types/identity/UserRoleScopeLocation.ts +1 -1
- package/src/core/api/types/identity/UserRoleScopeOperationType.ts +1 -1
- package/src/core/api/types/stockItem/StockBatch.ts +2 -2
- package/src/core/api/types/stockItem/StockItem.ts +6 -6
- package/src/core/api/types/stockItem/StockItemPackagingUOM.ts +3 -3
- package/src/core/api/types/stockItem/StockItemReference.ts +3 -3
- package/src/core/api/types/stockItem/StockItemTransaction.ts +1 -1
- package/src/core/api/types/stockItem/StockRule.ts +1 -1
- package/src/core/api/types/stockOperation/StockOperation.ts +8 -8
- package/src/core/api/types/stockOperation/StockOperationDTO.ts +3 -3
- package/src/core/api/types/stockOperation/StockOperationItem.ts +5 -5
- package/src/core/api/types/stockOperation/StockOperationItemDTO.ts +2 -2
- package/src/core/api/types/stockOperation/StockOperationType.ts +2 -2
- package/src/core/api/types/stockOperation/StockSource.ts +2 -2
- package/src/core/components/carbon/controlled-combo-box/controlled-combo-box.component.tsx +1 -1
- package/src/core/components/carbon/controlled-dropdown/controlled-dropdown.component.tsx +2 -2
- package/src/core/components/carbon/controlled-number-input/controlled-number-input.component.tsx +3 -3
- package/src/core/components/carbon/controlled-radio-button-group/controlled-radio-button-group.component.tsx +3 -3
- package/src/core/components/carbon/controlled-text-area/controlled-text-area.component.tsx +3 -3
- package/src/core/components/carbon/controlled-text-input/controlled-text-input.component.tsx +3 -3
- package/src/core/components/carbon/types.ts +1 -1
- package/src/core/components/side-nav/side-nav.component.tsx +1 -1
- package/src/core/components/table/table.component.tsx +1 -1
- package/src/core/components/table/types.ts +1 -1
- package/src/core/components/tabs/types.ts +1 -1
- package/src/core/components/tabs/vertical-tabs.component.tsx +1 -1
- package/src/core/print/PrintTemplate.ts +1 -1
- package/src/core/utils/utils.ts +1 -1
- package/src/index.ts +8 -0
- package/src/routes.json +14 -0
- package/src/stock-batch/stock-batch.resource.ts +4 -4
- package/src/stock-home/stock-home-inventory-expiry.resource.tsx +1 -1
- package/src/stock-home/stock-home-inventory-items.resource.tsx +1 -1
- package/src/stock-home/stock-home-issuing.resource.tsx +1 -1
- package/src/stock-home/stock-home-metrics.tsx +1 -1
- package/src/stock-home/stock-home-receiving.resource.tsx +1 -1
- package/src/stock-home/useDisposalList.tsx +1 -1
- package/src/stock-items/add-stock-item/add-stock-action-button.component.tsx +2 -3
- package/src/stock-items/add-stock-item/add-stock-item.component.tsx +30 -21
- package/src/stock-items/add-stock-item/add-stock-item.resource.tsx +1 -1
- package/src/stock-items/add-stock-item/add-stock-item.scss +22 -3
- package/src/stock-items/add-stock-item/add-stock-item.test.tsx +12 -12
- package/src/stock-items/add-stock-item/batch-information/batch-information-locations/batch-information-locations-filter.component.tsx +2 -2
- package/src/stock-items/add-stock-item/batch-information/batch-information.component.tsx +1 -1
- package/src/stock-items/add-stock-item/batch-information/batch-information.resource.tsx +1 -1
- package/src/stock-items/add-stock-item/concepts-selector/concepts-selector.component.tsx +3 -3
- package/src/stock-items/add-stock-item/dispensing-package-measurement/dispensing-package-measurement.component.tsx +3 -3
- package/src/stock-items/add-stock-item/dispensing-unit-selector/dispensing-unit-selector.component.tsx +3 -3
- package/src/stock-items/add-stock-item/drug-selector/drug-selector.component.tsx +3 -3
- package/src/stock-items/add-stock-item/drug-selector/drug-selector.resource.tsx +1 -1
- package/src/stock-items/add-stock-item/packaging-units/packaging-units-delete-modal-button.component.tsx +1 -1
- package/src/stock-items/add-stock-item/packaging-units/packaging-units-delete-modal.component.tsx +1 -1
- package/src/stock-items/add-stock-item/packaging-units/packaging-units.component.tsx +10 -11
- package/src/stock-items/add-stock-item/packaging-units/packaging-units.resource.tsx +2 -2
- package/src/stock-items/add-stock-item/packaging-units-concept-selector/packaging-units-concept-selector.component.tsx +4 -4
- package/src/stock-items/add-stock-item/preferred-vendor-selector/preferred-vendor-selector.component.tsx +4 -4
- package/src/stock-items/add-stock-item/quantities/quantities.resource.tsx +1 -1
- package/src/stock-items/add-stock-item/stock-item-category-selector/stock-item-category-selector.component.tsx +3 -3
- package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.component.tsx +226 -214
- package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.resource.tsx +7 -2
- package/src/stock-items/add-stock-item/stock-item-references/stock-item-references.component.tsx +2 -2
- package/src/stock-items/add-stock-item/stock-item-references/stock-item-references.resource.ts +1 -1
- package/src/stock-items/add-stock-item/stock-item-references/stock-references-selector.component.tsx +4 -4
- package/src/stock-items/add-stock-item/stock-item-rules/add-stock-rule-button.component.tsx +6 -4
- package/src/stock-items/add-stock-item/stock-item-rules/add-stock-rules.component.tsx +163 -167
- package/src/stock-items/add-stock-item/stock-item-rules/add-stock-rules.scss +19 -11
- package/src/stock-items/add-stock-item/stock-item-rules/edit-stock-rule.component.tsx +9 -6
- package/src/stock-items/add-stock-item/stock-item-rules/stock-item-rules.component.tsx +1 -1
- package/src/stock-items/add-stock-item/stock-item-rules/stock-item-rules.resource.tsx +1 -1
- package/src/stock-items/add-stock-item/stock-item-rules/stock-rules.resource.ts +3 -3
- package/src/stock-items/add-stock-item/stock-item-units-edit/stock-item-units-edit.component.tsx +2 -2
- package/src/stock-items/add-stock-item/transactions/printout/transactions-print-action.component.tsx +2 -3
- package/src/stock-items/add-stock-item/transactions/transaction-filters/transaction-locations-filter.component.tsx +2 -2
- package/src/stock-items/add-stock-item/transactions/transactions.component.tsx +1 -1
- package/src/stock-items/add-stock-item/transactions/transactions.resource.tsx +1 -1
- package/src/stock-items/edit-stock-item/edit-stock-item-action-menu.component.tsx +3 -3
- package/src/stock-items/stock-item.utils.tsx +7 -50
- package/src/stock-items/stock-items-table.component.tsx +2 -2
- package/src/stock-items/stock-items-table.resource.ts +1 -1
- package/src/stock-items/stock-items-table.test.tsx +28 -23
- package/src/stock-items/stock-items.resource.ts +17 -15
- package/src/stock-items/types.ts +3 -3
- package/src/stock-locations/add-locations-form.component.tsx +1 -1
- package/src/stock-locations/location-admin-form.component.tsx +1 -1
- package/src/stock-locations/stock-locations-table.resource.tsx +2 -2
- package/src/stock-lookups/stock-lookups.resource.ts +13 -13
- package/src/stock-operations/add-stock-operation/stock-operations-expanded-row/stock-items-table.tsx +1 -1
- package/src/stock-operations/add-stock-operation/stock-operations-expanded-row/stock-operation-expanded-row.component.tsx +1 -1
- package/src/stock-operations/edit-stock-operation/edit-stock-operation-action-menu.component.tsx +1 -1
- package/src/stock-operations/stock-operation-actions.component.tsx +2 -2
- package/src/stock-operations/stock-operation-links.component.tsx +2 -2
- package/src/stock-operations/stock-operation-status/stock-operation-status-row.tsx +1 -1
- package/src/stock-operations/stock-operation-types-selector/stock-operation-types-selector.component.tsx +1 -1
- package/src/stock-operations/stock-operation.utils.tsx +3 -3
- package/src/stock-operations/stock-operations-dialog/stock-operations-approve-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-approve-dispatch-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-cancel-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-complete-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-completed-dispatch-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-dialog.component.tsx +5 -2
- package/src/stock-operations/stock-operations-dialog/stock-operations-issue-stock-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-print-button.component.tsx +5 -6
- package/src/stock-operations/stock-operations-dialog/stock-operations-reject-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-dialog/stock-operations-return-button.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/hooks/useFilterableStockItems.ts +2 -2
- package/src/stock-operations/stock-operations-forms/hooks/useOperationTypePermisions.ts +1 -1
- package/src/stock-operations/stock-operations-forms/hooks/useParties.ts +3 -3
- package/src/stock-operations/stock-operations-forms/hooks/useSearchUser.ts +5 -1
- package/src/stock-operations/stock-operations-forms/hooks/useStockItemBatchNumbers.ts +1 -1
- package/src/stock-operations/stock-operations-forms/hooks/useStockOperationLinks.ts +2 -2
- package/src/stock-operations/stock-operations-forms/input-components/batch-no-selector.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/input-components/batch-no-selector.test.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/input-components/quantity-uom-selector.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/input-components/stock-item-search.component.tsx +2 -2
- package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.component.tsx +2 -2
- package/src/stock-operations/stock-operations-forms/input-components/unique-batch-no-entry-input.component.tsx +2 -3
- package/src/stock-operations/stock-operations-forms/input-components/users-selector.component.tsx +2 -4
- package/src/stock-operations/stock-operations-forms/step2.test.tsx +3 -4
- package/src/stock-operations/stock-operations-forms/step3.test.tsx +1 -2
- package/src/stock-operations/stock-operations-forms/steps/base-operation-details-form-step.tsx +16 -7
- package/src/stock-operations/stock-operations-forms/steps/received-items.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/steps/stock-operation-item-batch-no-cell.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/steps/stock-operation-item-cell.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/steps/stock-operation-item-expiry-cell.component.tsx +1 -1
- package/src/stock-operations/stock-operations-forms/steps/stock-operation-items-form-step.component.tsx +3 -3
- package/src/stock-operations/stock-operations-forms/steps/stock-operation-submission-form-step.component.tsx +4 -4
- package/src/stock-operations/stock-operations-forms/stock-issue-form-initializer-with-related-requisition-operation.component.tsx +2 -2
- package/src/stock-operations/stock-operations-forms/stock-item-form/stock-item-form.workspace.tsx +7 -4
- package/src/stock-operations/stock-operations-forms/stock-operation-form.component.tsx +9 -9
- package/src/stock-operations/stock-operations-forms/stock-operation-stepper/stock-operation-stepper.component.tsx +1 -0
- package/src/stock-operations/stock-operations-forms/stock-operations-form-utils.ts +1 -1
- package/src/stock-operations/stock-operations-table.component.tsx +1 -1
- package/src/stock-operations/stock-operations-table.resource.tsx +1 -1
- package/src/stock-operations/stock-operations.resource.ts +9 -9
- package/src/stock-operations/stock-print-reports/GoodsReceivedNote.tsx +1 -1
- package/src/stock-operations/stock-print-reports/RequisitionDocument.tsx +1 -1
- package/src/stock-operations/stock-print-reports/StockOperationReport.tsx +4 -4
- package/src/stock-operations/stock-print-reports/StockTransferDocument.tsx +1 -1
- package/src/stock-reports/generate-report/create-stock-report.component.tsx +3 -3
- package/src/stock-reports/stock-reports.resource.ts +1 -1
- package/src/stock-sources/add-stock-sources/add-stock-sources.component.tsx +2 -2
- package/src/stock-sources/add-stock-sources/add-stock-sources.test.tsx +2 -2
- package/src/stock-sources/edit-stock-source/edit-stock-source.component.tsx +1 -1
- package/src/stock-sources/stock-sources-items-table.resource.ts +1 -1
- package/src/stock-sources/stock-sources.resource.ts +3 -3
- package/src/stock-user-role-scopes/add-stock-user-scope/add-stock-user-role-scope.component.tsx +7 -7
- package/src/stock-user-role-scopes/edit-stock-user-scope/edit-stock-user-scope-action-menu.component.tsx +1 -1
- package/src/stock-user-role-scopes/stock-user-role-scopes-items-table.resource.ts +1 -1
- package/src/stock-user-role-scopes/stock-user-role-scopes.resource.ts +3 -3
- package/dist/600.js +0 -1
- package/dist/600.js.map +0 -1
- package/dist/880.js.map +0 -1
@@ -1,5 +1,5 @@
|
|
1
|
-
import { BaseOpenmrsObject } from '../BaseOpenmrsObject';
|
2
|
-
import { Concept } from './Concept';
|
1
|
+
import { type BaseOpenmrsObject } from '../BaseOpenmrsObject';
|
2
|
+
import { type Concept } from './Concept';
|
3
3
|
|
4
4
|
export interface ConceptName extends BaseOpenmrsObject {
|
5
5
|
conceptNameId: number;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { BaseOpenmrsMetadata } from '../BaseOpenmrsMetadata';
|
2
|
-
import { Concept } from './Concept';
|
1
|
+
import { type BaseOpenmrsMetadata } from '../BaseOpenmrsMetadata';
|
2
|
+
import { type Concept } from './Concept';
|
3
3
|
|
4
4
|
export interface Drug extends BaseOpenmrsMetadata {
|
5
5
|
drugId: number;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { SessionLocation } from '@openmrs/esm-framework';
|
2
|
-
import { PrivilegeScope } from './PriviledgeScope';
|
3
|
-
import { User } from './User';
|
1
|
+
import { type SessionLocation } from '@openmrs/esm-framework';
|
2
|
+
import { type PrivilegeScope } from './PriviledgeScope';
|
3
|
+
import { type User } from './User';
|
4
4
|
|
5
5
|
export interface GetSessionResponse {
|
6
6
|
sessionId: string;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { UserRoleScopeLocation } from './UserRoleScopeLocation';
|
3
|
-
import { UserRoleScopeOperationType } from './UserRoleScopeOperationType';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type UserRoleScopeLocation } from './UserRoleScopeLocation';
|
3
|
+
import { type UserRoleScopeOperationType } from './UserRoleScopeOperationType';
|
4
4
|
|
5
5
|
export interface UserRoleScope extends BaseOpenmrsData {
|
6
6
|
userUuid?: string;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { StockItem } from './StockItem';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type StockItem } from './StockItem';
|
3
3
|
|
4
4
|
export interface StockBatch extends BaseOpenmrsData {
|
5
5
|
batchNo: string;
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { Concept } from '../concept/Concept';
|
3
|
-
import { Drug } from '../concept/Drug';
|
4
|
-
import { RecordPermission } from '../RecordPermission';
|
5
|
-
import { StockBatch } from './StockBatch';
|
6
|
-
import { StockItemPackagingUOM, StockItemPackagingUOMDTO } from './StockItemPackagingUOM';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type Concept } from '../concept/Concept';
|
3
|
+
import { type Drug } from '../concept/Drug';
|
4
|
+
import { type RecordPermission } from '../RecordPermission';
|
5
|
+
import { type StockBatch } from './StockBatch';
|
6
|
+
import { type StockItemPackagingUOM, type StockItemPackagingUOMDTO } from './StockItemPackagingUOM';
|
7
7
|
|
8
8
|
export interface StockItem extends BaseOpenmrsData {
|
9
9
|
concept: Concept;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { Concept } from '../concept/Concept';
|
3
|
-
import { StockItem } from './StockItem';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type Concept } from '../concept/Concept';
|
3
|
+
import { type StockItem } from './StockItem';
|
4
4
|
|
5
5
|
export interface StockItemPackagingUOM extends BaseOpenmrsData {
|
6
6
|
factor: number;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { StockSource } from '../stockOperation/StockSource';
|
3
|
-
import { StockItem } from './StockItem';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type StockSource } from '../stockOperation/StockSource';
|
3
|
+
import { type StockItem } from './StockItem';
|
4
4
|
|
5
5
|
export interface StockItemReference extends BaseOpenmrsData {
|
6
6
|
referenceCode: string;
|
@@ -1,11 +1,11 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { Patient } from '../identity/Patient';
|
3
|
-
import { OpenMRSLocation } from '../Location';
|
4
|
-
import { User } from '../identity/User';
|
5
|
-
import { StockOperationItem } from './StockOperationItem';
|
6
|
-
import { StockOperationStatus } from './StockOperationStatus';
|
7
|
-
import { StockOperationType } from './StockOperationType';
|
8
|
-
import { Concept } from '../concept/Concept';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type Patient } from '../identity/Patient';
|
3
|
+
import { type OpenMRSLocation } from '../Location';
|
4
|
+
import { type User } from '../identity/User';
|
5
|
+
import { type StockOperationItem } from './StockOperationItem';
|
6
|
+
import { type StockOperationStatus } from './StockOperationStatus';
|
7
|
+
import { type StockOperationType } from './StockOperationType';
|
8
|
+
import { type Concept } from '../concept/Concept';
|
9
9
|
|
10
10
|
export interface StockOperation extends BaseOpenmrsData {
|
11
11
|
cancelReason: string;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import { RecordPermission } from '../RecordPermission';
|
2
|
-
import { StockOperationItemDTO } from './StockOperationItemDTO';
|
3
|
-
import { StockOperationStatus } from './StockOperationStatus';
|
1
|
+
import { type RecordPermission } from '../RecordPermission';
|
2
|
+
import { type StockOperationItemDTO } from './StockOperationItemDTO';
|
3
|
+
import { type StockOperationStatus } from './StockOperationStatus';
|
4
4
|
|
5
5
|
export interface StockOperationDTO {
|
6
6
|
uuid: string | null | undefined;
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { StockBatch } from '../stockItem/StockBatch';
|
3
|
-
import { StockItem } from '../stockItem/StockItem';
|
4
|
-
import { StockItemPackagingUOM } from '../stockItem/StockItemPackagingUOM';
|
5
|
-
import { StockOperation } from './StockOperation';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type StockBatch } from '../stockItem/StockBatch';
|
3
|
+
import { type StockItem } from '../stockItem/StockItem';
|
4
|
+
import { type StockItemPackagingUOM } from '../stockItem/StockItemPackagingUOM';
|
5
|
+
import { type StockOperation } from './StockOperation';
|
6
6
|
|
7
7
|
export interface StockOperationItem extends BaseOpenmrsData {
|
8
8
|
quantity: number;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { RecordPermission } from '../RecordPermission';
|
2
|
-
import { StockItemPackagingUOMDTO } from '../stockItem/StockItemPackagingUOM';
|
1
|
+
import { type RecordPermission } from '../RecordPermission';
|
2
|
+
import { type StockItemPackagingUOMDTO } from '../stockItem/StockItemPackagingUOM';
|
3
3
|
|
4
4
|
export interface StockOperationItemDTO {
|
5
5
|
itemIndex?: number;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { LocationType } from './LocationType';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type LocationType } from './LocationType';
|
3
3
|
|
4
4
|
export interface StockOperationType extends BaseOpenmrsData {
|
5
5
|
name: string;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
-
import { Concept } from '../concept/Concept';
|
1
|
+
import { type BaseOpenmrsData } from '../BaseOpenmrsData';
|
2
|
+
import { type Concept } from '../concept/Concept';
|
3
3
|
|
4
4
|
export interface StockSource extends BaseOpenmrsData {
|
5
5
|
name: string;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { Control, Controller, FieldValues } from 'react-hook-form';
|
3
|
-
import { DropdownProps, OnChangeData } from '@carbon/react/lib/components/Dropdown/Dropdown';
|
2
|
+
import { type Control, Controller, type FieldValues } from 'react-hook-form';
|
3
|
+
import { type DropdownProps, type OnChangeData } from '@carbon/react/lib/components/Dropdown/Dropdown';
|
4
4
|
import { TextInput } from '@carbon/react';
|
5
5
|
|
6
6
|
interface ControlledDropdownProps<T, K> extends DropdownProps<K> {
|
package/src/core/components/carbon/controlled-number-input/controlled-number-input.component.tsx
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { Control, Controller, FieldValues } from 'react-hook-form';
|
3
|
-
import { NumberInputProps } from '@carbon/react/lib/components/NumberInput/NumberInput';
|
2
|
+
import { type Control, Controller, type FieldValues } from 'react-hook-form';
|
3
|
+
import { type NumberInputProps } from '@carbon/react/lib/components/NumberInput/NumberInput';
|
4
4
|
import { NumberInput } from '@carbon/react';
|
5
|
-
import { StockItemPackagingUOMDTO } from '../../../api/types/stockItem/StockItemPackagingUOM';
|
5
|
+
import { type StockItemPackagingUOMDTO } from '../../../api/types/stockItem/StockItemPackagingUOM';
|
6
6
|
|
7
7
|
interface ControlledNumberInputProps<T> extends NumberInputProps {
|
8
8
|
row?: StockItemPackagingUOMDTO;
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { RadioButtonGroupProps } from '@carbon/react/lib/components/RadioButtonGroup/RadioButtonGroup';
|
3
|
-
import { Control, Controller, FieldValues } from 'react-hook-form';
|
2
|
+
import { type RadioButtonGroupProps } from '@carbon/react/lib/components/RadioButtonGroup/RadioButtonGroup';
|
3
|
+
import { type Control, Controller, type FieldValues } from 'react-hook-form';
|
4
4
|
import { RadioButtonGroup, RadioButton } from '@carbon/react';
|
5
|
-
import { RadioOption } from '../../../../stock-items/add-stock-item/stock-item-details/stock-item-details.resource';
|
5
|
+
import { type RadioOption } from '../../../../stock-items/add-stock-item/stock-item-details/stock-item-details.resource';
|
6
6
|
|
7
7
|
interface ControlledRadioButtonGroupProps<T> extends RadioButtonGroupProps {
|
8
8
|
controllerName: string;
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import React, { ChangeEvent } from 'react';
|
2
|
-
import { Control, Controller, FieldValues } from 'react-hook-form';
|
3
|
-
import { TextAreaProps } from '@carbon/react/lib/components/TextArea/TextArea';
|
1
|
+
import React, { type ChangeEvent } from 'react';
|
2
|
+
import { type Control, Controller, type FieldValues } from 'react-hook-form';
|
3
|
+
import { type TextAreaProps } from '@carbon/react/lib/components/TextArea/TextArea';
|
4
4
|
import { TextArea } from '@carbon/react';
|
5
5
|
|
6
6
|
interface ControlledTextAreaProps<T> extends TextAreaProps {
|
package/src/core/components/carbon/controlled-text-input/controlled-text-input.component.tsx
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
import React, { ChangeEvent } from 'react';
|
2
|
-
import { Control, Controller, FieldValues } from 'react-hook-form';
|
1
|
+
import React, { type ChangeEvent } from 'react';
|
2
|
+
import { type Control, Controller, type FieldValues } from 'react-hook-form';
|
3
3
|
import { TextInput } from '@carbon/react';
|
4
|
-
import { TextInputProps } from '@carbon/react/lib/components/TextInput/TextInput';
|
4
|
+
import { type TextInputProps } from '@carbon/react/lib/components/TextInput/TextInput';
|
5
5
|
|
6
6
|
interface ControlledTextInputProps<T> extends TextInputProps {
|
7
7
|
controllerName: string;
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { SideNavItem } from './types';
|
2
|
+
import { type SideNavItem } from './types';
|
3
3
|
import { SideNav, SideNavItems, SideNavLink } from '@carbon/react';
|
4
4
|
import styles from './side-nav.scss';
|
5
5
|
import { navigate } from '@openmrs/esm-framework';
|
@@ -20,7 +20,7 @@ import {
|
|
20
20
|
} from '@carbon/react';
|
21
21
|
import { DocumentDownload } from '@carbon/react/icons';
|
22
22
|
import { isDesktop, useLayoutType, usePagination } from '@openmrs/esm-framework';
|
23
|
-
import { DataTableRenderProps } from './types';
|
23
|
+
import { type DataTableRenderProps } from './types';
|
24
24
|
import styles from './table.scss';
|
25
25
|
|
26
26
|
type FilterProps = {
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { PrintCss } from './PrintStyles';
|
2
2
|
import { PRINT_LOGO } from '../../constants';
|
3
|
-
import { GetPrintLogo, PrintLogoData } from '../utils/imageUtils';
|
3
|
+
import { GetPrintLogo, type PrintLogoData } from '../utils/imageUtils';
|
4
4
|
import { getConfig } from '@openmrs/esm-framework';
|
5
5
|
|
6
6
|
export const GetPrintTemplate = (
|
package/src/core/utils/utils.ts
CHANGED
package/src/index.ts
CHANGED
@@ -131,6 +131,14 @@ export const stockOperationFormWorkspace = getAsyncLifecycle(
|
|
131
131
|
() => import('./stock-operations/stock-operations-forms/stock-operation-form.component'),
|
132
132
|
options,
|
133
133
|
);
|
134
|
+
export const stockItemFormWorkspace = getAsyncLifecycle(
|
135
|
+
() => import('./stock-items/add-stock-item/add-stock-item.component'),
|
136
|
+
options,
|
137
|
+
);
|
138
|
+
export const stockItemRulesFormWorkspace = getAsyncLifecycle(
|
139
|
+
() => import('./stock-items/add-stock-item/stock-item-rules/add-stock-rules.component'),
|
140
|
+
options,
|
141
|
+
);
|
134
142
|
export function startupApp() {
|
135
143
|
defineConfigSchema(moduleName, configSchema);
|
136
144
|
}
|
package/src/routes.json
CHANGED
@@ -216,6 +216,20 @@
|
|
216
216
|
"type": "form",
|
217
217
|
"canMaximize": true,
|
218
218
|
"width": "extra-wide"
|
219
|
+
},
|
220
|
+
{
|
221
|
+
"name": "stock-item-rules-form-workspace",
|
222
|
+
"component": "stockItemRulesFormWorkspace",
|
223
|
+
"title": "Stock Item Rules",
|
224
|
+
"type": "form"
|
225
|
+
},
|
226
|
+
{
|
227
|
+
"name": "stock-item-form-workspace",
|
228
|
+
"component": "stockItemFormWorkspace",
|
229
|
+
"title": "Stock Items",
|
230
|
+
"type": "form",
|
231
|
+
"canMaximize": true,
|
232
|
+
"width": "extra-wide"
|
219
233
|
}
|
220
234
|
],
|
221
235
|
"pages": [
|
@@ -1,9 +1,9 @@
|
|
1
1
|
import useSWR from 'swr';
|
2
|
-
import { ResourceFilterCriteria, toQueryParams } from '../core/api/api';
|
3
|
-
import { BatchJob, BatchJobType } from '../core/api/types/BatchJob';
|
4
|
-
import { PageableResult } from '../core/api/types/PageableResult';
|
2
|
+
import { type ResourceFilterCriteria, toQueryParams } from '../core/api/api';
|
3
|
+
import { type BatchJob, type BatchJobType } from '../core/api/types/BatchJob';
|
4
|
+
import { type PageableResult } from '../core/api/types/PageableResult';
|
5
5
|
import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
|
6
|
-
import { ReportType } from '../stock-reports/ReportType';
|
6
|
+
import { type ReportType } from '../stock-reports/ReportType';
|
7
7
|
|
8
8
|
export interface BatchJobFilter extends ResourceFilterCriteria {
|
9
9
|
batchJobType?: BatchJobType | null | undefined;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { StockItemFilter, useStockItems } from '../stock-items/stock-items.resource';
|
1
|
+
import { type StockItemFilter, useStockItems } from '../stock-items/stock-items.resource';
|
2
2
|
import { useEffect, useState } from 'react';
|
3
3
|
import { ResourceRepresentation } from '../core/api/api';
|
4
4
|
export function useStockInventoryItems(v?: ResourceRepresentation) {
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
1
|
+
import { type StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
2
2
|
|
3
3
|
export function useStockIssuing(filter: StockOperationFilter) {
|
4
4
|
const { items, isLoading, error } = useStockOperations(filter);
|
@@ -6,7 +6,7 @@ import styles from './stock-home.scss';
|
|
6
6
|
import MetricsCard from '../core/components/card/metrics-card-component';
|
7
7
|
import useStockList from './useStockList';
|
8
8
|
|
9
|
-
import { StockOperationFilter } from '../stock-operations/stock-operations.resource';
|
9
|
+
import { type StockOperationFilter } from '../stock-operations/stock-operations.resource';
|
10
10
|
import { useDisposalList } from './useDisposalList';
|
11
11
|
import { ResourceRepresentation } from '../core/api/api';
|
12
12
|
import { useStockInventoryItems } from './stock-home-inventory-items.resource';
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
1
|
+
import { type StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
2
2
|
|
3
3
|
export function useStockReceiving(filter: StockOperationFilter) {
|
4
4
|
const { items, isLoading, error } = useStockOperations(filter);
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
1
|
+
import { type StockOperationFilter, useStockOperations } from '../stock-operations/stock-operations.resource';
|
2
2
|
|
3
3
|
export function useDisposalList(filter: StockOperationFilter) {
|
4
4
|
const { items, isLoading, error } = useStockOperations(filter);
|
@@ -1,14 +1,13 @@
|
|
1
1
|
import { Button } from '@carbon/react';
|
2
2
|
import React, { useCallback } from 'react';
|
3
3
|
import { useTranslation } from 'react-i18next';
|
4
|
-
import {
|
5
|
-
import { launchAddOrEditDialog } from '../stock-item.utils';
|
4
|
+
import { launchAddOrStockItemWorkspace } from '../stock-item.utils';
|
6
5
|
|
7
6
|
const AddStockItemActionButton: React.FC = () => {
|
8
7
|
const { t } = useTranslation();
|
9
8
|
|
10
9
|
const handleClick = useCallback(() => {
|
11
|
-
|
10
|
+
launchAddOrStockItemWorkspace(t);
|
12
11
|
}, [t]);
|
13
12
|
|
14
13
|
return (
|
@@ -1,26 +1,25 @@
|
|
1
|
+
import { type DefaultWorkspaceProps } from '@openmrs/esm-framework';
|
1
2
|
import React, { useState } from 'react';
|
2
3
|
import { useTranslation } from 'react-i18next';
|
3
|
-
import
|
4
|
-
import
|
5
|
-
import
|
6
|
-
import PackagingUnits from './packaging-units/packaging-units.component';
|
7
|
-
import Transactions from './transactions/transactions.component';
|
4
|
+
import { type StockItemDTO } from '../../core/api/types/stockItem/StockItem';
|
5
|
+
import { type TabItem } from '../../core/components/tabs/types';
|
6
|
+
import StockOperationStepper from '../../stock-operations/stock-operations-forms/stock-operation-stepper/stock-operation-stepper.component';
|
8
7
|
import BatchInformation from './batch-information/batch-information.component';
|
8
|
+
import PackagingUnits from './packaging-units/packaging-units.component';
|
9
9
|
import StockQuantities from './quantities/quantities.component';
|
10
|
-
import
|
11
|
-
import { StockItemDTO } from '../../core/api/types/stockItem/StockItem';
|
12
|
-
import { SaveStockItem } from '../types';
|
10
|
+
import StockItemDetails from './stock-item-details/stock-item-details.component';
|
13
11
|
import StockReferences from './stock-item-references/stock-item-references.component';
|
12
|
+
import StockItemRules from './stock-item-rules/stock-item-rules.component';
|
13
|
+
import Transactions from './transactions/transactions.component';
|
14
14
|
|
15
|
-
interface AddStockItemProps {
|
16
|
-
|
17
|
-
model?: StockItemDTO;
|
18
|
-
onSave?: SaveStockItem;
|
15
|
+
interface AddStockItemProps extends Partial<DefaultWorkspaceProps> {
|
16
|
+
stockItem?: StockItemDTO;
|
19
17
|
}
|
20
18
|
|
21
|
-
const AddEditStockItem: React.FC<AddStockItemProps> = ({
|
19
|
+
const AddEditStockItem: React.FC<AddStockItemProps> = ({ stockItem, closeWorkspace }) => {
|
22
20
|
const { t } = useTranslation();
|
23
21
|
const [selectedTab, setSelectedTab] = useState(0);
|
22
|
+
const isEditing = Boolean(stockItem);
|
24
23
|
const handleTabChange = (index: number) => {
|
25
24
|
setSelectedTab(index);
|
26
25
|
};
|
@@ -28,42 +27,52 @@ const AddEditStockItem: React.FC<AddStockItemProps> = ({ isEditing, model, onSav
|
|
28
27
|
{
|
29
28
|
name: t('stockItemDetails', 'Stock Item Details'),
|
30
29
|
component: (
|
31
|
-
<StockItemDetails handleTabChange={handleTabChange}
|
30
|
+
<StockItemDetails handleTabChange={handleTabChange} stockItem={stockItem} onCloseWorkspace={closeWorkspace} />
|
32
31
|
),
|
33
32
|
},
|
34
33
|
{
|
35
34
|
name: t('packagingUnits', 'Packaging Units'),
|
36
|
-
component: <PackagingUnits isEditing handleTabChange={handleTabChange} stockItemUuid={
|
35
|
+
component: <PackagingUnits isEditing handleTabChange={handleTabChange} stockItemUuid={stockItem?.uuid} />,
|
37
36
|
disabled: !isEditing,
|
38
37
|
},
|
39
38
|
{
|
40
39
|
name: t('transactions', 'Transactions'),
|
41
|
-
component: <Transactions stockItemUuid={
|
40
|
+
component: <Transactions stockItemUuid={stockItem?.uuid} />,
|
42
41
|
disabled: !isEditing,
|
43
42
|
},
|
44
43
|
{
|
45
44
|
name: t('batchInformation', 'Batch Information'),
|
46
|
-
component: <BatchInformation stockItemUuid={
|
45
|
+
component: <BatchInformation stockItemUuid={stockItem?.uuid} />,
|
47
46
|
disabled: !isEditing,
|
48
47
|
},
|
49
48
|
{
|
50
49
|
name: t('quantities', 'Quantities'),
|
51
|
-
component: <StockQuantities stockItemUuid={
|
50
|
+
component: <StockQuantities stockItemUuid={stockItem?.uuid} />,
|
52
51
|
disabled: !isEditing,
|
53
52
|
},
|
54
53
|
{
|
55
54
|
name: t('stockRules', 'Rules'),
|
56
|
-
component: <StockItemRules stockItemUuid={
|
55
|
+
component: <StockItemRules stockItemUuid={stockItem?.uuid} />,
|
57
56
|
disabled: !isEditing,
|
58
57
|
},
|
59
58
|
{
|
60
59
|
name: t('references', 'References'),
|
61
|
-
component: <StockReferences stockItemUuid={
|
60
|
+
component: <StockReferences stockItemUuid={stockItem?.uuid} isEditing={isEditing} />,
|
62
61
|
disabled: !isEditing,
|
63
62
|
},
|
64
63
|
];
|
65
64
|
|
66
|
-
return
|
65
|
+
return (
|
66
|
+
<StockOperationStepper
|
67
|
+
steps={tabs.map((tab, index) => ({
|
68
|
+
title: tab.name,
|
69
|
+
component: tab.component,
|
70
|
+
disabled: tab.disabled,
|
71
|
+
}))}
|
72
|
+
selectedIndex={selectedTab}
|
73
|
+
onChange={handleTabChange}
|
74
|
+
/>
|
75
|
+
);
|
67
76
|
};
|
68
77
|
|
69
78
|
export default AddEditStockItem;
|
@@ -1,5 +1,24 @@
|
|
1
|
+
@use '@carbon/type';
|
2
|
+
@use '@carbon/layout';
|
3
|
+
@use '@carbon/colors';
|
4
|
+
|
1
5
|
.formContainer {
|
2
|
-
|
3
|
-
|
4
|
-
|
6
|
+
display: flex;
|
7
|
+
flex-direction: column;
|
8
|
+
justify-content: space-between;
|
9
|
+
width: 100%;
|
10
|
+
height: 100%;
|
11
|
+
}
|
12
|
+
|
13
|
+
.button {
|
14
|
+
display: flex;
|
15
|
+
align-content: flex-start;
|
16
|
+
align-items: baseline;
|
17
|
+
min-width: 50%;
|
18
|
+
}
|
19
|
+
|
20
|
+
.buttonSet {
|
21
|
+
display: flex;
|
22
|
+
justify-content: space-between;
|
23
|
+
width: 100%;
|
5
24
|
}
|