Merge remote-tracking branch 'origin/release_22_2_0' into hotfix/CB-2545-fix-session-context

Author: alexander-skoblikov

server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java

@@ -404,8 +404,9 @@ public WebConnectionInfo copyConnectionConfiguration(
 
             ((DataSourceDescriptor) newDataSource).setNavigatorSettings(CBApplication.getInstance().getAppConfiguration().getDefaultNavigatorSettings());
             globalDataSourceRegistry.addDataSource(newDataSource);
-
-            return new WebConnectionInfo(webSession, newDataSource);
+            WebConnectionInfo connectionInfo = new WebConnectionInfo(webSession, newDataSource);
+            webSession.addConnection(connectionInfo);
+            return connectionInfo;
         } catch (DBException e) {
             throw new DBWebException("Error copying connection", e);
         }

webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeNestedMessage.tsx

@@ -7,6 +7,7 @@
  */
 
 interface Props {
+  big?: boolean;
   className?: string;
 }
 

webapp/packages/core-blocks/src/Tree/TreeNode/TreeNodeStyles.ts

@@ -128,6 +128,16 @@ export const TREE_NODE_STYLES = css`
     TreeNodeNestedMessage {
       composes: theme-typography--caption from global;
       padding: 4px 12px;
+
+      [big] {
+        padding: 4px 24px;
+      }
+    }
+
+    tree-box[|big] {
+      & TreeNodeNestedMessage {
+        padding: 4px 24px;
+      }
     }
 
     node TreeNodeControl[big] {

webapp/packages/plugin-data-viewer/src/DataViewerPage/useDataViewerDatabaseDataModel.ts

@@ -13,7 +13,6 @@ import { ILoadableState, isContainsException, useMapResource, useObservableRef }
 import { ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NavNodeManagerService } from '@cloudbeaver/core-navigation-tree';
-import { CachedMapAllKey } from '@cloudbeaver/core-sdk';
 import type { ITab } from '@cloudbeaver/plugin-navigation-tabs';
 import type { IObjectViewerTabState } from '@cloudbeaver/plugin-object-viewer';
 
@@ -38,26 +37,30 @@ export function useDataViewerDatabaseDataModel(tab: ITab<IObjectViewerTabState>)
   const dataPresentationService = useService(DataPresentationService);
   const dataViewerDataChangeConfirmationService = useService(DataViewerDataChangeConfirmationService);
 
-  const connections = useMapResource(useDataViewerDatabaseDataModel, connectionInfoResource, CachedMapAllKey);
+  const connection = useMapResource(
+    useDataViewerDatabaseDataModel,
+    ConnectionInfoResource,
+    tab.handlerState.connectionKey ?? null
+  );
 
   const state = useObservableRef<IDataViewerDatabaseDataModel>(() => ({
     _exception: null,
     _loading: false,
     get exception() {
-      if (isContainsException(connections.exception)) {
-        return connections.exception;
+      if (isContainsException(connection.exception)) {
+        return connection.exception;
       }
       return this._exception;
     },
     isLoading(): boolean {
-      return connections.isLoading() || this._loading;
+      return connection.isLoading() || this._loading;
     },
     isLoaded(): boolean {
-      return connections.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
+      return connection.isLoaded() && dataViewerTableService.get(this.tab.handlerState.tableId || '') !== undefined;
     },
     async reload() {
-      if (isContainsException(connections.exception)) {
-        connections.reload?.();
+      if (isContainsException(connection.exception)) {
+        connection.reload?.();
       }
       this.init();
     },

webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTree.tsx

@@ -83,6 +83,7 @@ interface Props extends IElementsTreeOptions {
   selectionTree?: boolean;
   control?: NavTreeControlComponent;
   emptyPlaceholder?: React.FC;
+  big?: boolean;
   style?: ComponentStyle;
   className?: string;
   navNodeFilterCompare?: NavNodeFilterCompareFn;
@@ -103,6 +104,7 @@ export const ElementsTree = observer<Props>(function ElementsTree({
   filters = [],
   renderers = [],
   expandStateGetters,
+  big,
   style,
   className,
   getChildren,
@@ -288,7 +290,7 @@ export const ElementsTree = observer<Props>(function ElementsTree({
   return styled(useStyles(TREE_NODE_STYLES, styles, style))(
     <>
       <ElementsTreeTools tree={tree} style={style} />
-      <tree-box>
+      <tree-box {...use({ big })}>
         <ElementsTreeLoader
           root={root}
           context={context}

webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeLoader.tsx

@@ -9,7 +9,8 @@
 import { observer } from 'mobx-react-lite';
 import styled, { css } from 'reshadow';
 
-import { ILoadableState, Loader } from '@cloudbeaver/core-blocks';
+import { ILoadableState, Loader, TreeNodeNestedMessage, TREE_NODE_STYLES } from '@cloudbeaver/core-blocks';
+import { Translate } from '@cloudbeaver/core-localization';
 
 import type { IElementsTreeContext } from './ElementsTreeContext';
 
@@ -59,6 +60,12 @@ export const ElementsTreeLoader = observer<React.PropsWithChildren<Props>>(funct
           <Loader />
         </center>
       );
+    } else if (context.tree.filtering) {
+      return styled(TREE_NODE_STYLES)(
+        <TreeNodeNestedMessage>
+          <Translate token='app_navigationTree_node_no_results' filter={context.tree.filter} />
+        </TreeNodeNestedMessage>
+      );
     } else if (context.folderExplorer.root === context.folderExplorer.state.folder) {
       return <>{Placeholder && <Placeholder />}</>;
     }

webapp/packages/plugin-navigation-tree/src/locales/en.ts

@@ -16,6 +16,7 @@ export default [
   ['app_navigationTree_node_delete_error', 'Failed to delete "{args.name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Node not found'],
   ['app_navigationTree_connection_view', 'Connection view'],
   ['app_navigationTree_connection_view_option_simple', 'Simple'],

webapp/packages/plugin-navigation-tree/src/locales/it.ts

@@ -16,6 +16,7 @@ export default [
   ['app_navigationTree_settings_folders_title', 'Folders'],
   ['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Node not found'],
   ['app_navigationTree_connection_view', 'Vista di connessione'],
   ['app_navigationTree_connection_view_option_simple', 'Semplice'],

webapp/packages/plugin-navigation-tree/src/locales/ru.ts

@@ -19,6 +19,7 @@ export default [
   ['app_navigationTree_node_rename_error', 'Ошибка переименования ноды'],
 
   ['app_navigationTree_node_empty', 'Пусто'],
+  ['app_navigationTree_node_no_results', "Извините, не удалось найти элементы содержащие '{args.filter}'"],
   ['app_navigationTree_node_not_found', 'Элемент не найден'],
   ['app_navigationTree_connection_view', 'Отображение'],
   ['app_navigationTree_connection_view_option_simple', 'Упрощенное'],

webapp/packages/plugin-navigation-tree/src/locales/zh.ts

@@ -15,6 +15,7 @@ export default [
   ['app_navigationTree_node_delete_error', 'Failed to delete "{args.name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
+  ['app_navigationTree_node_no_results', "We're sorry. There no matching results for '{args.filter}'"],
   ['app_navigationTree_openNodeTab', '打开'],
   ['app_navigationTree_connection_view', '连接视图'],
   ['app_navigationTree_node_not_found', 'Node not found'],