@openmrs/esm-stock-management-app 1.0.1-pre.418 → 1.0.1-pre.433

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

@@ -0,0 +1,264 @@
+import React, { useMemo, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import {
+  Button,
+  DataTable,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+  DataTableSkeleton,
+} from "@carbon/react";
+import styles from "./stock-item-references.scss";
+import { TrashCan, Save } from "@carbon/react/icons";
+import { FormProvider, useForm, useFormContext } from "react-hook-form";
+import StockSourceSelector from "./stock-references-selector.component";
+import { useStockItemReferencesHook } from "./stock-item-references.resource";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { StockItemReferenceData } from "./validation-schema";
+import { stockItemDetailsSchema } from "../../validationSchema";
+import { StockItemReferenceDTO } from "../../../core/api/types/stockItem/StockItemReference";
+import ControlledTextInput from "../../../core/components/carbon/controlled-text-input/controlled-text-input.component";
+import {
+  createStockItemReference,
+  deleteStockItemReference,
+} from "../../stock-items.resource";
+import {
+  restBaseUrl,
+  showNotification,
+  showSnackbar,
+  showToast,
+} from "@openmrs/esm-framework";
+import { extractErrorMessagesFromResponse } from "../../../constants";
+import { handleMutate } from "../../../utils";
+
+interface StockReferencesProps {
+  isEditing?: boolean;
+  onSubmit?: () => void;
+  stockItemUuid: string;
+}
+
+const StockReferences: React.FC<StockReferencesProps> = ({
+  isEditing,
+  stockItemUuid,
+}) => {
+  const { t } = useTranslation();
+
+  // get stock item references
+  const { items, isLoading, setStockItemUuid } = useStockItemReferencesHook();
+  useEffect(() => {
+    setStockItemUuid(stockItemUuid);
+  }, [stockItemUuid, setStockItemUuid]);
+
+  const tableHeaders = useMemo(
+    () => [
+      {
+        key: "source",
+        header: t("source", "Source"),
+        styles: { width: "50%" },
+      },
+      {
+        key: "code",
+        header: t("code", "Code"),
+        styles: { width: "50%" },
+      },
+      {
+        key: "action",
+        header: t("action", "Actions"),
+        styles: { width: "50%" },
+      },
+    ],
+    [t]
+  );
+
+  const stockReferenceForm = useForm<StockItemReferenceData>({
+    defaultValues: {},
+    mode: "all",
+    resolver: zodResolver(stockItemDetailsSchema),
+  });
+
+  const handleSaveStockItemReference = () => {
+    const { getValues } = stockReferenceForm;
+    const { code, references } = getValues();
+
+    const payload: StockItemReferenceDTO = {
+      referenceCode: code,
+      stockItemUuid: stockItemUuid,
+      stockSourceUuid: references,
+    };
+
+    createStockItemReference(payload).then(
+      () => {
+        handleMutate(`${restBaseUrl}/stockmanagement/stockitemreference`);
+
+        showSnackbar({
+          title: t("saveReferenceTitle", "StockItem Reference"),
+          subtitle: t(
+            "saveStockItemReferenceMessage",
+            "Stock Item Reference saved successfully"
+          ),
+          kind: "success",
+        });
+      },
+      (error) => {
+        handleMutate(`${restBaseUrl}/stockmanagement/stockitemreference`);
+
+        const err = extractErrorMessagesFromResponse(error);
+        showSnackbar({
+          title: t("saveStockItemReferenceErrorTitle", "StockItem Reference"),
+          subtitle: t(
+            "saveStockItemReferenceErrorMessage",
+            "Error saving stock item reference" + err.join(",")
+          ),
+          kind: "error",
+        });
+      }
+    );
+  };
+
+  if (isLoading)
+    return (
+      <DataTableSkeleton
+        showHeader={false}
+        rowCount={5}
+        columnCount={5}
+        zebra
+      />
+    );
+
+  return (
+    <FormProvider {...stockReferenceForm}>
+      <DataTable
+        rows={items ?? []}
+        headers={tableHeaders}
+        isSortable={false}
+        useZebraStyles={true}
+        render={({ headers, getHeaderProps, getTableProps }) => (
+          <TableContainer className={styles.referencesTableContainer}>
+            <Table {...getTableProps()} className={styles.referencesTable}>
+              <TableHead>
+                <TableRow>
+                  {headers.map((header) => (
+                    <TableHeader
+                      {...getHeaderProps({
+                        header,
+                        isSortable: false,
+                      })}
+                      style={header.styles}
+                      key={header.key}
+                    >
+                      {header.header?.content ?? header.header}
+                    </TableHeader>
+                  ))}
+                  <TableHeader style={{ width: "70%" }} />
+                </TableRow>
+              </TableHead>
+              <TableBody className={styles.referencesTableBody}>
+                {items?.map((row: StockItemReferenceDTO, index) => (
+                  <StockReferencesRow row={row} key={`${index}-${row?.uuid}`} />
+                ))}
+                <StockReferencesRow row={{}} key="bottom-row" isEditing />
+              </TableBody>
+            </Table>
+          </TableContainer>
+        )}
+      />
+
+      <Button
+        name="save"
+        type="submit"
+        className="submitButton"
+        onClick={handleSaveStockItemReference}
+        kind="primary"
+        renderIcon={Save}
+      >
+        {t("save", "Save")}
+      </Button>
+    </FormProvider>
+  );
+};
+export default StockReferences;
+
+const StockReferencesRow: React.FC<{
+  isEditing?: boolean;
+  row: StockItemReferenceDTO;
+  key?: string;
+}> = ({ isEditing, row, key }) => {
+  const { t } = useTranslation();
+
+  const {
+    control,
+    formState: { errors },
+  } = useFormContext();
+
+  const handleDelete = (e) => {
+    e.preventDefault();
+    deleteStockItemReference(row.uuid).then(
+      () => {
+        showSnackbar({
+          title: t("deletePackagingUnitTitle", `Delete StockItem reference`),
+          kind: "success",
+          subtitle: t(
+            "deleteStockItemReferenceMesaage",
+            `StockItem reference deleted Successfully`
+          ),
+        });
+      },
+      (error) => {
+        const err = extractErrorMessagesFromResponse(error);
+        showSnackbar({
+          title: t(
+            "deleteStockItemReferenceTitle",
+            `Error Deleting a stockitem reference`
+          ),
+          kind: "error",
+          subtitle: err.join(","),
+        });
+      }
+    );
+  };
+
+  return (
+    <TableRow>
+      <TableCell>
+        {isEditing ? (
+          <StockSourceSelector
+            row={row}
+            name="references"
+            controllerName={"references"}
+            control={control}
+            placeholder={t("filter", "Filter...")}
+          />
+        ) : (
+          (!isEditing || !row.uuid.startsWith("new-item")) &&
+          row?.stockSourceName
+        )}
+      </TableCell>
+      <TableCell>
+        <div className={styles.referencesTableCell}>
+          <ControlledTextInput
+            id={`${row.uuid}-${key}`}
+            name="code"
+            control={control}
+            size={"md"}
+            value={row?.referenceCode ?? ""}
+            controllerName="code"
+            labelText={""}
+          />
+          <Button
+            type="button"
+            size="sm"
+            className="submitButton clear-padding-margin"
+            iconDescription={"Delete"}
+            kind="ghost"
+            renderIcon={TrashCan}
+            onClick={(e) => handleDelete(e)}
+          />
+        </div>
+      </TableCell>
+    </TableRow>
+  );
+};

package/src/stock-items/add-stock-item/stock-item-references/stock-item-references.resource.ts

@@ -0,0 +1,39 @@
+import { ResourceRepresentation } from "../../../core/api/api";
+import {
+  StockItemReferenceFilter,
+  useStockItemReferences,
+} from "../../stock-items.resource";
+import { useEffect, useState } from "react";
+
+export function useStockItemReferencesHook(v?: ResourceRepresentation) {
+  const [stockItemReferenceFilter, setStockItemReferenceFilter] =
+    useState<StockItemReferenceFilter>({
+      startIndex: 0,
+      v: v || ResourceRepresentation.Default,
+      q: null,
+      totalCount: true,
+    });
+
+  const [stockItemUuid, setStockItemUuid] = useState<string | null>();
+
+  useEffect(() => {
+    setStockItemReferenceFilter({
+      startIndex: 0,
+      v: ResourceRepresentation.Default,
+      totalCount: true,
+      stockItemUuid: stockItemUuid,
+    });
+  }, [stockItemUuid]);
+
+  const { items, isLoading, isError } = useStockItemReferences(
+    stockItemReferenceFilter
+  );
+
+  return {
+    items: items.results,
+    totalCount: items.totalCount,
+    isLoading,
+    isError,
+    setStockItemUuid,
+  };
+}

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/add-stock-rules.component.tsx

@@ -67,7 +67,10 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
     isLoading: loadingRoles,
   } = useRoles({ v: ResourceRepresentation.Default });
 
-  const [formModel, setFormModel] = useState<StockRule>();
+  const [formModel, setFormModel] = useState<StockRule>({
+    enabled: true,
+    ...model,
+  });
 
   useEffect(() => {
     if (model != null && Object.keys(model).length != 0) {
@@ -190,7 +193,7 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
         )
         .catch();
     },
-    [formModel, model, t]
+    [formModel, model, t, stockItemUuid]
   );
 
   return (

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-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"),