@openmrs/esm-stock-management-app 1.0.1-pre.350 → 1.0.1-pre.357

package/src/stock-locations/location-admin-form.component.tsx

@@ -0,0 +1,164 @@
+import React, { useState } from "react";
+import { z } from "zod";
+import { useForm, Controller } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+  Button,
+  ComposedModal,
+  FormGroup,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  Stack,
+  TextInput,
+  InlineNotification,
+  FilterableMultiSelect,
+  InlineLoading,
+} from "@carbon/react";
+import { useTranslation } from "react-i18next";
+import { locationData } from "../stock-items/types";
+import styles from "./stock-locations-table.scss";
+import { useLocationTags } from "./stock-locations-table.resource";
+
+const LocationAdministrationSchema = z.object({
+  name: z.string().max(255),
+});
+
+interface LocationAdministrationFormProps {
+  showModal: boolean;
+  onModalChange: (showModal: boolean) => void;
+  handleCreateQuestion?: (formData: locationData) => void;
+  handleDeleteBedTag?: () => void;
+  headerTitle: string;
+  initialData: locationData;
+}
+
+interface ErrorType {
+  message: string;
+}
+
+const LocationAdministrationForm: React.FC<LocationAdministrationFormProps> = ({
+  showModal,
+  onModalChange,
+  handleCreateQuestion,
+  headerTitle,
+  initialData,
+}) => {
+  const { t } = useTranslation();
+
+  const [showErrorNotification, setShowErrorNotification] = useState(false);
+  const [formStateError, setFormStateError] = useState("");
+
+  // Location tag types
+  const { locationTagList: Tags, loading: loadingRoles } = useLocationTags();
+
+  const {
+    handleSubmit,
+    control,
+    getValues,
+    formState: { isDirty },
+  } = useForm<locationData>({
+    mode: "all",
+    resolver: zodResolver(LocationAdministrationSchema),
+    defaultValues: {
+      name: initialData.name || "",
+      tags: initialData.tags || [],
+    },
+  });
+
+  const onSubmit = (formData: locationData) => {
+    const formDataFormSubmission = getValues();
+    const locationTagsUuid =
+      formDataFormSubmission?.tags?.["selectedItems"]?.map((tag) => tag.uuid) ??
+      [];
+
+    const payload = {
+      name: formDataFormSubmission.name,
+      tags: locationTagsUuid,
+    };
+    const result = LocationAdministrationSchema.safeParse(formData);
+    if (result.success) {
+      setShowErrorNotification(false);
+      handleCreateQuestion(payload);
+    }
+  };
+
+  const onError = (error: { [key: string]: ErrorType }) => {
+    setFormStateError(Object.entries(error)[0][1].message);
+    setShowErrorNotification(true);
+  };
+
+  return (
+    <ComposedModal
+      open={showModal}
+      onClose={() => onModalChange(false)}
+      preventCloseOnClickOutside
+      size={"md"}
+    >
+      <ModalHeader title={headerTitle} />
+      <form onSubmit={handleSubmit(onSubmit, onError)}>
+        <ModalBody hasScrollingContent>
+          <Stack gap={3}>
+            <FormGroup legendText={""}>
+              <Controller
+                name="name"
+                control={control}
+                rules={{ required: true }}
+                render={({ field, fieldState }) => (
+                  <>
+                    <TextInput
+                      id="location"
+                      labelText={t("location", "Location Name")}
+                      placeholder={t("locationPlaceholder", "Add a location")}
+                      invalidText={fieldState.error?.message}
+                      {...field}
+                    />
+                  </>
+                )}
+              />
+              <div className={styles.loaderContainer}>
+                <Controller
+                  name="tags"
+                  control={control}
+                  render={({ field, fieldState }) => (
+                    <FilterableMultiSelect
+                      id="tag"
+                      titleText="Select tag(s)"
+                      helperText="This is helper text"
+                      items={Tags ?? []}
+                      {...field}
+                      itemToString={(item) => (item ? item.display : "")}
+                      selectionFeedback="top-after-reopen"
+                    />
+                  )}
+                />
+              </div>
+            </FormGroup>
+
+            {showErrorNotification && (
+              <InlineNotification
+                lowContrast
+                title={t("error", "Error")}
+                style={{ minWidth: "100%", margin: "0rem", padding: "0rem" }}
+                role="alert"
+                kind="error"
+                subtitle={t("pleaseFillField", formStateError) + "."}
+                onClose={() => setShowErrorNotification(false)}
+              />
+            )}
+          </Stack>
+        </ModalBody>
+        <ModalFooter>
+          <Button onClick={() => onModalChange(false)} kind="secondary">
+            {t("cancel", "Cancel")}
+          </Button>
+          <Button disabled={!isDirty} type="submit">
+            <span>{t("save", "Save")}</span>
+          </Button>
+        </ModalFooter>
+      </form>
+    </ComposedModal>
+  );
+};
+
+export default LocationAdministrationForm;

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo, useState } from "react";
 import { useStockLocationPages } from "./stock-locations-table.resource";
 import {
   Button,
@@ -12,6 +12,9 @@ import styles from "../stock-items/stock-items-table.scss";
 import { ResourceRepresentation } from "../core/api/api";
 import DataList from "../core/components/table/table.component";
 import { useTranslation } from "react-i18next";
+import { mutate } from "swr";
+import NewLocationForm from "./add-locations-form.component";
+import { Add } from "@carbon/react/icons";
 
 interface StockLocationsTableProps {
   status?: string;
@@ -20,20 +23,29 @@ interface StockLocationsTableProps {
 const StockLocationsItems: React.FC<StockLocationsTableProps> = () => {
   const { t } = useTranslation();
 
-  const { tableHeaders, tableRows, items, isLoadingLocations } =
-    useStockLocationPages({
-      v: ResourceRepresentation.Full,
-    });
+  const [showLocationModal, setAddLocationModal] = useState(false);
+
+  const { tableHeaders, tableRows, items, isLoading } = useStockLocationPages({
+    v: ResourceRepresentation.Full,
+  });
 
   const handleRefresh = () => {
     // search.refetch()
   };
 
-  const createStockItem = () => {
-    // search.refetch()
+  const createStockLocation = () => {
+    {
+      showLocationModal ? (
+        <NewLocationForm
+          onModalChange={setAddLocationModal}
+          showModal={showLocationModal}
+          mutate={mutate}
+        />
+      ) : null;
+    }
   };
 
-  if (isLoadingLocations) {
+  if (isLoading) {
     return <DataTableSkeleton role="progressbar" />;
   }
 
@@ -48,8 +60,19 @@ const StockLocationsItems: React.FC<StockLocationsTableProps> = () => {
                 Refresh
               </TableToolbarAction>
             </TableToolbarMenu>
-            <Button onClick={createStockItem} size="md" kind="primary">
-              {t("stockmanagement.addnewlocation", "Add Location")}
+            {showLocationModal ? (
+              <NewLocationForm
+                onModalChange={setAddLocationModal}
+                showModal={showLocationModal}
+                mutate={mutate}
+              />
+            ) : null}
+            <Button
+              kind="ghost"
+              renderIcon={(props) => <Add size={16} {...props} />}
+              onClick={() => setAddLocationModal(true)}
+            >
+              {t("createLocation", "Create Location")}
             </Button>
           </>
         )}

package/src/stock-locations/stock-locations-table.resource.tsx

@@ -1,12 +1,22 @@
 import { StockOperationFilter } from "../stock-operations/stock-operations.resource";
 import { useMemo, useState } from "react";
-import { usePagination } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+  showToast,
+  usePagination,
+} from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
-import { useStockLocations } from "../stock-lookups/stock-lookups.resource";
+import {
+  useStockLocations,
+  useStockTagLocations,
+} from "../stock-lookups/stock-lookups.resource";
+import useSWR from "swr";
+import { extractErrorMessagesFromResponse } from "../constants";
 
 export function useStockLocationPages(filter: StockOperationFilter) {
-  const { locations, isErrorLocation, isLoadingLocations } =
-    useStockLocations(filter);
+  const { stockLocations, error, isLoading } = useStockTagLocations();
 
   const pageSizes = [10, 20, 30, 40, 50];
   const [currentPageSize, setPageSize] = useState(10);
@@ -15,7 +25,7 @@ export function useStockLocationPages(filter: StockOperationFilter) {
     goTo,
     results: paginatedQueueEntries,
     currentPage,
-  } = usePagination(locations.results, currentPageSize);
+  } = usePagination(stockLocations, currentPageSize);
 
   const { t } = useTranslation();
 
@@ -46,28 +56,73 @@ export function useStockLocationPages(filter: StockOperationFilter) {
   );
 
   const tableRows = useMemo(() => {
-    return locations?.results?.map((location) => ({
+    return stockLocations.map((location) => ({
       id: location?.uuid,
       key: `key-${location?.uuid}`,
       uuid: `${location?.uuid}`,
       name: `${location?.name}`,
-      tags: location?.tags?.map((p) => p.display)?.join(", ") ?? "",
+      tags:
+        location?.meta.tag
+          ?.filter((tag) => tag.code !== "SUBSETTED")
+          .map((p) => p.code)
+          ?.join(", ") ?? "",
       childLocations:
         location?.childLocations?.map((p) => p.display)?.join(", ") ?? "",
     }));
-  }, [locations?.results]);
-
+  }, [stockLocations]);
   return {
-    items: locations.results,
+    items: stockLocations,
     currentPage,
     currentPageSize,
     paginatedQueueEntries,
     goTo,
     pageSizes,
-    isLoadingLocations,
-    isErrorLocation,
+    isLoading,
+    error,
     setPageSize,
     tableHeaders,
     tableRows,
   };
 }
+
+export const useLocationTags = () => {
+  const url = `${restBaseUrl}/locationtag/`;
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { data, error, isLoading, isValidating, mutate } = useSWR<
+    { data },
+    Error
+  >(url, openmrsFetch);
+  const results = data?.data?.results ? data?.data?.results : [];
+  return {
+    locationTagList: results,
+    loading: isLoading,
+    mutate,
+  };
+};
+interface LocationName {
+  name: string;
+}
+export async function saveLocation({
+  locationPayload,
+}): Promise<FetchResponse<LocationName>> {
+  try {
+    const response: FetchResponse = await openmrsFetch(
+      `${restBaseUrl}/location/`,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: locationPayload,
+      }
+    );
+    return response;
+  } catch (error) {
+    const errorMessages = extractErrorMessagesFromResponse(error);
+    showToast({
+      description: errorMessages.join(", "),
+      title: "Error on saving form",
+      kind: "error",
+      critical: true,
+    });
+  }
+}

package/src/stock-locations/stock-locations-table.scss

@@ -0,0 +1,3 @@
+.loaderContainer {
+  margin-bottom: 150px;
+}

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

@@ -41,7 +41,7 @@ interface FHIRResponse {
 
 // getLocations
 export function useStockLocations(filter: LocationFilterCriteria) {
-  const apiUrl = `ws/rest/v1/location${toQueryParams(filter, false)}`;
+  const apiUrl = `${restBaseUrl}/location${toQueryParams(filter, false)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<OpenMRSLocation>;
@@ -76,7 +76,7 @@ export function useStockTagLocations() {
 
 // getLocationWithIdByUuid
 export function useLocationWithIdByUuid(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/location/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/location/${id}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<OpenMRSLocation>;
@@ -92,7 +92,7 @@ export function useLocationWithIdByUuid(id: string) {
 
 //  deleteLocation
 export function deleteLocation(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/location/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/location/${id}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "DELETE",
@@ -105,7 +105,7 @@ export function deleteLocation(id: string) {
 
 // getLocationTags
 export function useLocationTags(q: string) {
-  const apiUrl = `ws/rest/v1/locationtag?v=default${
+  const apiUrl = `${restBaseUrl}/locationtag?v=default${
     q && q.length > 0 ? "&q=" + encodeURIComponent(q) : ""
   }`;
   const { data, error, isLoading } = useSWR<
@@ -123,7 +123,7 @@ export function useLocationTags(q: string) {
 
 // getRoles
 export function useRoles(filter: ResourceFilterCriteria) {
-  const apiUrl = `ws/rest/v1/role${toQueryParams(filter)}`;
+  const apiUrl = `${restBaseUrl}/role${toQueryParams(filter)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<Role>;
@@ -139,7 +139,7 @@ export function useRoles(filter: ResourceFilterCriteria) {
 
 // getStockOperationTypes
 export function useStockOperationTypes() {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationtype?v=default`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationtype?v=default`;
   const { data, isLoading, error } = useSWR<
     {
       data: PageableResult<StockOperationType>;
@@ -156,13 +156,13 @@ export function useStockOperationTypes() {
 export function getStockOperationTypes(): Promise<
   FetchResponse<PageableResult<StockOperationType>>
 > {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationtype?v=default`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationtype?v=default`;
   return openmrsFetch(apiUrl);
 }
 
 // getUsers
 export function useUsers(filter: UserFilterCriteria) {
-  const apiUrl = `ws/rest/v1/user${toQueryParams(filter)}`;
+  const apiUrl = `${restBaseUrl}/user${toQueryParams(filter)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<User>;
@@ -178,7 +178,7 @@ export function useUsers(filter: UserFilterCriteria) {
 
 // getUser
 export function useUser(id: string) {
-  const apiUrl = `ws/rest/v1/user${id}`;
+  const apiUrl = `${restBaseUrl}/user${id}`;
   const { data, error, isLoading } = useSWR<
     {
       data: User;
@@ -193,7 +193,7 @@ export function useUser(id: string) {
 }
 
 export function useConcept(conceptUuid: string) {
-  const apiUrl = `ws/rest/v1/concept/${conceptUuid}`;
+  const apiUrl = `${restBaseUrl}/concept/${conceptUuid}`;
   const { data, error, isLoading } = useSWR<
     {
       data: Concept;
@@ -209,7 +209,7 @@ export function useConcept(conceptUuid: string) {
 
 // getParties
 export function useParties() {
-  const apiUrl = `ws/rest/v1/stockmanagement/party?v=default`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/party?v=default`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<Party>;
@@ -224,13 +224,13 @@ export function useParties() {
 }
 
 export function getParties(): Promise<FetchResponse<PageableResult<Party>>> {
-  const apiUrl = `ws/rest/v1/stockmanagement/party?v=default`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/party?v=default`;
   return openmrsFetch(apiUrl);
 }
 
 // getDrugs
 export function useDrugs(filter: DrugFilterCriteria) {
-  const apiUrl = `ws/rest/v1/drug${toQueryParams(filter)}`;
+  const apiUrl = `${restBaseUrl}/drug${toQueryParams(filter)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<Drug>;
@@ -246,7 +246,7 @@ export function useDrugs(filter: DrugFilterCriteria) {
 
 // getConcepts
 export function useConcepts(filter: ConceptFilterCriteria) {
-  const apiUrl = `ws/rest/v1/concept${toQueryParams(filter)}`;
+  const apiUrl = `${restBaseUrl}/concept${toQueryParams(filter)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<Concept>;
@@ -262,7 +262,7 @@ export function useConcepts(filter: ConceptFilterCriteria) {
 
 // getPatients
 export function usePatients(filter: ConceptFilterCriteria) {
-  const apiUrl = `ws/rest/v1/patient${toQueryParams(filter)}`;
+  const apiUrl = `${restBaseUrl}/patient${toQueryParams(filter)}`;
   const { data, error, isLoading } = useSWR<
     {
       data: PageableResult<Patient>;

package/src/stock-operations/add-stock-operation/add-stock-operation.component.tsx

@@ -22,7 +22,12 @@ import StockOperationApproveDispatchButton from "../stock-operations-dialog/stoc
 import StockOperationCompleteDispatchButton from "../stock-operations-dialog/stock-operations-completed-dispatch-button.component";
 import StockOperationIssueStockButton from "../stock-operations-dialog/stock-operations-issue-stock-button.component";
 import { StockOperation } from "./stock-operation-context/useStockOperationContext";
-import { formatDate, parseDate, showToast } from "@openmrs/esm-framework";
+import {
+  formatDate,
+  parseDate,
+  showSnackbar,
+  showToast,
+} from "@openmrs/esm-framework";
 import {
   OperationType,
   StockOperationType,
@@ -43,12 +48,12 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   if (isLoading) return <AccordionSkeleton />;
   if (isError) {
     closeOverlay();
-    showToast({
+    showSnackbar({
       kind: "error",
       title: t("error", "Error"),
-      description: t("errorLoadingStockOperation", "Error loading stock item"),
-      millis: 5000,
-      critical: true,
+      subtitle: t("errorLoadingStockOperation", "Error loading stock item"),
+      timeoutInMs: 5000,
+      isLowContrast: true,
     });
     return;
   }

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

@@ -1,4 +1,8 @@
-import { FetchResponse, openmrsFetch } from "@openmrs/esm-framework";
+import {
+  FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+} from "@openmrs/esm-framework";
 import useSWR from "swr";
 import { ResourceFilterCriteria, toQueryParams } from "../core/api/api";
 import { PageableResult } from "../core/api/types/PageableResult";
@@ -34,7 +38,7 @@ export interface StockItemInventoryFilter extends ResourceFilterCriteria {
 
 // getStockOperations
 export function useStockOperations(filter: StockOperationFilter) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation${toQueryParams(
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation${toQueryParams(
     filter
   )}`;
   const { data, error, isLoading } = useSWR<
@@ -51,7 +55,7 @@ export function useStockOperations(filter: StockOperationFilter) {
 
 // getStockOperationLinks
 export function useStockOperationLinks(filter: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationlink?v=default&q=${filter}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationlink?v=default&q=${filter}`;
   const { data, error, isLoading } = useSWR<
     { data: PageableResult<StockOperationLinkDTO> },
     Error
@@ -65,7 +69,7 @@ export function useStockOperationLinks(filter: string) {
 
 // getStockOperation
 export function useStockOperation(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}`;
   const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(
     apiUrl,
     openmrsFetch
@@ -79,14 +83,14 @@ export function useStockOperation(id: string) {
 export function getStockOperation(
   id: string
 ): Promise<FetchResponse<StockOperationDTO>> {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation/${id}?v=full`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}?v=full`;
 
   return openmrsFetch(apiUrl);
 }
 
 // getStockOperationAndItems
 export function useStockOperationAndItems(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation/${id}?v=full`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${id}?v=full`;
   const { data, error, isLoading } = useSWR<{ data: StockOperationDTO }, Error>(
     apiUrl,
     openmrsFetch
@@ -108,7 +112,7 @@ export function deleteStockOperations(ids: string[]) {
   if (otherIds.length > 0) {
     otherIds = "?ids=" + otherIds;
   }
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation/${ids[0]}${otherIds}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${ids[0]}${otherIds}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "DELETE",
@@ -121,7 +125,7 @@ export function deleteStockOperations(ids: string[]) {
 
 // deleteStockOperationItem
 export function deleteStockOperationItem(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationitem/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationitem/${id}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "DELETE",
@@ -134,7 +138,7 @@ export function deleteStockOperationItem(id: string) {
 
 // createStockOperation
 export function createStockOperation(item: StockOperationDTO) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "POST",
@@ -148,7 +152,7 @@ export function createStockOperation(item: StockOperationDTO) {
 
 // updateStockOperation
 export function updateStockOperation(item: StockOperationDTO) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperation/${item.uuid}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperation/${item.uuid}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "POST",
@@ -162,7 +166,7 @@ export function updateStockOperation(item: StockOperationDTO) {
 
 // executeStockOperationAction
 export function executeStockOperationAction(item: StopOperationAction) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationaction`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationaction`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "POST",
@@ -179,7 +183,7 @@ export function updateStockOperationBatchNumbers(
   item: StockOperationDTO,
   uuid: string
 ) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationbatchnumbers/${uuid}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationbatchnumbers/${uuid}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "POST",
@@ -193,7 +197,7 @@ export function updateStockOperationBatchNumbers(
 
 // get stock operation itemcosts
 export function getStockOperationItemsCost(filter: StockOperationFilter) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockoperationitemcost?v=default&stockOperationUuid=${filter}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockoperationitemcost?v=default&stockOperationUuid=${filter}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "GET",
@@ -205,7 +209,7 @@ export function getStockOperationItemsCost(filter: StockOperationFilter) {
 }
 // get stockiteminvoentory
 export function getStockItemInventory(filter: StockItemInventoryFilter) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stockiteminventory${toQueryParams(
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockiteminventory${toQueryParams(
     filter
   )}`;
   const abortController = new AbortController();

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

@@ -1,4 +1,4 @@
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 import { ResourceFilterCriteria, toQueryParams } from "../core/api/api";
 import useSWR from "swr";
 import { PageableResult } from "../core/api/types/PageableResult";
@@ -10,7 +10,7 @@ export interface StockSourceFilter extends ResourceFilterCriteria {
 
 // getStockSources
 export function useStockSources(filter: StockSourceFilter) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stocksource${toQueryParams(
+  const apiUrl = `${restBaseUrl}/stockmanagement/stocksource${toQueryParams(
     filter
   )}`;
 
@@ -28,7 +28,7 @@ export function useStockSources(filter: StockSourceFilter) {
 
 // getStockSource
 export function useStockSource(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/stocksource/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stocksource/${id}`;
   const { data, error, isLoading } = useSWR<{ data: StockSource }, Error>(
     apiUrl,
     openmrsFetch
@@ -50,7 +50,7 @@ export function deleteStockSource(ids: string[]) {
   if (otherIds.length > 0) {
     otherIds = "?ids=" + otherIds;
   }
-  const apiUrl = `ws/rest/v1/stockmanagement/stocksource/${ids[0]}${otherIds}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/stocksource/${ids[0]}${otherIds}`;
   const abortController = new AbortController();
   return openmrsFetch(apiUrl, {
     method: "DELETE",
@@ -65,7 +65,7 @@ export function deleteStockSource(ids: string[]) {
 export function createOrUpdateStockSource(item: StockSource) {
   const isNew = item.uuid != null;
 
-  const apiUrl = `ws/rest/v1/stockmanagement/stocksource${
+  const apiUrl = `${restBaseUrl}/stockmanagement/stocksource${
     isNew ? "/" + item.uuid : ""
   }`;
   const abortController = new AbortController();