Merge branch 'devel' into CB-5947-fix-server-config-descriptions

dbeaver · Nov 20, 2024 · 71d826c · 71d826c
2 parents 7cfda34 + 4323578
commit 71d826c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
@@ -362,7 +362,7 @@ private void importData(
                     processorInstance,
                     properties);
             DatabaseMappingContainer databaseMappingContainer =
-                new DatabaseMappingContainer(databaseConsumerSettings, producer.getDatabaseObject());
+                new DatabaseMappingContainer(monitor, databaseConsumerSettings, producer.getDatabaseObject(), consumer.getTargetObject());
             databaseMappingContainer.getAttributeMappings(monitor);
             databaseMappingContainer.setTarget(dataContainer);
             consumer.setContainerMapping(databaseMappingContainer);

diff --git a/...s/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java b/...s/io.cloudbeaver.service.rm.nio/src/io/cloudbeaver/service/rm/fs/RMVirtualFileSystem.java
@@ -28,6 +28,7 @@
 
 import java.net.URI;
 import java.nio.file.Path;
+import java.util.List;
 
 public class RMVirtualFileSystem extends AbstractVirtualFileSystem {
     @NotNull
@@ -83,7 +84,7 @@ public Path getPathByURI(@NotNull DBRProgressMonitor monitor, @NotNull URI uri)
 
     @NotNull
     @Override
-    public DBFVirtualFileSystemRoot[] getRootFolders(DBRProgressMonitor monitor) throws DBException {
-        return new RMVirtualFileSystemRoot[]{new RMVirtualFileSystemRoot(this, rmProject, rmNioFileSystemProvider)};
+    public List<? extends DBFVirtualFileSystemRoot> getRootFolders(DBRProgressMonitor monitor) throws DBException {
+        return List.of(new RMVirtualFileSystemRoot(this, rmProject, rmNioFileSystemProvider));
     }
 }
diff --git a/webapp/packages/plugin-connections/src/ConnectionShield.tsx b/webapp/packages/plugin-connections/src/ConnectionShield.tsx
@@ -23,10 +23,11 @@ export const ConnectionShield = observer<PropsWithChildren<IConnectionShieldProp
   const notificationService = useService(NotificationService);
 
   const connection = useResource(ConnectionShield, ConnectionInfoResource, connectionKey);
-  const connecting = getComputed(() => connectionKey && connection.resource.isConnecting(connectionKey));
+  const connecting = getComputed(() => (connectionKey && connection.resource.isConnecting(connectionKey)) || connection.loading);
+  const isConnectionReady = getComputed(() => !connecting && connection.data?.connected && connection.loaded && !connection.outdated);
 
   async function handleConnect() {
-    if (connecting || !connection.data || !connectionKey) {
+    if (isConnectionReady || !connection.data || !connectionKey) {
       return;
     }
 
@@ -37,11 +38,11 @@ export const ConnectionShield = observer<PropsWithChildren<IConnectionShieldProp
     }
   }
 
-  if (getComputed(() => connection.data && !connection.data.connected)) {
-    if (connecting) {
-      return <Loader message="ui_processing_connecting" />;
-    }
+  if (connecting) {
+    return <Loader message="ui_processing_connecting" />;
+  }
 
+  if (!isConnectionReady) {
     return (
       <TextPlaceholder>
         <Button type="button" mod={['unelevated']} onClick={handleConnect}>

diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel/ObjectViewerPanel.tsx
@@ -53,7 +53,7 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
         tab.handlerState.tabTitle = data.name;
       });
     },
-    active: getComputed(() => !!connection.tryGetData?.connected),
+    active: getComputed(() => !!connection.tryGetData?.connected && !connection.outdated),
   });
 
   const pages = dbObjectPagesService.orderedPages;