Merge branch 'staging' into 'main'
Staging See merge request frontend/squiz!393
@ -6,7 +6,7 @@
|
|||||||
"@craco/craco": "^7.0.0",
|
"@craco/craco": "^7.0.0",
|
||||||
"@emotion/react": "^11.10.5",
|
"@emotion/react": "^11.10.5",
|
||||||
"@emotion/styled": "^11.10.5",
|
"@emotion/styled": "^11.10.5",
|
||||||
"@frontend/kitui": "^1.0.86",
|
"@frontend/kitui": "^1.0.87",
|
||||||
"@frontend/squzanswerer": "^1.0.61",
|
"@frontend/squzanswerer": "^1.0.61",
|
||||||
"@mui/icons-material": "^5.10.14",
|
"@mui/icons-material": "^5.10.14",
|
||||||
"@mui/material": "^5.10.14",
|
"@mui/material": "^5.10.14",
|
||||||
@ -86,7 +86,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@emoji-mart/data": "^1.1.2",
|
"@emoji-mart/data": "^1.2.1",
|
||||||
"@emoji-mart/react": "^1.1.1",
|
"@emoji-mart/react": "^1.1.1",
|
||||||
"@types/cytoscape-popper": "^2.0.4",
|
"@types/cytoscape-popper": "^2.0.4",
|
||||||
"@types/react-beautiful-dnd": "^13.1.4",
|
"@types/react-beautiful-dnd": "^13.1.4",
|
||||||
|
|||||||
@ -174,6 +174,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
<script>
|
||||||
|
//Ждём время отображения сайта и оповещаем при выходе за рамки лимита.
|
||||||
|
const timeout = 25;
|
||||||
|
window.LoadingObserver = true;
|
||||||
|
setTimeout(() => {
|
||||||
|
if (window.LoadingObserver) fetch({
|
||||||
|
url: "https://squiz.pena.digital/heruvym/v1.0.0/create",
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({ Title: "Error", Message: `Реакт приложение не отобразилось за ${timeout} секунд`, system: true })
|
||||||
|
});
|
||||||
|
}, timeout * 1000)
|
||||||
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import { InfoPrivilege } from "./pages/InfoPrivilege";
|
|||||||
import AmoTokenExpiredDialog from "./pages/IntegrationsPage/IntegrationsModal/Amo/AmoTokenExpiredDialog";
|
import AmoTokenExpiredDialog from "./pages/IntegrationsPage/IntegrationsModal/Amo/AmoTokenExpiredDialog";
|
||||||
import Landing from "./pages/Landing/Landing";
|
import Landing from "./pages/Landing/Landing";
|
||||||
import Main from "./pages/main";
|
import Main from "./pages/main";
|
||||||
|
import { ErrorBoundary } from "react-error-boundary";
|
||||||
|
|
||||||
const MyQuizzesFull = lazy(() => import("./pages/createQuize/MyQuizzesFull"));
|
const MyQuizzesFull = lazy(() => import("./pages/createQuize/MyQuizzesFull"));
|
||||||
const QuizGallery = lazy(() => import("./pages/createQuize/QuizGallery"));
|
const QuizGallery = lazy(() => import("./pages/createQuize/QuizGallery"));
|
||||||
@ -66,6 +67,7 @@ const LazyLoading = ({ children, fallback }: SuspenseProps) => (
|
|||||||
);
|
);
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
|
window.LoadingObserver = false;
|
||||||
const userId = useUserStore((state) => state.userId);
|
const userId = useUserStore((state) => state.userId);
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import { clearUserData } from "@root/user";
|
|||||||
import { clearQuizData } from "@root/quizes/store";
|
import { clearQuizData } from "@root/quizes/store";
|
||||||
|
|
||||||
import type { AxiosResponse } from "axios";
|
import type { AxiosResponse } from "axios";
|
||||||
|
import { selectSendingMethod } from "@/ui_kit/FloatingSupportChat/utils";
|
||||||
|
|
||||||
interface MakeRequest {
|
interface MakeRequest {
|
||||||
method?: Method | undefined;
|
method?: Method | undefined;
|
||||||
@ -32,6 +33,11 @@ export const makeRequest = async <TRequest = unknown, TResponse = unknown>(
|
|||||||
} catch (nativeError) {
|
} catch (nativeError) {
|
||||||
const error = nativeError as AxiosError;
|
const error = nativeError as AxiosError;
|
||||||
|
|
||||||
|
if (window.location.hostname !== 'localhost') selectSendingMethod({
|
||||||
|
messageField: `status: ${error.response?.status}. Message ${(error.response?.data as ExtendedAxiosResponse)?.message}`,
|
||||||
|
isSnackbar: false,
|
||||||
|
systemError: true
|
||||||
|
});
|
||||||
if (
|
if (
|
||||||
error.response?.status === 400 &&
|
error.response?.status === 400 &&
|
||||||
(error.response?.data as ExtendedAxiosResponse)?.message ===
|
(error.response?.data as ExtendedAxiosResponse)?.message ===
|
||||||
|
|||||||
@ -12,7 +12,7 @@ export const getTariffs = async (
|
|||||||
try {
|
try {
|
||||||
const tariffs = await makeRequest<never, GetTariffsResponse>({
|
const tariffs = await makeRequest<never, GetTariffsResponse>({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
url: `${API_URL}?page=${page}&limit=100`,
|
url: `${API_URL}/getList?page=${page}&limit=100`,
|
||||||
});
|
});
|
||||||
return [tariffs];
|
return [tariffs];
|
||||||
} catch (nativeError) {
|
} catch (nativeError) {
|
||||||
|
|||||||
@ -18,6 +18,7 @@ const API_URL = `${process.env.REACT_APP_DOMAIN}/heruvym/v1.0.0`;
|
|||||||
export const sendTicketMessage = async (
|
export const sendTicketMessage = async (
|
||||||
ticketId: string,
|
ticketId: string,
|
||||||
message: string,
|
message: string,
|
||||||
|
systemError: boolean
|
||||||
): Promise<[null, string?]> => {
|
): Promise<[null, string?]> => {
|
||||||
try {
|
try {
|
||||||
const sendTicketMessageResponse = await makeRequest<
|
const sendTicketMessageResponse = await makeRequest<
|
||||||
@ -27,7 +28,8 @@ export const sendTicketMessage = async (
|
|||||||
url: `${API_URL}/send`,
|
url: `${API_URL}/send`,
|
||||||
method: "POST",
|
method: "POST",
|
||||||
useToken: true,
|
useToken: true,
|
||||||
body: { ticket: ticketId, message: message, lang: "ru", files: [] },
|
body: { ticket: ticketId, message: message, lang: "ru", files: [], system: systemError },
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return [sendTicketMessageResponse];
|
return [sendTicketMessageResponse];
|
||||||
@ -82,11 +84,12 @@ export const sendFile = async (
|
|||||||
export const createTicket = async (
|
export const createTicket = async (
|
||||||
message: string,
|
message: string,
|
||||||
useToken: boolean,
|
useToken: boolean,
|
||||||
|
systemError: boolean
|
||||||
): Promise<[CreateTicketResponse | null, string?]> => {
|
): Promise<[CreateTicketResponse | null, string?]> => {
|
||||||
try {
|
try {
|
||||||
const createdTicket = await createTicketRequest({
|
const createdTicket = await createTicketRequest({
|
||||||
url: `${process.env.REACT_APP_DOMAIN}/heruvym/v1.0.0/create`,
|
url: `${process.env.REACT_APP_DOMAIN}/heruvym/v1.0.0/create`,
|
||||||
body: { Title: "Unauth title", Message: message },
|
body: { Title: "Unauth title", Message: message, system: systemError },
|
||||||
useToken,
|
useToken,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 123 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 164 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 861 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 514 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 642 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 667 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 600 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 618 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 442 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 264 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 600 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 295 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 645 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 847 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 746 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 431 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 752 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 424 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 584 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 205 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 517 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 442 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 209 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 719 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 870 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 516 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 522 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 310 KiB After Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 572 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 758 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 1013 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 436 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 571 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 669 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 425 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 865 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 378 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 568 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 550 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 512 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 410 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 351 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 658 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 242 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 297 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 698 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 356 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 788 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 533 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 656 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 352 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 972 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 488 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 592 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 637 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 771 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 447 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 518 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 580 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 826 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 108 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 369 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 834 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 112 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 282 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 866 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 460 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 281 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 398 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 477 KiB After Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 910 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 263 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 376 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 585 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 291 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 178 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 473 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 352 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 881 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 8.4 KiB |