Fix warnings from TICS scan (#986)

## Done - fixing a couple of warnings that showed up in the TICS dashboard
canonical · Nov 19, 2024 · 5ca9b46 · 5ca9b46
2 parents df407b2 + f8046d4
commit 5ca9b46
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/src/components/forms/DiskDeviceFormRoot.tsx b/src/components/forms/DiskDeviceFormRoot.tsx
@@ -149,22 +149,20 @@ const DiskDeviceFormRoot: FC<Props> = ({ formik, pools, profiles }) => {
             readOnly: readOnly,
             overrideValue: hasRootStorage && (
               <>
-                {formRootDevice?.size ?? (hasRootStorage ? "unlimited" : "")}
-                {hasRootStorage && (
-                  <Button
-                    onClick={() => {
-                      ensureEditMode(formik);
-                      focusField("limits_disk");
-                    }}
-                    type="button"
-                    appearance="base"
-                    title="Edit"
-                    className="u-no-margin--bottom"
-                    hasIcon
-                  >
-                    <Icon name="edit" />
-                  </Button>
-                )}
+                {formRootDevice?.size ?? "unlimited"}
+                <Button
+                  onClick={() => {
+                    ensureEditMode(formik);
+                    focusField("limits_disk");
+                  }}
+                  type="button"
+                  appearance="base"
+                  title="Edit"
+                  className="u-no-margin--bottom"
+                  hasIcon
+                >
+                  <Icon name="edit" />
+                </Button>
               </>
             ),
             overrideForm: hasRootStorage && (

diff --git a/src/pages/cluster/ClusterMemberSelectTable.tsx b/src/pages/cluster/ClusterMemberSelectTable.tsx
@@ -30,7 +30,7 @@ const ClusterMemberSelectTable: FC<Props> = ({ onSelect, disableMember }) => {
 
   const rows = members.map((member) => {
     const disableReason =
-      disableMember?.name === member.server_name && disableMember.reason;
+      disableMember?.name === member.server_name && disableMember?.reason;
     const selectMember = () => {
       if (disableReason) {
         return;
@@ -95,7 +95,7 @@ const ClusterMemberSelectTable: FC<Props> = ({ onSelect, disableMember }) => {
       sortData: {
         name: member.server_name.toLowerCase(),
         roles: member.roles.join(", ").toLowerCase(),
-        archietecture: member.architecture.toLowerCase(),
+        architecture: member.architecture.toLowerCase(),
         status: member.status.toLowerCase(),
       },
     };

diff --git a/src/pages/instances/InstanceOverview.tsx b/src/pages/instances/InstanceOverview.tsx
@@ -144,7 +144,7 @@ const InstanceOverview: FC<Props> = ({ instance }) => {
         </Col>
         <Col size={7}>
           <DeviceListTable
-            configBaseURL={`/ui/project/${instance.project}/instance/${instance?.name}/configuration`}
+            configBaseURL={`/ui/project/${instance.project}/instance/${instance.name}/configuration`}
             devices={instance.expanded_devices as LxdDevices}
           />
         </Col>

diff --git a/src/pages/instances/forms/UploadExternalFormatFileForm.tsx b/src/pages/instances/forms/UploadExternalFormatFileForm.tsx
@@ -140,7 +140,7 @@ const UploadExternalFormatFileForm: FC<Props> = ({
     )
       .then((operation) => {
         const operationId = operation.metadata.id;
-        const operationSecret = operation.metadata?.metadata?.fs;
+        const operationSecret = operation.metadata.metadata?.fs;
         const instanceName = getInstanceName(operation.metadata);
 
         // establish websocket connection based on the instance creation operation

diff --git a/src/pages/storage/CustomVolumeCreateModal.tsx b/src/pages/storage/CustomVolumeCreateModal.tsx
@@ -53,7 +53,10 @@ const CustomVolumeCreateModal: FC<Props> = ({
     const driverDetails = settings?.environment?.storage_supported_drivers.find(
       (driver) => driver.Name === pool?.driver,
     );
-    return !driverDetails?.Remote ?? false;
+    if (!driverDetails) {
+      return false;
+    }
+    return !driverDetails.Remote;
   };
 
   const formik = useFormik<StorageVolumeFormValues>({

diff --git a/src/pages/storage/StoragePoolSelectTable.tsx b/src/pages/storage/StoragePoolSelectTable.tsx
@@ -30,7 +30,8 @@ const StoragePoolSelectTable: FC<Props> = ({ onSelect, disablePool }) => {
   ];
 
   const rows = pools.map((pool) => {
-    const disableReason = disablePool?.name === pool.name && disablePool.reason;
+    const disableReason =
+      disablePool?.name === pool.name && disablePool?.reason;
     const selectPool = () => {
       if (disableReason) {
         return;