fixing sonarqube issue

outerbase · Feb 9, 2024 · 66c180e · 66c180e
1 parent d3e0eb2
commit 66c180e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/app/(components)/SchemaView.tsx b/src/app/(components)/SchemaView.tsx
@@ -57,7 +57,7 @@ function SchemaViewmItem({
 }
 
 export default function SchemaView() {
-  const { refresh, schema, loading } = useSchema();
+  const { refresh, schema } = useSchema();
   const [selectedIndex, setSelectedIndex] = useState(-1);
 
   const prepareContextMenu = useCallback(
@@ -82,7 +82,6 @@ export default function SchemaView() {
       className="h-full select-none"
       onContextMenu={openContextMenuFromEvent(prepareContextMenu())}
     >
-      {loading && <OpacityLoading />}
       <div className="flex flex-col p-2 pr-4">
         {schema.map((item, schemaIndex) => {
           return (

diff --git a/src/components/custom/ErrorMessage.tsx b/src/components/custom/ErrorMessage.tsx
@@ -1,3 +1,7 @@
-export default function ErrorMessage({ message }: { message: string }) {
+export default function ErrorMessage({
+  message,
+}: {
+  readonly message: string;
+}) {
   return <div className="text-xs text-red-500">{message}</div>;
 }
diff --git a/src/screens/DatabaseScreen/ConnectingDialog.tsx b/src/screens/DatabaseScreen/ConnectingDialog.tsx
@@ -6,12 +6,12 @@ export default function ConnectingDialog({
   message,
   url,
   onRetry,
-}: {
+}: Readonly<{
   loading?: boolean;
   url?: string;
   message?: string;
   onRetry?: () => void;
-}) {
+}>) {
   const router = useRouter();
 
   let body = (

diff --git a/src/screens/DatabaseScreen/SchemaProvider.tsx b/src/screens/DatabaseScreen/SchemaProvider.tsx
@@ -7,17 +7,16 @@ import {
   useCallback,
   useContext,
   useEffect,
+  useMemo,
   useState,
 } from "react";
 import ConnectingDialog from "./ConnectingDialog";
 
 const SchemaContext = createContext<{
   schema: DatabaseSchemaItem[];
   refresh: () => void;
-  loading: boolean;
 }>({
   schema: [],
-  loading: false,
   refresh: () => {
     throw new Error("Not implemented");
   },
@@ -27,7 +26,7 @@ export function useSchema() {
   return useContext(SchemaContext);
 }
 
-export function SchemaProvider({ children }: PropsWithChildren) {
+export function SchemaProvider({ children }: Readonly<PropsWithChildren>) {
   const { updateTableList } = useAutoComplete();
   const [error, setError] = useState<string>();
   const [schemaItems, setSchemaItems] = useState<DatabaseSchemaItem[]>([]);
@@ -36,8 +35,6 @@ export function SchemaProvider({ children }: PropsWithChildren) {
 
   const fetchSchema = useCallback(
     (refresh?: boolean) => {
-      console.log("refresh", refresh);
-
       if (refresh) {
         setLoading(true);
       }
@@ -68,6 +65,10 @@ export function SchemaProvider({ children }: PropsWithChildren) {
     fetchSchema(true);
   }, [fetchSchema]);
 
+  const props = useMemo(() => {
+    return { schema: schemaItems, refresh: fetchSchema };
+  }, [schemaItems, fetchSchema]);
+
   if (error || loading) {
     return (
       <ConnectingDialog
@@ -79,10 +80,6 @@ export function SchemaProvider({ children }: PropsWithChildren) {
   }
 
   return (
-    <SchemaContext.Provider
-      value={{ schema: schemaItems, refresh: fetchSchema, loading }}
-    >
-      {children}
-    </SchemaContext.Provider>
+    <SchemaContext.Provider value={props}>{children}</SchemaContext.Provider>
   );
 }