From ec8c2ff1417c1eec85855af67b084dfbc15cfd85 Mon Sep 17 00:00:00 2001 From: Konstantin Vasilev Date: Wed, 14 Sep 2022 16:34:06 +0300 Subject: [PATCH] CB-2511 feat(plugin-data-export): Disable export form for binary processors --- .../DefaultExportOutputSettingsResource.ts | 2 +- .../src/Dialog/OutputOptionsForm.tsx | 47 ++++++++----------- .../src/Dialog/ProcessorConfigureDialog.tsx | 44 +++++++---------- 3 files changed, 37 insertions(+), 56 deletions(-) diff --git a/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts b/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts index af40f3454a..cbf233cfd4 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts +++ b/webapp/packages/plugin-data-export/src/Dialog/DefaultExportOutputSettingsResource.ts @@ -24,4 +24,4 @@ export class DefaultExportOutputSettingsResource async loader() { return (await this.graphQLService.sdk.getDataTransferDefaultParameters()).settings; } -} \ No newline at end of file +} diff --git a/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx b/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx index a9809a3582..078cbd50b8 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/OutputOptionsForm.tsx @@ -6,9 +6,9 @@ * you may not use this file except in compliance with the License. */ import { observer } from 'mobx-react-lite'; -import styled, { css, use } from 'reshadow'; +import styled, { css } from 'reshadow'; -import { Combobox, FieldCheckbox, InputField, Loader, useDataResource } from '@cloudbeaver/core-blocks'; +import { Combobox, FieldCheckbox, Loader, useDataResource } from '@cloudbeaver/core-blocks'; import type { DataTransferOutputSettings } from '@cloudbeaver/core-sdk'; import { DefaultExportOutputSettingsResource } from './DefaultExportOutputSettingsResource'; @@ -18,10 +18,10 @@ const styles = css` width: 140px; } - row { + root { + padding: 24px; display: flex; align-items: end; - margin-bottom: 24px; } FieldCheckbox { @@ -47,33 +47,24 @@ export const OutputOptionsForm = observer(function OutputOptionsForm(props: Prop } return styled(styles)( - <> - - - Encoding - - - Insert BOM - - - + - Filename timestamp pattern - - + Encoding + + + Insert BOM + + ); }} ); -}); \ No newline at end of file +}); diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx index 99940e945c..0d0d28ae83 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx @@ -5,15 +5,14 @@ * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ - import { observer } from 'mobx-react-lite'; import { useState } from 'react'; import styled, { css } from 'reshadow'; -import { IProperty, PropertiesTable, ErrorMessage, ObjectPropertyInfoForm } from '@cloudbeaver/core-blocks'; +import { IProperty, PropertiesTable, ErrorMessage } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper } from '@cloudbeaver/core-dialogs'; import { useTranslate } from '@cloudbeaver/core-localization'; -import type { DataTransferOutputSettings, DataTransferProcessorInfo, GQLErrorCatcher, ObjectPropertyInfo } from '@cloudbeaver/core-sdk'; +import type { DataTransferOutputSettings, DataTransferProcessorInfo, GQLErrorCatcher } from '@cloudbeaver/core-sdk'; import { useStyles } from '@cloudbeaver/core-theming'; import { ITabData, Tab, TabList, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui'; @@ -43,10 +42,6 @@ const styles = css` margin: 0 10px; } - content { - margin: 24px; - } - ObjectPropertyInfoForm { margin: 12px 0; } @@ -109,7 +104,7 @@ export const ProcessorConfigureDialog = observer(function ProcessorConfig footer={( (function ProcessorConfig noBodyPadding onReject={onClose} > - - - - {translate('data_transfer_format_settings')} - - - {translate('data_transfer_output_settings')} - - - + {!processor.isBinary ? ( + + + + {translate('data_transfer_format_settings')} + + + {translate('data_transfer_output_settings')} + + + + ) : null} {currentTabId === SETTINGS_TABS.EXTRACTION ? ( ) : ( - - - {/* */} - + )} {error.responseMessage && ( @@ -155,5 +146,4 @@ export const ProcessorConfigureDialog = observer(function ProcessorConfig )} ); -} -); +});