Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-5215 move form component #2815

Merged
merged 3 commits into from
Aug 5, 2024
+45 −45
Merged

CB-5215 move form component #2815

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26846a8
CB-5215 move form component
devnaumov Jul 31, 2024
f15aebc
Merge branch 'devel' into CB-5215-always-focus-first-input-sc
devnaumov Jul 31, 2024
d9902ed
Merge branch 'devel' into CB-5215-always-focus-first-input-sc
dariamarutkina Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions ...in-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,47 +81,47 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
}

return (
<Form ref={focusedRef} name="server_config" contents onChange={handleChange}>
<ColoredContainer vertical wrap gap parent>
{!configurationWizard && (
<Group box keepSize>
<ToolsPanel rounded>
<ToolsAction
title={translate('administration_configuration_tools_save_tooltip')}
icon="admin-save"
viewBox="0 0 24 24"
disabled={!changed}
onClick={save}
>
{translate('ui_processing_save')}
</ToolsAction>
<ToolsAction
title={translate('administration_configuration_tools_cancel_tooltip')}
icon="admin-cancel"
viewBox="0 0 24 24"
disabled={!changed}
onClick={reset}
>
{translate('ui_processing_cancel')}
</ToolsAction>
</ToolsPanel>
<ColoredContainer vertical wrap gap parent>
{!configurationWizard && (
<Group box keepSize>
<ToolsPanel rounded>
<ToolsAction
title={translate('administration_configuration_tools_save_tooltip')}
icon="admin-save"
viewBox="0 0 24 24"
disabled={!changed}
onClick={save}
>
{translate('ui_processing_save')}
</ToolsAction>
<ToolsAction
title={translate('administration_configuration_tools_cancel_tooltip')}
icon="admin-cancel"
viewBox="0 0 24 24"
disabled={!changed}
onClick={reset}
>
{translate('ui_processing_cancel')}
</ToolsAction>
</ToolsPanel>
</Group>
)}

<Container overflow gap wrap>
{configurationWizard && (
<Group form>
<GroupItem>
<h3>{translate('administration_configuration_wizard_configuration_title')}</h3>
</GroupItem>
<GroupItem>
<p className={s(styles, { message: true })}>{translate('administration_configuration_wizard_configuration_message')}</p>
</GroupItem>
</Group>
)}

<Container overflow gap wrap>
{configurationWizard && (
<Group form>
<GroupItem>
<h3>{translate('administration_configuration_wizard_configuration_title')}</h3>
</GroupItem>
<GroupItem>
<p className={s(styles, { message: true })}>{translate('administration_configuration_wizard_configuration_message')}</p>
</GroupItem>
</Group>
)}
<Loader state={service}>
{() => (
<Loader className={s(styles, { loader: true })} suspense>
<Loader state={service}>
{() => (
<Loader className={s(styles, { loader: true })} suspense>
<Form ref={focusedRef} name="server_config" contents onChange={handleChange}>
<Container wrap gap grid medium>
<ServerConfigurationInfoForm state={service.state} />
<Group form gap>
Expand All @@ -135,11 +135,11 @@ export const ServerConfigurationPage: AdministrationItemContentComponent = obser
<ServerConfigurationSecurityForm serverConfig={service.state.serverConfig} />
<ServerConfigurationDriversForm serverConfig={service.state.serverConfig} />
</Container>
</Loader>
)}
</Loader>
</Container>
</ColoredContainer>
</Form>
</Form>
</Loader>
)}
</Loader>
</Container>
</ColoredContainer>
);
});
Loading