fix(ui): several code quality issues

kouprlabs · Oct 30, 2024 · 36c85e3 · 36c85e3
1 parent 2342187
commit 36c85e3
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 61 deletions.
diff --git a/ui/qodana.yaml b/ui/qodana.yaml
@@ -0,0 +1,29 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-js:latest
diff --git a/ui/src/api/introspection.ts b/ui/src/api/introspection.ts
@@ -43,13 +43,10 @@ export interface Index extends DatabaseObject {
   status: string
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MaterializedView extends DatabaseObject {}
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface View extends DatabaseObject {}
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface Sequence extends DatabaseObject {}
 
 export interface Source extends DatabaseObject {

diff --git a/ui/src/components/actions/list.tsx b/ui/src/components/actions/list.tsx
@@ -142,8 +142,8 @@ const List = ({ type }: ListParams) => {
           <Delete
             id={actionId}
             open={openDeleteDialog}
-            onComplete={() => {
-              mutate()
+            onComplete={async () => {
+              await mutate()
               setOpenDeleteDialog(false)
             }}
             onDismiss={() => setOpenDeleteDialog(false)}

diff --git a/ui/src/components/actions/run/clone.tsx b/ui/src/components/actions/run/clone.tsx
@@ -18,7 +18,7 @@ const Clone = () => {
       try {
         setLoading(true)
         await ActionAPI.runClone({ sourceConnectionId, targetConnectionId })
-        mutate('/actions')
+        mutate('/actions').then()
       } finally {
         setLoading(false)
       }
@@ -68,17 +68,17 @@ const Clone = () => {
         isLoading={loading}
         isDisabled={
           loading ||
-          (sourceConnectionId &&
-            targetConnectionId &&
-            sourceConnectionId === targetConnectionId)
-            ? true
-            : false
+          Boolean(
+            sourceConnectionId &&
+              targetConnectionId &&
+              sourceConnectionId === targetConnectionId,
+          )
         }
-        onClick={() => {
+        onClick={async () => {
           setSourceInvalid(!sourceConnectionId)
           setTargetInvalid(!targetConnectionId)
           if (sourceConnectionId && targetConnectionId) {
-            handleClone(sourceConnectionId, targetConnectionId)
+            await handleClone(sourceConnectionId, targetConnectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/disable-constraints.tsx b/ui/src/components/actions/run/disable-constraints.tsx
@@ -15,7 +15,7 @@ const DisableConstraints = () => {
     try {
       setLoading(true)
       await ActionAPI.runDisableConstraints({ connectionId })
-      mutate('/actions')
+      mutate('/actions').then()
     } finally {
       setLoading(false)
     }
@@ -46,10 +46,10 @@ const DisableConstraints = () => {
         colorScheme="blue"
         leftIcon={<IconPlayArrow />}
         isDisabled={loading}
-        onClick={() => {
+        onClick={async () => {
           setInvalid(!connectionId)
           if (connectionId) {
-            handleRun(connectionId)
+            await handleRun(connectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/disable-triggers.tsx b/ui/src/components/actions/run/disable-triggers.tsx
@@ -15,7 +15,7 @@ const DisableTriggers = () => {
     try {
       setLoading(true)
       await ActionAPI.runDisableTriggers({ connectionId })
-      mutate('/actions')
+      mutate('/actions').then()
     } finally {
       setLoading(false)
     }
@@ -46,10 +46,10 @@ const DisableTriggers = () => {
         colorScheme="blue"
         leftIcon={<IconPlayArrow />}
         isDisabled={loading}
-        onClick={() => {
+        onClick={async () => {
           setInvalid(!connectionId)
           if (connectionId) {
-            handleRun(connectionId)
+            await handleRun(connectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/drop-objects.tsx b/ui/src/components/actions/run/drop-objects.tsx
@@ -15,7 +15,7 @@ const DropObjects = () => {
     try {
       setLoading(true)
       await ActionAPI.runDropObjects({ connectionId })
-      mutate('/actions')
+      mutate('/actions').then()
     } finally {
       setLoading(false)
     }
@@ -46,10 +46,10 @@ const DropObjects = () => {
         colorScheme="red"
         leftIcon={<IconPlayArrow />}
         isDisabled={loading}
-        onClick={() => {
+        onClick={async () => {
           setInvalid(!connectionId)
           if (connectionId) {
-            handleRun(connectionId)
+            await handleRun(connectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/enable-constraints.tsx b/ui/src/components/actions/run/enable-constraints.tsx
@@ -15,7 +15,7 @@ const EnableConstraints = () => {
     try {
       setLoading(true)
       await ActionAPI.runEnableConstraints({ connectionId })
-      mutate('/actions')
+      mutate('/actions').then()
     } finally {
       setLoading(false)
     }
@@ -46,10 +46,10 @@ const EnableConstraints = () => {
         colorScheme="blue"
         leftIcon={<IconPlayArrow />}
         isDisabled={loading}
-        onClick={() => {
+        onClick={async () => {
           setInvalid(!connectionId)
           if (connectionId) {
-            handleRun(connectionId)
+            await handleRun(connectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/enable-triggers.tsx b/ui/src/components/actions/run/enable-triggers.tsx
@@ -15,7 +15,7 @@ const EnableTriggers = () => {
     try {
       setLoading(true)
       await ActionAPI.runEnableTriggers({ connectionId })
-      mutate('/actions')
+      mutate('/actions').then()
     } finally {
       setLoading(false)
     }
@@ -46,10 +46,10 @@ const EnableTriggers = () => {
         colorScheme="blue"
         leftIcon={<IconPlayArrow />}
         isDisabled={loading}
-        onClick={() => {
+        onClick={async () => {
           setInvalid(!connectionId)
           if (connectionId) {
-            handleRun(connectionId)
+            await handleRun(connectionId)
           }
         }}
       >

diff --git a/ui/src/components/actions/run/migrate.tsx b/ui/src/components/actions/run/migrate.tsx
@@ -18,7 +18,7 @@ const Migrate = () => {
       try {
         setLoading(true)
         await ActionAPI.runMigrate({ sourceConnectionId, targetConnectionId })
-        mutate('/actions')
+        mutate('/actions').then()
       } finally {
         setLoading(false)
       }
@@ -67,17 +67,17 @@ const Migrate = () => {
         leftIcon={<IconPlayArrow />}
         isDisabled={
           loading ||
-          (sourceConnectionId &&
-            targetConnectionId &&
-            sourceConnectionId === targetConnectionId)
-            ? true
-            : false
+          Boolean(
+            sourceConnectionId &&
+              targetConnectionId &&
+              sourceConnectionId === targetConnectionId,
+          )
         }
-        onClick={() => {
+        onClick={async () => {
           setSourceInvalid(!sourceConnectionId)
           setTargetInvalid(!targetConnectionId)
           if (sourceConnectionId && targetConnectionId) {
-            handleClone(sourceConnectionId, targetConnectionId)
+            await handleClone(sourceConnectionId, targetConnectionId)
           }
         }}
       >

diff --git a/ui/src/components/comparison/result/index.tsx b/ui/src/components/comparison/result/index.tsx
@@ -79,7 +79,7 @@ const Result = ({
     }
     if (!comparison) {
       setIsCacheDataData(false)
-      handleCompare()
+      handleCompare().then()
     } else if (isCacheData) {
       setShowCacheNotice(true)
     }

diff --git a/ui/src/components/connection/edit.tsx b/ui/src/components/connection/edit.tsx
@@ -17,7 +17,14 @@ import {
 } from '@chakra-ui/react'
 import { variables } from '@koupr/ui'
 import { SectionSpinner } from '@koupr/ui'
-import { Field, FieldAttributes, Form, Formik } from 'formik'
+import {
+  Field,
+  FieldAttributes,
+  FieldProps,
+  Form,
+  Formik,
+  FormikHelpers,
+} from 'formik'
 import * as Yup from 'yup'
 import { BsEye, BsEyeSlash } from 'react-icons/bs'
 import { FiChevronLeft } from 'react-icons/fi'
@@ -30,6 +37,13 @@ type EditProps = {
   id: string
 }
 
+type FormValues = {
+  name: string
+  jdbcUrl: string
+  jdbcUsername: string
+  jdbcPassword: string
+}
+
 const Edit = ({ id }: EditProps) => {
   const navigate = useNavigate()
   const toast = useToast()
@@ -45,7 +59,10 @@ const Edit = ({ id }: EditProps) => {
   })
 
   const handleSubmit = useCallback(
-    async (values: any, { setSubmitting }: any) => {
+    async (
+      values: FormValues,
+      { setSubmitting }: FormikHelpers<FormValues>,
+    ) => {
       setSubmitting(true)
       try {
         await ConnectionAPI.update(id as string, {
@@ -98,7 +115,7 @@ const Edit = ({ id }: EditProps) => {
           name: connection.name,
           jdbcUrl: connection.jdbcUrl,
           jdbcUsername: connection.jdbcUsername,
-          jdbcPassword: connection.jdbcPassword,
+          jdbcPassword: connection.jdbcPassword || '',
         }}
         validationSchema={formSchema}
         onSubmit={handleSubmit}
@@ -108,9 +125,9 @@ const Edit = ({ id }: EditProps) => {
             <Stack spacing={variables.spacingLg}>
               <Stack spacing={variables.spacing}>
                 <Field name="name">
-                  {({ field }: FieldAttributes<any>) => (
+                  {({ field }: FieldAttributes<FieldProps>) => (
                     <FormControl
-                      isInvalid={errors.name && touched.name ? true : false}
+                      isInvalid={Boolean(errors.name && touched.name)}
                     >
                       <FormLabel htmlFor="name">Name</FormLabel>
                       <Input {...field} w="400px" disabled={isSubmitting} />
@@ -119,11 +136,9 @@ const Edit = ({ id }: EditProps) => {
                   )}
                 </Field>
                 <Field name="jdbcUrl">
-                  {({ field }: FieldAttributes<any>) => (
+                  {({ field }: FieldAttributes<FieldProps>) => (
                     <FormControl
-                      isInvalid={
-                        errors.jdbcUrl && touched.jdbcUrl ? true : false
-                      }
+                      isInvalid={Boolean(errors.jdbcUrl && touched.jdbcUrl)}
                     >
                       <FormLabel htmlFor="jdbcUrl">JDBC URL</FormLabel>
                       <Input {...field} w="400px" disabled={isSubmitting} />
@@ -132,13 +147,11 @@ const Edit = ({ id }: EditProps) => {
                   )}
                 </Field>
                 <Field name="jdbcUsername">
-                  {({ field }: FieldAttributes<any>) => (
+                  {({ field }: FieldAttributes<FieldProps>) => (
                     <FormControl
-                      isInvalid={
-                        errors.jdbcUsername && touched.jdbcUsername
-                          ? true
-                          : false
-                      }
+                      isInvalid={Boolean(
+                        errors.jdbcUsername && touched.jdbcUsername,
+                      )}
                     >
                       <FormLabel htmlFor="jdbcUsername">
                         JDBC username
@@ -149,13 +162,11 @@ const Edit = ({ id }: EditProps) => {
                   )}
                 </Field>
                 <Field name="jdbcPassword">
-                  {({ field }: FieldAttributes<any>) => (
+                  {({ field }: FieldAttributes<FieldProps>) => (
                     <FormControl
-                      isInvalid={
-                        errors.jdbcPassword && touched.jdbcPassword
-                          ? true
-                          : false
-                      }
+                      isInvalid={Boolean(
+                        errors.jdbcPassword && touched.jdbcPassword,
+                      )}
                     >
                       <FormLabel htmlFor="jdbcPassword">
                         JDBC password
@@ -214,8 +225,8 @@ const Edit = ({ id }: EditProps) => {
       <Delete
         id={id}
         open={openDeleteDialog}
-        onComplete={() => {
-          mutate()
+        onComplete={async () => {
+          await mutate()
           setOpenDeleteDialog(false)
           navigate('/connections')
         }}

diff --git a/ui/src/components/introspection/database-objects/index.tsx b/ui/src/components/introspection/database-objects/index.tsx
@@ -68,7 +68,7 @@ const DatabaseObjects = ({ connectionId, onDismiss }: DatabaseObjectsProps) => {
     }
     if (!introspection) {
       setIsCacheDataData(false)
-      handleIntrospect()
+      handleIntrospect().then()
     } else if (isCacheData) {
       setShowCacheNotice(true)
     }