Merge branch '501-se-bug-fixes' into 'master'

fix(ui): SE bug fixes

Closes #501

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

Author: NikolayS

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

@@ -93,7 +93,7 @@ export const StickyTopBar = () => {
     activateBilling()
       .then((res) => {
         setIsLoading(false)
-        if (res.response) {
+        if (res.response?.billing_active) {
           handleReset()
           setSnackbarState({
             isOpen: true,
@@ -103,7 +103,7 @@ export const StickyTopBar = () => {
         } else {
           setSnackbarState({
             isOpen: true,
-            message: capitalizeFirstLetter(res.error.message),
+            message: capitalizeFirstLetter(res?.error?.message),
             type: 'error',
           })
         }
@@ -196,7 +196,7 @@ export const StickyTopBar = () => {
         </div>
       )}
       <Snackbar
-        open={snackbarState.isOpen}
+        open={snackbarState.isOpen && !!snackbarState.message}
         className={
           snackbarState.type === 'error'
             ? classes.errorNotification

ui/packages/shared/pages/Configuration/InputWithTooltip/index.tsx

@@ -44,13 +44,15 @@ export const InputWithTooltip = ({
   onChange,
   tooltipText,
   disabled,
+  type,
 }: {
   value?: string
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
   tooltipText: () => React.ReactNode
   label: string
   error?: string
   disabled: boolean | undefined
+  type?: string
 }) => {
   const classes = useStyles()
 
@@ -69,6 +71,7 @@ export const InputWithTooltip = ({
       </label>
       <Box display="flex" alignItems="center" width="100%">
         <TextField
+          type={type || 'text'}
           className={classNames(
             !disabled && classes.textField,
             styles.textField,

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

@@ -471,6 +471,7 @@ export const Configuration = observer(
                     }
                   />
                   <InputWithTooltip
+                    type="password"
                     label="source.connection.password"
                     tooltipText={tooltipText.password}
                     disabled={isConfigurationDisabled}
@@ -499,19 +500,6 @@ export const Configuration = observer(
                       formik.setFieldValue('databases', e.target.value)
                     }
                   />
-                  <Box mt={2}>
-                    <InputWithChip
-                      value={formik.values.databases}
-                      label="Databases"
-                      id="databases"
-                      tooltipText={tooltipText.databases}
-                      handleDeleteChip={handleDeleteChip}
-                      disabled={isConfigurationDisabled}
-                      onChange={(e) =>
-                        formik.setFieldValue('databases', e.target.value)
-                      }
-                    />
-                  </Box>
                   <Box mt={3} mb={3}>
                     <Button
                       variant="contained"
@@ -524,6 +512,12 @@ export const Configuration = observer(
                         <Spinner size="sm" className={styles.spinner} />
                       )}
                     </Button>
+                    {(connectionStatus && connectionRes) || dbSourceError ? (
+                      <ResponseMessage
+                        type={dbSourceError ? 'error' : connectionStatus}
+                        message={dbSourceError || connectionRes}
+                      />
+                    ) : null}
                   </Box>
                   <InputWithTooltip
                     label="pg_dump jobs"
@@ -570,12 +564,6 @@ export const Configuration = observer(
                     }
                     label={'Ignore errors during logical data dump'}
                   />
-                  {(connectionStatus && connectionRes) || dbSourceError ? (
-                    <ResponseMessage
-                      type={dbSourceError ? 'error' : connectionStatus}
-                      message={dbSourceError || connectionRes}
-                    />
-                  ) : null}
                 </Box>
               </Box>
               <Box>

ui/packages/shared/pages/Configuration/useForm.ts

@@ -97,7 +97,6 @@ export const useForm = (onSubmit: (values: FormValues) => void) => {
     formik.values.port &&
     formik.values.username &&
     formik.values.dbname &&
-    formik.values.dockerImageType === 'custom' &&
     formik.values.dockerImage
 
   return [{ formik, connectionData, isConnectionDataValid }]

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

@@ -67,13 +67,7 @@ export const Instance = observer((props: Props) => {
   const { instanceId, api } = props
 
   const stores = useCreatedStores(props)
-  const {
-    instance,
-    instanceError,
-    instanceRetrieval,
-    load,
-    isReloadingInstance,
-  } = stores.main
+  const { instance, instanceError, instanceRetrieval, load } = stores.main
 
   useEffect(() => {
     load(instanceId)
@@ -120,9 +114,7 @@ export const Instance = observer((props: Props) => {
             rightContent={
               <Button
                 onClick={() => load(props.instanceId)}
-                isDisabled={
-                  (!instance && !instanceError) || isReloadingInstance
-                }
+                isDisabled={!instance && !instanceError}
                 className={classes.reloadButton}
               >
                 Reload info

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

@@ -122,19 +122,19 @@ export const Logs = ({ api }: { api: Api }) => {
     '[INFO]': !isEmpty(logsFilterState) ? logsFilterState?.['[INFO]'] : true,
     '[ERROR]': !isEmpty(logsFilterState) ? logsFilterState?.['[ERROR]'] : true,
     '[base.go]': !isEmpty(logsFilterState)
-      ? logsFilterState?.['base.go']
+      ? logsFilterState?.['[base.go]']
       : true,
     '[runners.go]': !isEmpty(logsFilterState)
-      ? logsFilterState?.['runners.go']
+      ? logsFilterState?.['[runners.go]']
       : true,
     '[snapshots.go]': !isEmpty(logsFilterState)
-      ? logsFilterState?.['snapshots.go']
+      ? logsFilterState?.['[snapshots.go]']
       : true,
     '[util.go]': !isEmpty(logsFilterState)
       ? logsFilterState?.['[util.go]']
       : true,
     '[logging.go]': !isEmpty(logsFilterState)
-      ? logsFilterState?.['logging.go']
+      ? logsFilterState?.['[logging.go]']
       : false,
     '[ws.go]': !isEmpty(logsFilterState) ? logsFilterState?.['[ws.go]'] : false,
     '[other]': !isEmpty(logsFilterState) ? logsFilterState?.['[other]'] : true,