From a578b19ddaf93eaa6f13697c3e26746dc7fa89cd Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Thu, 30 Sep 2021 16:49:26 +0300
Subject: [PATCH] fix(core-connections): provide connection id for includes map
 CB-1295, CB-1296, CB-1297

---
 .../src/ConnectionForm/ConnectionFormService.ts             | 6 +++---
 .../packages/core-connections/src/ConnectionInfoResource.ts | 2 +-
 .../ObjectPropertyTable/ObjectPropertyTableFooterService.ts | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormService.ts b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormService.ts
index 8b9324186c..e9b125ba08 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormService.ts
+++ b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormService.ts
@@ -133,15 +133,15 @@ export class ConnectionFormService {
     const config = contexts.getContext(connectionConfigContext);
 
     if (credentialsState.authModelId) {
-      if (config.credentials === undefined) {
-        config.credentials = {};
+      if (!config.credentials) {
+        config.credentials = { ...data.state.config.credentials };
       }
 
       config.credentials = observable(config.credentials);
     }
 
     if (credentialsState.networkHandlers.length > 0) {
-      if (config.networkHandlersConfig === undefined) {
+      if (!config.networkHandlersConfig) {
         config.networkHandlersConfig = [];
       }
 
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index adec1dcfb5..469316a2f0 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -156,7 +156,7 @@ export class ConnectionInfoResource extends CachedMapResource<string, Connection
       const { connection } = await this.graphQLService.sdk.initConnection({
         ...config,
         ...this.getDefaultIncludes(),
-        ...this.getIncludesMap(),
+        ...this.getIncludesMap(config.id),
       });
       this.updateConnection(connection);
     });
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
index 649782520e..c7bb75bdea 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/ObjectPropertyTable/ObjectPropertyTableFooterService.ts
@@ -50,7 +50,8 @@ export class ObjectPropertyTableFooterService {
         }
 
         const selectedNodes = this.getSelectedNodes(context.data.tableState.selectedList);
-        return !selectedNodes.some(node => node.features?.includes(ENodeFeature.canDelete));
+        return !selectedNodes.some(node => node.features?.includes(ENodeFeature.canDelete))
+          || this.navTreeResource.isLoading();
       },
       onClick: async context => {
         const nodes = this.getSelectedNodes(context.data.tableState.selectedList)