Merge branch 'configuration-tab-visibility' into 'master'

fix(ui): display configuration tab even if the mode is unknown

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

Author: Adrinlol

ui/packages/shared/pages/Configuration/utils/index.ts

@@ -114,7 +114,3 @@ export const postUniqueCustomOptions = (options: string) => {
   )
   return uniqueOptions
 }
-
-export const isRetrievalUnknown = (mode: string | undefined) => {
-  return mode === 'unknown' || mode === ''
-}

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

@@ -9,14 +9,13 @@ import { formatDateStd } from '@postgres.ai/shared/utils/date'
 import { Button } from '@postgres.ai/shared/components/Button2'
 import { Tooltip } from '@postgres.ai/shared/components/Tooltip'
 import { InfoIcon } from '@postgres.ai/shared/icons/Info'
-import { isRetrievalUnknown } from '@postgres.ai/shared/pages/Configuration/utils'
 
 import { Section } from '../components/Section'
 import { Property } from '../components/Property'
 
 import { RefreshFailedAlert } from './RefreshFailedAlert'
 
-import { getTypeByStatus } from './utils'
+import { getTypeByStatus, isRetrievalUnknown } from './utils'
 import { RetrievalModal } from './RetrievalModal'
 
 const useStyles = makeStyles(

ui/packages/shared/pages/Instance/Info/Retrieval/utils.ts

@@ -8,3 +8,7 @@ export const getTypeByStatus = (
   if (status === 'failed') return 'error'
   return 'unknown'
 }
+
+export const isRetrievalUnknown = (mode: string | undefined) => {
+  return mode === 'unknown' || mode === ''
+}

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

@@ -50,14 +50,12 @@ type Props = {
   handleChange: (event: React.ChangeEvent<{}>, newValue: number) => void
   hasLogs: boolean
   hideInstanceTabs?: boolean
-  isConfigActive?: boolean
 }
 
 export const Tabs = (props: Props) => {
   const classes = useStyles()
 
-  const { value, handleChange, hasLogs, isConfigActive, hideInstanceTabs } =
-    props
+  const { value, handleChange, hasLogs, hideInstanceTabs } = props
 
   return (
     <TabsComponent
@@ -83,10 +81,7 @@ export const Tabs = (props: Props) => {
       <TabComponent
         label="Configuration"
         classes={{
-          root:
-            props.hideInstanceTabs || !isConfigActive
-              ? classes.tabHidden
-              : classes.tabRoot,
+          root: props.hideInstanceTabs ? classes.tabHidden : classes.tabRoot,
         }}
         value={2}
       />

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

@@ -13,7 +13,6 @@ import { Button } from '@postgres.ai/shared/components/Button2'
 import { StubSpinner } from '@postgres.ai/shared/components/StubSpinner'
 import { SectionTitle } from '@postgres.ai/shared/components/SectionTitle'
 import { ErrorStub } from '@postgres.ai/shared/components/ErrorStub'
-import { isRetrievalUnknown } from '@postgres.ai/shared/pages/Configuration/utils'
 
 import { Tabs } from './Tabs'
 import { Logs } from '../Logs'
@@ -73,9 +72,7 @@ export const Instance = observer((props: Props) => {
     load(instanceId)
   }, [instanceId])
 
-  const isConfigurationActive =
-    !isRetrievalUnknown(instanceRetrieval?.mode) &&
-    instanceRetrieval?.mode !== 'physical'
+  const isConfigurationActive = instanceRetrieval?.mode !== 'physical'
 
   useEffect(() => {
     if (
@@ -126,7 +123,6 @@ export const Instance = observer((props: Props) => {
               handleChange={switchTab}
               hasLogs={api.initWS != undefined}
               hideInstanceTabs={props?.hideInstanceTabs}
-              isConfigActive={!isRetrievalUnknown(instanceRetrieval?.mode)}
             />
           </SectionTitle>
 

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

@@ -25,7 +25,6 @@ import { GetFullConfig } from '@postgres.ai/shared/types/api/endpoints/getFullCo
 import { GetInstanceRetrieval } from '@postgres.ai/shared/types/api/endpoints/getInstanceRetrieval'
 import { InstanceRetrievalType } from '@postgres.ai/shared/types/api/entities/instanceRetrieval'
 import { GetEngine } from '@postgres.ai/shared/types/api/endpoints/getEngine'
-import { isRetrievalUnknown } from '@postgres.ai/shared/pages/Configuration/utils'
 
 const POLLING_TIME = 2000
 
@@ -91,9 +90,7 @@ export class MainStore {
     this.isReloadingInstance = true
     this.loadInstance(instanceId)
     this.loadInstanceRetrieval(instanceId).then(() => {
-      if (!isRetrievalUnknown(this.instanceRetrieval?.mode)) {
-        this.getConfig()
-      }
+      this.getConfig()
     })
     this.snapshots.load(instanceId)
   }