From de86365e86c30292f6cd081badfad447a454ebf4 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:34:25 +0300
Subject: [PATCH] Minor fixes
---
rsconcept/frontend/src/App.tsx | 6 ++++--
rsconcept/frontend/src/components/Footer.tsx | 4 ++--
rsconcept/frontend/src/pages/CreateRSFormPage.tsx | 5 ++++-
.../RSFormPage/elements/ViewSideConstituents.tsx | 12 ++++++++++--
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx
index 79a1201e..6769c85d 100644
--- a/rsconcept/frontend/src/App.tsx
+++ b/rsconcept/frontend/src/App.tsx
@@ -19,12 +19,14 @@ import UserProfilePage from './pages/UserProfilePage';
function App () {
const { noNavigation } = useConceptTheme();
- const scrollWindowSize = useMemo(() => {
+ const scrollWindowSize = useMemo(
+ () => {
return !noNavigation ?
'max-h-[calc(100vh-4.5rem)]'
: 'max-h-[100vh]';
}, [noNavigation]);
- const mainSize = useMemo(() => {
+ const mainSize = useMemo(
+ () => {
return !noNavigation ?
'min-h-[calc(100vh-12rem)]'
: 'min-h-[calc(100vh-8rem)] ';
diff --git a/rsconcept/frontend/src/components/Footer.tsx b/rsconcept/frontend/src/components/Footer.tsx
index d112b970..9d829aba 100644
--- a/rsconcept/frontend/src/components/Footer.tsx
+++ b/rsconcept/frontend/src/components/Footer.tsx
@@ -28,9 +28,9 @@ function Footer() {
-
+
© 2023 ЦИВТ КОНЦЕПТ
-
Данный инструмент работы с экспликациями концептуальных схем в родоструктурной форме является уникальной Российской разработкой и вобрал в себя разработки начиная с 1990-х годов
+
Портал позволяет анализировать предметные области, формально записывать системы определений и синтезировать их с помощью математического аппарата родов структур
diff --git a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
index f19e7619..a999ff57 100644
--- a/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
+++ b/rsconcept/frontend/src/pages/CreateRSFormPage.tsx
@@ -10,12 +10,14 @@ import SubmitButton from '../components/Common/SubmitButton';
import TextArea from '../components/Common/TextArea';
import TextInput from '../components/Common/TextInput';
import RequireAuth from '../components/RequireAuth';
+import { useLibrary } from '../context/LibraryContext';
import useNewRSForm from '../hooks/useNewRSForm';
import { IRSFormCreateData, IRSFormMeta } from '../utils/models';
function CreateRSFormPage() {
const navigate = useNavigate();
- const { createSchema, error, setError, loading } = useNewRSForm()
+ const { createSchema, error, setError, loading } = useNewRSForm();
+ const library = useLibrary();
const [title, setTitle] = useState('');
const [alias, setAlias] = useState('');
@@ -37,6 +39,7 @@ function CreateRSFormPage() {
function onSuccess(newSchema: IRSFormMeta) {
toast.success('Схема успешно создана');
+ library.reload();
navigate(`/rsforms/${newSchema.id}`);
}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
index 779e74a5..a8d83453 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx
@@ -18,7 +18,7 @@ interface ViewSideConstituentsProps {
}
function ViewSideConstituents({ expression, activeID, onOpenEdit }: ViewSideConstituentsProps) {
- const { darkMode } = useConceptTheme();
+ const { darkMode, noNavigation } = useConceptTheme();
const { schema } = useRSForm();
const [filterMatch, setFilterMatch] = useLocalStorage('side-filter-match', CstMatchMode.ALL);
@@ -139,8 +139,16 @@ function ViewSideConstituents({ expression, activeID, onOpenEdit }: ViewSideCons
], []
);
+ const maxHeight = useMemo(
+ () => {
+ // TODO: calculate hieght based on left editor column height
+ return !noNavigation ?
+ 'max-h-[calc(100vh-10.3rem)]'
+ : 'max-h-[calc(100vh-10.3rem)] ';
+ }, [noNavigation]);
+
return (
-