diff --git a/rsconcept/frontend/src/app/GlobalTooltips.tsx b/rsconcept/frontend/src/app/GlobalTooltips.tsx
index 20d761cd..5ff3b3bd 100644
--- a/rsconcept/frontend/src/app/GlobalTooltips.tsx
+++ b/rsconcept/frontend/src/app/GlobalTooltips.tsx
@@ -1,14 +1,23 @@
'use client';
-import { InfoConstituenta } from '@/features/rsform/components/InfoConstituenta';
+import React, { Suspense } from 'react';
import { Tooltip } from '@/components/Container';
import { Loader } from '@/components/Loader';
import { useTooltipsStore } from '@/stores/tooltips';
import { globals } from '@/utils/constants';
+const InfoConstituenta = React.lazy(() =>
+ import('@/features/rsform/components/InfoConstituenta').then(module => ({ default: module.InfoConstituenta }))
+);
+
+const InfoOperation = React.lazy(() =>
+ import('@/features/oss/components/InfoOperation').then(module => ({ default: module.InfoOperation }))
+);
+
export const GlobalTooltips = () => {
const hoverCst = useTooltipsStore(state => state.activeCst);
+ const hoverOperation = useTooltipsStore(state => state.activeOperation);
return (
<>
@@ -25,8 +34,26 @@ export const GlobalTooltips = () => {
layer='z-topmost'
className='max-w-[calc(min(40rem,100dvw-2rem))] text-justify'
/>
-
- {hoverCst ? event.stopPropagation()} /> :
+ event.stopPropagation()} /> : null}
+
+
+
+
);
diff --git a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
index 15656fa6..093e9aeb 100644
--- a/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
+++ b/rsconcept/frontend/src/app/Navigation/NavigationContext.tsx
@@ -1,9 +1,8 @@
'use client';
-import { createContext, useCallback, useContext, useEffect, useState } from 'react';
-import { useLocation, useNavigate } from 'react-router';
+import { createContext, useContext, useEffect, useState } from 'react';
+import { useNavigate } from 'react-router';
-import { globals } from '@/utils/constants';
import { contextOutsideScope } from '@/utils/labels';
interface INavigationContext {
@@ -29,68 +28,48 @@ export const useConceptNavigation = () => {
export const NavigationState = ({ children }: React.PropsWithChildren) => {
const router = useNavigate();
- const { pathname } = useLocation();
const [isBlocked, setIsBlocked] = useState(false);
- const validate = useCallback(() => {
+
+ function validate() {
return !isBlocked || confirm('Изменения не сохранены. Вы уверены что хотите совершить переход?');
- }, [isBlocked]);
+ }
- const canBack = useCallback(() => !!window.history && window.history?.length !== 0, []);
+ function canBack() {
+ return !!window.history && window.history?.length !== 0;
+ }
- const scrollTop = useCallback(() => {
- window.scrollTo(0, 0);
- const mainScroll = document.getElementById(globals.main_scroll);
- if (mainScroll) {
- mainScroll.scroll(0, 0);
+ function push(path: string, newTab?: boolean) {
+ if (newTab) {
+ window.open(`${path}`, '_blank');
+ return;
}
- }, []);
-
- const push = useCallback(
- (path: string, newTab?: boolean) => {
- if (newTab) {
- window.open(`${path}`, '_blank');
- return;
- }
- if (validate()) {
- scrollTop();
- Promise.resolve(router(path, { viewTransition: true })).catch(console.log);
- setIsBlocked(false);
- }
- },
- [router, validate, scrollTop]
- );
-
- const replace = useCallback(
- (path: string) => {
- if (validate()) {
- scrollTop();
- Promise.resolve(router(path, { replace: true, viewTransition: true })).catch(console.log);
- setIsBlocked(false);
- }
- },
- [router, validate, scrollTop]
- );
-
- const back = useCallback(() => {
if (validate()) {
- scrollTop();
- Promise.resolve(router(-1)).catch(console.log);
+ Promise.resolve(router(path, { viewTransition: true })).catch(console.error);
setIsBlocked(false);
}
- }, [router, validate, scrollTop]);
+ }
- const forward = useCallback(() => {
+ function replace(path: string) {
if (validate()) {
- scrollTop();
- Promise.resolve(router(1)).catch(console.log);
+ Promise.resolve(router(path, { replace: true, viewTransition: true })).catch(console.error);
setIsBlocked(false);
}
- }, [router, validate, scrollTop]);
+ }
- useEffect(() => {
- scrollTop();
- }, [pathname, scrollTop]);
+ function back() {
+ if (validate()) {
+ Promise.resolve(router(-1)).catch(console.error);
+ setIsBlocked(false);
+ }
+ }
+
+ function forward() {
+ if (validate()) {
+ Promise.resolve(router(1)).catch(console.error);
+ setIsBlocked(false);
+ }
+ }
return (
{
- const queryClient = useQueryClient();
const [ignored, setIgnored] = useState([]);
const mutationErrors = useMutationState({
filters: { mutationKey: [KEYS.global_mutation], status: 'error' },
select: mutation => mutation.state.error!
});
- console.log(queryClient.getMutationCache().getAll());
-
function resetErrors() {
setIgnored(mutationErrors);
}
diff --git a/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx b/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
index 2f8271ff..96adc32d 100644
--- a/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
+++ b/rsconcept/frontend/src/features/library/components/EditorLibraryItem.tsx
@@ -29,22 +29,12 @@ import { useSetLocation } from '../backend/useSetLocation';
import { useSetOwner } from '../backend/useSetOwner';
import { useLibrarySearchStore } from '../stores/librarySearch';
-/**
- * Represents common {@link ILibraryItem} editor controller.
- */
-export interface ILibraryItemEditor {
+interface EditorLibraryItemProps {
schema: ILibraryItemData;
- deleteSchema: () => void;
-
- isMutable: boolean;
isAttachedToOSS: boolean;
}
-interface EditorLibraryItemProps {
- controller: ILibraryItemEditor;
-}
-
-export function EditorLibraryItem({ controller }: EditorLibraryItemProps) {
+export function EditorLibraryItem({ schema, isAttachedToOSS }: EditorLibraryItemProps) {
const getUserLabel = useLabelUser();
const role = useRoleStore(state => state.role);
const intl = useIntl();
@@ -63,31 +53,31 @@ export function EditorLibraryItem({ controller }: EditorLibraryItemProps) {
const ownerSelector = useDropdown();
const onSelectUser = function (newValue: number) {
ownerSelector.hide();
- if (newValue === controller.schema.owner) {
+ if (newValue === schema.owner) {
return;
}
if (!window.confirm(promptText.ownerChange)) {
return;
}
- void setOwner({ itemID: controller.schema.id, owner: newValue });
+ void setOwner({ itemID: schema.id, owner: newValue });
};
function handleOpenLibrary(event: CProps.EventMouse) {
- setGlobalLocation(controller.schema.location);
+ setGlobalLocation(schema.location);
router.push(urls.library, event.ctrlKey || event.metaKey);
}
function handleEditLocation() {
showEditLocation({
- initial: controller.schema.location,
- onChangeLocation: newLocation => void setLocation({ itemID: controller.schema.id, location: newLocation })
+ initial: schema.location,
+ onChangeLocation: newLocation => void setLocation({ itemID: schema.id, location: newLocation })
});
}
function handleEditEditors() {
showEditEditors({
- itemID: controller.schema.id,
- initialEditors: controller.schema.editors
+ itemID: schema.id,
+ initialEditors: schema.editors
});
}
@@ -104,31 +94,27 @@ export function EditorLibraryItem({ controller }: EditorLibraryItemProps) {
{ownerSelector.isOpen ? (
@@ -136,13 +122,13 @@ export function EditorLibraryItem({ controller }: EditorLibraryItemProps) {
id='editor_stats'
dense
icon={
@@ -150,7 +136,7 @@ export function EditorLibraryItem({ controller }: EditorLibraryItemProps) {
dense
disabled
icon={();
-export function TooltipOperation({ node, anchor }: TooltipOperationProps) {
+export function InfoOperation({ operation }: InfoOperationProps) {
const columns = [
columnHelper.accessor('substitution_term', {
id: 'substitution_term',
@@ -44,47 +42,47 @@ export function TooltipOperation({ node, anchor }: TooltipOperationProps) {
];
return (
-
-
+
);
}
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
index 0feb0e64..77a7b5fd 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
@@ -15,7 +15,7 @@ import { FormOSS } from './FormOSS';
import { OssStats } from './OssStats';
export function EditorOssCard() {
- const controller = useOssEdit();
+ const { schema, isMutable, deleteSchema } = useOssEdit();
const { isModified } = useModificationStore();
function initiateSubmit() {
@@ -36,7 +36,7 @@ export function EditorOssCard() {
return (
<>
-
- ({
resolver: zodResolver(schemaUpdateLibraryItem),
defaultValues: {
- id: controller.schema.id,
+ id: schema.id,
item_type: LibraryItemType.RSFORM,
- title: controller.schema.title,
- alias: controller.schema.alias,
- comment: controller.schema.comment,
- visible: controller.schema.visible,
- read_only: controller.schema.read_only
+ title: schema.title,
+ alias: schema.alias,
+ comment: schema.comment,
+ visible: schema.visible,
+ read_only: schema.read_only
}
});
const visible = useWatch({ control, name: 'visible' });
@@ -65,7 +65,7 @@ export function FormOSS() {
{...register('title')}
label='Полное название'
className='mb-3'
- disabled={!controller.isMutable}
+ disabled={!isMutable}
error={errors.title}
/>
(null);
const readyForSynthesis = (() => {
- if (operation?.operation_type !== OperationType.SYNTHESIS) {
+ if (operation.operation_type !== OperationType.SYNTHESIS) {
return false;
}
if (operation.result) {
return false;
}
- const argumentIDs = controller.schema.graph.expandInputs([operation.id]);
+ const argumentIDs = schema.graph.expandInputs([operation.id]);
if (!argumentIDs || argumentIDs.length < 1) {
return false;
}
- const argumentOperations = argumentIDs.map(id => controller.schema.operationByID.get(id)!);
+ const argumentOperations = argumentIDs.map(id => schema.operationByID.get(id)!);
if (argumentOperations.some(item => item.result === null)) {
return false;
}
@@ -79,37 +79,37 @@ export function NodeContextMenu({
useClickedOutside(isOpen, ref, onHide);
function handleOpenSchema() {
- if (operation) controller.navigateOperationSchema(operation.id);
+ navigateOperationSchema(operation.id);
}
function handleEditSchema() {
onHide();
- if (operation) onEditSchema(operation.id);
+ onEditSchema(operation.id);
}
function handleEditOperation() {
onHide();
- if (operation) onEditOperation(operation.id);
+ onEditOperation(operation.id);
}
function handleDeleteOperation() {
onHide();
- if (operation) onDelete(operation.id);
+ onDelete(operation.id);
}
function handleCreateSchema() {
onHide();
- if (operation) onCreateInput(operation.id);
+ onCreateInput(operation.id);
}
function handleRunSynthesis() {
onHide();
- if (operation) onExecuteOperation(operation.id);
+ onExecuteOperation(operation.id);
}
function handleRelocateConstituents() {
onHide();
- if (operation) onRelocateConstituents(operation.id);
+ onRelocateConstituents(operation.id);
}
return (
@@ -123,7 +123,7 @@ export function NodeContextMenu({
text='Редактировать'
title='Редактировать операцию'
icon={({ operation: undefined, cursorX: 0, cursorY: 0 });
+ const [menuProps, setMenuProps] = useState(null);
const [isContextMenuOpen, setIsContextMenuOpen] = useState(false);
function onSelectionChange({ nodes }: { nodes: Node[] }) {
const ids = nodes.map(node => Number(node.id));
- controller.setSelected(prev => [
+ setSelected(prev => [
...prev.filter(nodeID => ids.includes(nodeID)),
...ids.filter(nodeID => !prev.includes(Number(nodeID)))
]);
@@ -80,7 +95,7 @@ export function OssFlow() {
useEffect(() => {
setNodes(
- controller.schema.items.map(operation => ({
+ schema.items.map(operation => ({
id: String(operation.id),
data: { label: operation.alias, operation: operation },
position: { x: operation.position_x, y: operation.position_y },
@@ -88,15 +103,15 @@ export function OssFlow() {
}))
);
setEdges(
- controller.schema.arguments.map((argument, index) => ({
+ schema.arguments.map((argument, index) => ({
id: String(index),
source: String(argument.argument),
target: String(argument.operation),
type: edgeStraight ? 'straight' : 'simplebezier',
animated: edgeAnimate,
targetHandle:
- controller.schema.operationByID.get(argument.argument)!.position_x >
- controller.schema.operationByID.get(argument.operation)!.position_x
+ schema.operationByID.get(argument.argument)!.position_x >
+ schema.operationByID.get(argument.operation)!.position_x
? 'right'
: 'left'
}))
@@ -105,7 +120,7 @@ export function OssFlow() {
setTimeout(() => {
setIsModified(false);
}, PARAMETER.graphRefreshDelay);
- }, [controller.schema, setNodes, setEdges, setIsModified, toggleReset, edgeStraight, edgeAnimate]);
+ }, [schema, setNodes, setEdges, setIsModified, toggleReset, edgeStraight, edgeAnimate]);
function getPositions() {
return nodes.map(node => ({
@@ -116,7 +131,7 @@ export function OssFlow() {
}
function handleNodesChange(changes: NodeChange[]) {
- if (controller.isMutable && changes.some(change => change.type === 'position' && change.position)) {
+ if (isMutable && changes.some(change => change.type === 'position' && change.position)) {
setIsModified(true);
}
onNodesChange(changes);
@@ -124,9 +139,9 @@ export function OssFlow() {
function handleSavePositions() {
const positions = getPositions();
- void updatePositions({ itemID: controller.schema.id, positions: positions }).then(() => {
+ void updatePositions({ itemID: schema.id, positions: positions }).then(() => {
positions.forEach(item => {
- const operation = controller.schema.operationByID.get(item.id);
+ const operation = schema.operationByID.get(item.id);
if (operation) {
operation.position_x = item.position_x;
operation.position_y = item.position_y;
@@ -139,7 +154,7 @@ export function OssFlow() {
function handleCreateOperation(inputs: number[]) {
const positions = getPositions();
const target = flow.project({ x: window.innerWidth / 2, y: window.innerHeight / 2 });
- controller.promptCreateOperation({
+ promptCreateOperation({
defaultX: target.x,
defaultY: target.y,
inputs: inputs,
@@ -149,58 +164,58 @@ export function OssFlow() {
}
function handleDeleteOperation(target: number) {
- if (!controller.canDelete(target)) {
+ if (!canDelete(target)) {
return;
}
- controller.promptDeleteOperation(target, getPositions());
+ promptDeleteOperation(target, getPositions());
}
function handleDeleteSelected() {
- if (controller.selected.length !== 1) {
+ if (selected.length !== 1) {
return;
}
- handleDeleteOperation(controller.selected[0]);
+ handleDeleteOperation(selected[0]);
}
function handleInputCreate(target: number) {
- const operation = controller.schema.operationByID.get(target);
+ const operation = schema.operationByID.get(target);
if (!operation) {
return;
}
- if (libraryItems.find(item => item.alias === operation.alias && item.location === controller.schema.location)) {
+ if (libraryItems.find(item => item.alias === operation.alias && item.location === schema.location)) {
toast.error(errorMsg.inputAlreadyExists);
return;
}
void inputCreate({
- itemID: controller.schema.id,
+ itemID: schema.id,
data: { target: target, positions: getPositions() }
}).then(new_schema => router.push(urls.schema(new_schema.id)));
}
function handleEditSchema(target: number) {
- controller.promptEditInput(target, getPositions());
+ promptEditInput(target, getPositions());
}
function handleEditOperation(target: number) {
- controller.promptEditOperation(target, getPositions());
+ promptEditOperation(target, getPositions());
}
function handleOperationExecute(target: number) {
void operationExecute({
- itemID: controller.schema.id, //
+ itemID: schema.id, //
data: { target: target, positions: getPositions() }
});
}
function handleExecuteSelected() {
- if (controller.selected.length !== 1) {
+ if (selected.length !== 1) {
return;
}
- handleOperationExecute(controller.selected[0]);
+ handleOperationExecute(selected[0]);
}
function handleRelocateConstituents(target: number) {
- controller.promptRelocateConstituents(target, getPositions());
+ promptRelocateConstituents(target, getPositions());
}
function handleSaveImage() {
@@ -226,7 +241,7 @@ export function OssFlow() {
})
.then(dataURL => {
const a = document.createElement('a');
- a.setAttribute('download', `${controller.schema.alias}.png`);
+ a.setAttribute('download', `${schema.alias}.png`);
a.setAttribute('href', dataURL);
a.click();
})
@@ -246,11 +261,10 @@ export function OssFlow() {
cursorY: event.clientY
});
setIsContextMenuOpen(true);
- controller.setShowTooltip(false);
+ setHoverOperation(null);
}
function handleContextMenuHide() {
- controller.setShowTooltip(true);
setIsContextMenuOpen(false);
}
@@ -262,9 +276,7 @@ export function OssFlow() {
event.preventDefault();
event.stopPropagation();
if (node.data.operation.result) {
- controller.navigateOperationSchema(Number(node.id));
- } else {
- handleEditOperation(Number(node.id));
+ navigateOperationSchema(Number(node.id));
}
}
@@ -272,7 +284,7 @@ export function OssFlow() {
if (isProcessing) {
return;
}
- if (!controller.isMutable) {
+ if (!isMutable) {
return;
}
if ((event.ctrlKey || event.metaKey) && event.code === 'KeyS') {
@@ -284,7 +296,7 @@ export function OssFlow() {
if ((event.ctrlKey || event.metaKey) && event.code === 'KeyQ') {
event.preventDefault();
event.stopPropagation();
- handleCreateOperation(controller.selected);
+ handleCreateOperation(selected);
return;
}
if (event.key === 'Delete') {
@@ -303,9 +315,9 @@ export function OssFlow() {
>
flow.fitView({ duration: PARAMETER.zoomDuration })}
- onCreate={() => handleCreateOperation(controller.selected)}
+ onCreate={() => handleCreateOperation(selected)}
onDelete={handleDeleteSelected}
- onEdit={() => handleEditOperation(controller.selected[0])}
+ onEdit={() => handleEditOperation(selected[0])}
onExecute={handleExecuteSelected}
onResetPositions={() => setToggleReset(prev => !prev)}
onSavePositions={handleSavePositions}
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
index 6c363033..0e90c2a1 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/ToolbarOssGraph.tsx
@@ -50,10 +50,10 @@ export function ToolbarOssGraph({
onSavePositions,
onResetPositions
}: ToolbarOssGraphProps) {
- const controller = useOssEdit();
+ const { schema, selected, isMutable, canDelete } = useOssEdit();
const { isModified } = useModificationStore();
const isProcessing = useMutatingOss();
- const selectedOperation = controller.schema.operationByID.get(controller.selected[0]);
+ const selectedOperation = schema.operationByID.get(selected[0]);
const showGrid = useOSSGraphStore(state => state.showGrid);
const edgeAnimate = useOSSGraphStore(state => state.edgeAnimate);
@@ -70,12 +70,12 @@ export function ToolbarOssGraph({
return false;
}
- const argumentIDs = controller.schema.graph.expandInputs([selectedOperation.id]);
+ const argumentIDs = schema.graph.expandInputs([selectedOperation.id]);
if (!argumentIDs || argumentIDs.length < 1) {
return false;
}
- const argumentOperations = argumentIDs.map(id => controller.schema.operationByID.get(id)!);
+ const argumentOperations = argumentIDs.map(id => schema.operationByID.get(id)!);
if (argumentOperations.some(item => item.result === null)) {
return false;
}
@@ -140,7 +140,7 @@ export function ToolbarOssGraph({
offset={4}
/>
- {controller.isMutable ? (
+ {isMutable ? (
{node.data.operation.alias}
+ <> +{operation.alias}
- Тип: {labelOperationType(node.data.operation.operation_type)} + Тип: {labelOperationType(operation.operation_type)}
- {!node.data.operation.is_owned ? ( + {!operation.is_owned ? (КС не принадлежит ОСС
) : null} - {node.data.operation.is_consolidation ? ( + {operation.is_consolidation ? (Ромбовидный синтез
) : null} - {node.data.operation.title ? ( + {operation.title ? (Название: - {node.data.operation.title} + {operation.title}
) : null} - {node.data.operation.comment ? ( + {operation.comment ? (Комментарий: - {node.data.operation.comment} + {operation.comment}
) : null} - {node.data.operation.substitutions.length > 0 ? ( + {operation.substitutions.length > 0 ? (Отождествления: Отсутствуют
) : null} -
@@ -74,7 +74,7 @@ export function FormOSS() {
{...register('alias')}
label='Сокращение'
className='w-[16rem]'
- disabled={!controller.isMutable}
+ disabled={!isMutable}
error={errors.alias}
/>
setValue('visible', !visible, { shouldDirty: true })}
readOnly={readOnly}
toggleReadOnly={() => setValue('read_only', !readOnly, { shouldDirty: true })}
- controller={controller}
+ schema={schema}
+ isAttachedToOSS={false}
/>
@@ -91,10 +92,10 @@ export function FormOSS() {
{...register('comment')}
label='Описание'
rows={3}
- disabled={!controller.isMutable || isProcessing}
+ disabled={!isMutable || isProcessing}
error={errors.comment}
/>
- {controller.isMutable || isModified ? (
+ {isMutable || isModified ? (
+
@@ -175,14 +175,14 @@ export function MenuOssTabs() {
text={labelUserRole(UserRole.EDITOR)}
title={describeUserRole(UserRole.EDITOR)}
icon={ void;
}
-export interface IOssEditContext extends ILibraryItemEditor {
+export interface IOssEditContext {
schema: IOperationSchema;
selected: number[];
isOwned: boolean;
isMutable: boolean;
- isAttachedToOSS: boolean;
-
- showTooltip: boolean;
- setShowTooltip: (newValue: boolean) => void;
navigateTab: (tab: OssTabID) => void;
navigateOperationSchema: (target: number) => void;
@@ -82,7 +78,6 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren UserRole.READER && !schema.read_only;
- const [showTooltip, setShowTooltip] = useState(true);
const [selected, setSelected] = useState([]);
const showEditInput = useDialogsStore(state => state.showChangeInputSchema);
@@ -209,12 +204,8 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren void;
- controller: ILibraryItemEditor;
+ isMutable: boolean;
+ schema: ILibraryItem;
+ deleteSchema: () => void;
}
-export function ToolbarRSFormCard({ controller, onSubmit }: ToolbarRSFormCardProps) {
+export function ToolbarRSFormCard({ schema, onSubmit, isMutable, deleteSchema }: ToolbarRSFormCardProps) {
const role = useRoleStore(state => state.role);
+ const router = useConceptNavigation();
const { isModified } = useModificationStore();
const isProcessing = useMutatingLibrary();
const canSave = isModified && !isProcessing;
const ossSelector = (() => {
- if (controller.schema.item_type !== LibraryItemType.RSFORM) {
+ if (schema.item_type !== LibraryItemType.RSFORM) {
return null;
}
- const schema = controller.schema as IRSForm;
- if (schema.oss.length <= 0) {
+ const rsSchema = schema as IRSForm;
+ if (rsSchema.oss.length <= 0) {
return null;
}
return (
- (controller as IRSEditContext).navigateOss(value.id, event.ctrlKey || event.metaKey)
- }
+ items={rsSchema.oss}
+ onSelect={(event, value) => router.push(urls.oss(value.id), event.ctrlKey || event.metaKey)}
/>
);
})();
@@ -53,7 +49,7 @@ export function ToolbarRSFormCard({ controller, onSubmit }: ToolbarRSFormCardPro
return (
{ossSelector}
- {controller.isMutable || isModified ? (
+ {isMutable || isModified ? (
controller.navigateOss(value.id, event.ctrlKey || event.metaKey)}
+ items={schema.oss}
+ onSelect={(event, value) => navigateOss(value.id, event.ctrlKey || event.metaKey)}
/>
) : null}
{activeCst?.is_inherited ? (
@@ -85,7 +96,7 @@ export function ToolbarConstituenta({
icon={(null);
@@ -78,7 +78,7 @@ export function EditorRSExpression({
alias: activeCst.alias,
cst_type: activeCst.cst_type
};
- void checkInternal({ itemID: controller.schema.id, data }).then(parse => {
+ void checkInternal({ itemID: schema.id, data }).then(parse => {
setParseData(parse);
onSuccess?.(parse);
});
@@ -179,7 +179,7 @@ export function EditorRSExpression({
disabled={disabled}
onChange={handleChange}
onAnalyze={handleCheckExpression}
- schema={controller.schema}
+ schema={schema}
onOpenEdit={onOpenEdit}
{...restProps}
/>
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
index 24f4f668..debb82c3 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
@@ -15,7 +15,7 @@ import { FormRSForm } from './FormRSForm';
import { RSFormStats } from './RSFormStats';
export function EditorRSFormCard() {
- const controller = useRSEdit();
+ const { schema, isArchive, isMutable, deleteSchema, isAttachedToOSS } = useRSEdit();
const { isModified } = useModificationStore();
function initiateSubmit() {
@@ -36,7 +36,7 @@ export function EditorRSFormCard() {
return (
<>
-
- ({
resolver: zodResolver(schemaUpdateLibraryItem),
defaultValues: {
- id: controller.schema.id,
+ id: schema.id,
item_type: LibraryItemType.RSFORM,
- title: controller.schema.title,
- alias: controller.schema.alias,
- comment: controller.schema.comment,
- visible: controller.schema.visible,
- read_only: controller.schema.read_only
+ title: schema.title,
+ alias: schema.alias,
+ comment: schema.comment,
+ visible: schema.visible,
+ read_only: schema.read_only
}
});
const visible = useWatch({ control, name: 'visible' });
@@ -55,7 +55,7 @@ export function FormRSForm() {
}, [isDirty, setIsModified]);
function handleSelectVersion(version?: number) {
- router.push(urls.schema(controller.schema.id, version));
+ router.push(urls.schema(schema.id, version));
}
function onSubmit(data: IUpdateLibraryItemDTO) {
@@ -73,7 +73,7 @@ export function FormRSForm() {
{...register('title')}
label='Полное название'
className='mb-3'
- disabled={!controller.isContentEditable}
+ disabled={!isContentEditable}
error={errors.title}
/>
setHover(node.data.operation)}
+ >
);
diff --git a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
index c0fdd87d..1670f22f 100644
--- a/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/OssPage/MenuOssTabs.tsx
@@ -29,7 +29,7 @@ import { useMutatingOss } from '../../backend/useMutatingOss';
import { useOssEdit } from './OssEditContext';
export function MenuOssTabs() {
- const controller = useOssEdit();
+ const { deleteSchema, promptRelocateConstituents, isMutable, isOwned, schema } = useOssEdit();
const router = useConceptNavigation();
const { user, isAnonymous } = useAuthSuspense();
@@ -44,7 +44,7 @@ export function MenuOssTabs() {
function handleDelete() {
schemaMenu.hide();
- controller.deleteSchema();
+ deleteSchema();
}
function handleShare() {
@@ -67,7 +67,7 @@ export function MenuOssTabs() {
function handleRelocate() {
editMenu.hide();
- controller.promptRelocateConstituents(undefined, []);
+ promptRelocateConstituents(undefined, []);
}
return (
@@ -90,7 +90,7 @@ export function MenuOssTabs() {
icon={
{labelText}
- {controller.showTooltip && !node.dragging ? (
-
@@ -82,24 +82,25 @@ export function FormRSForm() {
{...register('alias')}
label='Сокращение'
className='w-[16rem]'
- disabled={!controller.isContentEditable}
+ disabled={!isContentEditable}
error={errors.alias}
/>
state.showCreateVersion);
const showEditVersions = useDialogsStore(state => state.showEditVersions);
function handleRestoreVersion() {
- if (!controller.schema.version || !window.confirm(promptText.restoreArchive)) {
+ if (!schema.version || !window.confirm(promptText.restoreArchive)) {
return;
}
- void versionRestore({ versionID: controller.schema.version }).then(() => controller.navigateVersion());
+ void versionRestore({ versionID: schema.version }).then(() => navigateVersion());
}
function handleCreateVersion() {
@@ -38,48 +38,48 @@ export function ToolbarVersioning({ blockReload }: ToolbarVersioningProps) {
return;
}
showCreateVersion({
- itemID: controller.schema.id,
- versions: controller.schema.versions,
- selected: controller.selected,
- totalCount: controller.schema.items.length,
- onCreate: newVersion => controller.navigateVersion(newVersion)
+ itemID: schema.id,
+ versions: schema.versions,
+ selected: selected,
+ totalCount: schema.items.length,
+ onCreate: newVersion => navigateVersion(newVersion)
});
}
function handleEditVersions() {
showEditVersions({
- itemID: controller.schema.id,
+ itemID: schema.id,
afterDelete: targetVersion => {
- if (targetVersion === controller.activeVersion) controller.navigateVersion();
+ if (targetVersion === activeVersion) navigateVersion();
}
});
}
return (
- {controller.isMutable ? (
+ {isMutable ? (
<>
прикрепленную к операционной схеме'
- : !controller.isContentEditable
+ : !isContentEditable
? 'Откатить к версии'
: 'Переключитесь на
неактуальную версию' } - disabled={controller.isContentEditable || blockReload} + disabled={isContentEditable || blockReload} onClick={handleRestoreVersion} icon={
на актуальную версию'} + disabled={!isContentEditable} onClick={handleCreateVersion} icon={) {
if (event.key === 'Escape') {
event.preventDefault();
event.stopPropagation();
- controller.deselectAll();
+ deselectAll();
return;
}
- if (!controller.isContentEditable || isProcessing) {
+ if (!isContentEditable || isProcessing) {
return;
}
- if (event.key === 'Delete' && controller.canDeleteSelected) {
+ if (event.key === 'Delete' && canDeleteSelected) {
event.preventDefault();
event.stopPropagation();
- controller.promptDeleteCst();
+ promptDeleteCst();
return;
}
if (!event.altKey || event.shiftKey) {
@@ -90,26 +100,26 @@ export function EditorRSList() {
}
function processAltKey(code: string): boolean {
- if (controller.selected.length > 0) {
+ if (selected.length > 0) {
// prettier-ignore
switch (code) {
- case 'ArrowUp': controller.moveUp(); return true;
- case 'ArrowDown': controller.moveDown(); return true;
- case 'KeyV': controller.cloneCst(); return true;
+ case 'ArrowUp': moveUp(); return true;
+ case 'ArrowDown': moveDown(); return true;
+ case 'KeyV': cloneCst(); return true;
}
}
// prettier-ignore
switch (code) {
- case 'Backquote': controller.createCstDefault(); return true;
+ case 'Backquote': createCstDefault(); return true;
- case 'Digit1': controller.createCst(CstType.BASE, true); return true;
- case 'Digit2': controller.createCst(CstType.STRUCTURED, true); return true;
- case 'Digit3': controller.createCst(CstType.TERM, true); return true;
- case 'Digit4': controller.createCst(CstType.AXIOM, true); return true;
- case 'KeyQ': controller.createCst(CstType.FUNCTION, true); return true;
- case 'KeyW': controller.createCst(CstType.PREDICATE, true); return true;
- case 'Digit5': controller.createCst(CstType.CONSTANT, true); return true;
- case 'Digit6': controller.createCst(CstType.THEOREM, true); return true;
+ case 'Digit1': createCst(CstType.BASE, true); return true;
+ case 'Digit2': createCst(CstType.STRUCTURED, true); return true;
+ case 'Digit3': createCst(CstType.TERM, true); return true;
+ case 'Digit4': createCst(CstType.AXIOM, true); return true;
+ case 'KeyQ': createCst(CstType.FUNCTION, true); return true;
+ case 'KeyW': createCst(CstType.PREDICATE, true); return true;
+ case 'Digit5': createCst(CstType.CONSTANT, true); return true;
+ case 'Digit6': createCst(CstType.THEOREM, true); return true;
}
return false;
}
@@ -118,12 +128,12 @@ export function EditorRSList() {
return (
<>
- {controller.isContentEditable ?
- 0} />
+ 0} />
setValue('visible', !visible, { shouldDirty: true })}
readOnly={readOnly}
toggleReadOnly={() => setValue('read_only', !readOnly, { shouldDirty: true })}
- controller={controller}
+ schema={schema}
+ isAttachedToOSS={isAttachedToOSS}
/>
@@ -110,10 +111,10 @@ export function FormRSForm() {
{...register('comment')}
label='Описание'
rows={3}
- disabled={!controller.isContentEditable || isProcessing}
+ disabled={!isContentEditable || isProcessing}
error={errors.comment}
/>
- {controller.isContentEditable || isDirty ? (
+ {isContentEditable || isDirty ? (
неактуальную версию' } - disabled={controller.isContentEditable || blockReload} + disabled={isContentEditable || blockReload} onClick={handleRestoreVersion} icon={
на актуальную версию'} + disabled={!isContentEditable} onClick={handleCreateVersion} icon={
- {controller.isContentEditable ? (
+ {isContentEditable ? (
- {controller.schema.oss.length > 0 ? (
+ {schema.oss.length > 0 ? (
controller.navigateOss(value.id, event.ctrlKey || event.metaKey)}
+ items={schema.oss}
+ onSelect={(event, value) => navigateOss(value.id, event.ctrlKey || event.metaKey)}
/>
) : null}
(null);
- const filteredGraph = produceFilteredGraph(controller.schema, filter, focusCst);
+ const filteredGraph = produceFilteredGraph(schema, filter, focusCst);
const [hidden, setHidden] = useState([]);
const [isDragging, setIsDragging] = useState(false);
const [hoverID, setHoverID] = useState(null);
- const hoverCst = hoverID && controller.schema.cstByID.get(hoverID);
+ const hoverCst = hoverID && schema.cstByID.get(hoverID);
const [hoverCstDebounced] = useDebounce(hoverCst, PARAMETER.graphPopupDelay);
const [hoverLeft, setHoverLeft] = useState(true);
@@ -84,9 +94,9 @@ export function TGFlow() {
function onSelectionChange({ nodes }: { nodes: Node[] }) {
const ids = nodes.map(node => Number(node.id));
if (ids.length === 0) {
- controller.setSelected([]);
+ setSelected([]);
} else {
- controller.setSelected(prev => [...prev.filter(nodeID => !filteredGraph.hasNode(nodeID)), ...ids]);
+ setSelected(prev => [...prev.filter(nodeID => !filteredGraph.hasNode(nodeID)), ...ids]);
}
}
@@ -96,24 +106,24 @@ export function TGFlow() {
useEffect(() => {
const newDismissed: number[] = [];
- controller.schema.items.forEach(cst => {
+ schema.items.forEach(cst => {
if (!filteredGraph.nodes.has(cst.id)) {
newDismissed.push(cst.id);
}
});
setHidden(newDismissed);
setHoverID(null);
- }, [controller.schema, filteredGraph]);
+ }, [schema, filteredGraph]);
const resetNodes = useCallback(() => {
const newNodes: Node[] = [];
filteredGraph.nodes.forEach(node => {
- const cst = controller.schema.cstByID.get(node.id);
+ const cst = schema.cstByID.get(node.id);
if (cst) {
newNodes.push({
id: String(node.id),
type: 'concept',
- selected: controller.selected.includes(node.id),
+ selected: selected.includes(node.id),
position: { x: 0, y: 0 },
data: {
fill: focusCst === cst ? APP_COLORS.bgPurple : colorBgGraphNode(cst, coloring),
@@ -150,11 +160,11 @@ export function TGFlow() {
setNodes(newNodes);
setEdges(newEdges);
- }, [controller.schema, filteredGraph, setNodes, setEdges, filter.noText, controller.selected, focusCst, coloring]);
+ }, [schema, filteredGraph, setNodes, setEdges, filter.noText, selected, focusCst, coloring]);
useEffect(() => {
setNeedReset(true);
- }, [controller.schema, focusCst, coloring, filter]);
+ }, [schema, focusCst, coloring, filter]);
useEffect(() => {
if (!needReset || !flow.viewportInitialized) {
@@ -162,7 +172,7 @@ export function TGFlow() {
}
setNeedReset(false);
resetNodes();
- }, [needReset, controller.schema, resetNodes, flow.viewportInitialized]);
+ }, [needReset, schema, resetNodes, flow.viewportInitialized]);
useEffect(() => {
setTimeout(() => {
@@ -171,20 +181,20 @@ export function TGFlow() {
}, [toggleResetView, flow, focusCst, filter]);
function handleSetSelected(newSelection: number[]) {
- controller.setSelected(newSelection);
+ setSelected(newSelection);
addSelectedNodes(newSelection.map(id => String(id)));
}
function handleCreateCst() {
- const definition = controller.selected.map(id => controller.schema.cstByID.get(id)!.alias).join(' ');
- controller.createCst(controller.selected.length === 0 ? CstType.BASE : CstType.TERM, false, definition);
+ const definition = selected.map(id => schema.cstByID.get(id)!.alias).join(' ');
+ createCst(selected.length === 0 ? CstType.BASE : CstType.TERM, false, definition);
}
function handleDeleteCst() {
- if (!controller.canDeleteSelected) {
+ if (!canDeleteSelected) {
return;
}
- controller.promptDeleteCst();
+ promptDeleteCst();
}
function handleSaveImage() {
@@ -210,7 +220,7 @@ export function TGFlow() {
})
.then(dataURL => {
const a = document.createElement('a');
- a.setAttribute('download', `${controller.schema.alias}.png`);
+ a.setAttribute('download', `${schema.alias}.png`);
a.setAttribute('href', dataURL);
a.click();
})
@@ -231,7 +241,7 @@ export function TGFlow() {
handleSetSelected([]);
return;
}
- if (!controller.isContentEditable) {
+ if (!isContentEditable) {
return;
}
if (event.key === 'Delete') {
@@ -256,10 +266,10 @@ export function TGFlow() {
if (cstID === null) {
setFocusCst(null);
} else {
- const target = controller.schema.cstByID.get(cstID) ?? null;
+ const target = schema.cstByID.get(cstID) ?? null;
setFocusCst(prev => (prev === target ? null : target));
if (target) {
- controller.setSelected([]);
+ setSelected([]);
}
}
}
@@ -275,7 +285,7 @@ export function TGFlow() {
function handleNodeDoubleClick(event: CProps.EventMouse, cstID: number) {
event.preventDefault();
event.stopPropagation();
- controller.navigateCst(cstID);
+ navigateCst(cstID);
}
function handleNodeEnter(event: CProps.EventMouse, cstID: number) {
@@ -307,19 +317,15 @@ export function TGFlow() {
/>
{!focusCst ? (
{
- const cst = controller.schema.cstByID.get(cstID);
+ const cst = schema.cstByID.get(cstID);
return !!cst && isBasicConcept(cst.cst_type);
}}
- isOwned={
- controller.schema.inheritance.length > 0
- ? cstID => !controller.schema.cstByID.get(cstID)?.is_inherited
- : undefined
- }
- value={controller.selected}
+ isOwned={schema.inheritance.length > 0 ? cstID => !schema.cstByID.get(cstID)?.is_inherited : undefined}
+ value={selected}
onChange={handleSetSelected}
- emptySelection={controller.selected.length === 0}
+ emptySelection={selected.length === 0}
/>
) : null}
{focusCst ? (
@@ -347,8 +353,8 @@ export function TGFlow() {
void;
+ activeOperation: IOperation | null;
+ setActiveOperation: (value: IOperation | null) => void;
}
export const useTooltipsStore = create()(set => ({
activeCst: null,
- setActiveCst: value => set({ activeCst: value })
+ setActiveCst: value => set({ activeCst: value }),
+
+ activeOperation: null,
+ setActiveOperation: value => set({ activeOperation: value })
}));
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index 5506d012..06a30884 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -111,8 +111,8 @@ export const globals = {
tooltip: 'global_tooltip',
value_tooltip: 'value_tooltip',
constituenta_tooltip: 'cst_tooltip',
+ operation_tooltip: 'operation_tooltip',
email_tooltip: 'email_tooltip',
- main_scroll: 'main_scroll',
library_item_editor: 'library_item_editor',
constituenta_editor: 'constituenta_editor',
graph_schemas: 'graph_schemas_tooltip'
- Выбор {controller.selected.length} из {controller.schema.stats?.count_all}
+ Выбор {selected.length} из {schema.stats?.count_all}
-
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
index a8664341..ec8fd01f 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarFocusedCst.tsx
@@ -25,11 +25,11 @@ export function ToolbarFocusedCst({
toggleShowInputs,
toggleShowOutputs
}: ToolbarFocusedCstProps) {
- const controller = useRSEdit();
+ const { deselectAll } = useRSEdit();
function resetSelection() {
reset();
- controller.setSelected([]);
+ deselectAll();
}
return (
diff --git a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
index 38adb871..06498607 100644
--- a/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ToolbarTermGraph.tsx
@@ -47,12 +47,12 @@ export function ToolbarTermGraph({
onFitView,
onSaveImage
}: ToolbarTermGraphProps) {
- const controller = useRSEdit();
const isProcessing = useMutatingRSForm();
const showTypeGraph = useDialogsStore(state => state.showShowTypeGraph);
+ const { schema, navigateOss, isContentEditable, canDeleteSelected } = useRSEdit();
function handleShowTypeGraph() {
- const typeInfo = controller.schema.items.map(item => ({
+ const typeInfo = schema.items.map(item => ({
alias: item.alias,
result: item.parse.typification,
args: item.parse.args
@@ -62,10 +62,10 @@ export function ToolbarTermGraph({
return (
- {controller.schema.oss.length > 0 ? (
+ {schema.oss.length > 0 ? (
controller.navigateOss(value.id, event.ctrlKey || event.metaKey)}
+ items={schema.oss}
+ onSelect={(event, value) => navigateOss(value.id, event.ctrlKey || event.metaKey)}
/>
) : null}
- {!controller.isArchive && !isAnonymous ? (
+ {!isArchive && !isAnonymous ? (
}
+ icon={
@@ -309,14 +320,14 @@ export function MenuRSTabs() {
text='Шаблоны'
title='Создать конституенту из шаблона'
icon={
логики типов и связей конституент' icon={
) : null}
- {controller.isArchive && !isAnonymous ? (
+ {isArchive && !isAnonymous ? (
}
- onClick={event => router.push(urls.schema(controller.schema.id), event.ctrlKey || event.metaKey)}
+ onClick={event => router.push(urls.schema(schema.id), event.ctrlKey || event.metaKey)}
/>
) : null}
{!isAnonymous ? (
@@ -400,14 +411,14 @@ export function MenuRSTabs() {
text={labelAccessMode(UserRole.EDITOR)}
title={describeAccessMode(UserRole.EDITOR)}
icon={логики типов и связей конституент' icon={