diff --git a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx index e58a8054..736a0b3a 100644 --- a/rsconcept/frontend/src/app/Navigation/UserMenu.tsx +++ b/rsconcept/frontend/src/app/Navigation/UserMenu.tsx @@ -19,7 +19,7 @@ function UserMenu() { {!user ? ( } + icon={} onClick={navigateLogin} /> ) : null} diff --git a/rsconcept/frontend/src/components/Help/HelpButton.tsx b/rsconcept/frontend/src/components/Help/HelpButton.tsx index d24082f6..64073cd6 100644 --- a/rsconcept/frontend/src/components/Help/HelpButton.tsx +++ b/rsconcept/frontend/src/components/Help/HelpButton.tsx @@ -16,7 +16,7 @@ interface HelpButtonProps extends CProps.Styling { function HelpButton({ topic, ...restProps }: HelpButtonProps) { return (
- +
event.stopPropagation()}>
diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx index 807dfe6f..de4a5ae5 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/ArgumentsTab.tsx @@ -110,7 +110,14 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { header: 'Типизация', enableHiding: true, cell: props => ( -
{props.getValue()}
+
+ {props.getValue()} +
) }), argumentsHelper.display({ @@ -123,7 +130,7 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { {props.row.original.value ? ( } + icon={} noHover onClick={() => handleClearArgument(props.row.original)} /> @@ -150,7 +157,13 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { -
+
} + icon={} disabled={!argumentValue || !selectedArgument} onClick={() => handleAssignArgument(selectedArgument!, argumentValue)} /> @@ -183,12 +202,12 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) { title='Откатить значение' disabled={!isModified} onClick={handleReset} - icon={} + icon={} /> } + icon={} onClick={() => (selectedArgument ? handleClearArgument(selectedArgument) : undefined)} />
diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index a65da25c..c7c8c67a 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -158,14 +158,14 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps) } + icon={} disabled={textProcessor.loading || !inputText} onClick={handleParse} /> } + icon={} disabled={textProcessor.loading || inputGrams.length == 0} onClick={handleInflect} /> @@ -182,14 +182,14 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps) } + icon={} disabled={textProcessor.loading || !inputText || inputGrams.length == 0} onClick={handleAddForm} /> } + icon={} disabled={textProcessor.loading || !inputText} onClick={handleGenerateLexeme} /> @@ -200,7 +200,7 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps) } + icon={} disabled={textProcessor.loading || forms.length === 0} onClick={handleResetAll} /> diff --git a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx b/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx index ad6e946f..be5082c0 100644 --- a/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx +++ b/rsconcept/frontend/src/dialogs/DlgSubstituteCst.tsx @@ -50,9 +50,9 @@ function DlgSubstituteCst({ hideWindow, onSubstitute }: DlgSubstituteCstProps) {
- {isMutable ? ( + {isMutable || processing ? ( - {controller.isContentEditable ? ( + {controller.isContentEditable || controller.isProcessing ? ( - +
ROW_SIZE_IN_CHARACTERS ? 3 : 2} onChange={event => setConvention(event.target.value)} /> - {isMutable ? ( + {isMutable || processing ? ( setShowControls(prev => !prev)} - icon={} + icon={} /> } + icon={} /> } + icon={} /> diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx index ba550e4b..a12d4b2c 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/EditorRSForm.tsx @@ -20,7 +20,7 @@ interface EditorRSFormProps { } function EditorRSForm({ isModified, onDestroy, setIsModified }: EditorRSFormProps) { - const { schema, isClaimable, isSubscribed, processing } = useRSForm(); + const { schema, isClaimable, isSubscribed } = useRSForm(); const { user } = useAuth(); function initiateSubmit() { @@ -42,7 +42,6 @@ function EditorRSForm({ isModified, onDestroy, setIsModified }: EditorRSFormProp return ( <> setAlias(event.target.value)} />
- {controller.isMutable ? ( + {controller.isMutable || controller.isProcessing ? ( setCanonical(value)} />
- {controller.isContentEditable ? ( + {controller.isContentEditable || controller.isProcessing ? ( } /> ) : null} diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx index 1312c3af..1b1630b5 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSForm/RSFormToolbar.tsx @@ -17,25 +17,16 @@ interface RSFormToolbarProps { subscribed: boolean; anonymous: boolean; claimable: boolean; - processing: boolean; onSubmit: () => void; onDestroy: () => void; } -function RSFormToolbar({ - modified, - anonymous, - subscribed, - claimable, - processing, - onSubmit, - onDestroy -}: RSFormToolbarProps) { +function RSFormToolbar({ modified, anonymous, subscribed, claimable, onSubmit, onDestroy }: RSFormToolbarProps) { const controller = useRSEdit(); const canSave = useMemo(() => modified && controller.isMutable, [modified, controller.isMutable]); return ( - {controller.isContentEditable ? ( + {controller.isContentEditable || controller.isProcessing ? ( @@ -71,11 +62,11 @@ function RSFormToolbar({ } - disabled={processing} + disabled={controller.isProcessing} onClick={controller.claim} /> ) : null} - {controller.isContentEditable ? ( + {controller.isContentEditable || controller.isProcessing ? ( - {controller.isContentEditable ? ( + {controller.isContentEditable || controller.isProcessing ? ( ) : null} - {controller.isContentEditable ? : null} + {controller.isContentEditable || controller.isProcessing ? ( + + ) : null}
- } + icon={} disabled={!controller.isMutable || nothingSelected} onClick={controller.moveUp} /> - } + icon={} disabled={!controller.isMutable || nothingSelected} onClick={controller.moveDown} /> - } + icon={} disabled={!controller.isMutable || selectedCount !== 1} onClick={controller.cloneCst} /> } + icon={} disabled={!controller.isMutable} onClick={() => controller.createCst(undefined, false)} /> @@ -62,7 +56,7 @@ function RSListToolbar({ selectedCount }: RSListToolbarProps) { } + icon={} disabled={!controller.isMutable} onClick={insertMenu.toggle} /> @@ -79,7 +73,7 @@ function RSListToolbar({ selectedCount }: RSListToolbarProps) {
} + icon={} disabled={!controller.isMutable || nothingSelected} onClick={controller.deleteCst} /> diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx index 218d94d9..0c75048b 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx @@ -195,7 +195,6 @@ function EditorTermGraph({ selected, setSelected, onOpenEdit }: EditorTermGraphP /> } + icon={} onClick={showParamsDialog} /> + ) : ( - + ) } onClick={toggleNoText} /> } + icon={} title='Восстановить камеру' onClick={onResetViewpoint} /> @@ -66,18 +68,19 @@ function GraphToolbar({ disabled={!is3D} onClick={toggleOrbit} /> - {isMutable ? ( + {controller.isMutable || controller.isProcessing ? ( } + disabled={!controller.isMutable} onClick={onCreate} /> ) : null} - {isMutable ? ( + {controller.isMutable || controller.isProcessing ? ( } - disabled={nothingSelected} + disabled={nothingSelected || !controller.isMutable} onClick={onDelete} /> ) : null} diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx index 264e4a98..1bae7ddd 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSEditContext.tsx @@ -45,6 +45,7 @@ interface IRSEditContext { schema?: IRSForm; isMutable: boolean; isContentEditable: boolean; + isProcessing: boolean; viewVersion: (version?: number) => void; @@ -429,6 +430,7 @@ export const RSEditState = ({ schema: model.schema, isMutable, isContentEditable, + isProcessing: model.processing, viewVersion, diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx index bc212b60..59ab7455 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabsMenu.tsx @@ -122,7 +122,7 @@ function RSTabsMenu({ onDestroy }: RSTabsMenuProps) { } + icon={} onClick={!model.isOwned && model.isClaimable ? handleClaimOwner : undefined} /> ) : null} diff --git a/rsconcept/frontend/src/pages/RegisterPage.tsx b/rsconcept/frontend/src/pages/RegisterPage.tsx index edde6c5f..5767532d 100644 --- a/rsconcept/frontend/src/pages/RegisterPage.tsx +++ b/rsconcept/frontend/src/pages/RegisterPage.tsx @@ -75,7 +75,7 @@ function RegisterPage() {
- +

- используйте уникальный пароль

diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx index e1e249da..94628277 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserTabs.tsx @@ -29,7 +29,7 @@ function UserTabs() { return ( + ) : ( - + ) } onClick={() => setShowSubs(prev => !prev)}