@openmrs/esm-stock-management-app 1.0.1-pre.38 → 1.0.1-pre.380

package/src/stock-reports/generate-report/create-stock-report.scss

@@ -2,8 +2,15 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-.section {
-  // margin: spacing.$spacing-03;
+.reportContainer {
+  min-height: 15rem;
+  display: flex;
+  flex-direction: column;
+  row-gap: 1rem;
+  padding: 1rem;
+}
+.reportButton {
+  padding: 1rem
 }
 
 .sectionTitle {

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

@@ -17,6 +17,7 @@ import {
   TableToolbarSearch,
   Tile,
   Button,
+  InlineLoading,
 } from "@carbon/react";
 import { isDesktop } from "@openmrs/esm-framework";
 import NewReportActionButton from "./new-report-button.component";
@@ -30,7 +31,6 @@ import {
   BatchJobStatusExpired,
   BatchJobStatusFailed,
   BatchJobStatusPending,
-  BatchJobStatusRunning,
 } from "../../core/api/types/BatchJob";
 import {
   CheckmarkOutline,
@@ -118,6 +118,13 @@ const StockReports: React.FC = () => {
       )),
       status: (
         <>
+          {batchJob.status === BatchJobStatusPending && (
+            <InlineLoading
+              status="active"
+              iconDescription="Loading"
+              description="Generating report..."
+            />
+          )}
           {batchJob.status === BatchJobStatusFailed && (
             <WarningAltFilled
               className="report-failed"

package/src/stock-reports/report-validation-schema.ts

@@ -0,0 +1,40 @@
+import { z } from "zod";
+
+export const reportSchema = z.object({
+  startDate: z.coerce.date().refine((date) => date !== undefined, {
+    message: "Start Date is required",
+  }),
+  endDate: z.coerce.date().refine((date) => date !== undefined, {
+    message: "End Date is required",
+  }),
+  location: z.string({ required_error: "Location Required" }).min(1, {
+    message: "Location Required",
+  }),
+  reportName: z.string({ required_error: "Report Name Required" }).min(1, {
+    message: "Report Name Required",
+  }),
+  stockReportItemCategory: z.string().optional(),
+  mostLeastMoving: z.string().optional(),
+  mostLeastMovingName: z.string().optional(),
+  stockItemUuid: z.string().optional(),
+  stockItemName: z.string().optional(),
+  patientUuid: z.string().optional(),
+  patientName: z.string().optional(),
+  locationUuid: z.string().optional(),
+  childLocations: z.boolean().optional(),
+  stockSourceUuid: z.string().optional(),
+  stockSource: z.string().optional(),
+  stockSourceDestinationUuid: z.string().optional(),
+  stockSourceDestination: z.string().optional(),
+  inventoryGroupBy: z.string().optional(),
+  inventoryGroupByName: z.string().optional(),
+  stockItemCategoryConceptUuid: z.string().optional(),
+  reportSystemName: z.string().optional(),
+  stockItemCategory: z.string().optional(),
+  maxReorderLevelRatio: z.number().optional(),
+  fullFillment: z.string().array().optional(),
+  limit: z.string().optional(),
+  date: z.date().optional(),
+});
+
+export type StockReportSchema = z.infer<typeof reportSchema>;

package/src/stock-user-role-scopes/add-stock-user-scope/add-stock-user-role-scope.component.tsx

@@ -14,10 +14,9 @@ import {
   Select,
   SelectItem,
 } from "@carbon/react";
-import React, { ChangeEvent, useMemo, useState } from "react";
+import React, { ChangeEvent, useState } from "react";
 import styles from "./add-stock-user-role-scope.scss";
 import {
-  UserFilterCriteria,
   useRoles,
   useStockOperationTypes,
   useStockTagLocations,
@@ -64,7 +63,6 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
 
   const [roles, setRoles] = useState<Role[]>([]);
 
-  const { data: user } = useUser(model?.uuid);
   const [showItems, setShowItems] = useState(false);
 
   // operation types
@@ -80,6 +78,9 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
     isLoading: loadingUsers,
   } = useUsers({ v: ResourceRepresentation.Default });
 
+  const [selectedUserUuid, setSelectedUserUuid] = useState<string | null>(null);
+  const { data: user, isError } = useUser(selectedUserUuid);
+
   // get roles
   const { items: rolesData, isLoading: loadingRoles } = useRoles({
     v: ResourceRepresentation.Default,
@@ -201,17 +202,6 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
   const onActiveDatesChange = (dates: Date[]): void => {
     setFormModel({ ...formModel, activeFrom: dates[0], activeTo: dates[1] });
   };
-  const handleUsersSearch = useMemo(
-    () =>
-      debounce((searchTerm) => {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        useUsers({
-          v: ResourceRepresentation.Default,
-          q: searchTerm,
-        } as any as UserFilterCriteria);
-      }, 3),
-    []
-  );
 
   const onUserChanged = (data: { selectedItem: User }) => {
     const stockRolesUUIDs = [
@@ -227,8 +217,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
     );
     setFormModel({ ...formModel, userUuid: data.selectedItem?.uuid });
     setRoles(filteredStockRoles ?? []);
-
-    console.info(roles);
+    setSelectedUserUuid(data?.selectedItem?.uuid);
   };
 
   const onRoleChange = (e: ChangeEvent<HTMLSelectElement>) => {
@@ -311,7 +300,6 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
       }
     );
   };
-
   if (isLoading || loadingRoles || loadingUsers) {
     return (
       <InlineLoading
@@ -321,7 +309,6 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
       />
     );
   }
-
   return (
     <div>
       <Form>
@@ -337,6 +324,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                     size="md"
                     labelText={t("user", "User")}
                     items={filteredItems}
+                    onChange={onUserChanged}
                     shouldFilterItem={() => true}
                     itemToString={(item) =>
                       `${item?.person?.display ?? item?.display ?? ""}`
@@ -448,6 +436,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                       <Checkbox
                         value={type.uuid}
                         checked={isOperationChecked(type)}
+                        className={styles.checkbox}
                         onChange={(event) =>
                           onStockOperationTypeChanged(
                             event,
@@ -455,7 +444,6 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
                             isOperationChecked(type)
                           )
                         }
-                        className={styles.checkbox}
                         labelText={type.name}
                         id={type.uuid}
                       />

package/tsconfig.json

@@ -14,7 +14,8 @@
       "es2015.promise",
       "es2016.array.include",
       "es2018",
-      "es2020"
+      "es2020",
+      "es2021"
     ],
     "resolveJsonModule": true,
     "noEmit": true,