From bf407c7520085732090d3fbeed230edbccbf3756 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Mon, 4 Oct 2021 15:44:41 +0300
Subject: [PATCH 1/2] fix(core-connections): CB-1295 reset includes when key is
 "All"

---
 .../src/ConnectionForm/ConnectionFormState.ts                | 5 -----
 .../packages/core-connections/src/ConnectionInfoResource.ts  | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
index d7156d57a5..4991b3ae50 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
+++ b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
@@ -244,11 +244,6 @@ export class ConnectionFormState implements IConnectionFormState {
     }
 
     const configuration = contexts.getContext(connectionFormConfigureContext);
-
-    if (!this.resource.has(data.config.connectionId)) {
-      return;
-    }
-
     await this.resource.load(data.config.connectionId, configuration.connectionIncludes);
   }
 }
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index 38319d8460..fcb6efa30b 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -223,6 +223,7 @@ export class ConnectionInfoResource extends CachedMapResource<string, Connection
       });
 
       if (all) {
+        this.resetIncludes();
         const unrestoredConnectionIdList = Array.from(this.data.values())
           .map(connection => connection.id)
           .filter(connectionId => !connections.some(connection => connection.id === connectionId));

From 4f755cf4a9afc956e1f98ad877b9dda4d75e9024 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Mon, 4 Oct 2021 15:56:21 +0300
Subject: [PATCH 2/2] fix(core-connections): CB-1295 revert resource check

---
 .../src/ConnectionForm/ConnectionFormState.ts                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
index 4991b3ae50..d7156d57a5 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
+++ b/webapp/packages/core-connections/src/ConnectionForm/ConnectionFormState.ts
@@ -244,6 +244,11 @@ export class ConnectionFormState implements IConnectionFormState {
     }
 
     const configuration = contexts.getContext(connectionFormConfigureContext);
+
+    if (!this.resource.has(data.config.connectionId)) {
+      return;
+    }
+
     await this.resource.load(data.config.connectionId, configuration.connectionIncludes);
   }
 }