Merge branch '513-overview-tab-reload' into 'master'

fix(ui): refetch overveiw tab data, additional check for billing_active boolean

Closes #513

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

Author: Adrinlol

ui/packages/ce/src/App/Menu/StickyTopBar/index.tsx

@@ -93,7 +93,7 @@ export const StickyTopBar = () => {
     activateBilling()
       .then((res) => {
         setIsLoading(false)
-        if (res.response?.billing_active) {
+        if (res.response?.billing_active || res.response?.billingActive) {
           handleReset()
           setSnackbarState({
             isOpen: true,

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

@@ -64,6 +64,7 @@ export const Instance = observer((props: Props) => {
   const classes = useStyles()
 
   const { instanceId, api } = props
+  const [activeTab, setActiveTab] = React.useState(0)
 
   const stores = useCreatedStores(props)
   const {
@@ -74,12 +75,26 @@ export const Instance = observer((props: Props) => {
     load,
   } = stores.main
 
+  const switchTab = (_: React.ChangeEvent<{}> | null, tabID: number) => {
+    const contentElement = document.getElementById('content-container')
+    setActiveTab(tabID)
+
+    if (tabID === 0) {
+      load(props.instanceId)
+    }
+    contentElement?.scroll(0, 0)
+  }
+
+  const isInstanceIntegrated =
+    instanceRetrieval ||
+    (!isLoadingInstance && instance && instance?.url && !instanceError)
+
+  const isConfigurationActive = instanceRetrieval?.mode !== 'physical'
+
   useEffect(() => {
     load(instanceId)
   }, [instanceId])
 
-  const isConfigurationActive = instanceRetrieval?.mode !== 'physical'
-
   useEffect(() => {
     if (
       instance &&
@@ -94,17 +109,6 @@ export const Instance = observer((props: Props) => {
     }
   }, [instance])
 
-  const [activeTab, setActiveTab] = React.useState(0)
-
-  const switchTab = (_: React.ChangeEvent<{}> | null, tabID: number) => {
-    const contentElement = document.getElementById('content-container')
-    setActiveTab(tabID)
-    contentElement?.scroll(0, 0)
-  }
-
-  const isInstanceIntegrated =
-    !isLoadingInstance && instance && instance?.url && !instanceError
-
   return (
     <HostProvider value={props}>
       <StoresProvider value={stores}>