From b9aed52c722fb489e730a599c78cacfed38e04dd Mon Sep 17 00:00:00 2001 From: Wroud Date: Fri, 31 Jul 2020 11:24:42 +0300 Subject: [PATCH] refactor(plugin-ag-grid): rename package to plugin-data-spreadsheet CB-164 --- .../.gitignore | 0 .../package.json | 2 +- .../src/AgGridTable/AgGridContext.ts | 0 .../src/AgGridTable/AgGridTable.tsx | 2 +- .../src/AgGridTable/AgGridTableController.ts | 1 - .../src/AgGridTable/LoadingCell.tsx | 0 .../PlainTextEditor/PlainTextEditor.tsx | 0 .../TableColumnHeader/TableColumnHeader.tsx | 0 .../TableSelection/RowSelection.ts | 0 .../TableSelection/TableSelection.ts | 0 .../modules/RangeSelection/rangeController.ts | 6 ++--- .../RangeSelection/rangeSelectionModule.ts | 0 .../src/Spreadsheet.tsx | 24 +++++++++++++++++++ .../src/index.ts | 2 +- .../src/manifest.ts | 0 .../src/styles/base.scss | 0 .../src/styles/styles.ts | 0 .../src/styles/themes/_base-ag-grid.scss | 0 .../src/styles/themes/dark.module.scss | 0 .../src/styles/themes/light.module.scss | 0 .../tsconfig.json | 0 .../packages/plugin-data-viewer/package.json | 1 + .../src/TableViewer/TableGrid.tsx | 6 ++--- webapp/packages/product-default/package.json | 2 +- webapp/packages/product-default/src/index.ts | 4 ++-- 25 files changed, 37 insertions(+), 13 deletions(-) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/.gitignore (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/package.json (96%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/AgGridContext.ts (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/AgGridTable.tsx (96%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/AgGridTableController.ts (99%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/LoadingCell.tsx (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/TableColumnHeader/TableColumnHeader.tsx (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/TableSelection/RowSelection.ts (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/AgGridTable/TableSelection/TableSelection.ts (100%) rename webapp/packages/{plugin-ag-grid/src => plugin-data-spreadsheet/src/AgGridTable}/modules/RangeSelection/rangeController.ts (98%) rename webapp/packages/{plugin-ag-grid/src => plugin-data-spreadsheet/src/AgGridTable}/modules/RangeSelection/rangeSelectionModule.ts (100%) create mode 100644 webapp/packages/plugin-data-spreadsheet/src/Spreadsheet.tsx rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/index.ts (78%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/manifest.ts (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/styles/base.scss (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/styles/styles.ts (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/styles/themes/_base-ag-grid.scss (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/styles/themes/dark.module.scss (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/src/styles/themes/light.module.scss (100%) rename webapp/packages/{plugin-ag-grid => plugin-data-spreadsheet}/tsconfig.json (100%) diff --git a/webapp/packages/plugin-ag-grid/.gitignore b/webapp/packages/plugin-data-spreadsheet/.gitignore similarity index 100% rename from webapp/packages/plugin-ag-grid/.gitignore rename to webapp/packages/plugin-data-spreadsheet/.gitignore diff --git a/webapp/packages/plugin-ag-grid/package.json b/webapp/packages/plugin-data-spreadsheet/package.json similarity index 96% rename from webapp/packages/plugin-ag-grid/package.json rename to webapp/packages/plugin-data-spreadsheet/package.json index 1037451664..63102179fa 100644 --- a/webapp/packages/plugin-ag-grid/package.json +++ b/webapp/packages/plugin-data-spreadsheet/package.json @@ -1,5 +1,5 @@ { - "name": "@cloudbeaver/plugin-ag-grid", + "name": "@cloudbeaver/plugin-data-spreadsheet", "sideEffects": false, "version": "0.1.0", "description": "", diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridContext.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridContext.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridContext.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridContext.ts diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTable.tsx b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTable.tsx similarity index 96% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTable.tsx rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTable.tsx index 495cdee260..b2da7cab65 100644 --- a/webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTable.tsx +++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTable.tsx @@ -32,7 +32,7 @@ async function loader() { const styles = await import('../styles/base.scss'); const { AgGridReact } = await import('@ag-grid-community/react'); const { InfiniteRowModelModule } = await import('@ag-grid-community/infinite-row-model'); - const { RangeSelectionModule } = await import('../modules/RangeSelection/rangeSelectionModule'); + const { RangeSelectionModule } = await import('./modules/RangeSelection/rangeSelectionModule'); return { AgGridReact, AllCommunityModules: [InfiniteRowModelModule, RangeSelectionModule] }; } diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTableController.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts similarity index 99% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTableController.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts index d442cf4a77..cc4a05c5ca 100644 --- a/webapp/packages/plugin-ag-grid/src/AgGridTable/AgGridTableController.ts +++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/AgGridTableController.ts @@ -29,7 +29,6 @@ import { } from '@cloudbeaver/plugin-data-viewer'; import { AgGridContext } from './AgGridContext'; -import { RowSelection } from './TableSelection/RowSelection'; import { TableSelection } from './TableSelection/TableSelection'; @injectable() diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/LoadingCell.tsx b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/LoadingCell.tsx similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/LoadingCell.tsx rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/LoadingCell.tsx diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/PlainTextEditor/PlainTextEditor.tsx diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/TableColumnHeader/TableColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableColumnHeader/TableColumnHeader.tsx similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/TableColumnHeader/TableColumnHeader.tsx rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableColumnHeader/TableColumnHeader.tsx diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/TableSelection/RowSelection.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableSelection/RowSelection.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/TableSelection/RowSelection.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableSelection/RowSelection.ts diff --git a/webapp/packages/plugin-ag-grid/src/AgGridTable/TableSelection/TableSelection.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableSelection/TableSelection.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/AgGridTable/TableSelection/TableSelection.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/TableSelection/TableSelection.ts diff --git a/webapp/packages/plugin-ag-grid/src/modules/RangeSelection/rangeController.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts similarity index 98% rename from webapp/packages/plugin-ag-grid/src/modules/RangeSelection/rangeController.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts index bc87638da8..2b6a60e075 100644 --- a/webapp/packages/plugin-ag-grid/src/modules/RangeSelection/rangeController.ts +++ b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeController.ts @@ -34,11 +34,11 @@ import { ValueService, } from '@ag-grid-community/core'; -import { INDEX_COLUMN_DEF } from '../../AgGridTable/AgGridTableController'; +import { INDEX_COLUMN_DEF } from '../../AgGridTableController'; import { IAgColumnClickEvent, COLUMN_CLICK_EVENT_TYPE, -} from '../../AgGridTable/TableColumnHeader/TableColumnHeader'; -import { TableSelection } from '../../AgGridTable/TableSelection/TableSelection'; +} from '../../TableColumnHeader/TableColumnHeader'; +import { TableSelection } from '../../TableSelection/TableSelection'; interface CellKeyDownEvent extends AgGridEvent{ event: KeyboardEvent; diff --git a/webapp/packages/plugin-ag-grid/src/modules/RangeSelection/rangeSelectionModule.ts b/webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeSelectionModule.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/modules/RangeSelection/rangeSelectionModule.ts rename to webapp/packages/plugin-data-spreadsheet/src/AgGridTable/modules/RangeSelection/rangeSelectionModule.ts diff --git a/webapp/packages/plugin-data-spreadsheet/src/Spreadsheet.tsx b/webapp/packages/plugin-data-spreadsheet/src/Spreadsheet.tsx new file mode 100644 index 0000000000..a2bd6485a9 --- /dev/null +++ b/webapp/packages/plugin-data-spreadsheet/src/Spreadsheet.tsx @@ -0,0 +1,24 @@ +/* + * cloudbeaver - Cloud Database Manager + * Copyright (C) 2020 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ + +import { TableViewerModel } from '@cloudbeaver/plugin-data-viewer'; + +import { AgGridTable } from './AgGridTable/AgGridTable'; + +type Props = { + tableModel: TableViewerModel; + className?: string; +} + +export function Spreadsheet({ + tableModel, + className, +}: Props) { + + return ; +} diff --git a/webapp/packages/plugin-ag-grid/src/index.ts b/webapp/packages/plugin-data-spreadsheet/src/index.ts similarity index 78% rename from webapp/packages/plugin-ag-grid/src/index.ts rename to webapp/packages/plugin-data-spreadsheet/src/index.ts index 06dd55635d..4def299006 100644 --- a/webapp/packages/plugin-ag-grid/src/index.ts +++ b/webapp/packages/plugin-data-spreadsheet/src/index.ts @@ -1,6 +1,6 @@ import { manifest } from './manifest'; -export * from './AgGridTable/AgGridTable'; +export * from './SpreadSheet'; // All Services and Components that is provided by this plugin should be exported here diff --git a/webapp/packages/plugin-ag-grid/src/manifest.ts b/webapp/packages/plugin-data-spreadsheet/src/manifest.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/manifest.ts rename to webapp/packages/plugin-data-spreadsheet/src/manifest.ts diff --git a/webapp/packages/plugin-ag-grid/src/styles/base.scss b/webapp/packages/plugin-data-spreadsheet/src/styles/base.scss similarity index 100% rename from webapp/packages/plugin-ag-grid/src/styles/base.scss rename to webapp/packages/plugin-data-spreadsheet/src/styles/base.scss diff --git a/webapp/packages/plugin-ag-grid/src/styles/styles.ts b/webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts similarity index 100% rename from webapp/packages/plugin-ag-grid/src/styles/styles.ts rename to webapp/packages/plugin-data-spreadsheet/src/styles/styles.ts diff --git a/webapp/packages/plugin-ag-grid/src/styles/themes/_base-ag-grid.scss b/webapp/packages/plugin-data-spreadsheet/src/styles/themes/_base-ag-grid.scss similarity index 100% rename from webapp/packages/plugin-ag-grid/src/styles/themes/_base-ag-grid.scss rename to webapp/packages/plugin-data-spreadsheet/src/styles/themes/_base-ag-grid.scss diff --git a/webapp/packages/plugin-ag-grid/src/styles/themes/dark.module.scss b/webapp/packages/plugin-data-spreadsheet/src/styles/themes/dark.module.scss similarity index 100% rename from webapp/packages/plugin-ag-grid/src/styles/themes/dark.module.scss rename to webapp/packages/plugin-data-spreadsheet/src/styles/themes/dark.module.scss diff --git a/webapp/packages/plugin-ag-grid/src/styles/themes/light.module.scss b/webapp/packages/plugin-data-spreadsheet/src/styles/themes/light.module.scss similarity index 100% rename from webapp/packages/plugin-ag-grid/src/styles/themes/light.module.scss rename to webapp/packages/plugin-data-spreadsheet/src/styles/themes/light.module.scss diff --git a/webapp/packages/plugin-ag-grid/tsconfig.json b/webapp/packages/plugin-data-spreadsheet/tsconfig.json similarity index 100% rename from webapp/packages/plugin-ag-grid/tsconfig.json rename to webapp/packages/plugin-data-spreadsheet/tsconfig.json diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json index d6c0a7461d..f053ce63ca 100644 --- a/webapp/packages/plugin-data-viewer/package.json +++ b/webapp/packages/plugin-data-viewer/package.json @@ -14,6 +14,7 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "peerDependencies": { + "@cloudbeaver/plugin-data-spreadsheet": "^0.1.0", "@cloudbeaver/plugin-object-viewer": "^0.1.0", "@cloudbeaver/core-app": "^0.1.0", "@cloudbeaver/core-blocks": "^0.1.0", diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx index c332d22153..16c32051f8 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableGrid.tsx @@ -11,7 +11,7 @@ import { PropsWithChildren } from 'react'; import styled, { css } from 'reshadow'; import { Button } from '@cloudbeaver/core-blocks'; -import { AgGridTable } from '@cloudbeaver/plugin-ag-grid'; +import { Spreadsheet } from '@cloudbeaver/plugin-data-spreadsheet'; import { TableViewerModel } from './TableViewerModel'; @@ -20,7 +20,7 @@ type TableGridProps = PropsWithChildren<{ }> const styles = css` - AgGridTable, no-data, error { + Spreadsheet, no-data, error { flex: 1; } no-data, error { @@ -51,5 +51,5 @@ export const TableGrid = observer(function TableGrid({ return styled(styles)(No data to show); } - return styled(styles)(); + return styled(styles)(); }); diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 8e478f6916..b6d042e86e 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -20,11 +20,11 @@ "@cloudbeaver/core-di": "0.1.0", "@cloudbeaver/core-product": "0.1.0", "@cloudbeaver/plugin-administration": "0.1.0", - "@cloudbeaver/plugin-ag-grid": "0.1.0", "@cloudbeaver/plugin-authentication": "0.1.0", "@cloudbeaver/plugin-connection-custom": "0.1.0", "@cloudbeaver/plugin-connection-preconfigured": "0.1.0", "@cloudbeaver/plugin-data-export": "0.1.0", + "@cloudbeaver/plugin-data-spreadsheet": "0.1.0", "@cloudbeaver/plugin-data-viewer": "0.1.0", "@cloudbeaver/plugin-ddl-viewer": "0.1.0", "@cloudbeaver/plugin-object-viewer": "0.1.0", diff --git a/webapp/packages/product-default/src/index.ts b/webapp/packages/product-default/src/index.ts index 797bd7c0f8..15b35a6b4d 100644 --- a/webapp/packages/product-default/src/index.ts +++ b/webapp/packages/product-default/src/index.ts @@ -4,7 +4,7 @@ import 'reflect-metadata'; import core, { bootstrap } from '@cloudbeaver/core-bootstrap'; import administration from '@cloudbeaver/plugin-administration'; -import agGrid from '@cloudbeaver/plugin-ag-grid'; +import spreadsheet from '@cloudbeaver/plugin-data-spreadsheet'; import authentication from '@cloudbeaver/plugin-authentication'; import dataExport from '@cloudbeaver/plugin-data-export'; import dataViewer from '@cloudbeaver/plugin-data-viewer'; @@ -18,7 +18,7 @@ import { defaultProductManifest } from './manifest'; const PLUGINS = [ core, administration, - agGrid, + spreadsheet, authentication, connectionCustom, connectionPreconfigured,