@openmrs/esm-stock-management-app 1.0.1-pre.338 → 1.0.1-pre.342

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. package/dist/220.js +1 -1
  2. package/dist/220.js.map +1 -1
  3. package/dist/main.js +1 -1
  4. package/dist/main.js.map +1 -1
  5. package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json +6 -6
  6. package/dist/routes.json +1 -1
  7. package/package.json +1 -1
  8. package/src/root.scss +65 -60
  9. package/src/stock-home/stock-home-issuing-card.component.tsx +4 -4
  10. package/src/stock-home/stock-home-receiving-card.component.tsx +1 -1
  11. package/src/stock-operations/add-stock-operation/add-stock-operation.scss +21 -24
  12. package/src/stock-operations/add-stock-operation/base-operation-details.component.tsx +11 -11
  13. package/src/stock-user-role-scopes/add-stock-user-scope/add-stock-user-role-scope.component.tsx +1 -1
package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json CHANGED
@@ -112,10 +112,10 @@
112
112
  "initial": true,
113
113
  "entry": true,
114
114
  "recorded": false,
115
- "size": 4354033,
115
+ "size": 4355099,
116
116
  "sizes": {
117
117
  "consume-shared": 252,
118
- "javascript": 4332085,
118
+ "javascript": 4333151,
119
119
  "share-init": 252,
120
120
  "runtime": 21444
121
121
  },
@@ -132,7 +132,7 @@
132
132
  "auxiliaryFiles": [
133
133
  "main.js.map"
134
134
  ],
135
- "hash": "b385faba305ca411",
135
+ "hash": "102e02cfcee9817a",
136
136
  "childrenByOrder": {}
137
137
  },
138
138
  {
@@ -140,9 +140,9 @@
140
140
  "initial": false,
141
141
  "entry": false,
142
142
  "recorded": false,
143
- "size": 917236,
143
+ "size": 918302,
144
144
  "sizes": {
145
- "javascript": 917026,
145
+ "javascript": 918092,
146
146
  "consume-shared": 210
147
147
  },
148
148
  "names": [],
@@ -156,7 +156,7 @@
156
156
  "auxiliaryFiles": [
157
157
  "220.js.map"
158
158
  ],
159
- "hash": "0bd6e2fb0c9b226a",
159
+ "hash": "c85dbf56c04e563d",
160
160
  "childrenByOrder": {}
161
161
  },
162
162
  {
package/dist/routes.json CHANGED
@@ -1 +1 @@
1
- {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.338"}
1
+ {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.342"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-stock-management-app",
3
- "version": "1.0.1-pre.338",
3
+ "version": "1.0.1-pre.342",
4
4
  "license": "MPL-2.0",
5
5
  "description": "Stock management microfrontend for OpenMRS 3.x",
6
6
  "browser": "dist/openmrs-esm-stock-management-app.js",
package/src/root.scss CHANGED
@@ -5,7 +5,6 @@
5
5
  @import "~carbon-components/src/globals/scss/vendor/@carbon/layout/scss/generated/layout";
6
6
  @import "carbon-components/scss/globals/scss/typography.scss";
7
7
  @import "~@openmrs/esm-styleguide/src/vars";
8
-
9
8
  $ui-01: #f4f4f4;
10
9
  $ui-02: #ffffff;
11
10
  $ui-03: #e0e0e0;
@@ -21,154 +20,160 @@ $danger: #da1e28;
21
20
  $interactive-01: #0f62fe;
22
21
  $brand-teal-01: #3197D9;
23
22
  $button-primary: #0078A6;
24
-
25
23
  .productiveHeading01 {
26
- @include carbon--type-style("productive-heading-01");
24
+ @include carbon--type-style("productive-heading-01");
27
25
  }
28
26
 
29
27
  .productiveHeading02 {
30
- @include carbon--type-style("productive-heading-02");
28
+ @include carbon--type-style("productive-heading-02");
31
29
  }
32
30
 
33
31
  .productiveHeading03 {
34
- @include carbon--type-style("productive-heading-03");
32
+ @include carbon--type-style("productive-heading-03");
35
33
  }
36
34
 
37
35
  .productiveHeading04 {
38
- @include carbon--type-style("productive-heading-04");
36
+ @include carbon--type-style("productive-heading-04");
39
37
  }
40
38
 
41
39
  .productiveHeading05 {
42
- @include carbon--type-style("productive-heading-05");
40
+ @include carbon--type-style("productive-heading-05");
43
41
  }
44
42
 
45
43
  .productiveHeading06 {
46
- @include carbon--type-style("productive-heading-06");
44
+ @include carbon--type-style("productive-heading-06");
47
45
  }
48
46
 
49
47
  .bodyShort01 {
50
- @include carbon--type-style("body-short-01");
48
+ @include carbon--type-style("body-short-01");
51
49
  }
52
50
 
53
51
  .helperText01 {
54
- @include carbon--type-style("helper-text-01");
52
+ @include carbon--type-style("helper-text-01");
55
53
  }
56
54
 
57
55
  .bodyShort02 {
58
- @include carbon--type-style("body-short-02");
56
+ @include carbon--type-style("body-short-02");
59
57
  }
60
58
 
61
59
  .bodyLong01 {
62
- @include carbon--type-style("body-long-01");
60
+ @include carbon--type-style("body-long-01");
63
61
  }
64
62
 
65
63
  .bodyLong02 {
66
- @include carbon--type-style("body-long-02");
64
+ @include carbon--type-style("body-long-02");
67
65
  }
68
66
 
69
67
  .label01 {
70
- @include carbon--type-style("label-01");
68
+ @include carbon--type-style("label-01");
71
69
  }
72
70
 
73
71
  .text01 {
74
- color: $text-01;
72
+ color: $text-01;
75
73
  }
76
74
 
77
75
  .text02 {
78
- color: $text-02;
76
+ color: $text-02;
79
77
  }
80
78
 
81
79
  aside {
82
- background-color: $ui-02 !important;
80
+ background-color: $ui-02 !important;
83
81
  }
84
82
 
85
83
  // Login Overrides
86
-
87
- div[class*='-esm-login__styles__center'] > img {
88
- width: 140px; // design has 120px
84
+ div[class*='-esm-login__styles__center']>img {
85
+ width: 140px; // design has 120px
89
86
  }
90
87
 
91
- :global(.tab-12rem) > button {
92
- width: 12rem !important;
88
+ :global(.tab-12rem)>button {
89
+ width: 12rem !important;
93
90
  }
94
91
 
95
- :global(.tab-14rem) > button {
96
- width: 14rem !important;
92
+ :global(.tab-14rem)>button {
93
+ width: 14rem !important;
97
94
  }
98
95
 
99
- :global(.tab-16rem) > button {
100
- width: 16rem !important;
96
+ :global(.tab-16rem)>button {
97
+ width: 16rem !important;
101
98
  }
102
99
 
103
- :global(.bx--overflow-menu) > div {
104
- width: 15rem !important;
100
+ :global(.bx--overflow-menu)>div {
101
+ width: 15rem !important;
105
102
  }
106
103
 
107
104
  nav :global(.bx--accordion__title) {
108
- color: #525252;
109
- font-weight: 600 !important;
105
+ color: #525252;
106
+ font-weight: 600 !important;
110
107
  }
111
108
 
112
109
  nav :global(.bx--accordion__content) {
113
- padding-bottom: 0 !important;
114
- padding-top: 0 !important;
110
+ padding-bottom: 0 !important;
111
+ padding-top: 0 !important;
115
112
  }
116
113
 
117
- nav :global(.bx--accordion__content) > a {
118
- background-color: #cecece !important;
119
- color: #161616 !important;
120
- border-left-color: var(--brand-01) !important;
114
+ nav :global(.bx--accordion__content)>a {
115
+ background-color: #cecece !important;
116
+ color: #161616 !important;
117
+ border-left-color: var(--brand-01) !important;
121
118
  }
122
119
 
123
120
  .container {
124
- padding: spacing.$spacing-07;
121
+ padding: spacing.$spacing-07;
125
122
  }
126
123
 
127
124
  .welcome {
128
- @include type.type-style('heading-04');
129
- margin: spacing.$spacing-05 0;
125
+ @include type.type-style('heading-04');
126
+ margin: spacing.$spacing-05 0;
130
127
  }
131
128
 
132
129
  .explainer {
133
- margin-bottom: 2rem;
130
+ margin-bottom: 2rem;
134
131
  }
135
132
 
136
133
  .noMargin {
137
- margin: 0 !important;
134
+ margin: 0 !important;
138
135
  }
139
136
 
140
137
  .noPadding {
141
- margin: 0 !important;
138
+ margin: 0 !important;
142
139
  }
143
140
 
144
141
  .noSpacing {
145
- margin: 0 !important;
146
- padding: 0 !important;
142
+ margin: 0 !important;
143
+ padding: 0 !important;
147
144
  }
148
145
 
149
146
  .section {
150
- margin: spacing.$spacing-03;
147
+ margin: spacing.$spacing-03;
151
148
  }
152
149
 
153
150
  :global(.cds--table-sort__description) {
154
- display: none;
151
+ display: none;
155
152
  }
156
153
 
157
154
  .formContainer {
158
- height: calc(100vh - 100px) !important;
159
- overflow: scroll;
160
- padding: 0 1rem;
155
+ height: calc(100vh - 100px) !important;
156
+ overflow: scroll;
157
+ padding: 0 1rem;
161
158
  }
162
159
 
163
160
  .verticalForm {
164
- display: flex;
165
- grid-row-gap: 2em;
166
- padding-top: 1rem;
167
- align-content: space-between;
168
- flex-direction: column;
169
-
170
- :global(.cds--form-item) {
171
- flex: none !important;
172
- }
173
- }
174
-
161
+ display: flex;
162
+ grid-row-gap: 2em;
163
+ padding-top: 1rem;
164
+ align-content: space-between;
165
+ flex-direction: column;
166
+ :global(.cds--form-item) {
167
+ flex: none !important;
168
+ }
169
+ :global(.cds--label) {
170
+ color: black;
171
+ display: inline-block;
172
+ font-size: var(--cds-label-01-font-size);
173
+ font-weight: bold;
174
+ letter-spacing: var(--cds-label-01-letter-spacing, .32px);
175
+ line-height: 1rem;
176
+ margin-bottom: 0.5rem;
177
+ vertical-align: baseline;
178
+ }
179
+ }
package/src/stock-home/stock-home-issuing-card.component.tsx CHANGED
@@ -18,7 +18,7 @@ const StockHomeIssuingCard = () => {
18
18
 
19
19
  if (isLoading) return <></>;
20
20
 
21
- if (items.length === 0) {
21
+ if (items?.length === 0) {
22
22
  return (
23
23
  <>
24
24
  <p className={styles.content}>
@@ -28,7 +28,7 @@ const StockHomeIssuingCard = () => {
28
28
  );
29
29
  }
30
30
 
31
- const itemsToDisplay = items.map((item, index) => {
31
+ const itemsToDisplay = items?.map((item, index) => {
32
32
  // Assuming you are using 'stockOperationItems' from each 'item'
33
33
  const stockItems = item?.stockOperationItems || [];
34
34
 
@@ -46,11 +46,11 @@ const StockHomeIssuingCard = () => {
46
46
  return formattedStockItems;
47
47
  });
48
48
 
49
- const flattenedItemsToDisplay = itemsToDisplay.flat().slice(0, 10);
49
+ const flattenedItemsToDisplay = itemsToDisplay?.flat().slice(0, 10);
50
50
 
51
51
  return (
52
52
  <>
53
- {flattenedItemsToDisplay.map((item, index) => (
53
+ {flattenedItemsToDisplay?.map((item, index) => (
54
54
  <div className={styles.card} key={index}>
55
55
  <div className={styles.colorLineGreen} />
56
56
  <div className={styles.icon}>
package/src/stock-home/stock-home-receiving-card.component.tsx CHANGED
@@ -30,7 +30,7 @@ const StockHomeReceivingCard = () => {
30
30
 
31
31
  return (
32
32
  <>
33
- {items.map((item, index) =>
33
+ {items?.map((item, index) =>
34
34
  item?.stockOperationItems.map((stock) => (
35
35
  <div className={styles.card} key={index}>
36
36
  <div className={styles.colorLineBlue} />
package/src/stock-operations/add-stock-operation/add-stock-operation.scss CHANGED
@@ -1,44 +1,41 @@
1
1
  @use '@carbon/styles/scss/spacing';
2
2
  @use '@carbon/styles/scss/type';
3
3
  @import '~@openmrs/esm-styleguide/src/vars';
4
-
5
4
  .sectionTitle {
6
- @include type.type-style('heading-compact-02');
7
- color: $text-02;
8
- margin-bottom: spacing.$spacing-04;
5
+ @include type.type-style('heading-compact-02');
6
+ color: $text-02;
7
+ margin-bottom: spacing.$spacing-04;
9
8
  }
10
9
 
11
10
  .modalBody {
12
- padding-bottom: spacing.$spacing-05;
11
+ padding-bottom: spacing.$spacing-05;
13
12
  }
14
13
 
15
14
  .actionsContainer {
16
- display: "flex";
17
- justify-content: space-between;
18
- margin: "5px";
19
- }
20
-
21
- .statusDescriptions {
22
- display: "flex";
23
- flex-direction: "row";
15
+ display: flex;
16
+ justify-content: space-between;
17
+ margin: 5px;
24
18
  }
25
19
 
26
20
  .statusContainer {
27
- display: "flex";
28
- flex-direction: "row";
29
- margin-top: "4px";
21
+ display: flex;
22
+ margin-top: 4px;
23
+ gap: 1rem;
30
24
  }
31
25
 
32
- .text {
33
- font-size: "8px";
34
- }
35
26
  .textHeading {
36
- font-size: "10px";
37
- font-weight: bold;
27
+ font-weight: bold;
28
+ }
29
+
30
+ .statusDescriptions {
31
+ margin-top: 4px;
32
+ .text {
33
+ margin-right: 4px;
34
+ }
38
35
  }
39
36
 
40
37
  .actionButtons {
41
- margin: "10px";
42
- display: "flex";
43
- flex-direction: "row";
38
+ margin: 10px;
39
+ display: flex;
40
+ flex-direction: row;
44
41
  }
package/src/stock-operations/add-stock-operation/base-operation-details.component.tsx CHANGED
@@ -182,7 +182,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
182
182
  id="operationNoLbl"
183
183
  value={model?.operationNumber}
184
184
  readOnly={true}
185
- labelText={"Operation Number:"}
185
+ labelText={"Operation Number"}
186
186
  />
187
187
  )}
188
188
 
@@ -193,8 +193,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
193
193
  control={control}
194
194
  title={
195
195
  operation?.hasDestination
196
- ? t("from:", "From:")
197
- : t("location:", "Location:")
196
+ ? t("from", "From")
197
+ : t("location:", "Location")
198
198
  }
199
199
  placeholder={
200
200
  operation.hasDestination
@@ -212,7 +212,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
212
212
  id="sourceUuidLbl"
213
213
  value={model?.sourceName ?? ""}
214
214
  readOnly={true}
215
- labelText={operation?.hasDestination ? "From:" : "From:"}
215
+ labelText={operation?.hasDestination ? "From" : "From"}
216
216
  />
217
217
  )}
218
218
  {canEdit && !lockDestination && operation?.hasDestination && (
@@ -220,7 +220,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
220
220
  controllerName="destinationUuid"
221
221
  name="destinationUuid"
222
222
  control={control}
223
- title={operation?.hasSource ? "To:" : "Location:"}
223
+ title={operation?.hasSource ? "To" : "Location"}
224
224
  placeholder={
225
225
  operation?.hasSource
226
226
  ? t("chooseADestination", "Choose a destination")
@@ -239,7 +239,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
239
239
  id="destinationUuidLbl"
240
240
  value={model?.destinationName ?? ""}
241
241
  readOnly={true}
242
- labelText={operation?.hasSource ? "To:" : "To:"}
242
+ labelText={operation?.hasSource ? "To" : "To"}
243
243
  />
244
244
  )}
245
245
 
@@ -248,7 +248,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
248
248
  controllerName="responsiblePersonUuid"
249
249
  name="responsiblePersonUuid"
250
250
  control={control}
251
- title={t("responsiblePerson:", "Responsible Person:")}
251
+ title={t("responsiblePerson:", "Responsible Person")}
252
252
  placeholder={t("filter", "Filter ...")}
253
253
  invalid={!!errors.responsiblePersonUuid}
254
254
  invalidText={
@@ -272,8 +272,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
272
272
  maxLength={255}
273
273
  size={"md"}
274
274
  value={`${model?.responsiblePersonOther ?? ""}`}
275
- labelText={t("responsiblePerson", "Responsible Person:")}
276
- placeholder={t("pleaseSpecify", "Please Specify:")}
275
+ labelText={t("responsiblePerson", "Responsible Person")}
276
+ placeholder={t("pleaseSpecify", "Please Specify")}
277
277
  invalid={!!errors.responsiblePersonOther}
278
278
  invalidText={
279
279
  errors.responsiblePersonOther &&
@@ -302,7 +302,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
302
302
  name="reasonUuid"
303
303
  control={control}
304
304
  placeholder={t("chooseAReason", "Choose a reason")}
305
- title={t("reason", "Reason:")}
305
+ title={t("reason", "Reason")}
306
306
  invalid={!!errors.reasonUuid}
307
307
  invalidText={errors.reasonUuid && errors?.reasonUuid?.message}
308
308
  onReasonChange={(reason) => {
@@ -327,7 +327,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
327
327
  controllerName="remarks"
328
328
  maxLength={255}
329
329
  value={`${model?.remarks ?? ""}`}
330
- labelText={t("remarks:", "Remarks:")}
330
+ labelText={t("remarks:", "Remarks")}
331
331
  invalid={!!errors.remarks}
332
332
  invalidText={errors.remarks && errors?.remarks?.message}
333
333
  />
package/src/stock-user-role-scopes/add-stock-user-scope/add-stock-user-role-scope.component.tsx CHANGED
@@ -422,7 +422,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
422
422
  </section>
423
423
  <section className={styles.section}>
424
424
  <CheckboxGroup className={styles.checkboxGrid}>
425
- {stockOperations.length > 0 &&
425
+ {stockOperations?.length > 0 &&
426
426
  stockOperations.map((type) => {
427
427
  return (
428
428
  <div style={{ display: "flex", flexDirection: "row" }}>