Merge branch 'instance-page-cleanup' into 'master'

fix(ui): remove unnecessary request and timeout causing loop

See merge request postgres-ai/database-lab!775

Author: Adrinlol

ui/packages/platform/src/actions/actions.js

@@ -64,7 +64,7 @@ const Actions = Reflux.createActions([{
   editDbLabInstance: ASYNC_ACTION,
   destroyDbLabInstance: ASYNC_ACTION,
   resetNewDbLabInstance: {},
-  getDbLabInstanceStatus: ASYNC_ACTION,
+  reloadDblabInstance: ASYNC_ACTION,
   checkDbLabInstanceUrl: ASYNC_ACTION,
   downloadReportJsonFiles: ASYNC_ACTION,
   addOrgDomain: ASYNC_ACTION,
@@ -846,7 +846,7 @@ Actions.destroyDbLabInstance.listen(function (token, instanceId) {
     });
 });
 
-Actions.getDbLabInstanceStatus.listen(function (token, instanceId) {
+Actions.reloadDblabInstance.listen(function (token, instanceId) {
   let action = this;
 
   if (!api) {
@@ -857,12 +857,12 @@ Actions.getDbLabInstanceStatus.listen(function (token, instanceId) {
 
   action.progressed({ instanceId: instanceId });
 
-  timeoutPromise(REQUEST_TIMEOUT, api.getDbLabInstanceStatus(token, instanceId))
+  timeoutPromise(REQUEST_TIMEOUT, api.getInstance(token, instanceId))
     .then(result => {
       result.json()
         .then(json => {
           if (json) {
-            action.completed({ data: json, instanceId: instanceId });
+            action.completed({ data: json[0], instanceId: instanceId });
           } else {
             action.failed({ instanceId: instanceId }, new Error(
               'wrong_reply'));

ui/packages/platform/src/api/api.js

@@ -544,16 +544,16 @@ class Api {
     });
   }
 
-  getDbLabInstanceStatus(token, instanceId) {
+  getInstance(token, orgId) {
     let headers = {
       Authorization: 'Bearer ' + token
     };
 
-    return this.post(`${this.apiServer}/rpc/dblab_instance_status_refresh`, {
-      instance_id: instanceId
+    return this.get(`${this.apiServer}/dblab_instances`,{
+      id: `eq.${orgId}`
     }, {
-      headers: headers
-    });
+      headers: headers,
+    })
   }
 
   checkDbLabInstanceUrl(token, url, verifyToken, useTunnel) {

ui/packages/platform/src/api/instances/refreshInstance.ts

@@ -250,7 +250,7 @@ class DbLabInstances extends Component<
             break
 
           case 'refresh':
-            Actions.getDbLabInstanceStatus(auth?.token, instanceId)
+            Actions.reloadDblabInstance(auth?.token, instanceId)
 
             break
 

ui/packages/platform/src/components/DbLabInstances/DbLabInstances.tsx

@@ -5,7 +5,6 @@ import { Instance as InstancePage } from '@postgres.ai/shared/pages/Instance'
 import { ConsoleBreadcrumbsWrapper } from 'components/ConsoleBreadcrumbs/ConsoleBreadcrumbsWrapper'
 import { ROUTES } from 'config/routes'
 import { getInstance } from 'api/instances/getInstance'
-import { refreshInstance } from 'api/instances/refreshInstance'
 import { getSnapshots } from 'api/snapshots/getSnapshots'
 import { destroyClone } from 'api/clones/destroyClone'
 import { resetClone } from 'api/clones/resetClone'
@@ -55,7 +54,6 @@ export const Instance = () => {
     getInstance,
     getSnapshots,
     destroyClone,
-    refreshInstance,
     resetClone,
     getWSToken,
     getConfig,

ui/packages/platform/src/pages/Instance/index.tsx

@@ -1314,7 +1314,7 @@ const Store = Reflux.createStore({
     };
   },
 
-  onGetDbLabInstanceStatusFailed: function (data, error) {
+  onReloadDblabInstanceFailed: function (data, error) {
     this.data.dbLabInstanceStatus.isProcessing = false;
     this.data.dbLabInstanceStatus.isProcessed = true;
     this.data.dbLabInstanceStatus.error = true;
@@ -1336,7 +1336,7 @@ const Store = Reflux.createStore({
     this.trigger(this.data);
   },
 
-  onGetDbLabInstanceStatusProgressed: function (data) {
+  onReloadDblabInstanceProgressed: function (data) {
     this.data.dbLabInstanceStatus.isProcessing = true;
     this.data.dbLabInstanceStatus.isProcessed = false;
     this.data.dbLabInstanceStatus.error = false;
@@ -1358,7 +1358,7 @@ const Store = Reflux.createStore({
     this.trigger(this.data);
   },
 
-  onGetDbLabInstanceStatusCompleted: function (data) {
+  onReloadDblabInstanceCompleted: function (data) {
     this.data.dbLabInstanceStatus.isProcessing = false;
     this.data.dbLabInstanceStatus.errorMessage = this.getError(data.data);
     this.data.dbLabInstanceStatus.error = !!this.data.dbLabInstanceStatus

ui/packages/platform/src/stores/store.js

@@ -12,7 +12,6 @@ import { Config } from '@postgres.ai/shared/types/api/entities/config'
 import { GetConfig } from '@postgres.ai/shared/types/api/endpoints/getConfig'
 import { UpdateConfig } from '@postgres.ai/shared/types/api/endpoints/updateConfig'
 import { TestDbSource } from '@postgres.ai/shared/types/api/endpoints/testDbSource'
-import { RefreshInstance } from '@postgres.ai/shared/types/api/endpoints/refreshInstance'
 import { DestroyClone } from '@postgres.ai/shared/types/api/endpoints/destroyClone'
 import { ResetClone } from '@postgres.ai/shared/types/api/endpoints/resetClone'
 import { GetWSToken } from '@postgres.ai/shared/types/api/endpoints/getWSToken'
@@ -26,14 +25,11 @@ import { GetInstanceRetrieval } from '@postgres.ai/shared/types/api/endpoints/ge
 import { InstanceRetrievalType } from '@postgres.ai/shared/types/api/entities/instanceRetrieval'
 import { GetEngine } from '@postgres.ai/shared/types/api/endpoints/getEngine'
 
-const POLLING_TIME = 2000
-
 const UNSTABLE_CLONE_STATUS_CODES = ['CREATING', 'RESETTING', 'DELETING']
 
 export type Api = {
   getInstance: GetInstance
   getSnapshots: GetSnapshots
-  refreshInstance?: RefreshInstance
   destroyClone: DestroyClone
   resetClone: ResetClone
   getWSToken: GetWSToken
@@ -62,7 +58,6 @@ export class MainStore {
   getFullConfigError: string | null = null
 
   unstableClones = new Set<string>()
-  private updateInstanceTimeoutId: number | null = null
 
   readonly snapshots: SnapshotsStore
 
@@ -125,16 +120,10 @@ export class MainStore {
     return !!response
   }
 
-  private loadInstance = async (
-    instanceId: string,
-    updateUnstableClones = true,
-  ) => {
+  private loadInstance = async (instanceId: string) => {
     this.instanceError = null
     this.isLoadingInstance = true
 
-    if (this.api.refreshInstance)
-      await this.api.refreshInstance({ instanceId: instanceId })
-
     const { response, error } = await this.api.getInstance({
       instanceId: instanceId,
     })
@@ -160,9 +149,6 @@ export class MainStore {
       })
 
       this.unstableClones = unstableClones
-
-      if (this.unstableClones.size && updateUnstableClones)
-        this.liveUpdateInstance()
     }
 
     if (error)
@@ -273,20 +259,13 @@ export class MainStore {
   }
 
   private liveUpdateInstance = async () => {
-    if (this.updateInstanceTimeoutId)
-      window.clearTimeout(this.updateInstanceTimeoutId)
     if (!this.unstableClones.size) return
     if (!this.instance) return
 
-    await this.loadInstance(this.instance.id, true)
+    await this.loadInstance(this.instance.id)
     await this.loadInstanceRetrieval(this.instance.id)
 
     if (!this.unstableClones.size) return
-
-    this.updateInstanceTimeoutId = window.setTimeout(
-      this.liveUpdateInstance,
-      POLLING_TIME,
-    )
   }
 
   reloadClones = async () => {