Merge branch 'instance-status-refresh' into 'master'

fix(ui): add instance status refresh

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

Author: NikolayS

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

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

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

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

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

@@ -0,0 +1,24 @@
+/*--------------------------------------------------------------------------
+ * Copyright (c) 2019-2021, Postgres.ai, Nikolay Samokhvalov [email protected]
+ * All Rights Reserved. Proprietary and confidential.
+ * Unauthorized copying of this file, via any medium is strictly prohibited
+ *--------------------------------------------------------------------------
+ */
+
+import { RefreshInstance } from '@postgres.ai/shared/types/api/endpoints/refreshInstance'
+
+import { request } from 'helpers/request'
+
+export const refreshInstance: RefreshInstance = async (req) => {
+  const response = await request('/rpc/dblab_instance_status_refresh', {
+    method: 'post',
+    body: JSON.stringify({
+      instance_id: req.instanceId,
+    }),
+  })
+
+  return {
+    response: response.ok ? true : null,
+    error: response.ok ? null : response,
+  }
+}

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

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

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

@@ -5,6 +5,7 @@ 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'
@@ -54,6 +55,7 @@ export const Instance = () => {
     getInstance,
     getSnapshots,
     destroyClone,
+    refreshInstance,
     resetClone,
     getWSToken,
     getConfig,

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

@@ -1314,7 +1314,7 @@ const Store = Reflux.createStore({
     };
   },
 
-  onReloadDblabInstanceFailed: function (data, error) {
+  onGetDbLabInstanceStatusFailed: 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);
   },
 
-  onReloadDblabInstanceProgressed: function (data) {
+  onGetDbLabInstanceStatusProgressed: 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);
   },
 
-  onReloadDblabInstanceCompleted: function (data) {
+  onGetDbLabInstanceStatusCompleted: function (data) {
     this.data.dbLabInstanceStatus.isProcessing = false;
     this.data.dbLabInstanceStatus.errorMessage = this.getError(data.data);
     this.data.dbLabInstanceStatus.error = !!this.data.dbLabInstanceStatus

ui/packages/shared/pages/Instance/index.tsx

@@ -73,6 +73,7 @@ export const Instance = observer((props: Props) => {
     instanceRetrieval,
     isLoadingInstance,
     load,
+    reload,
   } = stores.main
 
   const switchTab = (_: React.ChangeEvent<{}> | null, tabID: number) => {
@@ -120,7 +121,7 @@ export const Instance = observer((props: Props) => {
           className={classes.title}
           rightContent={
             <Button
-              onClick={() => load(props.instanceId)}
+              onClick={() => reload(props.instanceId)}
               isDisabled={!instance && !instanceError}
               className={classes.reloadButton}
             >

ui/packages/shared/pages/Instance/stores/Main.ts

@@ -12,6 +12,7 @@ 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'
@@ -30,6 +31,7 @@ const UNSTABLE_CLONE_STATUS_CODES = ['CREATING', 'RESETTING', 'DELETING']
 export type Api = {
   getInstance: GetInstance
   getSnapshots: GetSnapshots
+  refreshInstance?: RefreshInstance
   destroyClone: DestroyClone
   resetClone: ResetClone
   getWSToken: GetWSToken
@@ -82,6 +84,18 @@ export class MainStore {
   }
 
   load = (instanceId: string) => {
+    this.instance = null
+    this.isReloadingInstance = true
+    this.loadInstance(instanceId, false)
+    this.loadInstanceRetrieval(instanceId).then(() => {
+      if (this.instanceRetrieval) {
+        this.getConfig()
+      }
+    })
+    this.snapshots.load(instanceId)
+  }
+
+  reload = (instanceId: string) => {
     this.instance = null
     this.isReloadingInstance = true
     this.loadInstance(instanceId)
@@ -120,10 +134,16 @@ export class MainStore {
     return !!response
   }
 
-  private loadInstance = async (instanceId: string) => {
+  private loadInstance = async (
+    instanceId: string,
+    refresh: boolean = true,
+  ) => {
     this.instanceError = null
     this.isLoadingInstance = true
 
+    if (this.api.refreshInstance && refresh)
+      await this.api.refreshInstance({ instanceId: instanceId })
+
     const { response, error } = await this.api.getInstance({
       instanceId: instanceId,
     })