@openmrs/esm-stock-management-app 1.0.1-pre.348 → 1.0.1-pre.352

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/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-reports/report-list/stock-reports.component.tsx

@@ -1,9 +1,8 @@
-import React, { useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import {
   DataTable,
   DataTableSkeleton,
-  Link,
   TabPanel,
   Pagination,
   Table,
@@ -17,14 +16,44 @@ import {
   TableToolbarContent,
   TableToolbarSearch,
   Tile,
+  Button,
 } from "@carbon/react";
-import styles from "./stock-reports.scss";
 import { isDesktop } from "@openmrs/esm-framework";
-
 import NewReportActionButton from "./new-report-button.component";
+import styles from "./stock-reports.scss";
+import { useGetReports } from "../stock-reports.resource";
+import { URL_BATCH_JOB_ARTIFACT } from "../../constants";
+import { formatDisplayDateTime } from "../../core/utils/datetimeUtils";
+import {
+  BatchJobStatusCancelled,
+  BatchJobStatusCompleted,
+  BatchJobStatusExpired,
+  BatchJobStatusFailed,
+  BatchJobStatusPending,
+  BatchJobStatusRunning,
+} from "../../core/api/types/BatchJob";
+import {
+  CheckmarkOutline,
+  Copy,
+  Download,
+  IncompleteCancel,
+  MisuseOutline,
+  View,
+  WarningAltFilled,
+} from "@carbon/react/icons";
 
 const StockReports: React.FC = () => {
   const { t } = useTranslation();
+  const {
+    reports,
+    isLoading,
+    currentPage,
+    pageSizes,
+    totalItems,
+    goTo,
+    currentPageSize,
+    setPageSize,
+  } = useGetReports();
   const tableHeaders = useMemo(
     () => [
       {
@@ -40,8 +69,8 @@ const StockReports: React.FC = () => {
       },
       {
         id: 2,
-        header: t("DateRequested", "Date Requested"),
-        key: "DateRequested",
+        header: t("dateRequested", "Date Requested"),
+        key: "dateRequested",
       },
       {
         id: 3,
@@ -62,9 +91,112 @@ const StockReports: React.FC = () => {
     []
   );
 
+  const onDownloadReportClick = useCallback(
+    (uuid: string, fileExit: string | undefined | null) => {
+      if (uuid) {
+        window.open(URL_BATCH_JOB_ARTIFACT(uuid, true), "_blank");
+      }
+    },
+    []
+  );
+
   const tableRows = useMemo(() => {
-    return [];
-  }, []);
+    return reports?.map((batchJob, index) => ({
+      ...batchJob,
+      checkbox: "isBatchJobActive",
+      id: batchJob?.uuid,
+      key: `key-${batchJob?.uuid}`,
+      uuid: `${batchJob?.uuid}`,
+      batchJobType: batchJob.batchJobType,
+      dateRequested: formatDisplayDateTime(batchJob.dateCreated),
+      parameters: "",
+      report: batchJob.description,
+      requestedBy: batchJob?.owners?.map((p, index) => (
+        <div
+          key={`${batchJob.uuid}-owner-${index}`}
+        >{`${p.ownerFamilyName} ${p.ownerGivenName}`}</div>
+      )),
+      status: (
+        <>
+          {batchJob.status === BatchJobStatusFailed && (
+            <WarningAltFilled
+              className="report-failed"
+              title={batchJob.status}
+            />
+          )}
+          {batchJob.status === BatchJobStatusCancelled && (
+            <MisuseOutline
+              className="report-cancelled"
+              title={batchJob.status}
+            />
+          )}
+          {batchJob.status === BatchJobStatusCompleted && (
+            <CheckmarkOutline
+              className="report-completed"
+              title={batchJob.status}
+              size={16}
+            />
+          )}
+          {batchJob.status === BatchJobStatusExpired && (
+            <IncompleteCancel
+              className="report-expired"
+              title={batchJob.status}
+            />
+          )}
+        </>
+      ),
+      actions: (
+        <div
+          key={`${batchJob?.uuid}-actions`}
+          style={{ display: "inline-block", whiteSpace: "nowrap" }}
+        >
+          {batchJob.outputArtifactViewable &&
+            batchJob.batchJobType === "hide" && (
+              <Button
+                key={`${batchJob?.uuid}-actions-view`}
+                type="button"
+                size="sm"
+                className="submitButton clear-padding-margin"
+                iconDescription={"Edit"}
+                kind="ghost"
+                renderIcon={View}
+                // onClick={(e) => onViewItem(batchJob.uuid, e)}
+              />
+            )}
+          <Button
+            type="button"
+            size="sm"
+            className="submitButton clear-padding-margin"
+            iconDescription={"Copy"}
+            kind="ghost"
+            renderIcon={Copy}
+            // onClick={() => onCloneReportClick(batchJob.uuid)}
+          />
+          {batchJob?.status === BatchJobStatusCompleted &&
+            (batchJob.outputArtifactSize ?? 0) > 0 && (
+              <Button
+                type="button"
+                size="sm"
+                className="submitButton clear-padding-margin"
+                iconDescription={"Download"}
+                kind="ghost"
+                renderIcon={Download}
+                onClick={() =>
+                  onDownloadReportClick(
+                    batchJob.uuid,
+                    batchJob.outputArtifactFileExt
+                  )
+                }
+              />
+            )}
+        </div>
+      ),
+    }));
+  }, [reports, onDownloadReportClick]);
+
+  if (isLoading) {
+    return <DataTableSkeleton role="progressbar" />;
+  }
 
   return (
     <div className={styles.tableOverride}>
@@ -76,7 +208,7 @@ const StockReports: React.FC = () => {
         <div className="right-filters"></div>
       </div>
       <DataTable
-        rows={tableRows ?? []}
+        rows={tableRows}
         headers={tableHeaders}
         isSortable={true}
         useZebraStyles={true}
@@ -165,6 +297,21 @@ const StockReports: React.FC = () => {
           </TableContainer>
         )}
       ></DataTable>
+      <Pagination
+        page={currentPage}
+        pageSize={currentPageSize}
+        pageSizes={pageSizes}
+        totalItems={totalItems}
+        onChange={({ pageSize, page }) => {
+          if (pageSize !== currentPageSize) {
+            setPageSize(pageSize);
+          }
+          if (page !== currentPage) {
+            goTo(page);
+          }
+        }}
+        className={styles.paginationOverride}
+      />
     </div>
   );
 };

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

@@ -1,6 +1,11 @@
-import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
+import {
+  openmrsFetch,
+  restBaseUrl,
+  usePagination,
+} from "@openmrs/esm-framework";
 import useSWR from "swr";
 import { ReportType } from "./ReportType";
+import { useState } from "react";
 
 export function useReportTypes() {
   const apiUrl = `${restBaseUrl}/stockmanagement/report?v=default`;
@@ -14,3 +19,31 @@ export function useReportTypes() {
     isError: error,
   };
 }
+export function useGetReports() {
+  const apiUrl = `${restBaseUrl}/stockmanagement/batchjob?batchJobType=Report&v=default&limit=10&totalCount=true`;
+  const { data, error, isLoading } = useSWR<{ data: { results: any } }, Error>(
+    apiUrl,
+    openmrsFetch
+  );
+  const pageSizes = [10, 20, 30, 40, 50];
+  const [currentPageSize, setPageSize] = useState(10);
+
+  const {
+    goTo,
+    results: paginatedItems,
+    currentPage,
+  } = usePagination(data?.data?.results, currentPageSize);
+  return {
+    reports: data?.data?.results ?? [],
+    isLoading,
+    isError: error,
+    items: paginatedItems,
+    totalItems: data?.data?.results?.length,
+    currentPage,
+    currentPageSize,
+    paginatedItems,
+    goTo,
+    pageSizes,
+    setPageSize,
+  };
+}

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();

package/src/stock-user-role-scopes/stock-user-role-scopes.resource.ts

@@ -2,13 +2,13 @@ import useSWR from "swr";
 import { ResourceFilterCriteria, toQueryParams } from "../core/api/api";
 import { PageableResult } from "../core/api/types/PageableResult";
 import { UserRoleScope } from "../core/api/types/identity/UserRoleScope";
-import { openmrsFetch } from "@openmrs/esm-framework";
+import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 
 export type UserRoleScopeFilter = ResourceFilterCriteria;
 
 // getUserRoleScopes
 export function useUserRoleScopes(filter: UserRoleScopeFilter) {
-  const apiUrl = `ws/rest/v1/stockmanagement/userrolescope${toQueryParams(
+  const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope${toQueryParams(
     filter
   )}`;
   const { data, error, isLoading } = useSWR<
@@ -24,7 +24,7 @@ export function useUserRoleScopes(filter: UserRoleScopeFilter) {
 
 // getUserRoleScope
 export function useUserRoleScope(id: string) {
-  const apiUrl = `ws/rest/v1/stockmanagement/userrolescope/${id}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope/${id}`;
   const { data, error, isLoading } = useSWR<{ data: UserRoleScope }, Error>(
     apiUrl,
     openmrsFetch
@@ -46,7 +46,7 @@ export function deleteUserRoleScopes(ids: string[]) {
   if (otherIds.length > 0) {
     otherIds = "?ids=" + otherIds;
   }
-  const apiUrl = `ws/rest/v1/stockmanagement/userrolescope/${ids[0]}${otherIds}`;
+  const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope/${ids[0]}${otherIds}`;
   const abortController = new AbortController();
 
   return openmrsFetch(apiUrl, {
@@ -62,7 +62,7 @@ export function deleteUserRoleScopes(ids: string[]) {
 export function createOrUpdateUserRoleScope(item: UserRoleScope) {
   const abortController = new AbortController();
   const isNew = item.uuid != null;
-  const apiUrl = `ws/rest/v1/stockmanagement/userrolescope${
+  const apiUrl = `${restBaseUrl}/stockmanagement/userrolescope${
     isNew ? "/" + item.uuid : ""
   }`;
   return openmrsFetch(apiUrl, {