Merge pull request #89 from oarepo/importing-fetch-hooks-oarepo-ui

fixed wrong imports from oarepo ui
oarepo · Nov 27, 2024 · 6eb195c · 6eb195c
2 parents 9938a67 + 374af42
commit 6eb195c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/...ets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx b/...ets/semantic-ui/js/oarepo_requests_ui/common/components/RequestModalContentAndActions.jsx
@@ -13,7 +13,7 @@ import { mapLinksToActions } from "@js/oarepo_requests_common";
 import PropTypes from "prop-types";
 import { useQuery, useIsMutating } from "@tanstack/react-query";
 // TODO: remove when /configs starts using vnd zenodo accept header
-import { http } from "react-invenio-forms";
+import { httpApplicationJson } from "@js/oarepo_ui";
 
 export const RequestModalContentAndActions = ({
   request,
@@ -33,7 +33,9 @@ export const RequestModalContentAndActions = ({
   } = useQuery(
     ["applicableCustomFields", requestType?.type_id || request?.type],
     () =>
-      http.get(`/requests/configs/${requestType?.type_id || request?.type}`),
+      httpApplicationJson.get(
+        `/requests/configs/${requestType?.type_id || request?.type}`
+      ),
     {
       enabled: !!(requestType?.type_id || request?.type),
       refetchOnWindowFocus: false,

diff --git a/...requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx b/...requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/components/Timeline.jsx
@@ -6,7 +6,7 @@ import {
   TimelineEvent,
 } from "@js/oarepo_requests_detail/components";
 import PropTypes from "prop-types";
-import { http } from "@js/oarepo_ui";
+import { httpVnd } from "@js/oarepo_ui";
 import { useQuery } from "@tanstack/react-query";
 
 export const Timeline = ({ request, timelinePageSize }) => {
@@ -15,7 +15,7 @@ export const Timeline = ({ request, timelinePageSize }) => {
     ["requestEvents", request.id, page],
     () =>
       // q=!(type:T) to eliminate system created events
-      http.get(
+      httpVnd.get(
         `${request.links?.timeline}?q=!(type:T)&page=${page}&size=${timelinePageSize}&sort=newest`
       ),
     {

diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/utils.js
@@ -1,5 +1,5 @@
 import _isEmpty from "lodash/isEmpty";
-import { http } from "@js/oarepo_ui";
+import { httpVnd } from "@js/oarepo_ui";
 import _set from "lodash/set";
 import _has from "lodash/has";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
@@ -83,7 +83,7 @@ export const serializeCustomFields = (formData) => {
 
 export const saveAndSubmit = async (request, formValues) => {
   const response = await createOrSave(request, formValues);
-  const submittedRequest = await http.post(
+  const submittedRequest = await httpVnd.post(
     response?.data?.links?.actions?.submit,
     {}
   );
@@ -93,31 +93,34 @@ export const saveAndSubmit = async (request, formValues) => {
 export const createOrSave = async (requestOrRequestType, formValues) => {
   const customFieldsData = serializeCustomFields(formValues);
   if (requestOrRequestType?.links?.actions?.create) {
-    return await http.post(
+    return await httpVnd.post(
       requestOrRequestType.links.actions.create,
       customFieldsData
     );
   } else {
-    return await http.put(requestOrRequestType?.links?.self, customFieldsData);
+    return await httpVnd.put(
+      requestOrRequestType?.links?.self,
+      customFieldsData
+    );
   }
 };
 
 export const accept = async (request, formData) => {
-  return await http.post(
+  return await httpVnd.post(
     request.links?.actions?.accept,
     serializeDataForInvenioApi(formData)
   );
 };
 
 export const decline = async (request, formData) => {
-  return await http.post(
+  return await httpVnd.post(
     request.links?.actions?.decline,
     serializeDataForInvenioApi(formData)
   );
 };
 
 export const cancel = async (request, formData) => {
-  return await http.post(
+  return await httpVnd.post(
     request.links?.actions?.cancel,
     serializeDataForInvenioApi(formData)
   );

diff --git a/...me/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx b/...me/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx
@@ -11,7 +11,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from "@tanstack/react-query";
-import { http } from "@js/oarepo_ui";
+import { httpVnd } from "@js/oarepo_ui";
 
 export const requestButtonsDefaultIconConfig = {
   delete_published_record: { icon: "trash", labelPosition: "left" },
@@ -41,7 +41,7 @@ const RecordRequests = ({
     isFetching: applicableRequestTypesLoading,
   } = useQuery(
     ["applicableRequestTypes"],
-    () => http.get(initialRecord.links["applicable-requests"]),
+    () => httpVnd.get(initialRecord.links["applicable-requests"]),
     {
       enabled: !!initialRecord.links?.["applicable-requests"],
       refetchOnWindowFocus: false,
@@ -51,7 +51,7 @@ const RecordRequests = ({
     data: recordRequests,
     error: requestsLoadingError,
     isFetching: requestsLoading,
-  } = useQuery(["requests"], () => http.get(initialRecord.links?.requests), {
+  } = useQuery(["requests"], () => httpVnd.get(initialRecord.links?.requests), {
     enabled: !!initialRecord.links?.requests,
     refetchOnWindowFocus: false,
   });

diff --git a/...me/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/EventSubmitForm.jsx b/...me/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/EventSubmitForm.jsx
@@ -9,7 +9,7 @@ import {
   RequestCommentInput,
 } from "@js/oarepo_requests_common";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { http } from "@js/oarepo_ui";
+import { httpVnd } from "@js/oarepo_ui";
 
 export const EventSubmitForm = ({
   request,
@@ -34,7 +34,7 @@ export const EventSubmitForm = ({
   const queryClient = useQueryClient();
 
   const { mutate, isError, isLoading, reset } = useMutation(
-    () => http.post(request.links?.comments, values),
+    () => httpVnd.post(request.links?.comments, values),
     {
       onSuccess: (response) => {
         if (response.status === 201) {

diff --git a/...heme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx b/...heme/assets/semantic-ui/js/oarepo_requests_ui/request-detail/components/RequestDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
-import { scrollTop } from "@js/oarepo_ui";
+import { scrollTop, httpApplicationJson } from "@js/oarepo_ui";
 import {
   Button,
   Grid,
@@ -15,7 +15,6 @@ import {
 import { TopicPreview } from ".";
 import PropTypes from "prop-types";
 import { useQuery, useIsMutating } from "@tanstack/react-query";
-import { http } from "react-invenio-forms";
 import {
   mapLinksToActions,
   ConfirmModalContextProvider,
@@ -37,7 +36,7 @@ export const RequestDetail = ({
   const [scrollToTopVisible, setScrollToTopVisible] = useState(false);
   const { data, isLoading } = useQuery(
     ["applicableCustomFields", request?.type],
-    () => http.get(`/requests/configs/${request?.type}`),
+    () => httpApplicationJson.get(`/requests/configs/${request?.type}`),
     {
       enabled: !!request?.type,
       refetchOnWindowFocus: false,

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.3.0
+version = 2.3.1
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md