From ea5842d2ebbacb3827526d45927dc7571ddb3bf6 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Wed, 8 Jul 2020 12:53:47 +0300
Subject: [PATCH] fix: infinity data refreshes

---
 webapp/packages/core-root/src/PermissionsResource.ts          | 3 ++-
 webapp/packages/core-root/src/ServerConfigResource.ts         | 3 ++-
 webapp/packages/core-root/src/SessionResource.ts              | 3 ++-
 .../plugin-authentication/src/Administration/RolesResource.ts | 3 +++
 .../plugin-authentication/src/Administration/UsersResource.ts | 3 +++
 .../plugin-authentication/src/AuthProvidersResource.ts        | 3 ++-
 .../src/DataSourcesResource.ts                                | 4 +++-
 .../plugin-data-export/src/DataTransferProcessorsResource.ts  | 3 ++-
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/core-root/src/PermissionsResource.ts b/webapp/packages/core-root/src/PermissionsResource.ts
index a5624dff16..2c21a40285 100644
--- a/webapp/packages/core-root/src/PermissionsResource.ts
+++ b/webapp/packages/core-root/src/PermissionsResource.ts
@@ -29,13 +29,14 @@ export class PermissionsResource extends CachedDataResource<Set<string>, null> {
     return this.data.has(id);
   }
 
-  protected async loader(): Promise<Set<string>> {
+  protected async loader(key: null): Promise<Set<string>> {
     const { permissions } = await this.graphQLService.gql.sessionPermissions();
 
     this.data.clear();
     for (const permission of permissions) {
       this.data.add(permission);
     }
+    this.markUpdated(key);
     this.loaded = true;
 
     return this.data;
diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index 2d0523170f..4c57c831d7 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -21,9 +21,10 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     return !!this.data;
   }
 
-  protected async loader(): Promise<ServerConfig> {
+  protected async loader(key: null): Promise<ServerConfig> {
     const { serverConfig } = await this.graphQLService.gql.serverConfig();
 
+    this.markUpdated(key);
     return serverConfig;
   }
 }
diff --git a/webapp/packages/core-root/src/SessionResource.ts b/webapp/packages/core-root/src/SessionResource.ts
index 5a29f87fa1..6adb43489f 100644
--- a/webapp/packages/core-root/src/SessionResource.ts
+++ b/webapp/packages/core-root/src/SessionResource.ts
@@ -30,9 +30,10 @@ export class SessionResource extends CachedDataResource<SessionState | null, nul
     return !!this.data;
   }
 
-  protected async loader(): Promise<SessionState> {
+  protected async loader(key: null): Promise<SessionState> {
     const { session } = await this.graphQLService.gql.openSession();
 
+    this.markUpdated(key);
     return session;
   }
 }
diff --git a/webapp/packages/plugin-authentication/src/Administration/RolesResource.ts b/webapp/packages/plugin-authentication/src/Administration/RolesResource.ts
index 8d7bc28cb6..3aa2f65c7f 100644
--- a/webapp/packages/plugin-authentication/src/Administration/RolesResource.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/RolesResource.ts
@@ -31,6 +31,7 @@ export class RolesResource extends CachedDataResource<AdminRoleInfo[], string |
     const { roles } = await this.graphQLService.gql.getRolesList({ roleId });
 
     if (!roleId) {
+      this.markUpdated(roleId);
       return roles as AdminRoleInfo[];
     }
 
@@ -41,6 +42,8 @@ export class RolesResource extends CachedDataResource<AdminRoleInfo[], string |
       this.data.push(...roles as AdminRoleInfo[]);
     }
 
+    this.markUpdated(roleId);
+
     return this.data;
   }
 }
diff --git a/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts b/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts
index fdc9770eb3..d3db4be5f4 100644
--- a/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts
+++ b/webapp/packages/plugin-authentication/src/Administration/UsersResource.ts
@@ -31,6 +31,7 @@ export class UsersResource extends CachedDataResource<AdminUserInfo[], string |
     const { users } = await this.graphQLService.gql.getUsersList({ userId });
 
     if (!userId) {
+      this.markUpdated(userId);
       return users as AdminUserInfo[];
     }
 
@@ -41,6 +42,8 @@ export class UsersResource extends CachedDataResource<AdminUserInfo[], string |
       this.data.push(...users as AdminUserInfo[]);
     }
 
+    this.markUpdated(userId);
+
     return this.data;
   }
 }
diff --git a/webapp/packages/plugin-authentication/src/AuthProvidersResource.ts b/webapp/packages/plugin-authentication/src/AuthProvidersResource.ts
index c6e68ea380..819a3ec21f 100644
--- a/webapp/packages/plugin-authentication/src/AuthProvidersResource.ts
+++ b/webapp/packages/plugin-authentication/src/AuthProvidersResource.ts
@@ -27,9 +27,10 @@ export class AuthProvidersResource extends CachedDataResource<AuthProvider[], nu
     return !!this.data.length;
   }
 
-  protected async loader(): Promise<AuthProvider[]> {
+  protected async loader(key: null): Promise<AuthProvider[]> {
     const { providers } = await this.graphQLService.gql.getAuthProviders();
 
+    this.markUpdated(key);
     return providers;
   }
 }
diff --git a/webapp/packages/plugin-connection-preconfigured/src/DataSourcesResource.ts b/webapp/packages/plugin-connection-preconfigured/src/DataSourcesResource.ts
index b4273761b4..7a0a538d14 100644
--- a/webapp/packages/plugin-connection-preconfigured/src/DataSourcesResource.ts
+++ b/webapp/packages/plugin-connection-preconfigured/src/DataSourcesResource.ts
@@ -24,11 +24,13 @@ export class DataSourcesResource extends CachedDataResource<DBSource[], null> {
     return !!this.data.length;
   }
 
-  protected async loader(): Promise<DBSource[]> {
+  protected async loader(key: null): Promise<DBSource[]> {
     if (!await this.permissionsService.hasAsync(EPermission.public)) {
+      this.markUpdated(key);
       return [];
     }
     const { dataSourceList } = await this.graphQLService.gql.dataSourceList();
+    this.markUpdated(key);
     return dataSourceList;
   }
 }
diff --git a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
index 9d93f9c253..f00f87f03f 100644
--- a/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
+++ b/webapp/packages/plugin-data-export/src/DataTransferProcessorsResource.ts
@@ -25,7 +25,7 @@ export class DataTransferProcessorsResource extends CachedDataResource<Map<strin
     return this.loaded;
   }
 
-  protected async loader() {
+  protected async loader(key: null) {
     const { processors } = await this.graphQLService.gql.getDataTransferProcessors();
 
     this.data.clear();
@@ -34,6 +34,7 @@ export class DataTransferProcessorsResource extends CachedDataResource<Map<strin
       this.data.set(processor.id, processor);
     }
     this.loaded = true;
+    this.markUpdated(key);
 
     return this.data;
   }