From 9362a4e184dea21f1257bf111ab82c9c3c8450ca Mon Sep 17 00:00:00 2001 From: Wroud Date: Mon, 7 Sep 2020 14:00:48 +0300 Subject: [PATCH] feat(core-connections): connection create, back button --- .../ConnectionForm/ConnectionForm.tsx | 4 +++- .../CreateConnection/CreateConnection.tsx | 24 ++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx index c0bfb51ed0..5a0ccb609c 100644 --- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx +++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/ConnectionForm.tsx @@ -122,12 +122,14 @@ const styles = composes( type Props = { model: IConnectionFormModel; configurationWizard?: boolean; + onBack?(): void; onCancel?(): void; } export const ConnectionForm = observer(function ConnectionForm({ model, configurationWizard, + onBack = () => {}, onCancel = () => {}, }: Props) { const controller = useController(Controller, model, onCancel); @@ -151,7 +153,7 @@ export const ConnectionForm = observer(function ConnectionForm({ type="button" disabled={controller.isDisabled} mod={['outlined']} - onClick={onCancel} + onClick={onBack} > {translate('ui_processing_cancel')} diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx index 367cc7bd2c..3cd875daeb 100644 --- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx +++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx @@ -11,7 +11,7 @@ import { useMemo, useEffect, useCallback } from 'react'; import styled, { css } from 'reshadow'; import { - TabsState, TabList, Tab, TabTitle, IconButton, Loader, StaticImage + TabsState, TabList, Tab, TabTitle, IconButton, Loader, StaticImage, Icon } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; import { useTranslate } from '@cloudbeaver/core-localization'; @@ -80,7 +80,7 @@ const styles = composes( title-bar { composes: theme-typography--headline6 from global; - padding: 16px; + padding: 16px 24px; border-top: solid 1px; align-items: center; display: flex; @@ -93,13 +93,29 @@ const styles = composes( } StaticImage { + width: 32px; + max-height: 32px; margin-right: 16px; } fill { flex: 1; } - + + back-button { + position: relative; + box-sizing: border-box; + margin-right: 16px; + display: flex; + + & Icon { + box-sizing: border-box; + transform: rotate(90deg); + cursor: pointer; + height: 16px; + width: 16px; + } + } TabList { align-items: center; @@ -157,6 +173,7 @@ export const CreateConnection = observer(function CreateConnection({ return styled(useStyles(styles))( + {controller.driver?.icon && } {controller.driver?.name ?? translate('connections_administration_connection_create')} @@ -165,6 +182,7 @@ export const CreateConnection = observer(function CreateConnection({