Merge branch 'fix-platform-ui' into 'master'

fix(ui): fix bugs related to latest release

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

Author: NikolayS

ui/packages/platform/src/components/AddDbLabInstanceFormWrapper/AddDblabInstanceForm.tsx

@@ -2,7 +2,7 @@ import { CloudImage } from 'api/cloud/getCloudImages'
 import { initialState } from '../reducer'
 
 const API_SERVER = process.env.REACT_APP_API_SERVER
-const DEBUG_API_SERVER = 'https://postgres.ai/api/general'
+const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general'
 
 export const availableTags = ['3.4.0-rc.5', '4.0.0-alpha.5']
 

ui/packages/platform/src/components/DbLabInstanceForm/utils/index.ts

@@ -1,7 +1,7 @@
 import { initialState } from '../reducer'
 
 const API_SERVER = process.env.REACT_APP_API_SERVER
-const DEBUG_API_SERVER = 'https://postgres.ai/api/general'
+const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general'
 
 export const getPlaybookCommand = (
   state: typeof initialState,

ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts

@@ -471,6 +471,7 @@ class DbLabInstances extends Component<
                         ? data.data[index].url
                         : ''}
                       {!isHttps(data.data[index].url) &&
+                      data.data[index].url &&
                       !data.data[index].use_tunnel ? (
                         <Tooltip
                           title="The connection to Database Lab API is not secure"
@@ -479,7 +480,9 @@ class DbLabInstances extends Component<
                         >
                           <WarningIcon className={classes.warningIcon} />
                         </Tooltip>
-                      ) : null}
+                      ) : (
+                        'N/A'
+                      )}
                     </TableCell>
                     <TableCell className={classes.cell}>
                       {data.data[index]?.state?.cloning?.numClones ??

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

@@ -355,7 +355,9 @@ class JoeInstanceForm extends Component<
               }}
               margin="normal"
               helperText={
-                !isHttps(this.state.url) && !this.state.useTunnel ? (
+                this.state.url &&
+                !isHttps(this.state.url) &&
+                !this.state.useTunnel ? (
                   <span>
                     <WarningIcon className={classes.warningIcon} />
                     <span className={classes.warning}>

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

@@ -404,7 +404,8 @@ class JoeInstances extends Component<
 
                     <TableCell className={classes.cell}>
                       {data.data[i].url ? data.data[i].url : ''}
-                      {!isHttps(data.data[i].url) &&
+                      {data.data[i].url &&
+                      !isHttps(data.data[i].url) &&
                       !data.data[i].use_tunnel ? (
                         <Tooltip
                           title="The connection to Joe Bot API is not secure"
@@ -413,7 +414,9 @@ class JoeInstances extends Component<
                         >
                           <WarningIcon className={classes.warningIcon} />
                         </Tooltip>
-                      ) : null}
+                      ) : (
+                        'N/A'
+                      )}
                     </TableCell>
 
                     <TableCell align={'right'}>

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

@@ -7,6 +7,6 @@
 
 export const NODE_ENV = process.env.NODE_ENV
 export const SENTRY_DSN = process.env.REACT_APP_SENTRY_DSN
-export const API_URL_PREFIX = 'https://postgres.ai/api/general' ?? ''
+export const API_URL_PREFIX = process.env.REACT_APP_API_SERVER ?? ''
 export const WS_URL_PREFIX = process.env.REACT_APP_WS_URL_PREFIX ?? ''
 export const BUILD_TIMESTAMP = process.env.BUILD_TIMESTAMP

ui/packages/platform/src/config/env.ts

@@ -92,6 +92,7 @@ export const Instance = () => {
 
   return (
     <InstancePage
+      isPlatform
       title={`Database Lab instance #${params.instanceId} ${
         params.project ? `(${params.project})` : ''
       }`}

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

@@ -30,7 +30,7 @@ const useStyles = makeStyles(
       width: 0,
       flex: '1 1 100%',
       marginRight: '40px',
-      height: "100%",
+      height: '100%',
 
       [theme.breakpoints.down('sm')]: {
         width: '100%',
@@ -71,7 +71,7 @@ export const Clones = observer(() => {
   const goToCloneAddPage = () => history.push(host.routes.createClone())
 
   const showListSizeButton =
-    instance.state.cloning.clones.length > SHORT_LIST_SIZE && isMobile
+    instance.state.cloning.clones?.length > SHORT_LIST_SIZE && isMobile
 
   const isLoadingSnapshots = stores.main.snapshots.isLoading
   const hasSnapshots = Boolean(stores.main.snapshots.data?.length)

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

@@ -49,13 +49,13 @@ type Props = {
   value: number
   handleChange: (event: React.ChangeEvent<{}>, newValue: number) => void
   hasLogs: boolean
-  hideInstanceTabs?: boolean
+  isPlatform?: boolean
 }
 
 export const Tabs = (props: Props) => {
   const classes = useStyles()
 
-  const { value, handleChange, hasLogs, hideInstanceTabs } = props
+  const { value, handleChange, hasLogs } = props
 
   return (
     <TabsComponent
@@ -74,14 +74,14 @@ export const Tabs = (props: Props) => {
         label="Logs"
         disabled={!hasLogs}
         classes={{
-          root: classes.tabRoot,
+          root: props.isPlatform ? classes.tabHidden : classes.tabRoot,
         }}
         value={1}
       />
       <TabComponent
         label="Configuration"
         classes={{
-          root: props.hideInstanceTabs ? classes.tabHidden : classes.tabRoot,
+          root: props.isPlatform ? classes.tabHidden : classes.tabRoot,
         }}
         value={2}
       />