review: review changes

Signed-off-by: Mason Hu <[email protected]>

src/api/storage-pools.tsx

@@ -22,10 +22,10 @@ import { withEntitlementsQuery } from "util/entitlements/api";
 export const storagePoolEntitlements = ["can_delete", "can_edit"];
 export const storageVolumeEntitlements = ["can_delete"];
 
-export const fetchStoragePoolOnMember = (
+export const fetchStoragePool = (
   pool: string,
-  target: string,
   isFineGrained: boolean | null,
+  target?: string,
 ): Promise<LxdStoragePool> => {
   const entitlements = `&${withEntitlementsQuery(isFineGrained, storagePoolEntitlements)}`;
   return new Promise((resolve, reject) => {
@@ -37,19 +37,6 @@ export const fetchStoragePoolOnMember = (
   });
 };
 
-export const fetchStoragePool = (
-  pool: string,
-  isFineGrained: boolean | null,
-): Promise<LxdStoragePool> => {
-  const entitlements = `&${withEntitlementsQuery(isFineGrained, storagePoolEntitlements)}`;
-  return new Promise((resolve, reject) => {
-    fetch(`/1.0/storage-pools/${pool}?recursion=1${entitlements}`)
-      .then(handleResponse)
-      .then((data: LxdApiResponse<LxdStoragePool>) => resolve(data.metadata))
-      .catch(reject);
-  });
-};
-
 export const fetchStoragePools = (
   isFineGrained: boolean | null,
 ): Promise<LxdStoragePool[]> => {
@@ -231,11 +218,7 @@ export const fetchPoolFromClusterMembers = (
   return new Promise((resolve, reject) => {
     Promise.allSettled(
       clusterMembers.map((member) => {
-        return fetchStoragePoolOnMember(
-          poolName,
-          member.server_name,
-          isFineGrained,
-        );
+        return fetchStoragePool(poolName, isFineGrained, member.server_name);
       }),
     )
       .then((results) => {

src/components/forms/YamlForm.tsx

@@ -2,10 +2,7 @@ import { FC, ReactNode, useEffect, useRef, useState } from "react";
 import { Editor, loader } from "@monaco-editor/react";
 import { updateMaxHeight } from "util/updateMaxHeight";
 import useEventListener from "util/useEventListener";
-import {
-  editor,
-  IMarkdownString,
-} from "monaco-editor/esm/vs/editor/editor.api";
+import { editor } from "monaco-editor/esm/vs/editor/editor.api";
 import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
 import classnames from "classnames";
 
@@ -19,7 +16,7 @@ interface Props {
   children?: ReactNode;
   autoResize?: boolean;
   readOnly?: boolean;
-  readOnlyMessage?: IMarkdownString;
+  readOnlyMessage?: string;
 }
 
 const YamlForm: FC<Props> = ({
@@ -75,7 +72,7 @@ const YamlForm: FC<Props> = ({
             },
             overviewRulerLanes: 0,
             readOnly: readOnly,
-            readOnlyMessage: readOnlyMessage,
+            readOnlyMessage: { value: readOnlyMessage ?? "" },
           }}
           onMount={(editor: IStandaloneCodeEditor) => {
             setEditor(editor);

src/context/useStoragePools.tsx

@@ -3,24 +3,17 @@ import { queryKeys } from "util/queryKeys";
 import { UseQueryResult } from "@tanstack/react-query";
 import { useAuth } from "./auth";
 import { LxdStoragePool } from "types/storage";
-import {
-  fetchStoragePool,
-  fetchStoragePoolOnMember,
-  fetchStoragePools,
-} from "api/storage-pools";
+import { fetchStoragePool, fetchStoragePools } from "api/storage-pools";
 
 export const useStoragePool = (
   pool: string,
   target?: string,
   enabled?: boolean,
 ): UseQueryResult<LxdStoragePool> => {
   const { isFineGrained } = useAuth();
-  const queryFn = target
-    ? () => fetchStoragePoolOnMember(pool, target, isFineGrained)
-    : () => fetchStoragePool(pool, isFineGrained);
   return useQuery({
     queryKey: [queryKeys.storage, pool, target],
-    queryFn: queryFn,
+    queryFn: () => fetchStoragePool(pool, isFineGrained, target),
     enabled: (enabled ?? true) && isFineGrained !== null,
   });
 };

src/pages/instances/EditInstance.tsx

@@ -276,7 +276,7 @@ const EditInstance: FC<Props> = ({ instance }) => {
                   void formik.setFieldValue("yaml", yaml);
                 }}
                 readOnly={!!formik.values.editRestriction}
-                readOnlyMessage={{ value: formik.values.editRestriction ?? "" }}
+                readOnlyMessage={formik.values.editRestriction}
               >
                 <YamlNotification
                   entity="instance"

src/pages/storage/EditStoragePool.tsx

@@ -4,7 +4,6 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import {
   fetchPoolFromClusterMembers,
   fetchStoragePool,
-  fetchStoragePoolOnMember,
   updateClusteredPool,
   updatePool,
 } from "api/storage-pools";
@@ -126,9 +125,11 @@ const EditStoragePool: FC<Props> = ({ pool }) => {
             </>,
           );
           const member = clusterMembers[0]?.server_name ?? undefined;
-          const updatedPool = member
-            ? await fetchStoragePoolOnMember(values.name, member, isFineGrained)
-            : await fetchStoragePool(values.name, isFineGrained);
+          const updatedPool = await fetchStoragePool(
+            values.name,
+            isFineGrained,
+            member,
+          );
           const updatedPoolOnMembers = await fetchPoolFromClusterMembers(
             pool.name,
             clusterMembers,

src/pages/storage/forms/StoragePoolForm.tsx

@@ -266,7 +266,7 @@ const StoragePoolForm: FC<Props> = ({
                 void formik.setFieldValue("yaml", yaml);
               }}
               readOnly={!!formik.values.editRestriction}
-              readOnlyMessage={{ value: formik.values.editRestriction ?? "" }}
+              readOnlyMessage={formik.values.editRestriction}
             >
               <Notification severity="information" title="YAML Configuration">
                 {`${isSupportedStorageDriver ? "" : `The ${formik.values.driver} driver is not fully supported in the web interface. `}This is the YAML representation of the storage pool.`}