@openmrs/esm-stock-management-app 1.0.1-pre.417 → 1.0.1-pre.420

package/src/stock-items/add-stock-item/stock-item-references/stock-item-references.scss

@@ -0,0 +1,23 @@
+@use '@carbon/styles/scss/colors';
+@use "@carbon/styles/scss/spacing";
+@use "@carbon/styles/scss/type";
+
+.referencesTable {
+  min-height: 15rem;
+  display: block;
+}
+
+.referencesTableCell {
+  display: flex;
+  align-items: center;
+}
+
+.referencesTableBody {
+  min-height: spacing.$spacing-13;
+
+}
+
+.referencesTableContainer {
+  min-height: 15rem;
+  display: block;
+}

package/src/stock-items/add-stock-item/stock-item-references/stock-references-selector.component.tsx

@@ -0,0 +1,66 @@
+import React from "react";
+import { TextInputSkeleton, ComboBox } from "@carbon/react";
+import { Control, Controller, FieldValues } from "react-hook-form";
+import { StockSource } from "../../../core/api/types/stockOperation/StockSource";
+import { ResourceRepresentation } from "../../../core/api/api";
+import { useStockSources } from "../../../stock-sources/stock-sources.resource";
+import { Concept } from "../../../core/api/types/concept/Concept";
+import { StockItemReferenceDTO } from "../../../core/api/types/stockItem/StockItemReference";
+
+interface StockSourceSelectorProps<T> {
+  row?: StockItemReferenceDTO;
+  onSourceChange?: (unit: StockSource) => void;
+  title?: string;
+  placeholder?: string;
+  invalid?: boolean;
+
+  // Control
+  controllerName: string;
+  name: string;
+  control: Control<FieldValues, T>;
+}
+
+const StockSourceSelector = <T,>(props: StockSourceSelectorProps<T>) => {
+  const {
+    items: { results: sourcesList },
+    isLoading,
+  } = useStockSources({
+    v: ResourceRepresentation.Default,
+  });
+  if (isLoading) return <TextInputSkeleton />;
+
+  return (
+    <Controller
+      name={props.controllerName}
+      control={props.control}
+      render={({ field: { onChange, value, ref } }) => (
+        <ComboBox
+          titleText={props.title}
+          name={props.name}
+          control={props.control}
+          controllerName={props.controllerName}
+          id={props.name}
+          size={"md"}
+          items={sourcesList || []}
+          onChange={(data: { selectedItem: StockSource }) => {
+            props.onSourceChange?.(data.selectedItem);
+            onChange(data.selectedItem?.uuid);
+          }}
+          initialSelectedItem={
+            sourcesList?.find((p) => p.uuid === props.row?.uuid) || {}
+          }
+          itemToString={(item?: Concept) =>
+            item && item?.name ? `${item?.name}` : ""
+          }
+          shouldFilterItem={() => true}
+          value={sourcesList?.find((p) => p.uuid === value)?.name ?? ""}
+          placeholder={props.placeholder}
+          ref={ref}
+          invalid={props.invalid}
+        />
+      )}
+    />
+  );
+};
+
+export default StockSourceSelector;

package/src/stock-items/add-stock-item/stock-item-references/validation-schema.ts

@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const stockItemReferenceschema = z.object({
+  code: z.string().nullish(),
+  references: z.string().nullish(),
+});
+
+export type StockItemReferenceData = z.infer<typeof stockItemReferenceschema>;

package/src/stock-items/add-stock-item/stock-item-rules/stock-item-rules.component.tsx

@@ -42,7 +42,6 @@ const StockItemRules: React.FC<StockItemRulesProps> = ({
   canEdit = true,
 }) => {
   const { t } = useTranslation();
-  console.warn("Found stock uuid: " + stockItemUuid);
   const {
     isLoading,
     items,

package/src/stock-items/stock-items.resource.ts

@@ -12,6 +12,10 @@ import { StockOperationItemCost } from "../core/api/types/stockOperation/StockOp
 import { StockBatchDTO } from "../core/api/types/stockItem/StockBatchDTO";
 import { StockItemPackagingUOMDTO } from "../core/api/types/stockItem/StockItemPackagingUOM";
 import { StockRule } from "../core/api/types/stockItem/StockRule";
+import {
+  StockItemReference,
+  StockItemReferenceDTO,
+} from "../core/api/types/stockItem/StockItemReference";
 
 export interface StockItemFilter extends ResourceFilterCriteria {
   isDrug?: string | null | undefined;
@@ -47,6 +51,10 @@ export interface StockItemPackagingUOMFilter extends ResourceFilterCriteria {
   stockItemUuid?: string | null | undefined;
 }
 
+export interface StockItemReferenceFilter extends ResourceFilterCriteria {
+  stockItemUuid?: string | null | undefined;
+}
+
 export interface StockBatchFilter extends ResourceFilterCriteria {
   stockItemUuid?: string | null | undefined;
   excludeExpired?: boolean | null;
@@ -303,7 +311,6 @@ export function importStockItem(item: FormData) {
 // stock rules
 // getStockRules
 export function useStockRules(filter: StockRuleFilter) {
-  console.warn("Rules filter: " + JSON.stringify(filter));
   const apiUrl = `${restBaseUrl}/stockmanagement/stockrule${toQueryParams(
     filter
   )}`;
@@ -367,3 +374,67 @@ export function deleteStockRule(id: string) {
     signal: abortController.signal,
   });
 }
+
+// stock references
+// getStockItemReferences
+export function useStockItemReferences(filter: StockItemReferenceFilter) {
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockitemreference${toQueryParams(
+    filter
+  )}`;
+  const { data, error, isLoading } = useSWR<
+    {
+      data: PageableResult<StockItemReferenceDTO>;
+    },
+    Error
+  >(apiUrl, openmrsFetch);
+
+  return {
+    items: data?.data || <PageableResult<StockItemReferenceDTO>>{},
+    isLoading,
+    isError: error,
+  };
+}
+
+// create stockItemReference
+export function createStockItemReference(item: StockItemReferenceDTO) {
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockitemreference`;
+  const abortController = new AbortController();
+  return openmrsFetch(apiUrl, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    signal: abortController.signal,
+    body: item,
+  });
+}
+
+// updateStockRule
+export function updateStockItemReference(
+  item: StockItemReference,
+  uuid: string
+) {
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockitemreference/${uuid}`;
+  const abortController = new AbortController();
+  return openmrsFetch(apiUrl, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    signal: abortController.signal,
+    body: item,
+  });
+}
+// deleteStockItemReferemce
+export function deleteStockItemReference(id: string) {
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockitemreference/${id}`;
+  const abortController = new AbortController();
+
+  return openmrsFetch(apiUrl, {
+    method: "DELETE",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    signal: abortController.signal,
+  });
+}

package/src/stock-operations/stock-operation.utils.tsx

@@ -19,7 +19,7 @@ import {
 } from "../core/api/types/stockOperation/StockOperationType";
 import { useLocation } from "react-router-dom";
 import { extractErrorMessagesFromResponse } from "../constants";
-import { handleMutate } from "./swr-revalidation";
+import { handleMutate } from "../utils";
 export const addOrEditStockOperation = async (
   stockOperation: StockOperationDTO,
   isEditing: boolean,

package/src/stock-operations/stock-operations-dialog/stock-operations-dialog.component.tsx

@@ -19,7 +19,7 @@ import { executeStockOperationAction } from "../stock-operations.resource";
 import { restBaseUrl, showSnackbar } from "@openmrs/esm-framework";
 import { closeOverlay } from "../../core/components/overlay/hook";
 import { extractErrorMessagesFromResponse } from "../../constants";
-import { handleMutate } from "../swr-revalidation";
+import { handleMutate } from "../../utils";
 
 interface StockOperationDialogProps {
   title: string;

package/src/stock-operations/stock-operations-table.component.tsx

@@ -38,7 +38,12 @@ import {
   StockOperationStatusRejected,
   StockOperationStatusReturned,
 } from "../core/api/types/stockOperation/StockOperationStatus";
-import { isDesktop, showModal, useConfig } from "@openmrs/esm-framework";
+import {
+  isDesktop,
+  restBaseUrl,
+  showModal,
+  useConfig,
+} from "@openmrs/esm-framework";
 import StockOperationTypesSelector from "./stock-operation-types-selector/stock-operation-types-selector.component";
 import { launchAddOrEditDialog } from "./stock-operation.utils";
 import { initialStockOperationValue } from "../core/utils/utils";
@@ -51,6 +56,7 @@ import {
   DATE_PICKER_FORMAT,
   StockFilters,
 } from "../constants";
+import { handleMutate } from "../utils";
 
 interface StockOperationsTableProps {
   status?: string;
@@ -114,6 +120,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
       title: "complete",
       closeModal: () => dispose(),
     });
+    handleMutate(`${restBaseUrl}/stockmanagement/stockoperation`);
   };
 
   useEffect(() => {

package/src/stock-reports/generate-report/create-stock-report.component.tsx

@@ -355,7 +355,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayDate) {
         parameters += getReportParameter(
           ReportParameter.Date,
-          JSON.stringify(report.date).replaceAll('"', ""),
+          report.date ? JSON.stringify(report.date).replaceAll('"', "") : "",
           formatDisplayDate(report.date) ?? "",
           t("stockmanagement.report.edit.date"),
           newLine
@@ -364,7 +364,9 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayStartDate) {
         parameters += getReportParameter(
           ReportParameter.StartDate,
-          JSON.stringify(report.startDate).replaceAll('"', ""),
+          report.startDate
+            ? JSON.stringify(report.startDate).replaceAll('"', "")
+            : "",
           formatDisplayDate(report.startDate) ?? "",
           t(getReportStartDateLabel(report.reportSystemName)),
           newLine
@@ -373,7 +375,9 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
       if (displayEndDate) {
         parameters += getReportParameter(
           ReportParameter.EndDate,
-          JSON.stringify(report.endDate).replaceAll('"', ""),
+          report.endDate
+            ? JSON.stringify(report.endDate).replaceAll('"', "")
+            : "",
           formatDisplayDate(report.endDate) ?? "",
           t(getReportEndDateLabel(report.reportSystemName)),
           newLine
@@ -529,6 +533,30 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             )}
           />
         )}
+        {displayInventoryGroupBy && (
+          <Select
+            id="inventoryGroupBy"
+            defaultValue={model?.inventoryGroupBy}
+            invalid={errors?.inventoryGroupBy?.message}
+            invalidText={errors?.inventoryGroupBy?.message}
+            labelText={t("inventoryBy", "Inventory by")}
+            onChange={(e) => setValue("inventoryGroupBy", e.target.value)}
+          >
+            <SelectItem value="" text={t("SelectOption", "Select an option")} />
+            <SelectItem
+              value="StockItemOnly"
+              text={t("stockItem", "Stock Item")}
+            />
+            <SelectItem
+              value="LocationStockItem"
+              text={t("lcationstockitem", "Location  and Stock Item")}
+            />
+            <SelectItem
+              value="LocationStockItemBatchNo"
+              text={t("locationBatchno", "Location and Batch")}
+            />
+          </Select>
+        )}
         {displayLocation && (
           <Select
             name="location"
@@ -537,6 +565,8 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             id="location"
             onChange={(e) => setValue("location", e.target.value)}
             defaultValue=""
+            invalid={errors?.location?.message}
+            invalidText={errors?.location?.message}
           >
             <SelectItem
               disabled
@@ -674,6 +704,32 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             />
           </div>
         )}
+        {displayDate && (
+          <Controller
+            control={control}
+            name="date"
+            render={({ field: { onChange, value } }) => (
+              <DatePicker
+                datePickerType="single"
+                maxDate={formatForDatePicker(today())}
+                locale="en"
+                dateFormat={DATE_PICKER_CONTROL_FORMAT}
+                onChange={onChange}
+                value={value}
+              >
+                <DatePickerInput
+                  id="date"
+                  name="date"
+                  placeholder={DATE_PICKER_FORMAT}
+                  labelText={t("date", "Date")}
+                  defaultValue=""
+                  invalid={errors?.date?.message}
+                  invalidText={errors?.date?.message}
+                />
+              </DatePicker>
+            )}
+          />
+        )}
       </div>
       <div className={styles.reportButton}>
         <Button kind="secondary" onClick={closeOverlay}>

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

@@ -1,40 +1,77 @@
 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 const reportSchema = z
+  .object({
+    startDate: z.coerce.date().optional(),
+    endDate: z.coerce.date().optional(),
+    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(),
+    stockItemCategory: z.string().optional(),
+    inventoryGroupByName: z.string().optional(),
+    stockItemCategoryConceptUuid: z.string().optional(),
+    reportSystemName: z.string().optional(),
+    maxReorderLevelRatio: z.number().optional(),
+    fullFillment: z.string().array().optional(),
+    limit: z.string().optional(),
+    date: z.coerce.date().optional(),
+  })
+  .superRefine((data, ctx) => {
+    if (
+      data.reportName !== "Stock Status Report" &&
+      data.reportName !== "Stock-Out Report"
+    ) {
+      if (!data.startDate) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Start Date is required ",
+          path: ["startDate"],
+        });
+      }
+      if (!data.endDate) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "End Date is required",
+          path: ["endDate"],
+        });
+      }
+    }
+    if (
+      data.reportName === "Stock Status Report" ||
+      data.reportName === "Stock-Out Report"
+    ) {
+      if (!data.date) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Date is required ",
+          path: ["date"],
+        });
+      }
+      if (!data.inventoryGroupBy) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Inventory by is required ",
+          path: ["inventoryGroupBy"],
+        });
+      }
+    }
+  });
 
 export type StockReportSchema = z.infer<typeof reportSchema>;

package/src/stock-sources/add-stock-sources/add-stock-sources.component.tsx

@@ -9,15 +9,20 @@ import {
   SelectItem,
 } from "@carbon/react";
 import React, { ChangeEvent, useCallback, useState } from "react";
-import { handleMutate } from "../swr-revalidation";
 import styles from "./add-stock-sources.scss";
 import { useConcept } from "../../stock-lookups/stock-lookups.resource";
 import { StockSource } from "../../core/api/types/stockOperation/StockSource";
 import { createOrUpdateStockSource } from "../stock-sources.resource";
-import { showNotification, showToast, useConfig } from "@openmrs/esm-framework";
+import {
+  restBaseUrl,
+  showNotification,
+  showToast,
+  useConfig,
+} from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
 import { closeOverlay } from "../../core/components/overlay/hook";
 import { type ConfigObject } from "../../config-schema";
+import { handleMutate } from "../../utils";
 
 interface AddStockSourceProps {
   model?: StockSource;
@@ -68,7 +73,7 @@ const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
               ),
             });
 
-            handleMutate("ws/rest/v1/stockmanagement/stocksource");
+            handleMutate(`${restBaseUrl}/stockmanagement/stocksource`);
 
             closeOverlay();
           },

package/src/stock-sources/stock-sources-delete/stock-sources-delete.component.tsx

@@ -1,10 +1,15 @@
 import React, { useState } from "react";
-import { handleMutate } from "../swr-revalidation";
 import { Button, InlineLoading } from "@carbon/react";
 import { useTranslation } from "react-i18next";
 import { TrashCan } from "@carbon/react/icons";
 import { deleteStockSource } from "../stock-sources.resource";
-import { showModal, showNotification, showToast } from "@openmrs/esm-framework";
+import {
+  restBaseUrl,
+  showModal,
+  showNotification,
+  showToast,
+} from "@openmrs/esm-framework";
+import { handleMutate } from "../../utils";
 
 interface StockSourcesDeleteActionMenuProps {
   uuid: string;
@@ -29,7 +34,7 @@ const StockSourcesDeleteActionMenu: React.FC<
             () => {
               setDeletingSource(false);
 
-              handleMutate("ws/rest/v1/stockmanagement/stocksource");
+              handleMutate(`${restBaseUrl}/stockmanagement/stocksource`);
               showToast({
                 critical: true,
                 title: t("deletingSource", "Delete Source"),

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

@@ -28,7 +28,11 @@ import { closeOverlay } from "../../core/components/overlay/hook";
 import { useTranslation } from "react-i18next";
 import { UserRoleScope } from "../../core/api/types/identity/UserRoleScope";
 import { createOrUpdateUserRoleScope } from "../stock-user-role-scopes.resource";
-import { showNotification, showToast } from "@openmrs/esm-framework";
+import {
+  restBaseUrl,
+  showNotification,
+  showToast,
+} from "@openmrs/esm-framework";
 import { UserRoleScopeOperationType } from "../../core/api/types/identity/UserRoleScopeOperationType";
 import { UserRoleScopeLocation } from "../../core/api/types/identity/UserRoleScopeLocation";
 import {
@@ -42,11 +46,10 @@ import {
   formatForDatePicker,
   today,
 } from "../../constants";
-import { debounce } from "lodash-es";
 import { User } from "../../core/api/types/identity/User";
 import { Role } from "../../core/api/types/identity/Role";
 import { StockOperationType } from "../../core/api/types/stockOperation/StockOperationType";
-import { handleMutate } from "../swr-revalidation";
+import { handleMutate } from "../../utils";
 
 const MinDate: Date = today();
 
@@ -274,7 +277,7 @@ const AddStockUserRoleScope: React.FC<AddStockUserRoleScopeProps> = ({
 
     createOrUpdateUserRoleScope(formModel).then(
       (res) => {
-        handleMutate("ws/rest/v1/stockmanagement/userrolescope");
+        handleMutate(`${restBaseUrl}/stockmanagement/userrolescope`);
         showToast({
           critical: true,
           title: t("addUserRole", "Add User role"),

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

@@ -3,8 +3,13 @@ import { Button, InlineLoading } from "@carbon/react";
 import { useTranslation } from "react-i18next";
 import { TrashCan } from "@carbon/react/icons";
 import { deleteUserRoleScopes } from "../stock-user-role-scopes.resource";
-import { showModal, showNotification, showToast } from "@openmrs/esm-framework";
-import { handleMutate } from "../swr-revalidation";
+import {
+  restBaseUrl,
+  showModal,
+  showNotification,
+  showToast,
+} from "@openmrs/esm-framework";
+import { handleMutate } from "../../utils";
 
 interface StockUserScopDeleteActionMenuProps {
   uuid: string;
@@ -27,7 +32,7 @@ const StockUserScopeDeleteActionMenu: React.FC<
         deleteUserRoleScopes(ids)
           .then(
             () => {
-              handleMutate("ws/rest/v1/stockmanagement/userrolescope");
+              handleMutate(`${restBaseUrl}/stockmanagement/userrolescope`);
               setDeletingUserScope(false);
               showToast({
                 critical: true,

package/src/utils.ts

@@ -1,4 +1,5 @@
 import { showNotification } from "@openmrs/esm-framework";
+import { mutate } from "swr";
 
 export function errorAlert(msg: string, error?: Error) {
   showNotification({
@@ -8,3 +9,9 @@ export function errorAlert(msg: string, error?: Error) {
     description: error?.message,
   });
 }
+
+export const handleMutate = (url: string) => {
+  mutate((key) => typeof key === "string" && key.startsWith(url), undefined, {
+    revalidate: true,
+  });
+};