review: revert config row changes, permissions are checked from insta…

…nce permissions PR already Signed-off-by: Mason Hu <[email protected]>
canonical · Feb 17, 2025 · fda5c05 · fda5c05
1 parent 872a32f
commit fda5c05
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 53 deletions.
diff --git a/src/pages/storage/actions/CreateStoragePoolBtn.tsx b/src/pages/storage/actions/CreateStoragePoolBtn.tsx
@@ -12,20 +12,20 @@ interface Props {
 const CreateStoragePoolBtn: FC<Props> = ({ project, className }) => {
   const navigate = useNavigate();
   const isSmallScreen = useSmallScreen();
-  const { cancreateStoragePools } = useServerEntitlements();
+  const { canCreateStoragePools } = useServerEntitlements();
 
   return (
     <Button
       appearance="positive"
       className={className}
       hasIcon={!isSmallScreen}
       title={
-        !cancreateStoragePools()
+        !canCreateStoragePools()
           ? "You do not have permission to create storage pools"
           : ""
       }
       onClick={() => navigate(`/ui/project/${project}/storage/pools/create`)}
-      disabled={!cancreateStoragePools()}
+      disabled={!canCreateStoragePools()}
     >
       {!isSmallScreen && <Icon name="plus" light />}
       <span>Create pool</span>

diff --git a/src/pages/storage/actions/DeleteStoragePoolBtn.tsx b/src/pages/storage/actions/DeleteStoragePoolBtn.tsx
@@ -91,7 +91,7 @@ const DeleteStoragePoolBtn: FC<Props> = ({
       loading={isLoading}
       shiftClickEnabled
       showShiftClickHint
-      disabled={Boolean(disabledReason()) || !canDeletePool(pool)}
+      disabled={Boolean(disabledReason())}
       onHoverText={disabledReason()}
     >
       {(!isSmallScreen || !shouldExpand) && <Icon name="delete" />}

diff --git a/src/pages/storage/forms/StoragePoolFormCeph.tsx b/src/pages/storage/forms/StoragePoolFormCeph.tsx
@@ -20,8 +20,6 @@ const StoragePoolFormCeph: FC<Props> = ({ formik }) => {
           name: "ceph_cluster_name",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter cluster name" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
@@ -34,35 +32,27 @@ const StoragePoolFormCeph: FC<Props> = ({ formik }) => {
               placeholder="Enter number of placement groups"
             />
           ),
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "RBD clone copy",
           name: "ceph_rbd_clone_copy",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Ceph user name",
           name: "ceph_user_name",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter Ceph user name" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "RBD features",
           name: "ceph_rbd_features",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter RBD features" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
       ]}
     />

diff --git a/src/pages/storage/forms/StoragePoolFormCephFS.tsx b/src/pages/storage/forms/StoragePoolFormCephFS.tsx
@@ -20,53 +20,41 @@ const StoragePoolFormCephFS: FC<Props> = ({ formik }) => {
           name: "cephfs_cluster_name",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter cluster name" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Create missing",
           name: "cephfs_create_missing",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "FS cache",
           name: "cephfs_fscache",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Number of placement groups",
           name: "cephfs_osd_pg_num",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter number" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Path",
           name: "cephfs_path",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter path" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Ceph user name",
           name: "cephfs_user_name",
           defaultValue: "",
           children: <Input type="text" placeholder="Enter pool name" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
       ]}
     />

diff --git a/src/pages/storage/forms/StoragePoolFormPowerflex.tsx b/src/pages/storage/forms/StoragePoolFormPowerflex.tsx
@@ -20,35 +20,27 @@ const StoragePoolFormPowerflex: FC<Props> = ({ formik }) => {
           name: "powerflex_clone_copy",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "SDT",
           name: "powerflex_sdt",
           defaultValue: "",
           children: <Input type="text" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Gateway verify",
           name: "powerflex_gateway_verify",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Mode",
           name: "powerflex_mode",
           defaultValue: "",
           children: <Select options={optionNvmeSdc} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
       ]}
     />

diff --git a/src/pages/storage/forms/StoragePoolFormPure.tsx b/src/pages/storage/forms/StoragePoolFormPure.tsx
@@ -20,27 +20,21 @@ const StoragePoolFormPure: FC<Props> = ({ formik }) => {
           name: "pure_gateway_verify",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Mode",
           name: "pure_mode",
           defaultValue: "",
-          disabled:
-            !!formik.values.editRestriction || !formik.values.isCreating,
+          disabled: !formik.values.isCreating,
           children: <Select options={optionIscsiNvme} />,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Target",
           name: "pure_target",
           defaultValue: "",
           children: <Input type="text" />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
       ]}
     />

diff --git a/src/pages/storage/forms/StoragePoolFormZFS.tsx b/src/pages/storage/forms/StoragePoolFormZFS.tsx
@@ -41,30 +41,22 @@ const StoragePoolFormZFS: FC<Props> = ({ formik }) => {
             ) : (
               <>{value}</>
             ),
-          disabled:
-            !!formik.values.editRestriction ||
-            !formik.values.isCreating ||
-            formik.values.readOnly,
-          disabledReason:
-            formik.values.editRestriction ?? "ZFS pool name cannot be modified",
+          disabled: !formik.values.isCreating || formik.values.readOnly,
+          disabledReason: "ZFS pool name cannot be modified",
         }),
         getConfigurationRow({
           formik,
           label: "Clone copy",
           name: "zfs_clone_copy",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
         getConfigurationRow({
           formik,
           label: "Export",
           name: "zfs_export",
           defaultValue: "",
           children: <Select options={optionTrueFalse} />,
-          disabled: !!formik.values.editRestriction,
-          disabledReason: formik.values.editRestriction,
         }),
       ]}
     />

diff --git a/src/util/entitlements/server.tsx b/src/util/entitlements/server.tsx
@@ -18,7 +18,7 @@ export const useServerEntitlements = () => {
     hasEntitlement(isFineGrained, "admin", serverEntitlements) ||
     hasEntitlement(isFineGrained, "viewer", serverEntitlements);
 
-  const cancreateStoragePools = () =>
+  const canCreateStoragePools = () =>
     hasEntitlement(
       isFineGrained,
       "can_create_storage_pools",
@@ -28,7 +28,7 @@ export const useServerEntitlements = () => {
     hasEntitlement(isFineGrained, "storage_pool_manager", serverEntitlements);
 
   return {
-    cancreateStoragePools,
+    canCreateStoragePools,
     canEditServerConfiguration,
     canViewMetrics,
     canViewResources,