From e2bc7b0f3df5fe4ac2a5a04acce1a1e42504dbd1 Mon Sep 17 00:00:00 2001 From: Wroud Date: Tue, 4 Oct 2022 16:32:09 +0300 Subject: [PATCH] CB-2501 refactor: plugins structure --- .../packages/core-administration/package.json | 6 +++-- .../src/Administration/Administration.tsx | 4 +-- .../src/Administration/ItemContent.tsx | 4 +-- .../AdministrationScreen.tsx | 2 +- .../ConfigurationWizardScreen.tsx | 5 ++-- .../ConfigurationWizard/WizardStepper.tsx | 6 ++--- .../ConfigurationWizardTitle.tsx | 2 +- .../src/useAdministrationSettings.ts | 3 ++- webapp/packages/core-app/package.json | 6 +++-- .../packages/core-app/src/AppScreen/Main.tsx | 4 +-- .../core-app/src/AppScreen/RightArea.tsx | 3 ++- webapp/packages/core-app/src/Body.tsx | 4 +-- .../packages/core-authentication/package.json | 6 +++-- webapp/packages/core-blocks/package.json | 6 ++--- webapp/packages/core-blocks/src/Button.tsx | 3 ++- webapp/packages/core-blocks/src/Cell.tsx | 4 ++- webapp/packages/core-blocks/src/Code.tsx | 4 +-- .../packages/core-blocks/src/ErrorMessage.tsx | 3 ++- .../core-blocks/src/ExceptionMessage.tsx | 3 ++- .../core-blocks/src/Expand/Expandable.tsx | 3 ++- .../Checkboxes/CheckboxMarkup.tsx | 4 ++- .../FormControls/Checkboxes/FieldCheckbox.tsx | 3 +-- .../src/FormControls/Checkboxes/Switch.tsx | 3 ++- .../core-blocks/src/FormControls/Combobox.tsx | 6 +++-- .../core-blocks/src/FormControls/Filter.tsx | 3 ++- .../src/FormControls/FormFieldDescription.tsx | 3 ++- .../src/FormControls/InputField.tsx | 6 +++-- .../core-blocks/src/FormControls/Radio.tsx | 3 +-- .../core-blocks/src/FormControls/Textarea.tsx | 3 ++- .../packages/core-blocks/src/IconButton.tsx | 3 ++- webapp/packages/core-blocks/src/Iframe.tsx | 2 +- webapp/packages/core-blocks/src/InfoItem.tsx | 3 ++- .../core-blocks/src/ItemList/ItemList.tsx | 3 ++- .../src/ItemList/ItemListSearch.tsx | 6 +++-- .../core-blocks/src/ItemList/ListItem.tsx | 3 +-- .../src/ItemList/ListItemDescription.tsx | 3 +-- .../core-blocks/src/ItemList/ListItemIcon.tsx | 3 +-- .../core-blocks/src/ItemList/ListItemName.tsx | 3 +-- .../core-blocks/src/Loader/Loader.tsx | 6 +++-- .../core-blocks/src/Marks/ConnectionMark.tsx | 4 +-- webapp/packages/core-blocks/src/Menu/Menu.tsx | 3 ++- .../core-blocks/src/Menu/MenuEmptyItem.tsx | 5 ++-- .../core-blocks/src/Menu/MenuItem.tsx | 3 ++- .../core-blocks/src/Menu/MenuItemElement.tsx | 10 +++++--- .../core-blocks/src/Menu/MenuPanel.tsx | 3 ++- .../core-blocks/src/Overlay/Overlay.tsx | 6 +---- .../src/Overlay/OverlayActions.tsx | 4 +-- .../core-blocks/src/Overlay/OverlayHeader.tsx | 4 +-- .../src/Overlay/OverlayHeaderIcon.tsx | 6 +---- .../src/Overlay/OverlayHeaderSubTitle.tsx | 4 +-- .../src/Overlay/OverlayHeaderTitle.tsx | 4 +-- .../src/Overlay/OverlayMessage.tsx | 4 +-- .../src/PropertiesTable/PropertiesTable.tsx | 8 +++--- .../src/PropertiesTable/PropertyItem.tsx | 4 +-- .../PropertiesTable/PropertyValueSelector.tsx | 4 +-- .../core-blocks/src/Slide/SlideOverlay.tsx | 4 +-- .../src/Snackbars/ActionSnackbar.tsx | 4 +-- .../src/Snackbars/ProcessSnackbar.tsx | 3 ++- .../core-blocks/src/Snackbars/Snackbar.tsx | 4 +-- .../SnackbarMarkups/SnackbarWrapper.tsx | 5 ++-- .../core-blocks/src/Split/SplitControls.tsx | 5 ++-- .../core-blocks/src/StatusMessage.tsx | 6 +++-- .../core-blocks/src/Table/TableItemExpand.tsx | 2 +- .../core-blocks/src/Table/TableSelect.tsx | 3 +-- webapp/packages/core-blocks/src/Tags/Tag.tsx | 6 +---- .../core-blocks/src/TextPlaceholder.tsx | 4 +-- webapp/packages/core-blocks/src/TimerIcon.tsx | 3 ++- .../src/ToolsPanel/ToolsAction.tsx | 4 +-- .../core-blocks/src/ToolsPanel/ToolsPanel.tsx | 4 +-- .../src/Tree/TreeNode/TreeNodeExpand.tsx | 4 ++- .../src/Tree/TreeNode/TreeNodeIcon.tsx | 6 +++-- webapp/packages/core-blocks/src/index.ts | 5 ++++ .../core-blocks/src/layout/TopAppBar.tsx | 4 +-- .../src/localization}/Translate.tsx | 3 ++- .../src/localization}/useTranslate.ts | 4 +-- .../src/usePermission.ts | 3 +-- .../src/useStyles.ts | 11 ++------ webapp/packages/core-bootstrap/package.json | 2 +- webapp/packages/core-connections/package.json | 6 +++-- webapp/packages/core-di/package.json | 4 +-- webapp/packages/core-dialogs/package.json | 7 +++--- .../CommonDialog/CommonDialogWrapper.tsx | 6 ++--- .../src/CommonDialog/ConfirmationDialog.tsx | 6 ++--- .../src/CommonDialog/DialogsPortal.tsx | 4 +-- .../src/CommonDialog/RenameDialog.tsx | 8 +++--- .../src/Menu/MenuPanel/MenuPanelItem.tsx | 5 ++-- .../src/Menu/MenuPanel/MenuTrigger.tsx | 4 +-- webapp/packages/core-events/package.json | 2 +- webapp/packages/core-executor/package.json | 6 +++++ .../packages/core-localization/package.json | 12 +++++---- .../packages/core-localization/src/index.ts | 2 -- .../core-navigation-tree/package.json | 6 +++-- .../packages/core-notifications/package.json | 6 +++-- .../core-notifications/src/Notifications.tsx | 4 +-- .../ErrorDetailsDialog/ErrorDetailsDialog.tsx | 6 ++--- webapp/packages/core-plugin/package.json | 2 +- webapp/packages/core-product/package.json | 2 +- webapp/packages/core-projects/package.json | 9 ++++++- .../core-resource-manager/package.json | 9 ++++--- webapp/packages/core-root/package.json | 7 ++++-- webapp/packages/core-root/src/index.ts | 1 - webapp/packages/core-routing/package.json | 4 ++- webapp/packages/core-sdk/package.json | 4 ++- webapp/packages/core-sdk/src/GQLError.ts | 4 +-- webapp/packages/core-settings/package.json | 4 ++- .../src/LocalStorageSaveService.ts | 7 +----- webapp/packages/core-theming/package.json | 12 +++++---- .../core-theming/src/ComponentStyle.ts | 15 +++++++++++ webapp/packages/core-theming/src/index.ts | 2 +- webapp/packages/core-ui/package.json | 8 +++--- .../core-ui/src/AuthenticationProvider.tsx | 6 ++--- .../core-ui/src/ContextMenu/ContextMenu.tsx | 6 ++--- .../src/ContextMenu/MenuActionElement.tsx | 4 +-- .../src/ContextMenu/MenuBar/MenuBar.tsx | 3 ++- .../src/ContextMenu/MenuBar/MenuBarItem.tsx | 7 +++--- .../src/ContextMenu/MenuItemRenderer.tsx | 4 +-- .../src/ContextMenu/SubMenuElement.tsx | 4 +-- .../core-ui/src/InlineEditor/EditorDialog.tsx | 6 ++--- .../core-ui/src/InlineEditor/InlineEditor.tsx | 4 +-- .../core-ui/src/SideBarPanel/SideBarPanel.tsx | 3 ++- webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx | 6 ++--- .../core-ui/src/Tabs/Tab/TabDefault.tsx | 5 ++-- .../packages/core-ui/src/Tabs/Tab/TabIcon.tsx | 4 +-- .../core-ui/src/Tabs/Tab/TabTitle.tsx | 4 +-- .../core-ui/src/Tabs/TabPanelList.tsx | 3 ++- .../core-ui/src/Tabs/TabsBox/TabsBox.tsx | 3 ++- .../src/Tabs/TabsBox/TabsBoxFromArray.tsx | 3 ++- .../packages/core-version-update/package.json | 25 ++++++------------- webapp/packages/core-version/package.json | 18 ++++--------- webapp/packages/core-view/package.json | 8 +++++- .../ConfigurationWizard/Finish/FinishPage.tsx | 6 ++--- .../Finish/FinishPageDrawerItem.tsx | 3 +-- .../ServerConfigurationConfigurationForm.tsx | 5 ++-- .../Form/ServerConfigurationFeaturesForm.tsx | 4 +-- .../Form/ServerConfigurationInfoForm.tsx | 6 ++--- .../ServerConfigurationNavigatorViewForm.tsx | 5 ++-- .../Form/ServerConfigurationSecurityForm.tsx | 5 ++-- .../ServerConfigurationDrawerItem.tsx | 3 +-- .../ServerConfigurationDriversForm.tsx | 5 ++-- .../ServerConfigurationPage.tsx | 5 ++-- .../Welcome/WelcomeDrawerItem.tsx | 3 +-- .../Welcome/WelcomePage.tsx | 8 +++--- .../AuthConfigurationForm.tsx | 6 ++--- .../AuthConfigurationFormBaseActions.tsx | 4 +-- .../AuthConfigurationsAdministration.tsx | 6 ++--- .../AuthConfigurationsDrawerItem.tsx | 5 ++-- .../AuthConfiguration.tsx | 3 +-- .../AuthConfigurationEdit.tsx | 4 +-- .../AuthConfigurationsTable.tsx | 5 ++-- .../useConfigurationsTable.tsx | 4 +-- .../CreateAuthConfiguration.tsx | 7 ++---- .../IdentityProvidersServiceLink.tsx | 4 +-- .../Options/AuthConfigurationOptions.tsx | 4 +-- .../AuthenticationProviders.tsx | 4 +-- .../ServerConfigurationAdminForm.tsx | 6 ++--- .../MetaParameters/CreateMetaParameter.tsx | 7 +++--- .../MetaParameters/Form/MetaParameterForm.tsx | 4 +-- .../Form/UserInfo/MetaParameterInfoPanel.tsx | 6 ++--- .../Form/UserInfo/MetaParameterInfoTab.tsx | 4 +-- .../Users/MetaParameters/MetaParameters.tsx | 6 ++--- .../Users/MetaParameters/MetadataParam.tsx | 4 +-- .../Users/MetaParameters/UserEdit.tsx | 2 +- .../Administration/Users/Roles/CreateRole.tsx | 9 +++---- .../GrantedConnections/ConnectionList.tsx | 7 +++--- .../GrantedConnections/GrantedConnections.tsx | 5 ++-- .../GrantedConnectionsList.tsx | 8 +++--- .../GrantedConnectionsTableHeader.tsx | 6 ++--- .../GrantedConnectionsTableInnerHeader.tsx | 6 ++--- .../Roles/GrantedUsers/GrantedUserList.tsx | 8 +++--- .../Users/Roles/GrantedUsers/GrantedUsers.tsx | 7 +++--- .../GrantedUsersTableHeader.tsx | 6 ++--- .../GrantedUsersTableInnerHeader.tsx | 6 ++--- .../Users/Roles/GrantedUsers/UserList.tsx | 5 ++-- .../Users/Roles/Options/RoleOptions.tsx | 6 ++--- .../Administration/Users/Roles/RoleForm.tsx | 6 ++--- .../Users/Roles/RoleFormBaseActions.tsx | 4 +-- .../Users/Roles/RolesDrawerItem.tsx | 4 +-- .../Administration/Users/Roles/RolesPage.tsx | 6 ++--- .../Users/Roles/RolesTable/Role.tsx | 4 +-- .../Users/Roles/RolesTable/RoleEdit.tsx | 4 +-- .../Users/Roles/RolesTable/RolesTable.tsx | 6 ++--- .../Users/Roles/RolesTable/useRolesTable.tsx | 4 +-- .../Users/UserForm/ConnectionAccess.tsx | 4 +-- .../Users/UserForm/OriginInfoPanel.tsx | 6 ++--- .../Users/UserForm/OriginInfoTab.tsx | 3 +-- .../Users/UserForm/UserForm.tsx | 6 ++--- .../Users/UserForm/UserInfo.tsx | 6 ++--- .../Users/UsersAdministration.tsx | 6 ++--- .../Administration/Users/UsersDrawerItem.tsx | 3 +-- .../Users/UsersTable/CreateUser.tsx | 7 +++--- .../Administration/Users/UsersTable/User.tsx | 8 +++--- .../Users/UsersTable/UserEdit.tsx | 4 +-- .../Users/UsersTable/UsersTable.tsx | 6 ++--- .../src/Dialog/AuthDialog.tsx | 6 ++--- .../src/Dialog/AuthDialogFooter.tsx | 4 +-- .../AuthProviderForm/AuthProviderForm.tsx | 4 +-- .../AuthProviderForm/ConfigurationsList.tsx | 5 ++-- .../plugin-codemirror/src/CodeEditor.tsx | 4 ++- .../CustomConnectionDialog.tsx | 3 ++- .../DriverSelectorDialog/DriverSelector.tsx | 4 +-- .../src/Search/Database.tsx | 4 +-- .../src/Search/DatabaseList.tsx | 7 +++--- .../src/ConnectionDialog/ConnectionDialog.tsx | 5 ++-- .../ConnectionDialogFooter.tsx | 4 +-- .../Connections/ConnectionsAdministration.tsx | 5 ++-- .../Connections/ConnectionsDrawerItem.tsx | 3 +-- .../ConnectionsTable/Connection.tsx | 4 +-- .../ConnectionDetailsInfo/SSH.tsx | 4 +-- .../ConnectionsTable/ConnectionEdit.tsx | 3 +-- .../ConnectionsTable/ConnectionsTable.tsx | 8 +++--- .../CreateConnection/CreateConnection.tsx | 6 ++--- .../CreateConnection/Manual/DriverList.tsx | 4 +-- .../ConnectionAccess/ConnectionAccess.tsx | 9 +++---- .../ConnectionAccessGrantedList.tsx | 10 ++++---- .../ConnectionAccess/ConnectionAccessList.tsx | 7 +++--- .../ConnectionAccessTableHeader.tsx | 6 ++--- .../ConnectionAccessTableInnerHeader.tsx | 6 ++--- .../ConnectionAuthenticationDialog.tsx | 6 ++--- .../ConnectionAuthenticationForm.tsx | 6 ++--- .../NetworkHandlerAuthForm.tsx | 6 ++--- .../NetworkHandlers.tsx | 4 +-- .../src/ConnectionForm/ConnectionForm.tsx | 6 ++--- .../ConnectionFormBaseActions.tsx | 4 +-- .../DriverProperties/DriverProperties.tsx | 4 +-- .../src/ConnectionForm/Options/Options.tsx | 7 +++--- .../ConnectionForm/Options/ParametersForm.tsx | 6 ++--- .../ConnectionFormAuthenticationAction.tsx | 4 +-- .../ConnectionForm/OriginInfo/OriginInfo.tsx | 6 ++--- .../OriginInfo/OriginInfoTab.tsx | 3 +-- .../src/ConnectionForm/SSH/SSH.tsx | 4 +-- .../src/ConnectionForm/SSH/SSHTab.tsx | 6 ++--- .../DatabaseAuthDialog/DBAuthDialogFooter.tsx | 4 +-- .../DatabaseAuthDialog/DatabaseAuthDialog.tsx | 2 +- .../src/Dialog/ProcessorConfigureDialog.tsx | 4 +-- .../Dialog/ProcessorConfigureDialogFooter.tsx | 4 +-- .../src/Dialog/ProcessorSelectDialog.tsx | 3 +-- .../ExportNotification/ExportNotification.tsx | 6 ++--- .../FilterCustomValueDialog.tsx | 3 +-- .../src/DataGrid/DataGridTable.tsx | 4 +-- .../src/DataGrid/Formatters/Menu/CellMenu.tsx | 4 +-- .../TableColumnHeader/OrderButton.tsx | 3 +-- .../TableColumnHeader/TableColumnHeader.tsx | 3 +-- .../TableIndexColumnHeader.tsx | 3 +-- .../src/DataViewerPage/DataViewerTab.tsx | 3 +-- .../src/TableViewer/TableError.tsx | 6 ++--- .../AutoRefresh/AutoRefreshButton.tsx | 3 +-- .../AutoRefresh/AutoRefreshSettingsDialog.tsx | 4 +-- .../TableViewer/TableFooter/TableFooter.tsx | 4 +-- .../TableFooterMenu/TableFooterMenuItem.tsx | 9 +++---- .../TableHeader/TableWhereFilter.tsx | 6 ++--- .../TablePresentationBar/PresentationTab.tsx | 9 +++---- .../TablePresentationBar.tsx | 2 +- .../src/TableViewer/TableStatistics.tsx | 4 +-- .../src/TableViewer/TableToolsPanel.tsx | 3 +-- .../src/TableViewer/TableViewer.tsx | 5 ++-- .../src/TableViewer/ValuePanel/ValuePanel.tsx | 3 +-- .../BooleanValue/BooleanValuePresentation.tsx | 3 +-- .../ImageValue/ImageValuePresentation.tsx | 4 +-- .../QuotaPlaceholder.tsx | 4 +-- .../TextValue/TextValuePresentation.tsx | 4 +-- .../ConnectionSelector/ConnectionIcon.tsx | 3 +-- .../ConnectionSelector/ConnectionSelector.tsx | 5 ++-- .../src/DdlViewer/DDLViewerTab.tsx | 3 ++- .../src/DdlViewer/DDLViewerTabPanel.tsx | 3 +-- .../SearchResourceMenuItemComponent.tsx | 3 ++- .../src/GISValuePresentation.tsx | 3 +-- .../plugin-gis-viewer/src/LeafletMap.tsx | 3 +-- webapp/packages/plugin-help/src/Help.tsx | 4 +-- .../plugin-help/src/Shortcuts/Shortcut.tsx | 8 +++--- .../src/Shortcuts/ShortcutsDialog.tsx | 6 ++--- .../src/LogViewer/LogEntry.tsx | 6 ++--- .../src/LogViewer/LogViewer.tsx | 6 ++--- .../src/LogViewer/LogViewerInfoPanel.tsx | 4 +-- .../src/LogViewer/LogViewerTable.tsx | 4 +-- .../NavigationTabsBar/NavigationTabsBar.tsx | 4 +-- .../navigationTreeConnectionGroupRenderer.tsx | 7 +++--- .../ElementsTree/ElementsTree.tsx | 5 ++-- .../ElementsTree/ElementsTreeLoader.tsx | 4 +-- .../ElementsTreeTools/ElementsTreeFilter.tsx | 5 ++-- .../ElementsTreeTools/ElementsTreeTools.tsx | 5 ++-- .../ElementsTreeBaseSettingsForm.tsx | 4 +-- .../NavigationTreeSettings.tsx | 4 +-- .../elementsTreeLimitRenderer.tsx | 2 +- .../NavigationTreeNode/NavigationNode.tsx | 3 +-- .../NavigationNode/NavigationNodeNested.tsx | 3 +-- .../NavigationNodeDragged.tsx | 4 +-- .../NavigationNodeElement.tsx | 3 +-- .../src/NavigationTree/NavigationTree.tsx | 5 ++-- .../ProjectsRenderer/ProjectsSettingsForm.tsx | 4 +-- ...navigationTreeProjectsRendererRenderer.tsx | 3 +-- .../FolderTabRenderer.tsx | 4 +-- .../NavNodeMetadata/NavNodeMetadataTab.tsx | 3 +-- .../NavNodeMetadata/ObjectProperties.tsx | 10 +++----- .../VirtualFolder/VirtualFolderPanel.tsx | 3 +-- .../VirtualFolder/VirtualFolderTab.tsx | 2 +- .../ObjectPropertiesPage/ObjectFolders.tsx | 8 +++--- .../ObjectPropertiesPagePanel.tsx | 6 +---- .../ObjectPropertiesPageTab.tsx | 3 +-- .../ObjectPropertyTable.tsx | 3 +-- .../ObjectPropertyTableFooterItem.tsx | 9 +++---- .../ObjectPropertyTable/Table/Table.tsx | 4 +-- .../formControls/ObjectPropertyCheckbox.tsx | 4 +-- .../formControls/ObjectPropertyInput.tsx | 2 +- .../src/ObjectViewerPanel.tsx | 4 +-- .../src/ObjectViewerTab.tsx | 2 +- .../plugin-product/src/ProductInfoDialog.tsx | 8 +++--- .../plugin-projects/src/FolderDialog.tsx | 6 ++--- .../plugin-projects/src/ProjectSelect.tsx | 3 +-- .../src/ResourceManagerSettings.tsx | 3 +-- .../src/SaveScriptDialog.tsx | 6 ++--- .../ProjectsRenderer/ProjectsSettingsForm.tsx | 4 +-- ...navigationTreeProjectsRendererRenderer.tsx | 3 +-- .../src/Tree/ResourceManagerTree.tsx | 3 +-- .../SessionExpiredDialog.tsx | 8 +++--- .../SessionExpireWarningDialog.tsx | 8 +++--- .../src/SettingsMenu/SettingsMenu.tsx | 3 +-- .../src/SqlEditorTab.tsx | 2 +- .../src/Screen/SqlEditorScreen.tsx | 3 +-- .../src/ScriptPreview/ScriptPreviewDialog.tsx | 3 +-- .../plugin-sql-editor/src/SqlEditor.tsx | 4 +-- .../src/SqlEditor/ScriptImportDialog.tsx | 8 +++--- .../src/SqlEditor/SqlEditor.tsx | 3 +-- .../src/SqlGenerators/GeneratedSqlDialog.tsx | 9 +++---- .../ExecutionPlan/ExecutionPlanTreeBlock.tsx | 7 ++---- .../SqlResultTabs/ExecutionPlan/Expand.tsx | 3 +-- .../ExecutionPlan/NestedNode.tsx | 4 +-- .../PropertiesPanel/PropertiesPanel.tsx | 7 ++---- .../ExecutionPlan/SqlExecutionPlanPanel.tsx | 4 +-- .../src/SqlResultTabs/SqlResultTab.tsx | 3 ++- .../src/SqlResultTabs/SqlResultTabs.tsx | 4 +-- .../SqlScriptStatisticsPanel.tsx | 3 +-- .../src/ToolsPanel/ToolsPanel.tsx | 3 +-- .../src/TopNavBar/shared/TopMenuItem.tsx | 4 +-- .../src/TopNavBar/shared/TopNavButton.tsx | 5 ++-- .../plugin-user-profile/src/UserInfo.tsx | 7 ++---- .../src/UserMenu/UserMenu.tsx | 4 +-- .../AuthProviders/AuthProvidersList.tsx | 5 ++-- .../AuthProviders/UserAuthProvidersPanel.tsx | 4 +-- .../AuthProviders/UserAuthProvidersTab.tsx | 4 +-- .../AuthTokens/AuthTokenList.tsx | 4 +-- .../AuthTokens/UserAuthProvidersPanel.tsx | 4 +-- .../AuthTokens/UserAuthProvidersTab.tsx | 4 +-- .../Authentication/AuthenticationPanel.tsx | 4 +-- .../Authentication/AuthenticationTab.tsx | 4 +-- .../ChangePassword/ChangePassword.tsx | 6 ++--- .../src/UserProfileForm/UserForm.tsx | 4 +-- .../UserInfo/UserInfoPanel.tsx | 5 ++-- .../UserProfileForm/UserInfo/UserInfoTab.tsx | 4 +-- .../src/Instructions.tsx | 4 +-- .../src/Recommendations.tsx | 3 +-- .../src/Version.tsx | 3 +-- .../src/VersionChecker.tsx | 4 +-- .../src/VersionInfo.tsx | 4 +-- .../src/VersionSelector.tsx | 4 +-- .../src/VersionUpdate.tsx | 3 +-- .../src/VersionUpdateDrawerItem.tsx | 4 +-- .../src/VersionsTable.tsx | 4 +-- 357 files changed, 780 insertions(+), 923 deletions(-) rename webapp/packages/{core-localization/src => core-blocks/src/localization}/Translate.tsx (89%) rename webapp/packages/{core-localization/src => core-blocks/src/localization}/useTranslate.ts (80%) rename webapp/packages/{core-root => core-blocks}/src/usePermission.ts (87%) rename webapp/packages/{core-theming => core-blocks}/src/useStyles.ts (85%) create mode 100644 webapp/packages/core-theming/src/ComponentStyle.ts diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json index feb8938dcf..4be79bbac0 100644 --- a/webapp/packages/core-administration/package.json +++ b/webapp/packages/core-administration/package.json @@ -15,7 +15,7 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "test": "core-cli-test" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-authentication": "~0.1.0", "@cloudbeaver/core-blocks": "~0.1.0", "@cloudbeaver/core-di": "~0.1.0", @@ -23,7 +23,9 @@ "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-routing": "~0.1.0", "@cloudbeaver/core-theming": "~0.1.0", - "@cloudbeaver/core-executor": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0" + }, + "peerDependencies": { "react": "~18.x.x", "mobx": "~6.x.x", "mobx-react-lite": "~3.x.x", diff --git a/webapp/packages/core-administration/src/Administration/Administration.tsx b/webapp/packages/core-administration/src/Administration/Administration.tsx index b5b8a7f69f..432a67ede1 100644 --- a/webapp/packages/core-administration/src/Administration/Administration.tsx +++ b/webapp/packages/core-administration/src/Administration/Administration.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useLayoutEffect, useRef } from 'react'; import styled, { css } from 'reshadow'; -import { SlideBox, SlideElement, ErrorBoundary, SlideOverlay, slideBoxStyles } from '@cloudbeaver/core-blocks'; +import { SlideBox, SlideElement, ErrorBoundary, SlideOverlay, slideBoxStyles, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { TabsState, TabList, verticalTabStyles, BASE_TAB_STYLES, OptionsPanelService } from '@cloudbeaver/core-ui'; import { AdministrationItemService, filterOnlyActive } from '../AdministrationItem/AdministrationItemService'; diff --git a/webapp/packages/core-administration/src/Administration/ItemContent.tsx b/webapp/packages/core-administration/src/Administration/ItemContent.tsx index 5556507f96..1622dc6a20 100644 --- a/webapp/packages/core-administration/src/Administration/ItemContent.tsx +++ b/webapp/packages/core-administration/src/Administration/ItemContent.tsx @@ -8,9 +8,9 @@ import { observer } from 'mobx-react-lite'; -import { Loader, TextPlaceholder } from '@cloudbeaver/core-blocks'; +import { Loader, TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { AdministrationItemService } from '../AdministrationItem/AdministrationItemService'; import type { IAdministrationItemRoute } from '../AdministrationItem/IAdministrationItemRoute'; diff --git a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreen.tsx b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreen.tsx index 0b30aa364e..37afeb6c95 100644 --- a/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreen.tsx +++ b/webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreen.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; +import { usePermission } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { usePermission } from '@cloudbeaver/core-root'; import type { ScreenComponent } from '@cloudbeaver/core-routing'; import { Administration } from '../Administration/Administration'; diff --git a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx index dfaec77c41..95cf02a3f7 100644 --- a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx +++ b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/ConfigurationWizardScreen.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; -import { useDataResource } from '@cloudbeaver/core-blocks'; +import { Translate, useDataResource, usePermission } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; -import { SessionPermissionsResource, usePermission } from '@cloudbeaver/core-root'; +import { SessionPermissionsResource } from '@cloudbeaver/core-root'; import { Administration } from '../../Administration/Administration'; import { AdministrationItemService } from '../../AdministrationItem/AdministrationItemService'; diff --git a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx index 27570411fc..216b149651 100644 --- a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx +++ b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardStepper.tsx @@ -9,10 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Button } from '@cloudbeaver/core-blocks'; +import { Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { ConfigurationWizardService } from './ConfigurationWizardService'; diff --git a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx index 0bf1cc3346..cfb93bb019 100644 --- a/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx +++ b/webapp/packages/core-administration/src/AdministrationScreen/ConfigurationWizard/WizardTopAppBar/ConfigurationWizardTitle.tsx @@ -8,7 +8,7 @@ import styled, { css } from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; +import { Translate } from '@cloudbeaver/core-blocks'; const styles = css` wizard-title { diff --git a/webapp/packages/core-administration/src/useAdministrationSettings.ts b/webapp/packages/core-administration/src/useAdministrationSettings.ts index 0e0a470330..8671fd9752 100644 --- a/webapp/packages/core-administration/src/useAdministrationSettings.ts +++ b/webapp/packages/core-administration/src/useAdministrationSettings.ts @@ -6,8 +6,9 @@ * you may not use this file except in compliance with the License. */ +import { usePermission } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { usePermission, ServerService } from '@cloudbeaver/core-root'; +import { ServerService } from '@cloudbeaver/core-root'; import type { ServerConfig } from '@cloudbeaver/core-sdk'; import { EAdminPermission } from './EAdminPermission'; diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json index 917855a652..6cf987d936 100644 --- a/webapp/packages/core-app/package.json +++ b/webapp/packages/core-app/package.json @@ -14,7 +14,7 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-browser": "~0.1.0", "@cloudbeaver/core-blocks": "~0.1.0", "@cloudbeaver/core-connections": "~0.1.0", @@ -38,7 +38,9 @@ "@cloudbeaver/plugin-top-app-bar": "~0.1.0", "@cloudbeaver/plugin-navigation-tree": "~0.1.0", "@cloudbeaver/plugin-sql-editor": "~0.1.0", - "@cloudbeaver/plugin-sql-editor-navigation-tab": "~0.1.0", + "@cloudbeaver/plugin-sql-editor-navigation-tab": "~0.1.0" + }, + "peerDependencies": { "react": "~18.x.x", "react-dom": "~18.x.x", "reakit": "~1.x.x", diff --git a/webapp/packages/core-app/src/AppScreen/Main.tsx b/webapp/packages/core-app/src/AppScreen/Main.tsx index 88bdf46652..1fff3486ea 100644 --- a/webapp/packages/core-app/src/AppScreen/Main.tsx +++ b/webapp/packages/core-app/src/AppScreen/Main.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { splitStyles, Split, ResizerControls, Pane, ErrorBoundary, useSplitUserState } from '@cloudbeaver/core-blocks'; +import { splitStyles, Split, ResizerControls, Pane, ErrorBoundary, useSplitUserState, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { SideBarPanel, SideBarPanelService } from '@cloudbeaver/core-ui'; import { NavigationTree } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/core-app/src/AppScreen/RightArea.tsx b/webapp/packages/core-app/src/AppScreen/RightArea.tsx index e2075c2ac1..30985d1a04 100644 --- a/webapp/packages/core-app/src/AppScreen/RightArea.tsx +++ b/webapp/packages/core-app/src/AppScreen/RightArea.tsx @@ -19,11 +19,12 @@ import { splitHorizontalStyles, splitStyles, SlideOverlay, + useStyles, ErrorBoundary, useSplitUserState } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { OptionsPanelService } from '@cloudbeaver/core-ui'; import { NavigationTabsBar } from '@cloudbeaver/plugin-navigation-tabs'; import { ToolsPanelService, ToolsPanel } from '@cloudbeaver/plugin-tools-panel'; diff --git a/webapp/packages/core-app/src/Body.tsx b/webapp/packages/core-app/src/Body.tsx index fd813c238c..0b1266ed08 100644 --- a/webapp/packages/core-app/src/Body.tsx +++ b/webapp/packages/core-app/src/Body.tsx @@ -10,13 +10,13 @@ import { observer } from 'mobx-react-lite'; import { useRef, useLayoutEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Loader, useAppLoadingScreen, useDataResource } from '@cloudbeaver/core-blocks'; +import { Loader, useAppLoadingScreen, useDataResource, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { DialogsPortal } from '@cloudbeaver/core-dialogs'; import { Notifications } from '@cloudbeaver/core-notifications'; import { SessionPermissionsResource } from '@cloudbeaver/core-root'; import { ScreenService } from '@cloudbeaver/core-routing'; -import { ThemeService, useStyles } from '@cloudbeaver/core-theming'; +import { ThemeService } from '@cloudbeaver/core-theming'; import { DNDProvider } from '@cloudbeaver/core-ui'; import { useAppVersion } from '@cloudbeaver/plugin-version'; diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json index 8027b75be8..b337df8575 100644 --- a/webapp/packages/core-authentication/package.json +++ b/webapp/packages/core-authentication/package.json @@ -15,12 +15,14 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "test": "core-cli-test" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-events": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", - "@cloudbeaver/core-utils": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0" + }, + "peerDependencies": { "mobx": "~6.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index 018ca26650..dbbf9d6007 100644 --- a/webapp/packages/core-blocks/package.json +++ b/webapp/packages/core-blocks/package.json @@ -16,9 +16,6 @@ "test": "core-cli-test" }, "dependencies": { - "go-split": "^3.0.6" - }, - "peerDependencies": { "@cloudbeaver/core-authentication": "~0.1.0", "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-localization": "~0.1.0", @@ -27,6 +24,9 @@ "@cloudbeaver/core-theming": "~0.1.0", "@cloudbeaver/core-dialogs": "~0.1.0", "@cloudbeaver/core-utils": "~0.1.0", + "go-split": "^3.0.6" + }, + "peerDependencies": { "reshadow": "~0.x.x", "reakit": "~1.x.x", "react": "~18.x.x", diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx index 73d6a5c7a9..95b17c143c 100644 --- a/webapp/packages/core-blocks/src/Button.tsx +++ b/webapp/packages/core-blocks/src/Button.tsx @@ -10,11 +10,12 @@ import { observable } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Icon } from './Icon'; import { Loader } from './Loader/Loader'; import { useObservableRef } from './useObservableRef'; +import { useStyles } from './useStyles'; const buttonStyles = css` button-label { diff --git a/webapp/packages/core-blocks/src/Cell.tsx b/webapp/packages/core-blocks/src/Cell.tsx index 7c32f34e1a..a5448b6fd6 100644 --- a/webapp/packages/core-blocks/src/Cell.tsx +++ b/webapp/packages/core-blocks/src/Cell.tsx @@ -8,7 +8,9 @@ import styled, { css } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; + +import { useStyles } from './useStyles'; interface Props { description?: React.ReactElement | string; diff --git a/webapp/packages/core-blocks/src/Code.tsx b/webapp/packages/core-blocks/src/Code.tsx index 227f56d457..52cb7018c0 100644 --- a/webapp/packages/core-blocks/src/Code.tsx +++ b/webapp/packages/core-blocks/src/Code.tsx @@ -8,7 +8,7 @@ import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { className?: string; @@ -22,7 +22,7 @@ const styles = css` `; export const Code: React.FC> = function Code({ children, className }) { - return styled(useStyles(styles))( + return styled(styles)( {children} diff --git a/webapp/packages/core-blocks/src/ErrorMessage.tsx b/webapp/packages/core-blocks/src/ErrorMessage.tsx index ee885291d2..e813b0664a 100644 --- a/webapp/packages/core-blocks/src/ErrorMessage.tsx +++ b/webapp/packages/core-blocks/src/ErrorMessage.tsx @@ -9,10 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { Button } from './Button'; import { IconOrImage } from './IconOrImage'; +import { useTranslate } from './localization/useTranslate'; const styles = css` message { diff --git a/webapp/packages/core-blocks/src/ExceptionMessage.tsx b/webapp/packages/core-blocks/src/ExceptionMessage.tsx index 79f5e24232..d4aa3aed70 100644 --- a/webapp/packages/core-blocks/src/ExceptionMessage.tsx +++ b/webapp/packages/core-blocks/src/ExceptionMessage.tsx @@ -9,10 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { Button } from './Button'; import { IconOrImage } from './IconOrImage'; +import { useTranslate } from './localization/useTranslate'; import { useErrorDetails } from './useErrorDetails'; const styles = css` diff --git a/webapp/packages/core-blocks/src/Expand/Expandable.tsx b/webapp/packages/core-blocks/src/Expand/Expandable.tsx index 6ca934e42b..3ad478f167 100644 --- a/webapp/packages/core-blocks/src/Expand/Expandable.tsx +++ b/webapp/packages/core-blocks/src/Expand/Expandable.tsx @@ -11,9 +11,10 @@ import { forwardRef, ReactNode, useImperativeHandle } from 'react'; import { Disclosure, DisclosureContent, DisclosureStateReturn, useDisclosureState } from 'reakit'; import styled, { css, use } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { IconOrImage } from '../IconOrImage'; +import { useStyles } from '../useStyles'; export type ExpandableState = Pick; diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx index 6381818471..7fbb98824d 100644 --- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx @@ -9,7 +9,9 @@ import { useLayoutEffect, useRef } from 'react'; import styled, { css } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; + +import { useStyles } from '../../useStyles'; export type CheckboxMod = 'primary' | 'surface' | 'small'; diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx index 0fbeed298c..318f5215d4 100644 --- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx @@ -8,8 +8,7 @@ import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - +import { useStyles } from '../../useStyles'; import { baseFormControlStyles, baseValidFormControlStyles } from '../baseFormControlStyles'; import { isControlPresented } from '../isControlPresented'; import { Checkbox, CheckboxBaseProps, CheckboxType, ICheckboxControlledProps, ICheckboxObjectProps } from './Checkbox'; diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx index 163c24d924..47d127e65e 100644 --- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/Switch.tsx @@ -9,9 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { filterLayoutFakeProps } from '../../Containers/filterLayoutFakeProps'; +import { useStyles } from '../../useStyles'; import { baseFormControlStyles, baseValidFormControlStyles } from '../baseFormControlStyles'; import { isControlPresented } from '../isControlPresented'; import type { ICheckboxControlledProps, ICheckboxObjectProps } from './Checkbox'; diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx index 52962a630d..a71710b364 100644 --- a/webapp/packages/core-blocks/src/FormControls/Combobox.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Combobox.tsx @@ -11,8 +11,8 @@ import { useLayoutEffect, useCallback, useState, useRef, useContext, useEffect } import { useMenuState, Menu, MenuItem, MenuButton } from 'reakit/Menu'; import styled, { css, use } from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps'; import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps'; @@ -20,6 +20,8 @@ import { getComputed } from '../getComputed'; import { Icon } from '../Icon'; import { IconOrImage } from '../IconOrImage'; import { Loader } from '../Loader/Loader'; +import { useTranslate } from '../localization/useTranslate'; +import { useStyles } from '../useStyles'; import { baseFormControlStyles, baseValidFormControlStyles } from './baseFormControlStyles'; import { FormContext } from './FormContext'; diff --git a/webapp/packages/core-blocks/src/FormControls/Filter.tsx b/webapp/packages/core-blocks/src/FormControls/Filter.tsx index c651bcd389..c513c35328 100644 --- a/webapp/packages/core-blocks/src/FormControls/Filter.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Filter.tsx @@ -10,10 +10,11 @@ import { observer } from 'mobx-react-lite'; import { useCallback, useEffect, useState } from 'react'; import styled, { css, use } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { IconButton } from '../IconButton'; import { useFocus } from '../useFocus'; +import { useStyles } from '../useStyles'; import { InputField } from './InputField'; const filterStyles = css` diff --git a/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx b/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx index 55a9301493..5dddf0964b 100644 --- a/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx +++ b/webapp/packages/core-blocks/src/FormControls/FormFieldDescription.tsx @@ -8,10 +8,11 @@ import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps'; import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps'; +import { useStyles } from '../useStyles'; import { baseFormControlStyles, baseValidFormControlStyles } from './baseFormControlStyles'; const style = css` diff --git a/webapp/packages/core-blocks/src/FormControls/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField.tsx index 9e997a6009..84dbef316a 100644 --- a/webapp/packages/core-blocks/src/FormControls/InputField.tsx +++ b/webapp/packages/core-blocks/src/FormControls/InputField.tsx @@ -10,12 +10,14 @@ import { observer } from 'mobx-react-lite'; import { forwardRef, useCallback, useContext, useState } from 'react'; import styled, { use, css } from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps'; import { Icon } from '../Icon'; +import { useTranslate } from '../localization/useTranslate'; import { useCombinedHandler } from '../useCombinedHandler'; +import { useStyles } from '../useStyles'; import { baseFormControlStyles, baseInvalidFormControlStyles, baseValidFormControlStyles } from './baseFormControlStyles'; import { FormContext } from './FormContext'; import { isControlPresented } from './isControlPresented'; diff --git a/webapp/packages/core-blocks/src/FormControls/Radio.tsx b/webapp/packages/core-blocks/src/FormControls/Radio.tsx index 3dcecf72fc..a4af1769da 100644 --- a/webapp/packages/core-blocks/src/FormControls/Radio.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Radio.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useContext, useCallback } from 'react'; import styled, { css, use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { filterLayoutFakeProps } from '../Containers/filterLayoutFakeProps'; import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps'; +import { useStyles } from '../useStyles'; import { baseFormControlStyles } from './baseFormControlStyles'; import { FormContext } from './FormContext'; import { RadioGroupContext } from './RadioGroupContext'; diff --git a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx index 021c84962b..4acac4c00c 100644 --- a/webapp/packages/core-blocks/src/FormControls/Textarea.tsx +++ b/webapp/packages/core-blocks/src/FormControls/Textarea.tsx @@ -10,9 +10,10 @@ import { observer } from 'mobx-react-lite'; import { useCallback, useContext } from 'react'; import styled, { css, use } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import type { ILayoutSizeProps } from '../Containers/ILayoutSizeProps'; +import { useStyles } from '../useStyles'; import { baseFormControlStyles, baseValidFormControlStyles } from './baseFormControlStyles'; import { FormContext } from './FormContext'; diff --git a/webapp/packages/core-blocks/src/IconButton.tsx b/webapp/packages/core-blocks/src/IconButton.tsx index af408ca59c..06030ef727 100644 --- a/webapp/packages/core-blocks/src/IconButton.tsx +++ b/webapp/packages/core-blocks/src/IconButton.tsx @@ -9,10 +9,11 @@ import { Button, ButtonProps } from 'reakit/Button'; import styled, { css } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Icon } from './Icon'; import { StaticImage } from './StaticImage'; +import { useStyles } from './useStyles'; const styles = css` Button { diff --git a/webapp/packages/core-blocks/src/Iframe.tsx b/webapp/packages/core-blocks/src/Iframe.tsx index 0c63bcdd83..c972a68466 100644 --- a/webapp/packages/core-blocks/src/Iframe.tsx +++ b/webapp/packages/core-blocks/src/Iframe.tsx @@ -9,7 +9,7 @@ import type { DetailedHTMLProps, IframeHTMLAttributes } from 'react'; import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { useStyles } from './useStyles'; const styles = css` iframe { diff --git a/webapp/packages/core-blocks/src/InfoItem.tsx b/webapp/packages/core-blocks/src/InfoItem.tsx index 72bc248e34..68fd596be4 100644 --- a/webapp/packages/core-blocks/src/InfoItem.tsx +++ b/webapp/packages/core-blocks/src/InfoItem.tsx @@ -9,9 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import { IconOrImage } from './IconOrImage'; +import { useTranslate } from './localization/useTranslate'; export interface IInfoItem { info: TLocalizationToken; diff --git a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx index 07c1024ae2..1737f6f266 100644 --- a/webapp/packages/core-blocks/src/ItemList/ItemList.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ItemList.tsx @@ -8,8 +8,9 @@ import styled from 'reshadow'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; +import { useStyles } from '../useStyles'; import { Styles, ITEM_LIST_STYLES } from './styles'; interface Props { diff --git a/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx b/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx index 917e97e2ee..b62dff8271 100644 --- a/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ItemListSearch.tsx @@ -11,10 +11,12 @@ import { } from 'react'; import styled, { use } from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { IconButton } from '../IconButton'; +import { useTranslate } from '../localization/useTranslate'; +import { useStyles } from '../useStyles'; import { Styles } from './styles'; interface IProps { diff --git a/webapp/packages/core-blocks/src/ItemList/ListItem.tsx b/webapp/packages/core-blocks/src/ItemList/ListItem.tsx index d0dc79b3ba..28b3d197c0 100644 --- a/webapp/packages/core-blocks/src/ItemList/ListItem.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ListItem.tsx @@ -9,8 +9,7 @@ import { useContext } from 'react'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - +import { useStyles } from '../useStyles'; import { Styles } from './styles'; interface Props { diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx index 4a375bfcf3..72fc2c7d65 100644 --- a/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ListItemDescription.tsx @@ -9,8 +9,7 @@ import { useContext } from 'react'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - +import { useStyles } from '../useStyles'; import { Styles } from './styles'; interface Props { diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx index 5fd27b02e4..006a914229 100644 --- a/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ListItemIcon.tsx @@ -9,8 +9,7 @@ import { useContext } from 'react'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - +import { useStyles } from '../useStyles'; import { Styles } from './styles'; interface Props { diff --git a/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx b/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx index c334060c66..99418475ab 100644 --- a/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx +++ b/webapp/packages/core-blocks/src/ItemList/ListItemName.tsx @@ -9,8 +9,7 @@ import { useContext } from 'react'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - +import { useStyles } from '../useStyles'; import { Styles } from './styles'; interface Props { diff --git a/webapp/packages/core-blocks/src/Loader/Loader.tsx b/webapp/packages/core-blocks/src/Loader/Loader.tsx index d6c05ba971..f272458517 100644 --- a/webapp/packages/core-blocks/src/Loader/Loader.tsx +++ b/webapp/packages/core-blocks/src/Loader/Loader.tsx @@ -11,13 +11,15 @@ import { observer } from 'mobx-react-lite'; import { useState, useEffect, useContext, useRef } from 'react'; import styled, { use } from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { uuid } from '@cloudbeaver/core-utils'; import { Button } from '../Button'; import { ExceptionMessage } from '../ExceptionMessage'; +import { Translate } from '../localization/Translate'; import { StaticImage } from '../StaticImage'; +import { useStyles } from '../useStyles'; import type { ILoadableState } from './ILoadableState'; import { ILoaderContext, LoaderContext } from './LoaderContext'; import { loaderStyles, overlayStyles } from './loaderStyles'; diff --git a/webapp/packages/core-blocks/src/Marks/ConnectionMark.tsx b/webapp/packages/core-blocks/src/Marks/ConnectionMark.tsx index 5f1f927899..b276875ce5 100644 --- a/webapp/packages/core-blocks/src/Marks/ConnectionMark.tsx +++ b/webapp/packages/core-blocks/src/Marks/ConnectionMark.tsx @@ -8,7 +8,7 @@ import styled, { css, use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + const styles = css` status { @@ -35,7 +35,7 @@ interface Props { } export const ConnectionMark: React.FC = function ConnectionMark({ connected, className }) { - return styled(useStyles(styles))( + return styled(styles)( ); }; \ No newline at end of file diff --git a/webapp/packages/core-blocks/src/Menu/Menu.tsx b/webapp/packages/core-blocks/src/Menu/Menu.tsx index da3ab5dcfa..affbc254f0 100644 --- a/webapp/packages/core-blocks/src/Menu/Menu.tsx +++ b/webapp/packages/core-blocks/src/Menu/Menu.tsx @@ -11,10 +11,11 @@ import React, { forwardRef, useEffect } from 'react'; import { MenuButton, MenuInitialState, useMenuState } from 'reakit/Menu'; import styled from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { ErrorBoundary } from '../ErrorBoundary'; import { useObjectRef } from '../useObjectRef'; +import { useStyles } from '../useStyles'; import { MenuPanel } from './MenuPanel'; import { menuPanelStyles } from './menuPanelStyles'; import { IMenuState, MenuStateContext } from './MenuStateContext'; diff --git a/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx b/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx index 7758f1736b..515e48c72d 100644 --- a/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx +++ b/webapp/packages/core-blocks/src/Menu/MenuEmptyItem.tsx @@ -9,9 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; +import { useTranslate } from '../localization/useTranslate'; +import { useStyles } from '../useStyles'; import { MenuItem } from './MenuItem'; import { MenuItemElement } from './MenuItemElement'; import { menuPanelStyles } from './menuPanelStyles'; diff --git a/webapp/packages/core-blocks/src/Menu/MenuItem.tsx b/webapp/packages/core-blocks/src/Menu/MenuItem.tsx index 0a8b650515..bb1f5a753a 100644 --- a/webapp/packages/core-blocks/src/Menu/MenuItem.tsx +++ b/webapp/packages/core-blocks/src/Menu/MenuItem.tsx @@ -11,9 +11,10 @@ import React, { useContext } from 'react'; import { MenuItem as ReakitMenuItem } from 'reakit/Menu'; import styled, { use } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { useCombinedHandler } from '../useCombinedHandler'; +import { useStyles } from '../useStyles'; import { menuPanelStyles } from './menuPanelStyles'; import { MenuStateContext } from './MenuStateContext'; diff --git a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx index 419ea30066..9d833d66f0 100644 --- a/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx +++ b/webapp/packages/core-blocks/src/Menu/MenuItemElement.tsx @@ -9,10 +9,14 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { Icon, IconOrImage, Loader, useStateDelay } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; +import { Icon } from '../Icon'; +import { IconOrImage } from '../IconOrImage'; +import { Loader } from '../Loader/Loader'; +import { useTranslate } from '../localization/useTranslate'; +import { useStateDelay } from '../useStateDelay'; +import { useStyles } from '../useStyles'; import { menuPanelStyles } from './menuPanelStyles'; interface IMenuItemElementProps { diff --git a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx index 60d979b5d9..98e9c24d53 100644 --- a/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx +++ b/webapp/packages/core-blocks/src/Menu/MenuPanel.tsx @@ -11,10 +11,11 @@ import { Children } from 'react'; import { Menu, MenuStateReturn } from 'reakit/Menu'; import styled, { use } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { ErrorBoundary } from '../ErrorBoundary'; import { getComputed } from '../getComputed'; +import { useStyles } from '../useStyles'; import { MenuEmptyItem } from './MenuEmptyItem'; import { menuPanelStyles } from './menuPanelStyles'; diff --git a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx index ced6814b4a..a82bde9a22 100644 --- a/webapp/packages/core-blocks/src/Overlay/Overlay.tsx +++ b/webapp/packages/core-blocks/src/Overlay/Overlay.tsx @@ -9,8 +9,6 @@ import { observer } from 'mobx-react-lite'; import styled, { use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -25,13 +23,11 @@ export const Overlay = observer>(function Overlay className, children, }) { - const styles = useStyles(OVERLAY_BASE_STYLES); - if (!active) { return null; } - return styled(styles)( + return styled(OVERLAY_BASE_STYLES)( {children} diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx index a61d38b033..404071434b 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayActions.tsx @@ -9,8 +9,6 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -21,7 +19,7 @@ export const OverlayActions = observer>(function className, children, }) { - return styled(useStyles(OVERLAY_BASE_STYLES))( + return styled(OVERLAY_BASE_STYLES)( {children} diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx index 22de467871..e502bcab00 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeader.tsx @@ -8,8 +8,6 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -17,7 +15,7 @@ interface Props { } export const OverlayHeader: React.FC> = function OverlayHeader({ className, children }) { - return styled(useStyles(OVERLAY_BASE_STYLES))( + return styled(OVERLAY_BASE_STYLES)(
{children}
diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx index 3e4a51bef2..df694a6953 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderIcon.tsx @@ -8,8 +8,6 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { IconOrImage } from '../IconOrImage'; import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; @@ -20,13 +18,11 @@ interface Props { } export const OverlayHeaderIcon: React.FC> = function OverlayHeaderIcon({ icon, viewBox, className, children }) { - const style = useStyles(OVERLAY_BASE_STYLES); - if (!icon && !children) { return null; } - return styled(style)( + return styled(OVERLAY_BASE_STYLES)( {icon && } {children} diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx index dffe79e85e..2b2b11d6d8 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderSubTitle.tsx @@ -8,8 +8,6 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -17,7 +15,7 @@ interface Props { } export const OverlayHeaderSubTitle: React.FC> = function OverlayHeaderSubTitle({ className, children }) { - return styled(useStyles(OVERLAY_BASE_STYLES))( + return styled(OVERLAY_BASE_STYLES)( {children} ); }; \ No newline at end of file diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx index 7fbe6e3f45..a0c51c683f 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayHeaderTitle.tsx @@ -8,8 +8,6 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -17,7 +15,7 @@ interface Props { } export const OverlayHeaderTitle: React.FC> = function OverlayHeaderTitle({ className, children }) { - return styled(useStyles(OVERLAY_BASE_STYLES))( + return styled(OVERLAY_BASE_STYLES)(

{children}

 diff --git a/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx b/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx index 399490945d..0d3781362b 100644 --- a/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx +++ b/webapp/packages/core-blocks/src/Overlay/OverlayMessage.tsx @@ -9,8 +9,6 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { OVERLAY_BASE_STYLES } from './OVERLAY_BASE_STYLES'; interface Props { @@ -21,7 +19,7 @@ export const OverlayMessage = observer>(function className, children, }) { - return styled(useStyles(OVERLAY_BASE_STYLES))( + return styled(OVERLAY_BASE_STYLES)( {children} diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx index 661ecaaeb5..bf9603e714 100644 --- a/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx +++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertiesTable.tsx @@ -6,16 +6,14 @@ * you may not use this file except in compliance with the License. */ -import { computed, toJS } from 'mobx'; +import { computed } from 'mobx'; import { observer } from 'mobx-react-lite'; import { useCallback, useMemo, useState } from 'react'; import styled from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { Button } from '../Button'; import { ShadowInput } from '../FormControls/ShadowInput'; +import { useTranslate } from '../localization/useTranslate'; import { useObjectRef } from '../useObjectRef'; import type { IProperty } from './IProperty'; import { PropertyItem } from './PropertyItem'; @@ -112,7 +110,7 @@ export const PropertiesTable = observer(function PropertiesTable(props) { [] ); - return styled(useStyles(PROPERTIES_TABLE_STYLES))( + return styled(PROPERTIES_TABLE_STYLES)( diff --git a/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx b/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx index 0963bafc07..e21791aff7 100644 --- a/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx +++ b/webapp/packages/core-blocks/src/PropertiesTable/PropertyItem.tsx @@ -10,7 +10,7 @@ import { observer } from 'mobx-react-lite'; import { useCallback, useRef, useState, useLayoutEffect } from 'react'; import styled, { css, use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ShadowInput } from '../FormControls/ShadowInput'; import { Icon } from '../Icon'; @@ -151,7 +151,7 @@ export const PropertyItem = observer(function PropertyItem({ const focus = menuOpen; - return styled(useStyles(styles))( + return styled(styles)( >(fu const visible = menu.visible; - return styled(useStyles(BASE_DROPDOWN_STYLES, styles))( + return styled(BASE_DROPDOWN_STYLES, styles)( <> {children} diff --git a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx index dca55708dd..f566290076 100644 --- a/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx +++ b/webapp/packages/core-blocks/src/Slide/SlideOverlay.tsx @@ -8,8 +8,6 @@ import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { Icon } from '../Icon'; interface Props { @@ -43,7 +41,7 @@ export const SlideOverlay: React.FC = function SlideOverlay({ className, onClick, }) { - return styled(useStyles(styles))( + return styled(styles)(
diff --git a/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx index 0117356d7c..bd6a3b0dbe 100644 --- a/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx +++ b/webapp/packages/core-blocks/src/Snackbars/ActionSnackbar.tsx @@ -8,10 +8,10 @@ import { observer } from 'mobx-react-lite'; -import { Button } from '@cloudbeaver/core-blocks'; import type { INotificationExtraProps, NotificationComponent } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button } from '../Button'; +import { useTranslate } from '../localization/useTranslate'; import { SnackbarBody } from './SnackbarMarkups/SnackbarBody'; import { SnackbarContent } from './SnackbarMarkups/SnackbarContent'; import { SnackbarFooter } from './SnackbarMarkups/SnackbarFooter'; diff --git a/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx index 8e4419374b..0588e73f98 100644 --- a/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx +++ b/webapp/packages/core-blocks/src/Snackbars/ProcessSnackbar.tsx @@ -9,9 +9,10 @@ import { observer } from 'mobx-react-lite'; import { INotificationProcessExtraProps, ENotificationType, NotificationComponent } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { Button } from '../Button'; +import { useTranslate } from '../localization/useTranslate'; import { useErrorDetails } from '../useErrorDetails'; import { useStateDelay } from '../useStateDelay'; import { SnackbarBody } from './SnackbarMarkups/SnackbarBody'; diff --git a/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx b/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx index a58d4833dc..8fda0f8a16 100644 --- a/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx +++ b/webapp/packages/core-blocks/src/Snackbars/Snackbar.tsx @@ -8,10 +8,10 @@ import { observer } from 'mobx-react-lite'; -import { Button } from '@cloudbeaver/core-blocks'; import type { ENotificationType } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button } from '../Button'; +import { useTranslate } from '../localization/useTranslate'; import { useStateDelay } from '../useStateDelay'; import { SnackbarBody } from './SnackbarMarkups/SnackbarBody'; import { SnackbarContent } from './SnackbarMarkups/SnackbarContent'; diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx index b141023bb3..80346b3472 100644 --- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx +++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarWrapper.tsx @@ -9,7 +9,7 @@ import { useEffect, useState } from 'react'; import styled, { css, use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { IconButton } from '../../IconButton'; @@ -59,14 +59,13 @@ interface Props { export const SnackbarWrapper: React.FC> = function SnackbarWrapper({ closing = false, persistent, onClose, children, className, }) { - const styles = useStyles(SNACKBAR_WRAPPER_STYLES); const [mounted, setMounted] = useState(false); useEffect(() => { setMounted(true); }, []); - return styled(styles)( + return styled(SNACKBAR_WRAPPER_STYLES)( {children} {!persistent && onClose && ( diff --git a/webapp/packages/core-blocks/src/Split/SplitControls.tsx b/webapp/packages/core-blocks/src/Split/SplitControls.tsx index 4ca31b6958..62e353ad15 100644 --- a/webapp/packages/core-blocks/src/Split/SplitControls.tsx +++ b/webapp/packages/core-blocks/src/Split/SplitControls.tsx @@ -10,7 +10,7 @@ import { SplitContext } from 'go-split'; import { useContext } from 'react'; import styled, { use } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { useObjectRef } from '../useObjectRef'; import { buttonStyles } from './splitButtonStyles'; @@ -19,7 +19,6 @@ export const SplitControls: React.FC = function SplitControls() { const { size, split, mode, setMode, isMainSecond, getContainerSize, ...splitContext } = useContext(SplitContext); - const styles = useStyles(buttonStyles); const inverse = isMainSecond(); @@ -54,7 +53,7 @@ export const SplitControls: React.FC = function SplitControls() { }, }), { mode, setMode }, ['handleCollapse', 'handleExpand']); - return styled(styles)( + return styled(buttonStyles)( (function Tag({ id, label, icon, onRemove, className }) { - const styles = useStyles(style); - - return styled(styles)( + return styled(style)( {icon && ( diff --git a/webapp/packages/core-blocks/src/TextPlaceholder.tsx b/webapp/packages/core-blocks/src/TextPlaceholder.tsx index 7d0d64e2b3..ce3b47fb60 100644 --- a/webapp/packages/core-blocks/src/TextPlaceholder.tsx +++ b/webapp/packages/core-blocks/src/TextPlaceholder.tsx @@ -8,8 +8,6 @@ import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - const TextPlaceholderStyles = css` div { flex: 1; @@ -30,7 +28,7 @@ interface Props { } export const TextPlaceholder: React.FC> = function TextPlaceholder(props) { - return styled(useStyles(TextPlaceholderStyles))( + return styled(TextPlaceholderStyles)(
{props.children} diff --git a/webapp/packages/core-blocks/src/TimerIcon.tsx b/webapp/packages/core-blocks/src/TimerIcon.tsx index 4bdac722a7..6eab9a68a1 100644 --- a/webapp/packages/core-blocks/src/TimerIcon.tsx +++ b/webapp/packages/core-blocks/src/TimerIcon.tsx @@ -9,9 +9,10 @@ import type React from 'react'; import styled, { css } from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Icon } from './Icon'; +import { useStyles } from './useStyles'; const style = css` timer { diff --git a/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx b/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx index 33c011f48d..91af736cc8 100644 --- a/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx +++ b/webapp/packages/core-blocks/src/ToolsPanel/ToolsAction.tsx @@ -9,8 +9,6 @@ import type { ButtonHTMLAttributes } from 'react'; import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import { IconOrImage } from '../IconOrImage'; const styles = css` @@ -44,7 +42,7 @@ interface Props extends ButtonHTMLAttributes { } export const ToolsAction: React.FC = function ToolsAction({ icon, viewBox, children, ...rest }) { - return styled(useStyles(styles))( + return styled(styles)( )} diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx index 7e6ed7c244..cf082d833c 100644 --- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx +++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuPanelItem.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { use } from 'reshadow'; -import { Checkbox, Icon, IconOrImage, Loader, Radio } from '@cloudbeaver/core-blocks'; +import { Checkbox, Icon, IconOrImage, Loader, Radio, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import type { IMenuItem } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { menuPanelStyles } from './menuPanelStyles'; diff --git a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx index 797b09e57d..89983c56ab 100644 --- a/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx +++ b/webapp/packages/core-dialogs/src/Menu/MenuPanel/MenuTrigger.tsx @@ -15,8 +15,8 @@ import { } from 'reakit/Menu'; import styled, { use } from 'reshadow'; -import { useObjectRef } from '@cloudbeaver/core-blocks'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import { useObjectRef, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import type { IMenuItem, IMenuPanel diff --git a/webapp/packages/core-events/package.json b/webapp/packages/core-events/package.json index 8145ba0e5e..16d62f958e 100644 --- a/webapp/packages/core-events/package.json +++ b/webapp/packages/core-events/package.json @@ -15,7 +15,7 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "test": "core-cli-test" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", "@cloudbeaver/core-plugin": "~0.1.0", diff --git a/webapp/packages/core-executor/package.json b/webapp/packages/core-executor/package.json index 179f9e5c80..adff06f288 100644 --- a/webapp/packages/core-executor/package.json +++ b/webapp/packages/core-executor/package.json @@ -13,5 +13,11 @@ "postbuild": "tsc", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" + }, + "dependencies": { + "@cloudbeaver/core-utils": "~0.1.0" + }, + "peerDependencies": { + "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json index 67b8cb8b99..27010cd30e 100644 --- a/webapp/packages/core-localization/package.json +++ b/webapp/packages/core-localization/package.json @@ -15,14 +15,16 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "test": "core-cli-test" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-events": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", + "@cloudbeaver/core-plugin": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", - "react": "~18.x.x", - "mobx": "~6.x.x", - "mobx-react-lite": "~3.x.x" + "@cloudbeaver/core-settings": "~0.1.0" + }, + "peerDependencies": { + "mobx": "~6.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-localization/src/index.ts b/webapp/packages/core-localization/src/index.ts index cbae96ec6f..5b95adb8c9 100644 --- a/webapp/packages/core-localization/src/index.ts +++ b/webapp/packages/core-localization/src/index.ts @@ -1,6 +1,4 @@ export { manifest as coreLocalizationManifest } from './manifest'; export * from './LocalizationService'; -export * from './useTranslate'; export * from './Locale'; export * from './TLocalizationToken'; -export * from './Translate'; diff --git a/webapp/packages/core-navigation-tree/package.json b/webapp/packages/core-navigation-tree/package.json index 52b8128aa0..f4b14b27d5 100644 --- a/webapp/packages/core-navigation-tree/package.json +++ b/webapp/packages/core-navigation-tree/package.json @@ -15,13 +15,15 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "test": "core-cli-test" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-app": "~0.1.0", "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-events": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", + "@cloudbeaver/core-settings": "~0.1.0" + }, + "peerDependencies": { "react": "~18.x.x", "mobx": "~6.x.x", "mobx-react-lite": "~3.x.x" diff --git a/webapp/packages/core-notifications/package.json b/webapp/packages/core-notifications/package.json index 3a43662f65..646e22772a 100644 --- a/webapp/packages/core-notifications/package.json +++ b/webapp/packages/core-notifications/package.json @@ -14,14 +14,16 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-localization": "~0.1.0", "@cloudbeaver/core-blocks": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", "@cloudbeaver/core-events": "~0.1.0", "@cloudbeaver/core-theming": "~0.1.0", - "@cloudbeaver/core-dialogs": "~0.1.0", + "@cloudbeaver/core-dialogs": "~0.1.0" + }, + "peerDependencies": { "reshadow": "~0.x.x", "react": "~18.x.x", "react-dom": "~18.x.x", diff --git a/webapp/packages/core-notifications/src/Notifications.tsx b/webapp/packages/core-notifications/src/Notifications.tsx index 7b80d325b9..e8ce04aa99 100644 --- a/webapp/packages/core-notifications/src/Notifications.tsx +++ b/webapp/packages/core-notifications/src/Notifications.tsx @@ -12,7 +12,7 @@ import styled, { css } from 'reshadow'; import { useService } from '@cloudbeaver/core-di'; import { NotificationService } from '@cloudbeaver/core-events'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { NotificationsItem } from './NotificationsItem/NotificationsItem'; @@ -29,7 +29,7 @@ const styles = css` export const Notifications = observer(function Notifications() { const notificationService = useService(NotificationService); - return styled(useStyles(styles))( + return styled(styles)( {notificationService.visibleNotifications.map(notification => ( diff --git a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx index 538b2e7f75..a59edcd80a 100644 --- a/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx +++ b/webapp/packages/core-notifications/src/NotificationsItem/ErrorDetailsDialog/ErrorDetailsDialog.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import { useCallback, useMemo } from 'react'; import styled from 'reshadow'; -import { useClipboard, Button, Iframe, Textarea } from '@cloudbeaver/core-blocks'; +import { useClipboard, Button, Iframe, Textarea, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { ErrorModel, IErrorInfo } from './ErrorModel'; import { dialogStyle, styles } from './styles'; diff --git a/webapp/packages/core-plugin/package.json b/webapp/packages/core-plugin/package.json index 5b31969b47..f389772c90 100644 --- a/webapp/packages/core-plugin/package.json +++ b/webapp/packages/core-plugin/package.json @@ -14,7 +14,7 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-product": "~0.1.0", "@cloudbeaver/core-settings": "~0.1.0" diff --git a/webapp/packages/core-product/package.json b/webapp/packages/core-product/package.json index 1e098a040b..742578b85d 100644 --- a/webapp/packages/core-product/package.json +++ b/webapp/packages/core-product/package.json @@ -14,7 +14,7 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-settings": "~0.1.0", diff --git a/webapp/packages/core-projects/package.json b/webapp/packages/core-projects/package.json index 3515a06ec5..65dc5b3f4a 100644 --- a/webapp/packages/core-projects/package.json +++ b/webapp/packages/core-projects/package.json @@ -14,13 +14,20 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-authentication": "~0.1.0", + "@cloudbeaver/core-localization": "~0.1.0", + "@cloudbeaver/core-ui": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", + "@cloudbeaver/core-resource-manager": "~0.1.0", "@cloudbeaver/core-settings": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", "@cloudbeaver/core-navigation-tree": "~0.1.0", "@cloudbeaver/core-utils": "~0.1.0" + }, + "peerDependencies": { + "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-resource-manager/package.json b/webapp/packages/core-resource-manager/package.json index 638e6fc3ef..d06e8910c4 100644 --- a/webapp/packages/core-resource-manager/package.json +++ b/webapp/packages/core-resource-manager/package.json @@ -14,13 +14,14 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", - "@cloudbeaver/core-authentication": "~0.1.0", + "@cloudbeaver/core-administration": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", "@cloudbeaver/core-root": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", - "@cloudbeaver/core-navigation-tree": "~0.1.0", "@cloudbeaver/core-utils": "~0.1.0" + }, + "peerDependencies": { + "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-root/package.json b/webapp/packages/core-root/package.json index 8c7c48b679..a79d4d1fe4 100644 --- a/webapp/packages/core-root/package.json +++ b/webapp/packages/core-root/package.json @@ -14,11 +14,14 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-sdk": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", "@cloudbeaver/core-settings": "~0.1.0", - "@cloudbeaver/core-utils": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0" + }, + "peerDependencies": { "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-root/src/index.ts b/webapp/packages/core-root/src/index.ts index fb4a39cc60..cdcce2be37 100644 --- a/webapp/packages/core-root/src/index.ts +++ b/webapp/packages/core-root/src/index.ts @@ -14,6 +14,5 @@ export * from './SessionActionService'; export * from './SessionDataResource'; export * from './SessionSettingsService'; export * from './SessionExpireService'; -export * from './usePermission'; export * from './WindowEventsService'; export { manifest as coreRootManifest } from './manifest'; diff --git a/webapp/packages/core-routing/package.json b/webapp/packages/core-routing/package.json index 18172070f6..08e4094812 100644 --- a/webapp/packages/core-routing/package.json +++ b/webapp/packages/core-routing/package.json @@ -15,11 +15,13 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { + "@cloudbeaver/core-di": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0", "router5": "~8.0.1", "router5-plugin-browser": "~8.0.1" }, "peerDependencies": { - "@cloudbeaver/core-di": "~0.1.0", "mobx": "~6.x.x", "mobx-react-lite": "~3.x.x" } diff --git a/webapp/packages/core-sdk/package.json b/webapp/packages/core-sdk/package.json index fbba13e953..50599c5cb6 100644 --- a/webapp/packages/core-sdk/package.json +++ b/webapp/packages/core-sdk/package.json @@ -18,6 +18,9 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { + "@cloudbeaver/core-di": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", "graphql-request": "~4.3.0" }, "devDependencies": { @@ -31,7 +34,6 @@ "graphql": "~16.x.x" }, "peerDependencies": { - "@cloudbeaver/core-di": "~0.1.0", "mobx": "~6.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-sdk/src/GQLError.ts b/webapp/packages/core-sdk/src/GQLError.ts index cff744f0df..c387a59e48 100644 --- a/webapp/packages/core-sdk/src/GQLError.ts +++ b/webapp/packages/core-sdk/src/GQLError.ts @@ -25,7 +25,7 @@ export class GQLError extends DetailsError { if (typeof clientError.response.error === 'string') { message = clientError.response.error; - } else if (clientError.response.errors && clientError.response.errors.length > 0){ + } else if (clientError.response.errors && clientError.response.errors.length > 0) { message = clientError.response.errors .map(e => e.message) .join('\n'); @@ -37,7 +37,7 @@ export class GQLError extends DetailsError { this.name = 'Server Error'; this.response = clientError.response; this.request = clientError.request; - + if (typeof clientError.response.error === 'string') { this.isTextBody = true; } else { diff --git a/webapp/packages/core-settings/package.json b/webapp/packages/core-settings/package.json index 790969dc8d..2999090d45 100644 --- a/webapp/packages/core-settings/package.json +++ b/webapp/packages/core-settings/package.json @@ -14,8 +14,10 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, + "dependencies": { + "@cloudbeaver/core-di": "~0.1.0" + }, "peerDependencies": { - "@cloudbeaver/core-di": "~0.1.0", "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-settings/src/LocalStorageSaveService.ts b/webapp/packages/core-settings/src/LocalStorageSaveService.ts index df23e31026..d80f6fe40e 100644 --- a/webapp/packages/core-settings/src/LocalStorageSaveService.ts +++ b/webapp/packages/core-settings/src/LocalStorageSaveService.ts @@ -6,12 +6,7 @@ * you may not use this file except in compliance with the License. */ -import { - autorun, - ObservableMap, - set, - toJS -} from 'mobx'; +import { autorun, ObservableMap, set, toJS } from 'mobx'; import { injectable } from '@cloudbeaver/core-di'; diff --git a/webapp/packages/core-theming/package.json b/webapp/packages/core-theming/package.json index 2f83207d5c..2c085f40e0 100644 --- a/webapp/packages/core-theming/package.json +++ b/webapp/packages/core-theming/package.json @@ -16,6 +16,13 @@ "test": "core-cli-test" }, "dependencies": { + "@cloudbeaver/core-di": "~0.1.0", + "@cloudbeaver/core-events": "~0.1.0", + "@cloudbeaver/core-executor": "~0.1.0", + "@cloudbeaver/core-root": "~0.1.0", + "@cloudbeaver/core-plugin": "~0.1.0", + "@cloudbeaver/core-settings": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0", "@material/button": "~4.0.0", "@material/elevation": "~4.0.0", "@material/layout-grid": "~4.0.0", @@ -27,12 +34,7 @@ "@material/checkbox": "~4.0.0" }, "peerDependencies": { - "@cloudbeaver/core-di": "~0.1.0", - "@cloudbeaver/core-events": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", - "@cloudbeaver/core-utils": "~0.1.0", "mobx": "~6.x.x", - "mobx-react-lite": "~3.x.x", "react": "~18.x.x", "reshadow": "~0.x.x" } diff --git a/webapp/packages/core-theming/src/ComponentStyle.ts b/webapp/packages/core-theming/src/ComponentStyle.ts new file mode 100644 index 0000000000..820d884c56 --- /dev/null +++ b/webapp/packages/core-theming/src/ComponentStyle.ts @@ -0,0 +1,15 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2022 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 type { ClassCollection } from './themeUtils'; + +export type BaseStyles = ClassCollection; +export type ThemeSelector = (theme: string) => Promise; +export type Style = BaseStyles | ThemeSelector; +export type DynamicStyle = Style | boolean | undefined; +export type ComponentStyle = DynamicStyle | DynamicStyle[]; \ No newline at end of file diff --git a/webapp/packages/core-theming/src/index.ts b/webapp/packages/core-theming/src/index.ts index a22479352c..d5c192eaab 100644 --- a/webapp/packages/core-theming/src/index.ts +++ b/webapp/packages/core-theming/src/index.ts @@ -1,5 +1,5 @@ export { manifest as coreThemingManifest } from './manifest'; +export * from './ComponentStyle'; export * from './ThemeService'; export * from './themeUtils'; -export * from './useStyles'; export * from './ThemeSettingsService'; diff --git a/webapp/packages/core-ui/package.json b/webapp/packages/core-ui/package.json index f91b31030d..79ccf47c9b 100644 --- a/webapp/packages/core-ui/package.json +++ b/webapp/packages/core-ui/package.json @@ -15,10 +15,6 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { - "react-dnd": "~16.0.1", - "react-dnd-html5-backend": "~16.0.1" - }, - "peerDependencies": { "@cloudbeaver/core-authentication": "~0.1.0", "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-executor": "~0.1.0", @@ -28,6 +24,10 @@ "@cloudbeaver/core-events": "~0.1.0", "@cloudbeaver/core-utils": "~0.1.0", "@cloudbeaver/core-view": "~0.1.0", + "react-dnd": "~16.0.1", + "react-dnd-html5-backend": "~16.0.1" + }, + "peerDependencies": { "mobx": "~6.x.x", "mobx-react-lite": "~3.x.x" } diff --git a/webapp/packages/core-ui/src/AuthenticationProvider.tsx b/webapp/packages/core-ui/src/AuthenticationProvider.tsx index 3e79ffb750..9215371369 100644 --- a/webapp/packages/core-ui/src/AuthenticationProvider.tsx +++ b/webapp/packages/core-ui/src/AuthenticationProvider.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Button, Container, GroupItem } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, Button, Container, GroupItem, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + import { useAuthenticationAction } from './useAuthenticationAction'; diff --git a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx index e5a9fc1021..93ea21b9ee 100644 --- a/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/ContextMenu.tsx @@ -11,10 +11,10 @@ import { ButtonHTMLAttributes, forwardRef, useRef } from 'react'; import type { MenuInitialState } from 'reakit/Menu'; import styled from 'reshadow'; -import { getComputed, IMenuState, Menu, menuPanelStyles, useObjectRef } from '@cloudbeaver/core-blocks'; +import { getComputed, IMenuState, Menu, menuPanelStyles, useObjectRef, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { IMenuData, MenuActionItem, MenuService } from '@cloudbeaver/core-view'; import { MenuItemRenderer } from './MenuItemRenderer'; diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx index 03111964f6..7ff8cec8b9 100644 --- a/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/MenuActionElement.tsx @@ -11,8 +11,8 @@ import React from 'react'; import { MenuItem, MenuItemCheckbox, MenuItemRadio } from 'reakit/Menu'; import styled, { use } from 'reshadow'; -import { Checkbox, MenuItemElement, menuPanelStyles, Radio } from '@cloudbeaver/core-blocks'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Checkbox, MenuItemElement, menuPanelStyles, Radio, useStyles } from '@cloudbeaver/core-blocks'; + import type { IMenuActionItem } from '@cloudbeaver/core-view'; import type { IContextMenuItemProps } from './IContextMenuItemProps'; diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx index 5c0debd03c..cee63b73b1 100644 --- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBar.tsx @@ -11,7 +11,8 @@ import { forwardRef, useCallback } from 'react'; import { MenuInitialState, MenuSeparator } from 'reakit'; import styled, { use } from 'reshadow'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import { useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { DATA_CONTEXT_MENU_NESTED, IMenuActionItem, IMenuData, IMenuItem, MenuActionItem, MenuBaseItem, MenuSeparatorItem, MenuSubMenuItem, useMenu } from '@cloudbeaver/core-view'; import { ContextMenu } from '../ContextMenu'; diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx index 332f50690e..6f40a68caf 100644 --- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx @@ -10,9 +10,8 @@ import { observer } from 'mobx-react-lite'; import { ButtonHTMLAttributes, forwardRef } from 'react'; import styled from 'reshadow'; -import { IconOrImage, Loader, useStateDelay } from '@cloudbeaver/core-blocks'; -import { Translate, useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import { IconOrImage, Loader, useStateDelay, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; interface Props extends Omit, HTMLButtonElement>, 'style'> { label?: string; @@ -38,7 +37,7 @@ export const MenuBarItem = observer(forwardRef(functio {loading && } {!loading && icon && } - {label && } + {label && {translate(label)}} ); })); diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx index a790a3efb3..b051880080 100644 --- a/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/MenuItemRenderer.tsx @@ -11,8 +11,8 @@ import React, { useCallback } from 'react'; import { MenuItem, MenuItemCheckbox, MenuSeparator, MenuStateReturn } from 'reakit/Menu'; import styled, { use } from 'reshadow'; -import { Checkbox, MenuItemElement, menuPanelStyles } from '@cloudbeaver/core-blocks'; -import { ComponentStyle, joinStyles, useStyles } from '@cloudbeaver/core-theming'; +import { Checkbox, joinStyles, MenuItemElement, menuPanelStyles, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { IMenuItem, IMenuData, MenuSubMenuItem, MenuSeparatorItem, MenuActionItem, MenuBaseItem, MenuCustomItem, MenuCheckboxItem } from '@cloudbeaver/core-view'; import { MenuActionElement } from './MenuActionElement'; diff --git a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx index 563b7cad9c..d72001a5bf 100644 --- a/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx +++ b/webapp/packages/core-ui/src/ContextMenu/SubMenuElement.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import { forwardRef, useRef } from 'react'; import styled from 'reshadow'; -import { getComputed, IMenuState, Menu, MenuItemElement, menuPanelStyles, useObjectRef } from '@cloudbeaver/core-blocks'; +import { getComputed, IMenuState, Menu, MenuItemElement, menuPanelStyles, useObjectRef, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { DATA_CONTEXT_MENU_NESTED, DATA_CONTEXT_SUBMENU_ITEM, IMenuData, IMenuSubMenuItem, MenuActionItem, MenuService, useMenu } from '@cloudbeaver/core-view'; import type { IMenuItemRendererProps } from './MenuItemRenderer'; diff --git a/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx b/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx index 0515d42efe..7b7b07a419 100644 --- a/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx +++ b/webapp/packages/core-ui/src/InlineEditor/EditorDialog.tsx @@ -12,10 +12,10 @@ import { } from 'react'; import styled, { css } from 'reshadow'; -import { Button } from '@cloudbeaver/core-blocks'; +import { Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper, DialogComponent, DialogComponentProps } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + const dialogStyle = css` footer { diff --git a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx index 1c903a066f..7a558c752f 100644 --- a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx +++ b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx @@ -12,10 +12,10 @@ import { } from 'react'; import styled, { use } from 'reshadow'; -import { Icon, IconOrImage, Loader, useObjectRef } from '@cloudbeaver/core-blocks'; +import { Icon, IconOrImage, Loader, useObjectRef, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { EditorDialog } from './EditorDialog'; import { InlineEditorStyles } from './styles'; diff --git a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx index 2c51bf291e..962d4df142 100644 --- a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx +++ b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx @@ -9,7 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + +import { useStyles } from '@cloudbeaver/core-blocks'; import { BASE_TAB_STYLES, TabList, TabPanelList, TabsContainer, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui'; const tabsStyles = css` diff --git a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx index 05612c4920..58fe54943c 100644 --- a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx +++ b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx @@ -11,9 +11,9 @@ import { useMemo, useState } from 'react'; import { Tab as BaseTab } from 'reakit/Tab'; import styled, { use } from 'reshadow'; -import { getComputed, Icon } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import { getComputed, Icon, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { IDataContext, useMenu } from '@cloudbeaver/core-view'; import { ContextMenu } from '../../ContextMenu/ContextMenu'; diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx index 14b840c5a9..2bfdfac444 100644 --- a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx +++ b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx @@ -9,8 +9,9 @@ import { useMemo } from 'react'; import styled from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { TabContext } from '../TabContext'; import type { ITabData } from '../TabsContainer/ITabsContainer'; diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx index 568f972dc7..a16d0160a0 100644 --- a/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx +++ b/webapp/packages/core-ui/src/Tabs/Tab/TabIcon.tsx @@ -8,8 +8,8 @@ import styled from 'reshadow'; -import { IconOrImage } from '@cloudbeaver/core-blocks'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { IconOrImage, useStyles } from '@cloudbeaver/core-blocks'; + import { BASE_TAB_STYLES } from './BASE_TAB_STYLES'; diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx index 79191dea5a..51cc77c5bc 100644 --- a/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx +++ b/webapp/packages/core-ui/src/Tabs/Tab/TabTitle.tsx @@ -8,7 +8,7 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { BASE_TAB_STYLES } from './BASE_TAB_STYLES'; @@ -17,7 +17,7 @@ interface IProps { } export const TabTitle: React.FC> = function TabTitle({ children, className }) { - return styled(useStyles(BASE_TAB_STYLES))( + return styled(BASE_TAB_STYLES)( {children || } diff --git a/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx b/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx index 5fad1d8c59..ad3d4a390f 100644 --- a/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx +++ b/webapp/packages/core-ui/src/Tabs/TabPanelList.tsx @@ -10,7 +10,8 @@ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; import styled from 'reshadow'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import { useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { generateTabElement } from './generateTabElement'; import { BASE_TAB_STYLES } from './Tab/BASE_TAB_STYLES'; diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx index 9e8ca84179..aa5c9da1f8 100644 --- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx +++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBox.tsx @@ -9,7 +9,8 @@ import { PropsWithChildren, ReactNode, forwardRef } from 'react'; import styled, { css } from 'reshadow'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import { useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import type { MetadataMap } from '@cloudbeaver/core-utils'; import type { ITabData } from '../TabsContainer/ITabsContainer'; diff --git a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx index 454d8b1a9e..268ebe80e2 100644 --- a/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx +++ b/webapp/packages/core-ui/src/Tabs/TabsBox/TabsBoxFromArray.tsx @@ -9,7 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useStyles, ComponentStyle } from '@cloudbeaver/core-theming'; +import { useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { BASE_TAB_STYLES } from '../Tab/BASE_TAB_STYLES'; import { Tab } from '../Tab/Tab'; diff --git a/webapp/packages/core-version-update/package.json b/webapp/packages/core-version-update/package.json index fb9f1440aa..6e6625f6ba 100644 --- a/webapp/packages/core-version-update/package.json +++ b/webapp/packages/core-version-update/package.json @@ -14,27 +14,16 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { - "@cloudbeaver/core-administration": "~0.1.0", - "@cloudbeaver/core-authentication": "~0.1.0", - "@cloudbeaver/core-blocks": "~0.1.0", - "@cloudbeaver/core-di": "~0.1.0", - "@cloudbeaver/core-dialogs": "~0.1.0", - "@cloudbeaver/core-extensions": "~0.1.0", - "@cloudbeaver/core-localization": "~0.1.0", - "@cloudbeaver/core-notifications": "~0.1.0", - "@cloudbeaver/core-plugin": "~0.1.0", - "@cloudbeaver/core-sdk": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", - "@cloudbeaver/core-theming": "~0.1.0", - "@cloudbeaver/core-utils": "~0.1.0", - "@cloudbeaver/core-view": "~0.1.0", - "mobx": "~6.x.x" - }, "dependencies": { + "@cloudbeaver/core-di": "~0.1.0", + "@cloudbeaver/core-version": "~0.1.0", + "@cloudbeaver/core-localization": "~0.1.0", "semver": "~7.3.7" }, + "peerDependencies": { + "mobx": "~6.x.x" + }, "devDependencies": { "@types/semver": "~7.3.9" } -} +} \ No newline at end of file diff --git a/webapp/packages/core-version/package.json b/webapp/packages/core-version/package.json index 604c04b8aa..b06ffb0b2d 100644 --- a/webapp/packages/core-version/package.json +++ b/webapp/packages/core-version/package.json @@ -14,21 +14,13 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { - "@cloudbeaver/core-administration": "~0.1.0", - "@cloudbeaver/core-authentication": "~0.1.0", - "@cloudbeaver/core-blocks": "~0.1.0", + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", - "@cloudbeaver/core-dialogs": "~0.1.0", - "@cloudbeaver/core-extensions": "~0.1.0", - "@cloudbeaver/core-localization": "~0.1.0", - "@cloudbeaver/core-notifications": "~0.1.0", - "@cloudbeaver/core-plugin": "~0.1.0", - "@cloudbeaver/core-sdk": "~0.1.0", - "@cloudbeaver/core-settings": "~0.1.0", - "@cloudbeaver/core-theming": "~0.1.0", + "@cloudbeaver/core-root": "~0.1.0", "@cloudbeaver/core-utils": "~0.1.0", - "@cloudbeaver/core-view": "~0.1.0", + "@cloudbeaver/core-sdk": "~0.1.0" + }, + "peerDependencies": { "mobx": "~6.x.x" } } diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json index ecce00f83e..a461f5fceb 100644 --- a/webapp/packages/core-view/package.json +++ b/webapp/packages/core-view/package.json @@ -14,9 +14,15 @@ "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, - "peerDependencies": { + "dependencies": { "@cloudbeaver/core-di": "~0.1.0", "@cloudbeaver/core-extensions": "~0.1.0", + "@cloudbeaver/core-localization": "~0.1.0", + "@cloudbeaver/core-blocks": "~0.1.0", + "@cloudbeaver/core-utils": "~0.1.0", + "@cloudbeaver/core-theming": "~0.1.0" + }, + "peerDependencies": { "mobx": "~6.x.x" } } \ No newline at end of file diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx index 44cba2d0fa..6aad8e6797 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPage.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { ConfigurationWizardService } from '@cloudbeaver/core-administration'; -import { BASE_LAYOUT_GRID_STYLES, Button, useFocus } from '@cloudbeaver/core-blocks'; +import { BASE_LAYOUT_GRID_STYLES, Button, useFocus, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + const styles = css` layout-grid { diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx index 178d153aa3..c4f30aa411 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Finish/FinishPageDrawerItem.tsx @@ -10,8 +10,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; export const FinishPageDrawerItem = observer(function FinishPageDrawerItem({ diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx index 8a9a153a62..b2991d5ef9 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationConfigurationForm.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Switch } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import type { ServerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { serverConfig: ServerConfigInput; diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx index 449ef3e426..82d7c81360 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationFeaturesForm.tsx @@ -11,12 +11,10 @@ import { useContext } from 'react'; import styled from 'reshadow'; import { AdministrationSettingsService } from '@cloudbeaver/core-administration'; -import { BASE_CONTAINERS_STYLES, FormContext, GroupTitle, Loader, PlaceholderComponent, Switch, useDataResource } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, FormContext, GroupTitle, Loader, PlaceholderComponent, Switch, useDataResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { FeaturesResource } from '@cloudbeaver/core-root'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration'; export const ServerConfigurationFeaturesForm: PlaceholderComponent = observer(function ServerConfigurationFeaturesForm({ diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx index 5344a7cfcc..9910e432c8 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationInfoForm.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { Group, GroupTitle, BASE_CONTAINERS_STYLES, InputField } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Group, GroupTitle, BASE_CONTAINERS_STYLES, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + import type { IServerConfigurationPageState } from '../IServerConfigurationPageState'; diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx index 192d7fa5fa..8f2216dff3 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationNavigatorViewForm.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Switch } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { CONNECTION_NAVIGATOR_VIEW_SETTINGS, isNavigatorViewSettingsEqual } from '@cloudbeaver/core-root'; -import { useStyles } from '@cloudbeaver/core-theming'; + import type { IServerConfigurationPageState } from '../IServerConfigurationPageState'; diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx index 9a350f4ff3..b9029d9fd4 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/Form/ServerConfigurationSecurityForm.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Group, GroupTitle, Switch } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, Group, GroupTitle, Switch, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import type { ServerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { serverConfig: ServerConfigInput; diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx index 67d102ef15..87a2f1a3fb 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDrawerItem.tsx @@ -9,9 +9,8 @@ import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; export const ServerConfigurationDrawerItem: React.FC = function ServerConfigurationDrawerItem({ item, onSelect, style, disabled, diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx index ad7473b5b4..d0d01d34ff 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationDriversForm.tsx @@ -11,11 +11,10 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; import styled, { css } from 'reshadow'; -import { Group, GroupTitle, BASE_CONTAINERS_STYLES, useMapResource, Combobox, Tags, ITag, Tag } from '@cloudbeaver/core-blocks'; +import { Group, GroupTitle, BASE_CONTAINERS_STYLES, useMapResource, Combobox, Tags, ITag, Tag, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { DBDriverResource } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { CachedMapAllKey, resourceKeyList, ServerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx index 5fce6cef5a..ab99415eee 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationPage.tsx @@ -10,12 +10,11 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES, ConfigurationWizardService } from '@cloudbeaver/core-administration'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, GroupItem, GroupTitle, ToolsAction, Loader, Placeholder, SubmittingForm, useFocus, useFormValidator, ToolsPanel } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, GroupItem, GroupTitle, ToolsAction, Loader, Placeholder, SubmittingForm, useFocus, useFormValidator, ToolsPanel, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogService, ConfirmationDialog, DialogueStateResult } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { ServerConfigResource } from '@cloudbeaver/core-root'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ServerConfigurationConfigurationForm } from './Form/ServerConfigurationConfigurationForm'; import { ServerConfigurationFeaturesForm } from './Form/ServerConfigurationFeaturesForm'; diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx index bff223b414..c1fd812780 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomeDrawerItem.tsx @@ -9,9 +9,8 @@ import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; export const WelcomeDrawerItem: React.FC = function WelcomeDrawerItem({ item, onSelect, style, disabled, diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx index 11c7575100..f6bc582ddb 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/Welcome/WelcomePage.tsx @@ -8,9 +8,9 @@ import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, GroupItem } from '@cloudbeaver/core-blocks'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, GroupItem, Translate } from '@cloudbeaver/core-blocks'; + + const styles = css` p { @@ -24,7 +24,7 @@ const styles = css` `; export const WelcomePage: React.FC = function WelcomePage() { - return styled(useStyles(styles, BASE_CONTAINERS_STYLES))( + return styled(styles, BASE_CONTAINERS_STYLES)(

diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx index 55d50c48c2..60af6b5b3c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationForm.tsx @@ -10,11 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage } from '@cloudbeaver/core-blocks'; +import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { AuthConfigurationFormService } from './AuthConfigurationFormService'; @@ -110,7 +108,7 @@ export const AuthConfigurationForm = observer(function AuthConfigurationF }) { const translate = useTranslate(); const props = useObjectRef({ onSave }); - const style = [BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES]; + const style = useStyles(BASE_TAB_STYLES, tabsStyles, UNDERLINE_TAB_STYLES); const styles = useStyles(style, BASE_CONTAINERS_STYLES, topBarStyles, formStyles); const service = useService(AuthConfigurationFormService); diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx index e5f34ad58b..b915d0932b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationFormBaseActions.tsx @@ -8,8 +8,8 @@ import { observer } from 'mobx-react-lite'; -import { Button, PlaceholderComponent } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, PlaceholderComponent, useTranslate } from '@cloudbeaver/core-blocks'; + import type { IAuthConfigurationFormProps } from './IAuthConfigurationFormProps'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx index 5b7f46c3e6..bb625d68d2 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsAdministration.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES } from '@cloudbeaver/core-administration'; -import { BASE_CONTAINERS_STYLES, ToolsAction, Loader, ToolsPanel, BASE_LAYOUT_GRID_STYLES } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, ToolsAction, Loader, ToolsPanel, BASE_LAYOUT_GRID_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { AuthConfigurationsTable } from './AuthConfigurationsTable/AuthConfigurationsTable'; import { useConfigurationsTable } from './AuthConfigurationsTable/useConfigurationsTable'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx index fd52b71b45..dea7fe0c8b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsDrawerItem.tsx @@ -9,9 +9,10 @@ import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + export const AuthConfigurationsDrawerItem: React.FC = function AuthConfigurationsDrawerItem({ item, onSelect, style, disabled, diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx index 04f92fb812..2331c6255e 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfiguration.tsx @@ -16,7 +16,6 @@ import { } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { AuthConfigurationsAdministrationService } from '../AuthConfigurationsAdministrationService'; import { AuthConfigurationEdit } from './AuthConfigurationEdit'; @@ -48,7 +47,7 @@ export const AuthConfiguration = observer(function AuthConfiguration({ co const icon = configuration.iconURL || resource.data?.icon; - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx index d329d09620..48486c42c1 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationEdit.tsx @@ -11,9 +11,9 @@ import { useRef, useEffect, useContext, useCallback } from 'react'; import styled, { css } from 'reshadow'; import { AuthConfigurationsResource } from '@cloudbeaver/core-authentication'; -import { TableContext } from '@cloudbeaver/core-blocks'; +import { TableContext, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { AuthConfigurationForm } from '../AuthConfigurationForm'; import { useAuthConfigurationFormState } from '../useAuthConfigurationFormState'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx index 3e97c9e785..52aa319f6e 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/AuthConfigurationsTable.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import type { AdminAuthProviderConfiguration } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { AuthConfiguration } from './AuthConfiguration'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx index 675e098e6d..22569902dd 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/AuthConfigurationsTable/useConfigurationsTable.tsx @@ -9,11 +9,11 @@ import { computed, observable } from 'mobx'; import { AuthConfigurationsResource, compareAuthConfigurations } from '@cloudbeaver/core-authentication'; -import { TableState, useObservableRef } from '@cloudbeaver/core-blocks'; +import { TableState, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs'; import { NotificationService } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { AdminAuthProviderConfiguration, resourceKeyList } from '@cloudbeaver/core-sdk'; interface State { diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx index 506347bbc2..1dc40c1365 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/CreateAuthConfiguration.tsx @@ -9,10 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { IconButton } from '@cloudbeaver/core-blocks'; +import { IconButton, Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { AuthConfigurationForm } from './AuthConfigurationForm'; import { CreateAuthConfigurationService } from './CreateAuthConfigurationService'; @@ -50,14 +48,13 @@ const styles = css` `; export const CreateAuthConfiguration: React.FC = observer(function CreateAuthConfiguration() { - const style = useStyles(styles); const service = useService(CreateAuthConfigurationService); if (!service.data) { return null; } - return styled(style)( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx index df75a90a89..f3863e9b89 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/IdentityProvidersServiceLink.tsx @@ -7,9 +7,9 @@ */ import type { ServiceDescriptionComponent } from '@cloudbeaver/core-authentication'; -import { Link } from '@cloudbeaver/core-blocks'; +import { Link, Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; + import { AuthConfigurationsAdministrationNavService } from './AuthConfigurationsAdministrationNavService'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx index d6d1c12641..c7ff75c57c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/IdentityProviders/Options/AuthConfigurationOptions.tsx @@ -14,11 +14,9 @@ import { AuthConfigurationParametersResource, AuthProvidersResource } from '@clo import { BASE_CONTAINERS_STYLES, ColoredContainer, Combobox, FieldCheckbox, Group, GroupTitle, InputField, Link, ObjectPropertyInfoForm, SubmittingForm, - Textarea, useClipboard, useMapResource, useObjectPropertyCategories + Textarea, useClipboard, useMapResource, useObjectPropertyCategories, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { AuthProviderConfigurationParametersFragment, CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import type { IAuthConfigurationFormProps } from '../IAuthConfigurationFormProps'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx index a3e8224f5d..b215fb419c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/AuthenticationProviders.tsx @@ -11,11 +11,9 @@ import React, { useContext } from 'react'; import styled from 'reshadow'; import { AuthProviderService, AuthProvidersResource, AuthSettingsService, AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication'; -import { BASE_CONTAINERS_STYLES, FormContext, Group, GroupTitle, Loader, PlaceholderComponent, Switch, useExecutor, useMapResource } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, FormContext, Group, GroupTitle, Loader, PlaceholderComponent, Switch, useExecutor, useMapResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IConfigurationPlaceholderProps } from '@cloudbeaver/plugin-administration'; import { ServerConfigurationAdminForm } from './ServerConfigurationAdminForm'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx index 41e5455d96..5e1710ae68 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAdminForm.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Group, GroupTitle, InputField } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, Group, GroupTitle, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + import type { ServerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { serverConfig: ServerConfigInput; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx index 6452359532..744549ab0b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/CreateMetaParameter.tsx @@ -8,9 +8,10 @@ import styled, { css } from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; + +import { Translate } from '@cloudbeaver/core-blocks'; import type { AdminUserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { UserForm } from '../UserForm/UserForm'; @@ -53,7 +54,7 @@ export const CreateMetaParameter: React.FC = function CreateMetaParameter user, onCancel, }) { - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx index 6bd9dcb499..cd3969d3e9 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/MetaParameterForm.tsx @@ -9,10 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, IconOrImage } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import type { UserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { UNDERLINE_TAB_STYLES, TabList, TabsState, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import type { IUserProfileFormState } from './IUserProfileFormState'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx index 7072f27654..23e6c73c91 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoPanel.tsx @@ -11,10 +11,10 @@ import styled from 'reshadow'; import { UserMetaParametersResource } from '@cloudbeaver/core-authentication'; import { TabPanel } from '@cloudbeaver/core-ui'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, InputField, Loader, ObjectPropertyInfoForm, useDataResource } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, InputField, Loader, ObjectPropertyInfoForm, useDataResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + import type { UserInfo } from '@cloudbeaver/core-sdk'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { AuthProvidersList } from '../AuthProviders/ConfigurationsList'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx index 79b481297d..fe2c9f61c8 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/Form/UserInfo/MetaParameterInfoTab.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; import { Tab } from '@cloudbeaver/core-ui'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; interface Props { className?: string; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx index 4e9276919a..df0d636a7b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetaParameters.tsx @@ -11,10 +11,10 @@ import styled, { css, use } from 'reshadow'; import type { IAdministrationItemSubItem } from '@cloudbeaver/core-administration'; import { UserMetaParametersResource } from '@cloudbeaver/core-authentication'; -import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useDataResource, ToolsPanel, ToolsAction, Loader, BASE_LAYOUT_GRID_STYLES } from '@cloudbeaver/core-blocks'; +import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useDataResource, ToolsPanel, ToolsAction, Loader, BASE_LAYOUT_GRID_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useController, useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { CreateMetaParameter } from './CreateMetaParameter'; import { CreateMetaParameterService } from './CreateMetaParameterService'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx index eb18408c36..2acfdab3ac 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/MetadataParam.tsx @@ -13,7 +13,7 @@ import { TableItem, TableColumnValue, TableItemSelect, TableItemExpand } from '@cloudbeaver/core-blocks'; import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + const styles = css` TableColumnValue[expand] { @@ -27,7 +27,7 @@ interface Props { } export const MetadataParam = observer(function MetadataParam({ param, selectable }) { - return styled(useStyles(styles))( + return styled(styles)( {selectable && ( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx index d98a8b6a8a..eb3008ad4b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/MetaParameters/UserEdit.tsx @@ -15,7 +15,7 @@ import { TableContext } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { UserForm } from '../UserForm/UserForm'; import { UserEditController } from './UserEditController'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/CreateRole.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/CreateRole.tsx index ecad1c3aca..3a1af51fa8 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/CreateRole.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/CreateRole.tsx @@ -9,10 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { IconButton } from '@cloudbeaver/core-blocks'; +import { IconButton, Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { CreateRoleService } from './CreateRoleService'; import { RoleForm } from './RoleForm'; @@ -50,14 +50,13 @@ const styles = css` `; export const CreateRole: React.FC = observer(function CreateRole() { - const style = useStyles(styles); const service = useService(CreateRoleService); if (!service.data) { return null; } - return styled(style)( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/ConnectionList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/ConnectionList.tsx index af01a39b7f..61b7affe8b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/ConnectionList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/ConnectionList.tsx @@ -9,7 +9,7 @@ import { observable } from 'mobx'; import { observer } from 'mobx-react-lite'; import { useCallback, useState } from 'react'; -import styled, { css, use } from 'reshadow'; +import styled, { css } from 'reshadow'; import { Table, @@ -22,12 +22,13 @@ import { useObjectRef, getComputed, getSelectedItems, + useTranslate, + useStyles, } from '@cloudbeaver/core-blocks'; import { DBDriverResource } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { DatabaseConnectionFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { getFilteredConnections } from './getFilteredConnections'; import { GrantedConnectionsTableHeader, IFilterState } from './GrantedConnectionsTableHeader/GrantedConnectionsTableHeader'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnections.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnections.tsx index 1db2684114..f6d19de3a1 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnections.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnections.tsx @@ -13,13 +13,12 @@ import styled, { css } from 'reshadow'; import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, - InfoItem, Loader, TextPlaceholder, useMapResource + InfoItem, Loader, TextPlaceholder, useMapResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { ConnectionInfoProjectKey, ConnectionInfoResource, DBDriverResource, isCloudConnection } from '@cloudbeaver/core-connections'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import { PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui'; import type { IRoleFormProps } from '../IRoleFormProps'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsList.tsx index 9e5860ab03..117ad3793f 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsList.tsx @@ -21,13 +21,15 @@ import { Button, useObjectRef, getSelectedItems, - getComputed + getComputed, + useTranslate, + useStyles } from '@cloudbeaver/core-blocks'; import { DBDriverResource } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import type { DatabaseConnectionFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { getFilteredConnections } from './getFilteredConnections'; import { GrantedConnectionsTableHeader, IFilterState } from './GrantedConnectionsTableHeader/GrantedConnectionsTableHeader'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx index 9d6761c20a..d84168befe 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Filter } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + export interface IFilterState { filterValue: string; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx index fa93b81cf7..8f6013486c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedConnections/GrantedConnectionsTableHeader/GrantedConnectionsTableInnerHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TableColumnHeader, TableHeader, TableSelect } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { TableColumnHeader, TableHeader, TableSelect, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + interface Props { disabled?: boolean; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUserList.tsx index 9712a320d6..1540bdc284 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUserList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUserList.tsx @@ -22,12 +22,14 @@ import { Button, useObjectRef, getComputed, - getSelectedItems + getSelectedItems, + useTranslate, + useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { getFilteredUsers } from './getFilteredUsers'; import { GrantedUsersTableHeader, IFilterState } from './GrantedUsersTableHeader/GrantedUsersTableHeader'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsers.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsers.tsx index 16d1b9cf2f..5d76a0a7a5 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsers.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsers.tsx @@ -12,14 +12,13 @@ import { useEffect, useMemo } from 'react'; import styled, { css } from 'reshadow'; import { UsersResource } from '@cloudbeaver/core-authentication'; -import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui'; import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, - InfoItem, Loader, TextPlaceholder, useMapResource + InfoItem, Loader, TextPlaceholder, useMapResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui'; + import type { IRoleFormProps } from '../IRoleFormProps'; import { GrantedUserList } from './GrantedUserList'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx index b73026999b..71bb41915a 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Filter } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + export interface IFilterState { filterValue: string; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx index 43d6d2addb..23e66809c1 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/GrantedUsersTableHeader/GrantedUsersTableInnerHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TableColumnHeader, TableHeader, TableSelect } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { TableColumnHeader, TableHeader, TableSelect, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + interface Props { disabled?: boolean; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/UserList.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/UserList.tsx index c283fb975a..551afb6270 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/UserList.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/GrantedUsers/UserList.tsx @@ -23,11 +23,12 @@ import { useObjectRef, getComputed, getSelectedItems, + useTranslate, + useStyles, } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { getFilteredUsers } from './getFilteredUsers'; import { GrantedUsersTableHeader, IFilterState } from './GrantedUsersTableHeader/GrantedUsersTableHeader'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx index 9fd4b20a74..7e330f63da 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx @@ -11,10 +11,10 @@ import { useRef } from 'react'; import styled, { css } from 'reshadow'; import { PermissionsResource } from '@cloudbeaver/core-administration'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, FieldCheckbox, Group, GroupTitle, InputField, SubmittingForm, Textarea, useMapResource } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, FieldCheckbox, Group, GroupTitle, InputField, SubmittingForm, Textarea, useMapResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import type { IRoleFormProps } from '../IRoleFormProps'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleForm.tsx index 68e0aa8910..020460f7b8 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleForm.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleForm.tsx @@ -11,10 +11,10 @@ import { useEffect } from 'react'; import styled, { css } from 'reshadow'; import type { RoleInfo } from '@cloudbeaver/core-authentication'; -import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage } from '@cloudbeaver/core-blocks'; +import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { roleContext } from './Contexts/roleContext'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleFormBaseActions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleFormBaseActions.tsx index ac36ed1e51..8b4d238e08 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleFormBaseActions.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RoleFormBaseActions.tsx @@ -8,8 +8,8 @@ import { observer } from 'mobx-react-lite'; -import { Button, PlaceholderComponent } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, PlaceholderComponent, useTranslate } from '@cloudbeaver/core-blocks'; + import type { IRoleFormProps } from './IRoleFormProps'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesDrawerItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesDrawerItem.tsx index 30d1c45b67..5dd7a0de4b 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesDrawerItem.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesDrawerItem.tsx @@ -10,8 +10,8 @@ import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + export const RolesDrawerItem: React.FC = function RolesDrawerItem({ item, diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesPage.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesPage.tsx index ce263498ce..59f9231f9c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesPage.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesPage.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; import { ADMINISTRATION_TOOLS_PANEL_STYLES, IAdministrationItemSubItem } from '@cloudbeaver/core-administration'; -import { BASE_CONTAINERS_STYLES, BASE_LAYOUT_GRID_STYLES, ToolsAction, ToolsPanel } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, BASE_LAYOUT_GRID_STYLES, ToolsAction, ToolsPanel, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { CreateRole } from './CreateRole'; import { CreateRoleService } from './CreateRoleService'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/Role.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/Role.tsx index e02821c5be..949713eacd 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/Role.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/Role.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; import type { RoleInfo } from '@cloudbeaver/core-authentication'; -import { TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder } from '@cloudbeaver/core-blocks'; +import { TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { RolesAdministrationService } from '../RolesAdministrationService'; import { RoleEdit } from './RoleEdit'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RoleEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RoleEdit.tsx index 5399a87c67..9228b99971 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RoleEdit.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RoleEdit.tsx @@ -11,9 +11,9 @@ import { useRef, useEffect, useContext, useCallback } from 'react'; import styled, { css } from 'reshadow'; import { RolesResource } from '@cloudbeaver/core-authentication'; -import { TableContext } from '@cloudbeaver/core-blocks'; +import { TableContext, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { RoleForm } from '../RoleForm'; import { useRoleFormState } from '../useRoleFormState'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RolesTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RolesTable.tsx index 3232cfd7a8..d34b5bcad0 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RolesTable.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/RolesTable.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import type { RoleInfo } from '@cloudbeaver/core-authentication'; -import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, Loader, ILoadableState } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, Loader, ILoadableState, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + import { Role } from './Role'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/useRolesTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/useRolesTable.tsx index 3e3db20e32..a0cfadbb70 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/useRolesTable.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/RolesTable/useRolesTable.tsx @@ -9,11 +9,11 @@ import { computed, observable } from 'mobx'; import { compareRoles, RoleInfo, RolesResource } from '@cloudbeaver/core-authentication'; -import { ILoadableState, TableState, useMapResource, useObservableRef } from '@cloudbeaver/core-blocks'; +import { ILoadableState, TableState, useMapResource, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogService, ConfirmationDialogDelete, DialogueStateResult } from '@cloudbeaver/core-dialogs'; import { NotificationService } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { CachedMapAllKey, resourceKeyList } from '@cloudbeaver/core-sdk'; interface State { diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess.tsx index 30ff99e92a..d7313ff961 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/ConnectionAccess.tsx @@ -14,13 +14,11 @@ import styled, { css } from 'reshadow'; import { Table, TableHeader, TableColumnHeader, TableBody, TableItem, TableColumnValue, TableItemSelect, StaticImage, - TextPlaceholder, ColoredContainer, BASE_CONTAINERS_STYLES, Group + TextPlaceholder, ColoredContainer, BASE_CONTAINERS_STYLES, Group, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { DBDriverResource, isCloudConnection } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { AdminSubjectType } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import type { IUserFormProps } from './UserFormService'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx index 74e0727d06..ca005f139a 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoPanel.tsx @@ -10,11 +10,11 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; import { AUTH_PROVIDER_LOCAL_ID, UsersResource } from '@cloudbeaver/core-authentication'; -import { TextPlaceholder, Loader, ExceptionMessage, BASE_CONTAINERS_STYLES, ColoredContainer, ObjectPropertyInfoForm, Group } from '@cloudbeaver/core-blocks'; +import { TextPlaceholder, Loader, ExceptionMessage, BASE_CONTAINERS_STYLES, ColoredContainer, ObjectPropertyInfoForm, Group, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui'; import { getOriginTabId } from './getOriginTabId'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx index 84d22935a3..1f826ca1ff 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/OriginInfoTab.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui'; import { getOriginTabId } from './getOriginTabId'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx index 10368ac8a9..285da2b1db 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx @@ -9,11 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Loader, SubmittingForm, Button, useFocus, StatusMessage } from '@cloudbeaver/core-blocks'; +import { Loader, SubmittingForm, Button, useFocus, StatusMessage, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useController, useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { AdminUserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabsState, TabList, TabPanelList, UNDERLINE_TAB_STYLES, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { UserFormController } from './UserFormController'; @@ -109,7 +107,7 @@ export const UserForm = observer(function UserForm({ controller.update(user, editing, onCancel); - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx index 7ec0f789c0..3cc61c8295 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserInfo.tsx @@ -11,9 +11,9 @@ import { useCallback } from 'react'; import styled, { css } from 'reshadow'; import { UserMetaParametersResource } from '@cloudbeaver/core-authentication'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, FieldCheckbox, Group, GroupTitle, InputField, Loader, ObjectPropertyInfoForm, useDataResource } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, FieldCheckbox, Group, GroupTitle, InputField, Loader, ObjectPropertyInfoForm, useDataResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import type { IUserFormProps } from './UserFormService'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx index 7520ffb9c7..5d2b853363 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministration.tsx @@ -10,10 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { AdministrationItemContentComponent, ADMINISTRATION_TOOLS_PANEL_STYLES } from '@cloudbeaver/core-administration'; -import { ToolsPanel } from '@cloudbeaver/core-blocks'; +import { ToolsPanel, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { BASE_TAB_STYLES, ITabData, Tab, TabList, TabPanel, TabsState, UNDERLINE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { MetaParameters } from './MetaParameters/MetaParameters'; diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx index 7a699c70ff..a19fb6c5c7 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersDrawerItem.tsx @@ -9,8 +9,7 @@ import styled from 'reshadow'; import type { AdministrationItemDrawerProps } from '@cloudbeaver/core-administration'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Translate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabTitle, TabIcon } from '@cloudbeaver/core-ui'; export const UsersDrawerItem: React.FC = function UsersDrawerItem({ diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx index b2aee4f0f2..460b82030a 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUser.tsx @@ -8,9 +8,10 @@ import styled, { css } from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; + +import { Translate } from '@cloudbeaver/core-blocks'; import type { AdminUserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { UserForm } from '../UserForm/UserForm'; @@ -54,7 +55,7 @@ export const CreateUser: React.FC = function CreateUser({ user, onCancel, }) { - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx index 130131c2e3..1b4e6b549c 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/User.tsx @@ -11,12 +11,12 @@ import styled, { css, use } from 'reshadow'; import { AdminUser, UsersResource } from '@cloudbeaver/core-authentication'; import { - TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder, Checkbox + TableItem, TableColumnValue, TableItemSelect, TableItemExpand, Placeholder, Checkbox, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { NotificationService } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { UsersAdministrationService } from '../UsersAdministrationService'; import { UserEdit } from './UserEdit'; @@ -53,7 +53,7 @@ export const User = observer(function User({ user, selectable }) { const enabledCheckboxTitle = usersService.isActiveUser(user.userId) ? translate('administration_roles_role_granted_users_permission_denied') : undefined; - return styled(useStyles(styles))( + return styled(styles)( {selectable && ( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx index e07fffb679..7d1f6242fd 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UserEdit.tsx @@ -15,7 +15,7 @@ import { TableContext } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { UserForm } from '../UserForm/UserForm'; import { UserEditController } from './UserEditController'; @@ -50,7 +50,7 @@ export const UserEdit = observer(function UserEdit({ }); }, []); - return styled(useStyles(styles))( + return styled(styles)( {controller.user ? ( diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx index 4e40fe791e..c702fbf422 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/UsersTable.tsx @@ -11,11 +11,11 @@ import styled, { css, use } from 'reshadow'; import { ADMINISTRATION_TOOLS_PANEL_STYLES, IAdministrationItemSubItem } from '@cloudbeaver/core-administration'; import { AdminUser, UsersResource } from '@cloudbeaver/core-authentication'; -import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useMapResource, ToolsAction, ToolsPanel, Loader, BASE_LAYOUT_GRID_STYLES } from '@cloudbeaver/core-blocks'; +import { Table, TableHeader, TableColumnHeader, TableBody, TableSelect, useMapResource, ToolsAction, ToolsPanel, Loader, BASE_LAYOUT_GRID_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useController, useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { filterUndefined } from '@cloudbeaver/core-utils'; import { CreateUser } from './CreateUser'; diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx index 48cfada95a..d44be1521c 100644 --- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx +++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx @@ -10,11 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; import { AuthProvider, UserInfoResource } from '@cloudbeaver/core-authentication'; -import { SubmittingForm, Loader, ErrorMessage, TextPlaceholder, Link, useErrorDetails } from '@cloudbeaver/core-blocks'; +import { SubmittingForm, Loader, ErrorMessage, TextPlaceholder, Link, useErrorDetails, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { Translate, useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabsState, TabList, Tab, TabTitle, UNDERLINE_TAB_STYLES, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { AuthenticationService } from '../AuthenticationService'; @@ -133,7 +131,7 @@ export const AuthDialog: DialogComponent = observer(function {translate('authentication_provider_disabled')} {authenticationService.configureAuthProvider && ( { navToSettings(); }}> - + {translate('ui_configure')} )} diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx index 2446890aba..b6241bdb7e 100644 --- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx +++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialogFooter.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Button } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, useTranslate } from '@cloudbeaver/core-blocks'; + const styles = css` footer-container { diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx index cc639166b6..23d650f33e 100644 --- a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx +++ b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/AuthProviderForm.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; import type { AuthProvider, IAuthCredentials } from '@cloudbeaver/core-authentication'; -import { BASE_CONTAINERS_STYLES, Combobox, Group, InputField, useFocus } from '@cloudbeaver/core-blocks'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, Combobox, Group, InputField, useFocus, useStyles } from '@cloudbeaver/core-blocks'; + interface Props { provider: AuthProvider; diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx index 95521a6574..509107bb41 100644 --- a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx +++ b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx @@ -11,13 +11,12 @@ import { useState } from 'react'; import styled, { css } from 'reshadow'; import { AuthInfoService, AuthProvider, AuthProviderConfiguration, comparePublicAuthConfigurations } from '@cloudbeaver/core-authentication'; -import { Filter, IconOrImage, Link, Cell, getComputed, TextPlaceholder, usePromiseState, Loader, Button } from '@cloudbeaver/core-blocks'; +import { Filter, IconOrImage, Link, Cell, getComputed, TextPlaceholder, usePromiseState, Loader, Button, useTranslate, useStyles, Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { NotificationService } from '@cloudbeaver/core-events'; import type { ITask } from '@cloudbeaver/core-executor'; -import { Translate, useTranslate } from '@cloudbeaver/core-localization'; import type { UserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { AuthenticationService } from '../../AuthenticationService'; diff --git a/webapp/packages/plugin-codemirror/src/CodeEditor.tsx b/webapp/packages/plugin-codemirror/src/CodeEditor.tsx index 4312c1d4ec..562166795f 100644 --- a/webapp/packages/plugin-codemirror/src/CodeEditor.tsx +++ b/webapp/packages/plugin-codemirror/src/CodeEditor.tsx @@ -21,7 +21,9 @@ import 'codemirror/addon/selection/mark-selection'; import 'codemirror/lib/codemirror.css'; import 'codemirror/addon/hint/show-hint.css'; -import { useStyles } from '@cloudbeaver/core-theming'; + + +import { useStyles } from '@cloudbeaver/core-blocks'; import type { ICodeEditorProps } from './ICodeEditorProps'; import { SqlEditorStyles } from './theme'; diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx index 112c5eda8d..422ebdb75a 100644 --- a/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx +++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/CustomConnectionDialog.tsx @@ -8,9 +8,10 @@ import { observer } from 'mobx-react-lite'; +import { useTranslate } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; import type { DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { CustomConnectionController } from './CustomConnectionController'; import { DriverSelectorDialog } from './DriverSelectorDialog/DriverSelectorDialog'; diff --git a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx index 1a470c577d..978f649dcb 100644 --- a/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx +++ b/webapp/packages/plugin-connection-custom/src/CustomConnection/DriverSelectorDialog/DriverSelector.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import { useState, useMemo } from 'react'; import styled, { css } from 'reshadow'; -import { ItemListSearch, ItemList, useFocus } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { ItemListSearch, ItemList, useFocus, useTranslate } from '@cloudbeaver/core-blocks'; + import { Driver, IDriver } from './Driver'; diff --git a/webapp/packages/plugin-connection-search/src/Search/Database.tsx b/webapp/packages/plugin-connection-search/src/Search/Database.tsx index 10a2227dca..59806162aa 100644 --- a/webapp/packages/plugin-connection-search/src/Search/Database.tsx +++ b/webapp/packages/plugin-connection-search/src/Search/Database.tsx @@ -16,7 +16,7 @@ import { import { DBDriverResource } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + const styles = css` ListItemIcon { @@ -66,7 +66,7 @@ export const Database = observer(function Database({ database, onSelect } const host = database.host + ':' + database.port; const name = database.displayName !== database.host ? database.displayName + ' (' + host + ')' : host; - return styled(useStyles(styles))( + return styled(styles)( {orderedDrivers.map(driverId => )} diff --git a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx index 5208922dcb..0459a9c105 100644 --- a/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx +++ b/webapp/packages/plugin-connection-search/src/Search/DatabaseList.tsx @@ -11,11 +11,10 @@ import { useCallback, useState } from 'react'; import styled, { css } from 'reshadow'; import { - ItemListSearch, ItemList, SubmittingForm, TextPlaceholder, useFocus + ItemListSearch, ItemList, SubmittingForm, TextPlaceholder, useFocus, useTranslate } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { AdminConnectionSearchInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { Database } from './Database'; @@ -56,7 +55,7 @@ export const DatabaseList = observer(function DatabaseList({ const placeholderMessage = isSearched ? 'connections_not_found' : 'connections_administration_search_database_tip'; - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx index 02733fc6b8..19dff622e7 100644 --- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx +++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx @@ -15,11 +15,10 @@ import { SubmittingForm, Loader, useFocus, + useTranslate, } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ConnectionAuthenticationForm } from '@cloudbeaver/plugin-connections'; import { ConnectionController, ConnectionStep } from './ConnectionController'; @@ -57,7 +56,7 @@ export const ConnectionDialog: DialogComponent = observer(function C subtitle = controller.template.name; } - return styled(useStyles(styles))( + return styled(styles)( = function ConnectionsDrawerItem({ item, onSelect, style, disabled, configurationWizard, diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx index 802430f8d1..b42a3f335a 100644 --- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx +++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/Connection.tsx @@ -14,7 +14,7 @@ import { } from '@cloudbeaver/core-blocks'; import { DatabaseConnection, DBDriverResource, IConnectionInfoParams } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ConnectionsAdministrationService } from '../ConnectionsAdministrationService'; import { ConnectionEdit } from './ConnectionEdit'; @@ -47,7 +47,7 @@ export const Connection = observer(function Connection({ connectionKey, c const connectionsAdministrationService = useService(ConnectionsAdministrationService); const icon = driversResource.get(connection.driverId)?.icon; - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx index 885b64dc06..de6bb84d37 100644 --- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx +++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionDetailsInfo/SSH.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { PlaceholderComponent, StaticImage, useMapResource } from '@cloudbeaver/core-blocks'; +import { PlaceholderComponent, StaticImage, useMapResource, useTranslate } from '@cloudbeaver/core-blocks'; import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { IConnectionDetailsPlaceholderProps } from '../../ConnectionsAdministrationService'; import { CONNECTION_DETAILS_STYLES } from './ConnectionDetailsStyles'; diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx index bbe23fb461..9b0095462a 100644 --- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx +++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/ConnectionsTable/ConnectionEdit.tsx @@ -12,7 +12,6 @@ import styled, { css } from 'reshadow'; import { ConnectionInfoResource, IConnectionInfoParams } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ConnectionForm, useConnectionFormState } from '@cloudbeaver/plugin-connections'; const styles = css` @@ -53,7 +52,7 @@ export const ConnectionEdit = observer(function ConnectionEditNew({ data.config.connectionId = item.connectionId; data.projectId = item.projectId; - return styled(useStyles(styles))( + return styled(styles)( (function ConnectionsTable({ }) { const translate = useTranslate(); - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx index b8e9577c93..4fae69e594 100644 --- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx +++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/CreateConnection.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { IconButton, Loader, StaticImage, Icon, useMapResource } from '@cloudbeaver/core-blocks'; +import { IconButton, Loader, StaticImage, Icon, useMapResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { DBDriverResource } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { ConnectionForm } from '@cloudbeaver/plugin-connections'; diff --git a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx index d6e11b8f4f..b7c92eb6ec 100644 --- a/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx +++ b/webapp/packages/plugin-connections-administration/src/Administration/Connections/CreateConnection/Manual/DriverList.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useState, useMemo } from 'react'; import styled, { css } from 'reshadow'; -import { ItemListSearch, ItemList, useFocus } from '@cloudbeaver/core-blocks'; +import { ItemListSearch, ItemList, useFocus, useTranslate } from '@cloudbeaver/core-blocks'; import type { DBDriver } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { Driver } from './Driver'; diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx index 5110914f0c..76ad2946e1 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccess.tsx @@ -21,11 +21,11 @@ import { Group, Container, InfoItem, + useTranslate, } from '@cloudbeaver/core-blocks'; import { isCloudConnection } from '@cloudbeaver/core-connections'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import { CachedMapAllKey } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from '@cloudbeaver/plugin-connections'; @@ -55,7 +55,6 @@ export const ConnectionAccess: TabContainerPanelComponent state: formState, }) { const state = useConnectionAccessState(formState.info); - const style = useStyles(styles, BASE_CONTAINERS_STYLES); const translate = useTranslate(); const { selected } = useTab(tabId, state.load); @@ -86,9 +85,9 @@ export const ConnectionAccess: TabContainerPanelComponent info = 'cloud_connections_access_placeholder'; } - return styled(style)( + return styled(styles, BASE_CONTAINERS_STYLES)( - {() => styled(style)( + {() => styled(styles, BASE_CONTAINERS_STYLES)( {!users.resource.values.length && !roles.resource.values.length ? ( diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx index 64583e3ea6..b28cf3358d 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessGrantedList.tsx @@ -22,11 +22,12 @@ import { Button, useObjectRef, getComputed, - getSelectedItems + getSelectedItems, + useTranslate } from '@cloudbeaver/core-blocks'; -import { TLocalizationToken, useTranslate } from '@cloudbeaver/core-localization'; +import type { TLocalizationToken } from '@cloudbeaver/core-localization'; import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ConnectionAccessTableHeader, IFilterState } from './ConnectionAccessTableHeader/ConnectionAccessTableHeader'; import { ConnectionAccessTableInnerHeader } from './ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader'; @@ -72,7 +73,6 @@ export const ConnectionAccessGrantedList = observer(function ConnectionAc onEdit, }) { const props = useObjectRef({ onRevoke, onEdit }); - const style = useStyles(styles, BASE_CONTAINERS_STYLES); const translate = useTranslate(); const [selectedSubjects] = useState>(() => observable(new Map())); const [filterState] = useState(() => observable({ filterValue: '' })); @@ -97,7 +97,7 @@ export const ConnectionAccessGrantedList = observer(function ConnectionAc } } - return styled(style)( + return styled(styles, BASE_CONTAINERS_STYLES)( diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx index cac9e059d6..67ba2a2abc 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessList.tsx @@ -23,10 +23,10 @@ import { useObjectRef, getComputed, getSelectedItems, + useTranslate, } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { AdminUserInfoFragment } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ConnectionAccessTableHeader, IFilterState } from './ConnectionAccessTableHeader/ConnectionAccessTableHeader'; import { ConnectionAccessTableInnerHeader } from './ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader'; @@ -72,7 +72,6 @@ export const ConnectionAccessList = observer(function ConnectionAccessLis disabled, }) { const props = useObjectRef({ onGrant }); - const style = useStyles(styles, BASE_CONTAINERS_STYLES); const translate = useTranslate(); const [selectedSubjects] = useState>(() => observable(new Map())); const [filterState] = useState(() => observable({ filterValue: '' })); @@ -88,7 +87,7 @@ export const ConnectionAccessList = observer(function ConnectionAccessLis selectedSubjects.clear(); }, []); - return styled(style)( + return styled(styles, BASE_CONTAINERS_STYLES)( diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx index fec4e4b5c9..a2e633efcb 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Filter } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Filter, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + export interface IFilterState { filterValue: string; diff --git a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx index 3bc4c7707f..327030a265 100644 --- a/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx +++ b/webapp/packages/plugin-connections-administration/src/ConnectionForm/ConnectionAccess/ConnectionAccessTableHeader/ConnectionAccessTableInnerHeader.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TableColumnHeader, TableHeader, TableSelect } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { TableColumnHeader, TableHeader, TableSelect, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + + interface Props { disabled?: boolean; diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx index 4b384d4ecb..f2bf8b8d26 100644 --- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationDialog.tsx @@ -9,12 +9,12 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { SubmittingForm, useFocus, Button } from '@cloudbeaver/core-blocks'; +import { SubmittingForm, useFocus, Button, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useDBDriver } from '@cloudbeaver/core-connections'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { ConnectionConfig } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ConnectionAuthenticationForm } from './ConnectionAuthenticationForm'; diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx index 741b492530..94806f66e0 100644 --- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/ConnectionAuthenticationForm.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Container, FieldCheckbox, Group, GroupTitle, ObjectPropertyInfoForm, TextPlaceholder, useMapResource } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Container, FieldCheckbox, Group, GroupTitle, ObjectPropertyInfoForm, TextPlaceholder, useMapResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { DatabaseAuthModelsResource } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import type { IConnectionAuthenticationConfig } from './IConnectionAuthenticationConfig'; import { NetworkHandlers } from './NetworkHandlers'; diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx index a083ffc040..b8caa50e86 100644 --- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlerAuthForm.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, FieldCheckbox, GroupTitle, InputField, useMapResource } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, FieldCheckbox, GroupTitle, InputField, useMapResource, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { NetworkHandlerResource } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { NetworkHandlerAuthType, NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { id: string; diff --git a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx index 48220535d7..614627590f 100644 --- a/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionAuthentication/NetworkHandlers.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Group } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Group, useStyles } from '@cloudbeaver/core-blocks'; import type { NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { NetworkHandlerAuthForm } from './NetworkHandlerAuthForm'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx index 0304c3477a..d884e51b4a 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx @@ -10,11 +10,11 @@ import { observer } from 'mobx-react-lite'; import { useEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, Loader, ErrorMessage, useErrorDetails } from '@cloudbeaver/core-blocks'; +import { Placeholder, useObjectRef, useExecutor, BASE_CONTAINERS_STYLES, IconOrImage, Loader, ErrorMessage, useErrorDetails, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { ConnectionConfig } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { TabsState, TabList, UNDERLINE_TAB_STYLES, TabPanelList, BASE_TAB_STYLES } from '@cloudbeaver/core-ui'; import { ConnectionFormService } from './ConnectionFormService'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx index 14bbbbb642..6e29967118 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionFormBaseActions.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication'; -import { Button, getComputed, PlaceholderComponent, useMapResource } from '@cloudbeaver/core-blocks'; +import { Button, getComputed, PlaceholderComponent, useMapResource, useTranslate } from '@cloudbeaver/core-blocks'; import { DBDriverResource, DatabaseAuthModelsResource } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { useAuthenticationAction } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from './IConnectionFormProps'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx index f4412b6b73..456197980a 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/DriverProperties/DriverProperties.tsx @@ -11,9 +11,9 @@ import { observer } from 'mobx-react-lite'; import { useMemo, useState } from 'react'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, IProperty, Loader, PropertiesTable, useMapResource } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Group, IProperty, Loader, PropertiesTable, useMapResource, useStyles } from '@cloudbeaver/core-blocks'; import { DBDriverResource } from '@cloudbeaver/core-connections'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { TabContainerPanelComponent, useTab } from '@cloudbeaver/core-ui'; import { uuid } from '@cloudbeaver/core-utils'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx index 631f15135d..87e5f26759 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx @@ -30,14 +30,13 @@ import { Radio, RadioGroup, FormFieldDescription, + useTranslate, + usePermission, } from '@cloudbeaver/core-blocks'; import { DatabaseAuthModelsResource, DBDriverResource, isLocalConnection } from '@cloudbeaver/core-connections'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { PROJECT_GLOBAL_ID } from '@cloudbeaver/core-projects'; -import { usePermission } from '@cloudbeaver/core-root'; import { CachedMapEmptyKey, DriverConfigurationType, resourceKeyList } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import { useAuthenticationAction } from '@cloudbeaver/core-ui'; import { ProjectSelect } from '@cloudbeaver/plugin-projects'; @@ -190,7 +189,7 @@ export const Options: TabContainerPanelComponent = observe const providerPropertiesWithoutBoolean = driver?.providerProperties.slice().filter(property => property.dataType !== 'Boolean'); const booleanProviderProperties = driver?.providerProperties.slice().filter(property => property.dataType === 'Boolean'); - return styled(useStyles(styles, BASE_CONTAINERS_STYLES))( + return styled(styles, BASE_CONTAINERS_STYLES)( diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx index 25578b0718..7906cd71e8 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ParametersForm.tsx @@ -9,10 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Container, InputField } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { BASE_CONTAINERS_STYLES, Container, InputField, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; + import type { ConnectionConfig } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { config: ConnectionConfig; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx index 6d64ba913a..83c272fc91 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/ConnectionFormAuthenticationAction.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import { AUTH_PROVIDER_LOCAL_ID } from '@cloudbeaver/core-authentication'; -import { Button, getComputed, PlaceholderComponent, useMapResource } from '@cloudbeaver/core-blocks'; +import { Button, getComputed, PlaceholderComponent, useMapResource, useTranslate } from '@cloudbeaver/core-blocks'; import { DatabaseAuthModelsResource, DBDriverResource } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import { useAuthenticationAction } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from '../IConnectionFormProps'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx index 5af9f5661c..112d314c63 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfo.tsx @@ -9,10 +9,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TextPlaceholder, Loader, ExceptionMessage, useMapResource, ColoredContainer, Group, ObjectPropertyInfoForm, BASE_CONTAINERS_STYLES } from '@cloudbeaver/core-blocks'; +import { TextPlaceholder, Loader, ExceptionMessage, useMapResource, ColoredContainer, Group, ObjectPropertyInfoForm, BASE_CONTAINERS_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { createConnectionParam } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { TabContainerPanelComponent, useTab, useTabState } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from '../IConnectionFormProps'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx index 151e1be452..7b76d230b2 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/OriginInfo/OriginInfoTab.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { useStyles, Translate } from '@cloudbeaver/core-blocks'; import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from '../IConnectionFormProps'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx index 8b5547bb9e..b908384ff1 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx @@ -14,12 +14,10 @@ import { useAdministrationSettings } from '@cloudbeaver/core-administration'; import { Group, SubmittingForm, useMapResource, Button, ColoredContainer, InputField, FieldCheckbox, BASE_CONTAINERS_STYLES, Switch, GroupItem, Container, Textarea, - UploadArea, Combobox, Expandable, EXPANDABLE_FORM_STYLES + UploadArea, Combobox, Expandable, EXPANDABLE_FORM_STYLES, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { NetworkHandlerAuthType, NetworkHandlerConfigInput } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui'; import { getTextFileReadingProcess } from '@cloudbeaver/core-utils'; diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx index decd6ecef1..cf91ac9192 100644 --- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx +++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSHTab.tsx @@ -9,11 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui'; -import { useMapResource } from '@cloudbeaver/core-blocks'; +import { Translate, useMapResource, useStyles } from '@cloudbeaver/core-blocks'; import { NetworkHandlerResource, SSH_TUNNEL_ID } from '@cloudbeaver/core-connections'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { TabTitle, Tab, TabContainerTabComponent } from '@cloudbeaver/core-ui'; import type { IConnectionFormProps } from '../IConnectionFormProps'; diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx index f1ef58ad27..2699eb7beb 100644 --- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx +++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DBAuthDialogFooter.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Button } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, useTranslate } from '@cloudbeaver/core-blocks'; + const styles = css` footer-container { diff --git a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx index d400d55abe..7fb8e8b8aa 100644 --- a/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx +++ b/webapp/packages/plugin-connections/src/DatabaseAuthDialog/DatabaseAuthDialog.tsx @@ -15,11 +15,11 @@ import { Loader, useFocus, ErrorMessage, + useStyles, } from '@cloudbeaver/core-blocks'; import { IConnectionInfoParams, useConnectionInfo, useDBDriver } from '@cloudbeaver/core-connections'; import { useController } from '@cloudbeaver/core-di'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ConnectionAuthenticationForm } from '../ConnectionAuthentication/ConnectionAuthenticationForm'; import { DBAuthDialogController } from './DBAuthDialogController'; diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx index 0d0d28ae83..12323e01a5 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialog.tsx @@ -9,11 +9,9 @@ import { observer } from 'mobx-react-lite'; import { useState } from 'react'; import styled, { css } from 'reshadow'; -import { IProperty, PropertiesTable, ErrorMessage } from '@cloudbeaver/core-blocks'; +import { IProperty, PropertiesTable, ErrorMessage, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; 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'; import { OutputOptionsForm } from './OutputOptionsForm'; diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx index 1914128b99..dd0ff33711 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorConfigureDialogFooter.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Button } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, useTranslate } from '@cloudbeaver/core-blocks'; + const styles = css` controls { diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx index cfc31b14cd..eaf129bb01 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx @@ -9,9 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Loader } from '@cloudbeaver/core-blocks'; +import { Loader, useTranslate } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; import type { DataTransferProcessorInfo } from '@cloudbeaver/core-sdk'; import { useNode } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx index 5b531b3804..45cbceccd6 100644 --- a/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx +++ b/webapp/packages/plugin-data-export/src/ExportNotification/ExportNotification.tsx @@ -10,12 +10,10 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { - Button, SnackbarWrapper, SnackbarStatus, SnackbarContent, SnackbarBody, SnackbarFooter + Button, SnackbarWrapper, SnackbarStatus, SnackbarContent, SnackbarBody, SnackbarFooter, useTranslate } from '@cloudbeaver/core-blocks'; import { useController } from '@cloudbeaver/core-di'; import { ENotificationType, NotificationComponentProps } from '@cloudbeaver/core-events'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { EDeferredState } from '@cloudbeaver/core-utils'; import { ExportNotificationController } from './ExportNotificationController'; @@ -54,7 +52,7 @@ export const ExportNotification = observer(function ExportNotification({ const translate = useTranslate(); const { title, status, message } = controller.status; - return styled(useStyles(styles))( + return styled(styles)( diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx index 8b49f4105a..29e64c1094 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridContextMenu/DataGridContextMenuFilter/FilterCustomValueDialog.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useState, useCallback, useRef, useEffect } from 'react'; import { css } from 'reshadow'; -import { Button, InputField } from '@cloudbeaver/core-blocks'; +import { Button, InputField, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { CommonDialogWrapper, DialogComponent, DialogComponentProps } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { ClipboardService } from '@cloudbeaver/core-ui'; export const dialogStyle = css` diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx index ab81704011..3b912a6f72 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx @@ -10,12 +10,10 @@ import { observer } from 'mobx-react-lite'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import styled from 'reshadow'; -import { TextPlaceholder, useObjectRef } from '@cloudbeaver/core-blocks'; +import { TextPlaceholder, useObjectRef, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events'; import { Executor } from '@cloudbeaver/core-executor'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ClipboardService } from '@cloudbeaver/core-ui'; import { DatabaseDataSelectActionsData, DatabaseEditChangeType, IDatabaseResultSet, IDataPresentationProps, diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx index 893a4bdb7d..e0bea7079c 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/Formatters/Menu/CellMenu.tsx @@ -13,7 +13,6 @@ import { Icon } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { MenuTrigger } from '@cloudbeaver/core-dialogs'; import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IDatabaseDataModel, IDataPresentationActions, IDataTableActions, IResultSetElementKey } from '@cloudbeaver/plugin-data-viewer'; import { DataGridContextMenuService } from '../../DataGridContextMenu/DataGridContextMenuService'; @@ -39,7 +38,6 @@ export const CellMenu = observer(function CellMenu({ onStateSwitch, }) { const dataGridContextMenuService = useService(DataGridContextMenuService); - const style = useStyles(cellMenuStyles); const panel = dataGridContextMenuService.constructMenuWithContext( model, actions, spreadsheetActions, resultIndex, cellKey @@ -62,7 +60,7 @@ export const CellMenu = observer(function CellMenu({ EventContext.set(event, EventStopPropagationFlag); } - return styled(style)( + return styled(cellMenuStyles)( >(function Tab dataGridContext.focus(); } - return styled(useStyles(headerStyles))( + return styled(headerStyles)( diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx index 748269ef47..2313931704 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx +++ b/webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/TableColumnHeader/TableIndexColumnHeader.tsx @@ -10,8 +10,7 @@ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; import styled, { css } from 'reshadow'; -import { getComputed, IconOrImage } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { getComputed, IconOrImage, useTranslate } from '@cloudbeaver/core-blocks'; import type { HeaderRendererProps } from '@cloudbeaver/plugin-react-data-grid'; import { DataGridContext } from '../DataGridContext'; diff --git a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx index 15adafa79b..27bcdc2334 100644 --- a/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx +++ b/webapp/packages/plugin-data-viewer/src/DataViewerPage/DataViewerTab.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; +import { useStyles, Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabIcon, Tab, TabTitle } from '@cloudbeaver/core-ui'; import type { ObjectPageTabComponent } from '@cloudbeaver/plugin-object-viewer'; diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx index fac296bf02..990e203bfb 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx @@ -10,10 +10,8 @@ import { observable } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; -import { Button, IconOrImage, useErrorDetails, useObservableRef, useStateDelay } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, IconOrImage, useErrorDetails, useObservableRef, useStateDelay, useTranslate } from '@cloudbeaver/core-blocks'; import { ServerErrorType } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IDatabaseDataModel } from '../DatabaseDataModel/IDatabaseDataModel'; @@ -127,7 +125,7 @@ export const TableError = observer(function TableViewer({ icon = '/icons/info_icon.svg'; } - return styled(useStyles(style))( + return styled(style)( errorInfo.show()} /> diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx index 7736b6a36a..5ff466a5f3 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshButton.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Icon, Menu, MenuItem, MenuItemElement, TimerIcon } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Icon, Menu, MenuItem, MenuItemElement, TimerIcon, useTranslate } from '@cloudbeaver/core-blocks'; import { declensionOfNumber } from '@cloudbeaver/core-utils'; import type { IDatabaseDataModel } from '../../../DatabaseDataModel/IDatabaseDataModel'; diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx index 4386751a6d..ea0de4d54e 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/AutoRefresh/AutoRefreshSettingsDialog.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useRef } from 'react'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Button, Container, FieldCheckbox, Group, InputField, SubmittingForm } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Button, Container, FieldCheckbox, Group, InputField, SubmittingForm, useTranslate } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper, DialogComponentProps } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; + import type { IAutoRefreshSettings } from './IAutoRefreshSettings'; diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx index e25ec2d7e7..842c06f05c 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooter.tsx @@ -12,7 +12,7 @@ import styled, { css, use } from 'reshadow'; import { SubmittingForm, ToolsPanel } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel'; import { DataViewerSettingsService } from '../../DataViewerSettingsService'; @@ -107,7 +107,7 @@ export const TableFooter = observer(function TableFooter({ const disabled = model.isLoading() || model.isDisabled(resultIndex); - return styled(useStyles(tableFooterStyles))( + return styled(tableFooterStyles)( {/* model.refresh()}> diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx index 2ac6b6b5ad..8ea23d43f7 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx @@ -10,10 +10,8 @@ import { observer } from 'mobx-react-lite'; import type { ButtonHTMLAttributes } from 'react'; import styled, { css, use } from 'reshadow'; -import { IconOrImage, ToolsAction } from '@cloudbeaver/core-blocks'; +import { IconOrImage, ToolsAction, useTranslate } from '@cloudbeaver/core-blocks'; import { IMenuItem, MenuTrigger } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; type Props = ButtonHTMLAttributes & { menuItem: IMenuItem; @@ -54,10 +52,9 @@ export const TableFooterMenuItem = observer(function TableFooterMenuItem( ...props }) { const translate = useTranslate(); - const styles = useStyles(tableFooterMenuStyles); if (!menuItem.panel) { - return styled(styles)( + return styled(tableFooterMenuStyles)( (function TableFooterMenuItem( ); } - return styled(styles)( + return styled(tableFooterMenuStyles)( ; + model: IDatabaseDataModel; resultIndex: number; } diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx index 173b252c45..c3fa496faa 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableToolsPanel.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { TextPlaceholder } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks'; import type { ResultDataFormat } from '@cloudbeaver/core-sdk'; import type { IDatabaseDataModel } from '../DatabaseDataModel/IDatabaseDataModel'; diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx index e0c9665e96..88c34a239d 100644 --- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx +++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableViewer.tsx @@ -14,7 +14,7 @@ import styled, { css } from 'reshadow'; import { Loader, Pane, ResizerControls, Split, splitStyles, TextPlaceholder, useObjectRef, useObservableRef, useSplitUserState } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { ResultDataFormat } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ResultSetConstraintAction } from '../DatabaseDataModel/Actions/ResultSet/ResultSetConstraintAction'; import { DataPresentationService, DataPresentationType } from '../DataPresentationService'; @@ -104,7 +104,6 @@ export const TableViewer = observer(function TableViewer({ onPresentationChange, onValuePresentationChange, }) { - const styles = useStyles(viewerStyles, splitStyles); const dataPresentationService = useService(DataPresentationService); const tableViewerStorageService = useService(TableViewerStorageService); const dataModel = tableViewerStorageService.get(tableId); @@ -240,7 +239,7 @@ export const TableViewer = observer(function TableViewer({ && overlay && resultExist; - return styled(styles)( + return styled(viewerStyles, splitStyles)( = ob } } - return styled(useStyles(BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES))( + return styled(BASE_TAB_STYLES, styles, UNDERLINE_TAB_STYLES)( = function Shortcut({ shortcut }) { const translate = useTranslate(); - return styled(useStyles(style))( + return styled(style)( {translate(shortcut.label)} diff --git a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx index 9f522c48d2..21e85a3bba 100644 --- a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx +++ b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx @@ -8,10 +8,10 @@ import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Button, Container, Group, GroupTitle, Link } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Button, Container, Group, GroupTitle, Link, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; + + import { Shortcut } from './Shortcut'; import { DATA_VIEWER_SHORTCUTS, NAVIGATION_TREE_SHORTCUTS, SQL_EDITOR_SHORTCUTS } from './SHORTCUTS_DATA'; diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx index 1e57f17038..972a81c017 100644 --- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx +++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogEntry.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; -import { BASE_TABLE_STYLES, IconOrImage, Link } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_TABLE_STYLES, IconOrImage, Link, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; + + import type { ILogEntry } from './ILogEntry'; diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx index f0688b2f23..820ba087be 100644 --- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx +++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx @@ -10,9 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; import styled, { css } from 'reshadow'; -import { Pane, ResizerControls, Split, splitStyles, TextPlaceholder, useSplitUserState } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Pane, ResizerControls, Split, splitStyles, TextPlaceholder, useSplitUserState, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; + + import { LogViewerInfoPanel } from './LogViewerInfoPanel'; import { LogViewerTable } from './LogViewerTable'; diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx index 62008a6640..fcadd35c38 100644 --- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx +++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerInfoPanel.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import { useCallback } from 'react'; import styled, { css } from 'reshadow'; -import { Button, Textarea, useClipboard } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Button, Textarea, useClipboard, useTranslate } from '@cloudbeaver/core-blocks'; + import type { ILogEntry } from './ILogEntry'; diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx index df574603c8..43a041c6c4 100644 --- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx +++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewerTable.tsx @@ -9,9 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled, { css, use } from 'reshadow'; -import { BASE_TABLE_STYLES, Button } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_TABLE_STYLES, Button, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import type { ILogEntry } from './ILogEntry'; import { LogEntry } from './LogEntry'; diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx index 1e15f1c3ae..8d8342dae8 100644 --- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx +++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx @@ -11,10 +11,8 @@ import { useCallback, useEffect } from 'react'; import styled, { css } from 'reshadow'; import { UserInfoResource } from '@cloudbeaver/core-authentication'; -import { TextPlaceholder, useExecutor } from '@cloudbeaver/core-blocks'; +import { TextPlaceholder, useExecutor, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { TabsBox, TabPanel, BASE_TAB_STYLES, ITabData } from '@cloudbeaver/core-ui'; import { CaptureView } from '@cloudbeaver/core-view'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx index 7bd2aa1501..feda95daa6 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ConnectionGroup/navigationTreeConnectionGroupRenderer.tsx @@ -8,8 +8,7 @@ import styled, { css } from 'reshadow'; -import { Translate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { Translate } from '@cloudbeaver/core-blocks'; import type { NavigationNodeRendererComponent } from '../ElementsTree/NavigationNodeComponent'; import { NAVIGATION_TREE_CONNECTION_GROUPS } from './navigationTreeConnectionGroupFilter'; @@ -39,8 +38,8 @@ const styles = css` `; const ManageableGroup: NavigationNodeRendererComponent = function ManageableGroup() { - return styled(useStyles(styles))(); + return styled(styles)(); }; const UnManageableGroup: NavigationNodeRendererComponent = function UnManageableGroup() { - return styled(useStyles(styles))(); + return styled(styles)(); }; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx index 9e572e15fa..0945ab8e97 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx @@ -10,12 +10,11 @@ import { observer } from 'mobx-react-lite'; import { useMemo, useCallback, useEffect } from 'react'; import styled, { css, use } from 'reshadow'; -import { EventTreeNodeClickFlag, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, FolderExplorer, FolderExplorerPath, Loader, PlaceholderElement, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES, useFolderExplorer, useMapResource, useObjectRef } from '@cloudbeaver/core-blocks'; +import { EventTreeNodeClickFlag, EventTreeNodeExpandFlag, EventTreeNodeSelectFlag, FolderExplorer, FolderExplorerPath, Loader, PlaceholderElement, Translate, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES, useFolderExplorer, useMapResource, useObjectRef, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { EventContext, EventStopPropagationFlag } from '@cloudbeaver/core-events'; -import { Translate } from '@cloudbeaver/core-localization'; import { type NavNode, ROOT_NODE_PATH, NavTreeResource, NavNodeInfoResource, EObjectFeature } from '@cloudbeaver/core-navigation-tree'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { useNavTreeDropBox } from '../useNavTreeDropBox'; import { IElementsTreeContext, ElementsTreeContext } from './ElementsTreeContext'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx index bf90a915bd..17e5dfb09a 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { ILoadableState, Loader, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; -import { Translate } from '@cloudbeaver/core-localization'; +import { ILoadableState, Loader, Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; + import type { IElementsTreeContext } from './ElementsTreeContext'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx index 64155a3088..ba40325bfa 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.tsx @@ -9,9 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { Filter, useFocus } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import { Filter, useFocus, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import type { IElementsTree } from '../useElementsTree'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx index 09e512a068..a6d3d64d1e 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import React, { useState } from 'react'; import styled, { css, use } from 'reshadow'; -import { IconButton, PlaceholderElement, useMapResource } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { IconButton, PlaceholderElement, useMapResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { NavTreeResource } from '@cloudbeaver/core-navigation-tree'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { useCaptureViewContext } from '@cloudbeaver/core-view'; import { DATA_CONTEXT_ELEMENTS_TREE } from '../DATA_CONTEXT_ELEMENTS_TREE'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx index b94db92208..40becf6fed 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeBaseSettingsForm.tsx @@ -9,9 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, GroupTitle, Switch } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, GroupTitle, Switch, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import type { IElementsTreeSettingsProps } from './ElementsTreeSettingsService'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx index d1e8da8016..607fd30d74 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/NavigationTreeSettings.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Group, Placeholder, PlaceholderElement } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Group, Placeholder, PlaceholderElement, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; + import { ElementsTreeSettingsService, IElementsTreeSettingsProps } from './ElementsTreeSettingsService'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx index ae2df6dd22..608c9325aa 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavTreeLimitFilter/elementsTreeLimitRenderer.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; +import { Translate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; import { NavTreeResource } from '@cloudbeaver/core-navigation-tree'; import type { NavigationNodeRendererComponent } from '../NavigationNodeComponent'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx index 8cc356dfab..37431f0b32 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode.tsx @@ -9,10 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled, { use, css } from 'reshadow'; -import { getComputed, TreeNode } from '@cloudbeaver/core-blocks'; +import { getComputed, TreeNode, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { NavNodeManagerService, DATA_CONTEXT_NAV_NODE, DATA_CONTEXT_NAV_NODES } from '@cloudbeaver/core-navigation-tree'; -import { useStyles } from '@cloudbeaver/core-theming'; import { useDNDData } from '@cloudbeaver/core-ui'; import { useDataContext } from '@cloudbeaver/core-view'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx index 7af08606d8..bede8ff085 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.tsx @@ -10,8 +10,7 @@ import { observer } from 'mobx-react-lite'; import { forwardRef, useContext, useMemo } from 'react'; import styled from 'reshadow'; -import { getComputed, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { getComputed, TreeNodeNested, TreeNodeNestedMessage, TREE_NODE_STYLES, useTranslate } from '@cloudbeaver/core-blocks'; import { ElementsTreeContext } from '../../ElementsTreeContext'; import type { NavTreeNodeComponent } from '../../NavigationNodeComponent'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx index 97865ed4ed..156be108e2 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeDragged.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; import styled from 'reshadow'; -import { getComputed, TreeNode, useObjectRef } from '@cloudbeaver/core-blocks'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { getComputed, TreeNode, useObjectRef, useStyles } from '@cloudbeaver/core-blocks'; + import { ElementsTreeContext } from '../ElementsTreeContext'; import type { NavigationNodeComponent } from '../NavigationNodeComponent'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx index 750253d841..6bdd81a858 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeElement.tsx @@ -10,9 +10,8 @@ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; import styled from 'reshadow'; -import { TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; +import { Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; import { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree'; import { ElementsTreeContext } from '../ElementsTreeContext'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx index a0bfbbd755..af3fc0d983 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/NavigationTree.tsx @@ -10,12 +10,11 @@ import { observer } from 'mobx-react-lite'; import { useMemo } from 'react'; import styled, { css } from 'reshadow'; -import { useUserData } from '@cloudbeaver/core-blocks'; +import { Translate, usePermission, useUserData } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { Translate } from '@cloudbeaver/core-localization'; import { NavNodeInfoResource, NavTreeResource, ProjectsNavNodeService, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree'; import { ProjectsService } from '@cloudbeaver/core-projects'; -import { usePermission, EPermission } from '@cloudbeaver/core-root'; +import { EPermission } from '@cloudbeaver/core-root'; import { CaptureView } from '@cloudbeaver/core-view'; import { NavNodeViewService } from '../NodesManager/NavNodeView/NavNodeViewService'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx index fdac30ada4..0927eb75c1 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/ProjectsSettingsForm.tsx @@ -9,11 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, Switch, PlaceholderElement } from '@cloudbeaver/core-blocks'; +import { type PlaceholderComponent, BASE_CONTAINERS_STYLES, Switch, PlaceholderElement, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { ProjectsService } from '@cloudbeaver/core-projects'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IElementsTreeSettingsProps } from '../ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService'; diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx index db83637080..204bb1b992 100644 --- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx +++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ProjectsRenderer/navigationTreeProjectsRendererRenderer.tsx @@ -10,8 +10,7 @@ import { observer } from 'mobx-react-lite'; import { useContext } from 'react'; import styled, { css, use } from 'reshadow'; -import { TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; -import { Translate } from '@cloudbeaver/core-localization'; +import { Translate, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks'; import type { NavNodeInfoResource } from '@cloudbeaver/core-navigation-tree'; import { NAV_NODE_TYPE_PROJECT } from '@cloudbeaver/core-projects'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx index 62b53999c4..620fc818cc 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/FolderTabRenderer.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { getComputed, Loader, useStateDelay } from '@cloudbeaver/core-blocks'; +import { getComputed, Loader, useStateDelay, useStyles } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import { DBObjectResource } from '@cloudbeaver/core-navigation-tree'; import { resourceKeyList } from '@cloudbeaver/core-sdk'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui'; import { NavNodeViewService, useNode, useChildren } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx index 61ed0bd5e5..f7de566250 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/NavNodeMetadataTab.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui'; import { type NavNodeTransformViewComponent, useNode } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx index 11214cfef3..3fbbefbada 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/NavNodeMetadata/ObjectProperties.tsx @@ -9,12 +9,11 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { ColoredContainer, Loader, TextPlaceholder, useObjectPropertyCategories, GroupTitle, ObjectPropertyInfoForm, Group, useMapResource, BASE_CONTAINERS_STYLES } from '@cloudbeaver/core-blocks'; +import { ColoredContainer, Loader, TextPlaceholder, useObjectPropertyCategories, GroupTitle, ObjectPropertyInfoForm, Group, useMapResource, BASE_CONTAINERS_STYLES, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { NavTreeResource, DBObjectResource } from '@cloudbeaver/core-navigation-tree'; import type { ObjectPropertyInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + interface Props { objectId: string; @@ -32,14 +31,13 @@ export const ObjectProperties = observer(function ObjectProperties({ const dbObject = useMapResource(ObjectProperties, DBObjectResource, objectId, { onLoad: async () => !(await navTreeResource.preloadNodeParents(parents, objectId)), }); - const styles = useStyles(BASE_CONTAINERS_STYLES); const { categories, isUncategorizedExists } = useObjectPropertyCategories( dbObject.data?.object?.properties ?? emptyArray ); const properties = dbObject.data?.object?.properties; - return styled(styles)( - {() => styled(styles)( + return styled(BASE_CONTAINERS_STYLES)( + {() => styled(BASE_CONTAINERS_STYLES)( <> {!properties || properties.length === 0 ? ( {translate('plugin_object_viewer_table_no_items')} diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx index e1c671f229..0f50d56d04 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderPanel.tsx @@ -11,9 +11,8 @@ import { observer } from 'mobx-react-lite'; import { useEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Loader, TextPlaceholder, useMapResource } from '@cloudbeaver/core-blocks'; +import { Loader, TextPlaceholder, useMapResource, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { NavNodeInfoResource, NavTreeResource, DBObjectResource, type DBObject, DBObjectParentKey } from '@cloudbeaver/core-navigation-tree'; import { type NavNodeTransformViewComponent, NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx index d97ed51f32..180cb541e9 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/NavNodeView/VirtualFolder/VirtualFolderTab.tsx @@ -8,7 +8,7 @@ import styled from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { useStyles } from '@cloudbeaver/core-blocks'; import { Tab, TabIcon, TabTitle } from '@cloudbeaver/core-ui'; import type { NavNodeTransformViewComponent } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx index c9bd57c39a..f122dfa423 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectFolders.tsx @@ -10,11 +10,9 @@ import { observer } from 'mobx-react-lite'; import { useEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Loader, TextPlaceholder, useMapResource } from '@cloudbeaver/core-blocks'; +import { Loader, TextPlaceholder, useMapResource, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { NavNodeManagerService, NavTreeResource } from '@cloudbeaver/core-navigation-tree'; -import { useStyles } from '@cloudbeaver/core-theming'; import { BASE_TAB_STYLES, ITabData, TabList, TabPanel, TabsState, useTabLocalState, verticalTabStyles } from '@cloudbeaver/core-ui'; import { MetadataMap } from '@cloudbeaver/core-utils'; import type { ITab } from '@cloudbeaver/plugin-navigation-tabs'; @@ -64,9 +62,9 @@ interface IProps { export const ObjectFolders = observer(function ObjectFolders({ tab }) { const translate = useTranslate(); + const style = useStyles(BASE_TAB_STYLES, verticalTabStyles, styles); const navNodeManagerService = useService(NavNodeManagerService); const navNodeViewService = useService(NavNodeViewService); - const style = useStyles(BASE_TAB_STYLES, verticalTabStyles, styles); const innerTabState = useTabLocalState(() => new MetadataMap()); const nodeId = tab.handlerState.objectId; @@ -107,7 +105,7 @@ export const ObjectFolders = observer(function ObjectFolders({ tab }) { }); return styled(style)( - {() => styled(style)( + {() => styled(style)( <> {folders.length > 0 ? ( diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx index 6e45356579..380dfcac0d 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPagePanel.tsx @@ -9,8 +9,6 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { useStyles } from '@cloudbeaver/core-theming'; - import type { ObjectPagePanelComponent } from '../ObjectPage/ObjectPage'; import { ObjectFolders } from './ObjectFolders'; @@ -27,9 +25,7 @@ const viewerStyles = css` export const ObjectPropertiesPagePanel: ObjectPagePanelComponent = observer(function ObjectPropertiesPagePanel({ tab, }) { - const style = useStyles(viewerStyles); - - return styled(style)( + return styled(viewerStyles)( diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx index 939060a8ca..485934feee 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertiesPageTab.tsx @@ -9,8 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { TabIcon, Tab, TabTitle } from '@cloudbeaver/core-ui'; import type { ObjectPageTabComponent } from '../ObjectPage/ObjectPage'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx index d22f551e18..75906ad607 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTable.tsx @@ -11,9 +11,8 @@ import { observer } from 'mobx-react-lite'; import { useEffect } from 'react'; import styled, { css } from 'reshadow'; -import { Loader, TextPlaceholder, useMapResource } from '@cloudbeaver/core-blocks'; +import { Loader, TextPlaceholder, useMapResource, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { NavTreeResource, DBObjectResource, type DBObject, DBObjectParentKey } from '@cloudbeaver/core-navigation-tree'; import { NavNodeViewService } from '@cloudbeaver/plugin-navigation-tree'; diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx index 60ce70724c..4615db2eef 100644 --- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx +++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterItem.tsx @@ -10,10 +10,8 @@ import { observer } from 'mobx-react-lite'; import type { ButtonHTMLAttributes } from 'react'; import styled, { css, use } from 'reshadow'; -import { IconOrImage, ToolsAction } from '@cloudbeaver/core-blocks'; +import { IconOrImage, ToolsAction, useTranslate } from '@cloudbeaver/core-blocks'; import { IMenuItem, MenuTrigger } from '@cloudbeaver/core-dialogs'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; type Props = ButtonHTMLAttributes & { menuItem: IMenuItem; @@ -54,10 +52,9 @@ export const ObjectPropertyTableFooterItem = observer(function ObjectProp ...props }) { const translate = useTranslate(); - const styles = useStyles(style); if (!menuItem.panel) { - return styled(styles)( + return styled(style)( (function ObjectProp ); } - return styled(styles)( + return styled(style)( >( function ProductInfoDialog(props) { const translate = useTranslate(); - const styles = useStyles(BASE_CONTAINERS_STYLES, productInfoDialogStyles); const serverConfigResource = useService(ServerConfigResource); const themeService = useService(ThemeService); @@ -50,7 +48,7 @@ export const ProductInfoDialog = observer>( const productInfo = serverConfigResource.data?.productInfo; const logoIcon = themeService.currentThemeId === 'light' ? '/icons/product-logo_light.svg' : '/icons/product-logo_dark.svg'; - return styled(styles)( + return styled(BASE_CONTAINERS_STYLES, productInfoDialogStyles)( = observer( diff --git a/webapp/packages/plugin-resource-manager/src/SaveScriptDialog.tsx b/webapp/packages/plugin-resource-manager/src/SaveScriptDialog.tsx index 692a2a22d1..7404b3b4e3 100644 --- a/webapp/packages/plugin-resource-manager/src/SaveScriptDialog.tsx +++ b/webapp/packages/plugin-resource-manager/src/SaveScriptDialog.tsx @@ -10,10 +10,8 @@ import { action, observable } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Button, Container, InputField, SubmittingForm, useFocus, useObservableRef } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, Button, Container, InputField, SubmittingForm, Translate, useFocus, useObservableRef, useTranslate } from '@cloudbeaver/core-blocks'; import { CommonDialogWrapper, DialogComponent } from '@cloudbeaver/core-dialogs'; -import { Translate, useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ProjectSelect } from '@cloudbeaver/plugin-projects'; const style = css` @@ -76,7 +74,7 @@ export const SaveScriptDialog: DialogComponent submit: action.bound, }, false); - return styled(useStyles(style, BASE_CONTAINERS_STYLES))( + return styled(style, BASE_CONTAINERS_STYLES)( = observer(functi window.location.reload(); } - return styled(useStyles(styles))( + return styled(styles)( = observer( }) { const translate = useTranslate(); - return styled(useStyles(styles))( + return styled(styles)( = function Scrip rejectDialog, className, }) { - return styled(useStyles(style))( + return styled(style)( >(functi rejectDialog, payload, }) { - const style = useStyles(styles); const translate = useTranslate(); const copy = useClipboard(); @@ -118,7 +115,7 @@ export const GeneratedSqlDialog = observer>(functi }); }); - return styled(style)( + return styled(styles)( >(functi > - {() => styled(style)( + {() => styled(styles)( (function ExecutionPlanTreeBlock({ nodeList, query, onNodeSelect, className, }) { - const style = useStyles(styles, splitStyles); const translate = useTranslate(); const splitState = useSplitUserState('execution-plan-block'); const state = useExecutionPlanTreeState(nodeList, onNodeSelect); - return styled(style)( + return styled(styles, splitStyles)( = function Expand({ expanded, onClick, className }) { - return styled(useStyles(styles))( + return styled(styles)( = function NestedNode({ columns, node, depth, className }) { - const style = useStyles(styles); const [expanded, setExpanded] = useState(true); const expand = useCallback((event: React.MouseEvent) => { @@ -53,7 +51,7 @@ export const NestedNode: React.FC = function NestedNode({ columns, node, const hasChildren = node.children.length > 0; - return styled(style)( + return styled(styles)( <> {columns.map((column, idx) => { diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx index 7f69528552..c7f18c72a6 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx +++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/PropertiesPanel/PropertiesPanel.tsx @@ -11,10 +11,8 @@ import { observer } from 'mobx-react-lite'; import { useMemo } from 'react'; import styled, { css } from 'reshadow'; -import { Table, TableHeader, TableColumnHeader, TableBody, TextPlaceholder } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { Table, TableHeader, TableColumnHeader, TableBody, TextPlaceholder, useTranslate } from '@cloudbeaver/core-blocks'; import type { ObjectPropertyInfo, SqlExecutionPlanNode } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { isVisibleProperty } from '../useExecutionPlanTreeState'; import { PropertiesPanelItemsGroup } from './PropertiesPanelItemsGroup'; @@ -35,7 +33,6 @@ interface Props { } export const PropertiesPanel = observer(function PropertiesPanel({ selectedNode, nodeList, className }) { - const style = useStyles(styles); const translate = useTranslate(); const { general, details } = useMemo(() => computed(() => { @@ -66,7 +63,7 @@ export const PropertiesPanel = observer(function PropertiesPanel({ select const nameColumnTitle = translate('sql_execution_plan_properties_panel_name'); const valueColumnTitle = translate('sql_execution_plan_properties_panel_value'); - return styled(style)( + return styled(styles)(
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx index 7f4e329f59..bc21f04f30 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx +++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/ExecutionPlan/SqlExecutionPlanPanel.tsx @@ -12,7 +12,6 @@ import styled, { css } from 'reshadow'; import { Split, Pane, ResizerControls, splitStyles, Loader, useSplitUserState } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; import type { IExecutionPlanTab } from '../../ISqlEditorTabState'; import { ExecutionPlanTreeBlock } from './ExecutionPlanTreeBlock'; @@ -35,7 +34,6 @@ interface Props { export const SqlExecutionPlanPanel = observer(function SqlExecutionPlanPanel({ executionPlanTab, }) { - const style = useStyles(styles, splitStyles); const sqlExecutionPlanService = useService(SqlExecutionPlanService); const data = sqlExecutionPlanService.data.get(executionPlanTab.tabId); const [selectedNode, setSelectedNode] = useState(null); @@ -50,7 +48,7 @@ export const SqlExecutionPlanPanel = observer(function SqlExecutionPlanPa ); } - return styled(style)( + return styled(styles, splitStyles)( (function UserInfo({ info }) { const translate = useTranslate(); - const style = useStyles(styles); const userProfileService = useService(UserProfileService); - return styled(style)( + return styled(styles)( userProfileService.open()}> diff --git a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx index 54d5de2d8c..4e7da703b0 100644 --- a/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx +++ b/webapp/packages/plugin-user-profile/src/UserMenu/UserMenu.tsx @@ -12,7 +12,6 @@ import styled from 'reshadow'; import { AuthInfoService, DATA_CONTEXT_USER } from '@cloudbeaver/core-authentication'; import { Icon } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useStyles } from '@cloudbeaver/core-theming'; import { ContextMenu } from '@cloudbeaver/core-ui'; import { useMenu } from '@cloudbeaver/core-view'; import { topMenuStyles } from '@cloudbeaver/plugin-top-app-bar'; @@ -22,7 +21,6 @@ import { MENU_USER_PROFILE } from './MENU_USER_PROFILE'; import { userMenuStyles } from './userMenuStyles'; export const UserMenu = observer(function UserMenu() { - const style = useStyles(userMenuStyles); const authInfoService = useService(AuthInfoService); const menu = useMenu({ menu: MENU_USER_PROFILE }); @@ -32,7 +30,7 @@ export const UserMenu = observer(function UserMenu() { return null; } - return styled(style)( + return styled(userMenuStyles)( <> diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx index f779b008d5..cb8541484c 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/AuthProvidersList.tsx @@ -10,10 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { AuthProvidersResource } from '@cloudbeaver/core-authentication'; -import { IconOrImage, Link, Cell, useMapResource, Loader, getComputed } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; +import { IconOrImage, Link, Cell, useMapResource, Loader, getComputed, useTranslate, useStyles } from '@cloudbeaver/core-blocks'; import { resourceKeyList, UserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; + const styles = css` container { diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx index 1fa00e3090..863cd30282 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersPanel.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, useStyles } from '@cloudbeaver/core-blocks'; import type { UserInfo } from '@cloudbeaver/core-sdk'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { BASE_TAB_STYLES, TabPanel } from '@cloudbeaver/core-ui'; import { AuthProvidersList } from './AuthProvidersList'; diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx index c7560e5644..40e1ab3b2e 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthProviders/UserAuthProvidersTab.tsx @@ -10,8 +10,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; import { Tab } from '@cloudbeaver/core-ui'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; interface Props { className?: string; diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx index 016d6a8cf3..82930b5373 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/AuthTokenList.tsx @@ -10,11 +10,9 @@ import { observer } from 'mobx-react-lite'; import styled, { css } from 'reshadow'; import { AuthProviderConfiguration, AuthProvidersResource } from '@cloudbeaver/core-authentication'; -import { IconOrImage, Link, Cell, useMapResource, Loader, Button } from '@cloudbeaver/core-blocks'; +import { IconOrImage, Link, Cell, useMapResource, Loader, Button, useStyles, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; -import { useTranslate } from '@cloudbeaver/core-localization'; import { CachedMapAllKey, UserInfo } from '@cloudbeaver/core-sdk'; -import { useStyles } from '@cloudbeaver/core-theming'; import { AuthenticationService } from '@cloudbeaver/plugin-authentication'; const styles = css` diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx index 09f67ca340..bb6c8cd4ef 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersPanel.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group } from '@cloudbeaver/core-blocks'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, Group, useStyles } from '@cloudbeaver/core-blocks'; import type { UserInfo } from '@cloudbeaver/core-sdk'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { BASE_TAB_STYLES, TabPanel } from '@cloudbeaver/core-ui'; import { AuthProvidersList } from '../AuthProviders/AuthProvidersList'; diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx index eae8f01da6..63bf8d6463 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/AuthTokens/UserAuthProvidersTab.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; + +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Tab } from '@cloudbeaver/core-ui'; interface Props { diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx index 3b9b237510..c3151d26e4 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationPanel.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, ColoredContainer, Container } from '@cloudbeaver/core-blocks'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, ColoredContainer, Container, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { BASE_TAB_STYLES, TabPanel } from '@cloudbeaver/core-ui'; import { ChangePassword } from './ChangePassword/ChangePassword'; diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx index 1fdea1032e..e32fa2112a 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/AuthenticationTab.tsx @@ -9,9 +9,9 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; +import { useTranslate, useStyles } from '@cloudbeaver/core-blocks'; +import type { ComponentStyle } from '@cloudbeaver/core-theming'; import { Tab } from '@cloudbeaver/core-ui'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { ComponentStyle, useStyles } from '@cloudbeaver/core-theming'; interface Props { className?: string; diff --git a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx index c555cc8f14..25007361a9 100644 --- a/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx +++ b/webapp/packages/plugin-user-profile/src/UserProfileForm/Authentication/ChangePassword/ChangePassword.tsx @@ -9,9 +9,7 @@ import { observer } from 'mobx-react-lite'; import styled from 'reshadow'; -import { BASE_CONTAINERS_STYLES, Button, Group, GroupItem, GroupTitle, InputField } from '@cloudbeaver/core-blocks'; -import { useTranslate } from '@cloudbeaver/core-localization'; -import { useStyles } from '@cloudbeaver/core-theming'; +import { BASE_CONTAINERS_STYLES, Button, Group, GroupItem, GroupTitle, InputField, useTranslate } from '@cloudbeaver/core-blocks'; import { useChangePassword } from './useChangePassword'; @@ -21,7 +19,7 @@ export const ChangePassword = observer(function ChangePassword() { const disabled = state.submitting; - return styled(useStyles(BASE_CONTAINERS_STYLES))( + return styled(BASE_CONTAINERS_STYLES)( {translate('plugin_user_profile_authentication_change_password')} (function VersionSelector({ versions }) { - const styles = useStyles(BASE_CONTAINERS_STYLES, style); const versionUpdateService = useService(VersionUpdateService); const versionResource = useService(VersionResource); const serverConfigResource = useService(ServerConfigResource); @@ -49,7 +47,7 @@ export const VersionSelector = observer(function VersionSelector({ versio const version = versions.find(v => v.number === selected); const Instruction = versionUpdateService.instructionGetter?.(); - return styled(styles)( + return styled(BASE_CONTAINERS_STYLES, style)(