From 895ad1554bb52dddbc018cdfb6f7e246eed2c1a6 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Mon, 4 Sep 2023 22:17:04 +0300 Subject: [PATCH] Minor changes --- rsconcept/frontend/src/index.css | 6 +++--- .../frontend/src/pages/RSFormPage/RSTabs.tsx | 19 +++++++++++++++++-- .../RSFormPage/elements/ParsingResult.tsx | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/rsconcept/frontend/src/index.css b/rsconcept/frontend/src/index.css index 06478d6f..3a5ddf1e 100644 --- a/rsconcept/frontend/src/index.css +++ b/rsconcept/frontend/src/index.css @@ -141,7 +141,7 @@ } :is(.clr-primary, - .clr-btn-primary, + .clr-btn-primary:hover, .clr-checkbox:checked ) { color: var(--cl-prim-fg-100); @@ -152,7 +152,8 @@ } } - :is(.clr-selected + :is(.clr-selected, + .clr-btn-primary, ) { color: var(--cl-fg-100); background-color: var(--cl-prim-bg-80); @@ -178,7 +179,6 @@ .clr-tab, .clr-btn-nav, .clr-btn-default, - .clr-btn-primary, .clr-btn-clear ):hover:not(:disabled) { color: var(--cl-fg-100); diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx index b6b3623e..033faee2 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx @@ -1,12 +1,14 @@ +import axios from 'axios'; import fileDownload from 'js-file-download'; import { useCallback, useLayoutEffect, useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; import { TabList, TabPanel, Tabs } from 'react-tabs'; import { toast } from 'react-toastify'; -import BackendError from '../../components/BackendError'; +import BackendError, { ErrorInfo } from '../../components/BackendError'; import { ConceptLoader } from '../../components/Common/ConceptLoader'; import ConceptTab from '../../components/Common/ConceptTab'; +import TextURL from '../../components/Common/TextURL'; import { useLibrary } from '../../context/LibraryContext'; import { useRSForm } from '../../context/RSFormContext'; import { useConceptTheme } from '../../context/ThemeContext'; @@ -34,6 +36,19 @@ export enum RSTabID { TERM_GRAPH = 3 } +function ProcessError({error}: {error: ErrorInfo}): React.ReactElement { + if (axios.isAxiosError(error) && error.response && error.response.status === 404) { + return ( +
+

Схема с указанным идентификатором отсутствует на портале.

+ +
+ ); + } else { + return ( ); + } +} + function RSTabs() { const navigate = useNavigate(); const search = useLocation().search; @@ -279,7 +294,7 @@ function RSTabs() { return (
{ loading && } - { error && } + { error && } { schema && !loading && <> {showUpload && Дерево разбора