Переписываю спорные решения

Фикс отправки отчета, проверка на массив в map в Description.js

src/components/features/bookkeeping/ActContent/ActContent.js

@@ -6,9 +6,9 @@ import {BookkeepingFormField} from "../BookkeepingFormField/BookkeepingFormField
 import {BookkepingSelect} from '../BookkepingSelect/BookkepingSelect';
 import {BookkepingInput} from '../BookkepingInput/BookkepingInput';
 
-import {useRequest} from "../../../../hooks/useRequest";
 
 import "./actContent.css"
+import {apiRequest} from "../../../../api/request";
 
 export const ActContent = () => {
 
@@ -16,7 +16,6 @@ export const ActContent = () => {
   const [selectedTemplate, setSelectedTemplate] = useState();
   const [templatedFields, setTemplatedFields] = useState([]);
 
-  const {apiRequest} = useRequest();
 
   useEffect(() => {
     apiRequest('/template/get-template-list')

src/components/features/bookkeeping/ContractContent/ContractContent.js

@@ -5,7 +5,6 @@ import {BookkeepingFormField} from "../BookkeepingFormField/BookkeepingFormField
 import {BookkepingSelect} from '../BookkepingSelect/BookkepingSelect';
 import {BookkepingInput} from '../BookkepingInput/BookkepingInput';
 import {Link} from "react-router-dom"
-import {useRequest} from "../../../../hooks/useRequest";
 
 export const ContractContent = () => {
 
@@ -13,7 +12,6 @@ export const ContractContent = () => {
   const [selectedTemplate, setSelectedTemplate] = useState();
   const [templatedFields, setTemplatedFields] = useState([]);
 
-  const {apiRequest} = useRequest();
 
   useEffect(() => {
     apiRequest(`/document/get-document-list`)

src/components/features/quiz/HeaderQuiz.js

@@ -1,8 +1,8 @@
 import React, {useEffect} from 'react'
 import {useDispatch, useSelector} from 'react-redux'
 import {selectUserInfo, setQuestionnairesList, setUserInfo} from "../../../redux/quizSlice";
-import {useRequest} from "../../../hooks/useRequest";
 import './quiz.scss'
+import {apiRequest} from "../../../api/request";
 
 export const HeaderQuiz = ({header}) => {
 
@@ -10,7 +10,6 @@ export const HeaderQuiz = ({header}) => {
   const userId = localStorage.getItem('id');
   const userInfo = useSelector(selectUserInfo);
 
-  const {apiRequest} = useRequest();
 
   useEffect(() => {
     dispatch(setUserInfo(userId))

src/components/features/quiz/Instructions.js

@@ -5,14 +5,14 @@ import {useEffect, useState} from "react";
 import {useSelector} from "react-redux";
 import {selectedTest} from "../../../redux/quizSlice";
 
-import {useRequest} from "../../../hooks/useRequest";
+import {useRequest} from "../../../HOOks/useRequest";
+import {apiRequest} from "../../../api/request";
 
 export const Instruction = () => {
 
    const [countQuestions, setCountQuestions] = useState(null);
    const test = useSelector(selectedTest);
 
-  const {apiRequest} = useRequest();
 
    useEffect( () => {
 

src/components/features/quiz/Results.js

@@ -1,7 +1,8 @@
 import React, {useEffect, useState} from 'react';
 import {useDispatch, useSelector} from "react-redux";
 import {fetchResultTest, selectedTest, selectResult} from "../../../redux/quizSlice";
-import {useRequest} from "../../../hooks/useRequest";
+import {useRequest} from "../../../HOOks/useRequest";
+import {apiRequest} from "../../../api/request";
 
 
 export const Results = () => {
@@ -9,7 +10,6 @@ export const Results = () => {
   const test = useSelector(selectedTest);
   const [maxScore, setMaxScore] = useState('');
   const dispatch = useDispatch();
-  const {apiRequest} = useRequest();
 
   useEffect(() => {
     dispatch(fetchResultTest(test.uuid));

src/components/features/quiz/Task.js

@@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react'
 import {useNavigate} from "react-router-dom"
 import {useSelector, useDispatch} from 'react-redux'
 
-import {useRequest} from "../../../hooks/useRequest";
+import {useRequest} from "../../../HOOks/useRequest";
 import {Progressbar} from './ProgressbarQuiz'
 import {GetOptionTask} from './GetOptionTask'
 
@@ -11,6 +11,7 @@ import {
 } from './../../../redux/quizSlice'
 
 import './quiz.scss'
+import {apiRequest} from "../../../api/request";
 
 export const TaskQuiz = () => {
 
@@ -26,7 +27,6 @@ export const TaskQuiz = () => {
   const [inputValue, setInputValue] = useState('');
   const [questions, setQuestions] = useState([]);
 
-  const {apiRequest} = useRequest();
 
   const id = localStorage.getItem('id');