From 0530eb44928c04bb9915b571c41c75582f3f2ad7 Mon Sep 17 00:00:00 2001
From: "s.teleshev" <s.teleshev@mu.se>
Date: Wed, 20 Mar 2024 15:23:40 +0100
Subject: [PATCH] CB-4686 makes onDataOutdated execution manual

---
 .../core-authentication/src/AuthConfigurationsResource.ts  | 6 +++++-
 .../packages/core-authentication/src/UserInfoResource.ts   | 4 ++++
 webapp/packages/core-authentication/src/UsersResource.ts   | 2 ++
 .../ConnectionExecutionContextResource.ts                  | 7 ++++++-
 .../core-connections/src/ConnectionFolderResource.ts       | 7 ++++++-
 .../core-connections/src/ConnectionInfoResource.ts         | 7 +++++++
 .../src/NodesManager/NavTreeResource.ts                    | 6 +++++-
 .../core-resource-manager/src/ResourceManagerResource.ts   | 3 +++
 .../core-resource-manager/src/SharedProjectsResource.ts    | 2 ++
 .../packages/core-resource/src/Resource/CachedResource.ts  | 1 -
 webapp/packages/core-root/src/ServerConfigResource.ts      | 4 ++++
 11 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts b/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
index be4acb05d7..14960db42b 100644
--- a/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
+++ b/webapp/packages/core-authentication/src/AuthConfigurationsResource.ts
@@ -30,7 +30,10 @@ type NewConfiguration = AuthConfiguration & { [NEW_CONFIGURATION_SYMBOL]: boolea
 
 @injectable()
 export class AuthConfigurationsResource extends CachedMapResource<string, AuthConfiguration, GetAuthProviderConfigurationsQueryVariables> {
-  constructor(private readonly graphQLService: GraphQLService, permissionsResource: SessionPermissionsResource) {
+  constructor(
+    private readonly graphQLService: GraphQLService,
+    permissionsResource: SessionPermissionsResource,
+  ) {
     super(() => new Map(), []);
 
     permissionsResource.require(this, EAdminPermission.admin).outdateResource(this);
@@ -51,6 +54,7 @@ export class AuthConfigurationsResource extends CachedMapResource<string, AuthCo
       }
 
       this.set(configuration.id, configuration);
+      this.onDataOutdated.execute(configuration.id);
     });
 
     return this.get(config.id)!;
diff --git a/webapp/packages/core-authentication/src/UserInfoResource.ts b/webapp/packages/core-authentication/src/UserInfoResource.ts
index e11390d484..a82a506560 100644
--- a/webapp/packages/core-authentication/src/UserInfoResource.ts
+++ b/webapp/packages/core-authentication/src/UserInfoResource.ts
@@ -182,6 +182,8 @@ export class UserInfoResource extends CachedDataResource<UserInfo | null, void,
       if (this.data) {
         this.data.configurationParameters[key] = value;
       }
+
+      this.onDataOutdated.execute();
     });
 
     return this.data;
@@ -210,6 +212,8 @@ export class UserInfoResource extends CachedDataResource<UserInfo | null, void,
           delete this.data?.configurationParameters[item];
         }
       });
+
+      this.onDataOutdated.execute();
     });
     return this.data;
   }
diff --git a/webapp/packages/core-authentication/src/UsersResource.ts b/webapp/packages/core-authentication/src/UsersResource.ts
index b51f0d1454..143495710d 100644
--- a/webapp/packages/core-authentication/src/UsersResource.ts
+++ b/webapp/packages/core-authentication/src/UsersResource.ts
@@ -193,6 +193,8 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
       if (user) {
         user.authRole = authRole;
       }
+
+      this.onDataOutdated.execute(userId);
     });
 
     if (!skipUpdate) {
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
index a840a75282..59e6b772e7 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextResource.ts
@@ -71,7 +71,8 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
   }
 
   async create(key: IConnectionInfoParams, defaultCatalog?: string, defaultSchema?: string): Promise<IConnectionExecutionContextInfo> {
-    return await this.performUpdate(getContextBaseId(key, ''), [], async () => {
+    const contextKey = getContextBaseId(key, '');
+    return await this.performUpdate(contextKey, [], async () => {
       const { context } = await this.graphQLService.sdk.executionContextCreate({
         ...key,
         defaultCatalog,
@@ -85,6 +86,8 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
         this.markOutdated(); // TODO: should be removed, currently multiple contexts for same connection may change catalog/schema for all contexts of connection
       });
 
+      this.onDataOutdated.execute(contextKey);
+
       return this.get(baseContext.id)!;
     });
   }
@@ -107,6 +110,7 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
 
       context.defaultCatalog = defaultCatalog;
       context.defaultSchema = defaultSchema;
+      this.onDataOutdated.execute(contextId);
     });
 
     this.markOutdated();
@@ -126,6 +130,7 @@ export class ConnectionExecutionContextResource extends CachedMapResource<string
         connectionId: context.connectionId,
         projectId: context.projectId,
       });
+      this.onDataOutdated.execute(contextId);
     });
 
     runInAction(() => {
diff --git a/webapp/packages/core-connections/src/ConnectionFolderResource.ts b/webapp/packages/core-connections/src/ConnectionFolderResource.ts
index 5b25873085..63bbab8571 100644
--- a/webapp/packages/core-connections/src/ConnectionFolderResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionFolderResource.ts
@@ -37,7 +37,11 @@ export const ConnectionFolderProjectKey = resourceKeyAliasFactory('@connection-f
 
 @injectable()
 export class ConnectionFolderResource extends CachedMapResource<IConnectionFolderParam, ConnectionFolder> {
-  constructor(private readonly graphQLService: GraphQLService, sessionDataResource: SessionDataResource, appAuthService: AppAuthService) {
+  constructor(
+    private readonly graphQLService: GraphQLService,
+    sessionDataResource: SessionDataResource,
+    appAuthService: AppAuthService,
+  ) {
     super();
 
     appAuthService.requireAuthentication(this);
@@ -70,6 +74,7 @@ export class ConnectionFolderResource extends CachedMapResource<IConnectionFolde
         folderPath: key.folderId,
       });
       this.delete(key);
+      this.onDataOutdated.execute(key);
     });
   }
 
diff --git a/webapp/packages/core-connections/src/ConnectionInfoResource.ts b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
index befdb6ef5e..0f855d6f83 100644
--- a/webapp/packages/core-connections/src/ConnectionInfoResource.ts
+++ b/webapp/packages/core-connections/src/ConnectionInfoResource.ts
@@ -364,6 +364,8 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
         projectId: connectionKey.projectId,
         connectionId: connectionKey.connectionId,
       });
+
+      this.onDataOutdated.execute(connectionKey);
       return subjects;
     });
 
@@ -396,6 +398,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
         ...this.getIncludesMap(key),
       });
       this.set(createConnectionParam(connection), connection);
+      this.onDataOutdated.execute(key);
     });
 
     return this.get(key)!;
@@ -413,6 +416,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
       });
 
       this.set(createConnectionParam(connection), connection);
+      this.onDataOutdated.execute(key);
     });
 
     return this.get(key)!;
@@ -428,6 +432,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
       });
 
       this.set(createConnectionParam(connection), connection);
+      this.onDataOutdated.execute(key);
     });
     return this.get(key)!;
   }
@@ -442,6 +447,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
       });
 
       this.set(createConnectionParam(connection), connection);
+      this.onDataOutdated.execute(key);
     });
 
     const connection = this.get(key)!;
@@ -457,6 +463,7 @@ export class ConnectionInfoResource extends CachedMapResource<IConnectionInfoPar
     await ResourceKeyUtils.forEachAsync(key, async key => {
       await this.performUpdate(key, [], async () => {
         await this.graphQLService.sdk.deleteConnection({ projectId: key.projectId, connectionId: key.connectionId });
+        this.onDataOutdated.execute(key);
       });
       this.delete(key);
     });
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
index dfad4051f6..92edcdb250 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavTreeResource.ts
@@ -193,6 +193,7 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
           await this.graphQLService.sdk.navDeleteNodes({ nodePaths: [path] });
           deletedPaths.push(path);
         }
+        this.onDataOutdated.execute(key);
       } finally {
         runInAction(() => {
           const deletedNodes: string[] = [];
@@ -223,8 +224,9 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
 
   async moveTo(key: ResourceKeySimple<string>, target: string): Promise<void> {
     const parents = Array.from(new Set(ResourceKeyUtils.mapArray(key, key => this.navNodeInfoResource.get(key)?.parentId).filter(isDefined)));
+    const parentsKey = resourceKeyList(parents);
 
-    await this.performUpdate(resourceKeyList(parents), [], async () => {
+    await this.performUpdate(parentsKey, [], async () => {
       this.markLoading(target, true);
 
       try {
@@ -235,6 +237,7 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
 
         this.moveToNode(key, target);
         this.markLoaded(target);
+        this.onDataOutdated.execute(parentsKey);
       } finally {
         this.markLoading(target, false);
       }
@@ -272,6 +275,7 @@ export class NavTreeResource extends CachedMapResource<string, string[], Record<
 
         this.markTreeOutdated(parentId);
         this.markLoaded(node.id);
+        this.onDataOutdated.execute(parentId);
         return parts.join('/');
       } finally {
         this.markLoading(node.id, false);
diff --git a/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts b/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
index 15424a1b36..95ac2ed50e 100644
--- a/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
+++ b/webapp/packages/core-resource-manager/src/ResourceManagerResource.ts
@@ -118,6 +118,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
       await this.loader(to, []);
 
       this.moveSync(from, to, this.get(to)!);
+      this.onDataOutdated.execute(from);
     });
   }
 
@@ -144,6 +145,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
       }
 
       Object.assign(properties, propertiesPatch);
+      this.onDataOutdated.execute(key);
     });
 
     return properties;
@@ -195,6 +197,7 @@ export class ResourceManagerResource extends CachedTreeResource<RmResourceInfo,
       });
 
       this.delete(path);
+      this.onDataOutdated.execute(path);
     });
   }
 
diff --git a/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts b/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
index 537fb515da..c4e9876637 100644
--- a/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
+++ b/webapp/packages/core-resource-manager/src/SharedProjectsResource.ts
@@ -126,6 +126,8 @@ export class SharedProjectsResource extends CachedMapResource<string, SharedProj
 
           deleted.push(projectId);
         });
+
+        this.onDataOutdated.execute(key);
       });
     } finally {
       if (deleted.length > 0) {
diff --git a/webapp/packages/core-resource/src/Resource/CachedResource.ts b/webapp/packages/core-resource/src/Resource/CachedResource.ts
index 811526aced..3310a353fd 100644
--- a/webapp/packages/core-resource/src/Resource/CachedResource.ts
+++ b/webapp/packages/core-resource/src/Resource/CachedResource.ts
@@ -659,7 +659,6 @@ export abstract class CachedResource<
       {
         success: () => {
           if (loaded) {
-            this.onDataOutdated.execute(key); // TODO: probably need to remove, we need to notify any related resources that subscribed to .onOutdate, to recursively outdate them
             this.dataUpdate(key);
           }
         },
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index c4f1dd2fc3..840a5781d6 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -232,6 +232,7 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     await this.performUpdate(undefined, undefined, async () => {
       await this.graphQLService.sdk.updateProductConfiguration({ configuration });
       this.setData(await this.loader());
+      this.onDataOutdated.execute();
     });
   }
 
@@ -256,6 +257,8 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
           });
           this.setData(await this.loader());
         }
+
+        this.onDataOutdated.execute();
       },
       () => !this.isNavigatorSettingsChanged() && (!this.isChanged() || skipConfigUpdate),
     );
@@ -271,6 +274,7 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
         });
 
         this.setData(await this.loader());
+        this.onDataOutdated.execute();
       },
       () => !this.isChanged() && !onlyRestart,
     );