Merge pull request #1230 from layer5io/copilot/fix-lint-checks

pontusringblom · web-flow · commit c85aecdcd576 · 2026-01-15T22:05:08.000-06:00
Fix lint errors from CI run
diff --git a/src/custom/Modal/index.tsx b/src/custom/Modal/index.tsx
@@ -91,15 +91,15 @@ export const useModal = ({ headerIcon }: { headerIcon: React.ReactNode }): UseMo
   const [reactNode, setReactNode] = useState<React.ReactNode | null>(null);
 
   const openModal: openModalCallback = ({ title, reactNode = null, onClose }) => {
-    title && setTitle(title);
-    onClose && (onCloseRef.current = onClose);
+    if (title) setTitle(title);
+    if (onClose) onCloseRef.current = onClose;
     setOpen(true);
-    reactNode && setReactNode(reactNode);
+    if (reactNode) setReactNode(reactNode);
   };
 
   const closeModal = () => {
     setOpen(false);
-    onCloseRef.current && onCloseRef.current();
+    if (onCloseRef.current) onCloseRef.current();
     setReactNode(null);
     setTitle('');
     onCloseRef.current = null;
diff --git a/src/custom/ResourceDetailFormatters/Formatter.tsx b/src/custom/ResourceDetailFormatters/Formatter.tsx
@@ -59,12 +59,6 @@ import {
 } from './types';
 import { parseCpu, splitCamelCaseString } from './utils';
 
-interface ResourceProgressProps {
-  title: string;
-  percentage: number;
-  type: string;
-}
-
 interface StatusColorType {
   background: string;
   text: string;
@@ -427,8 +421,8 @@ export const MemoryUsage: React.FC<MemoryUsageProps> = ({
     [height, width]
   );
 
-  const ResourceProgress = useCallback<React.FC<ResourceProgressProps>>(
-    ({ title, percentage, type }) => (
+  const renderResourceProgress = useCallback(
+    (title: string, percentage: number, type: string) => (
       <ResourceProgressContainer>
         <Typography variant="body1">{title}</Typography>
         <BBChart options={chartOptions(percentage, type)} />
@@ -443,9 +437,9 @@ export const MemoryUsage: React.FC<MemoryUsageProps> = ({
 
   return (
     <FlexResourceContainer>
-      <ResourceProgress title="System Reserved Cpu" percentage={reservedCpu} type={'CPU'} />
-      <ResourceProgress title="Memory Usage" percentage={memoryUsage} type={'Memory'} />
-      <ResourceProgress title="Disk Usage" percentage={diskUsagePercent} type={'Disk'} />
+      {renderResourceProgress('System Reserved Cpu', reservedCpu, 'CPU')}
+      {renderResourceProgress('Memory Usage', memoryUsage, 'Memory')}
+      {renderResourceProgress('Disk Usage', diskUsagePercent, 'Disk')}
     </FlexResourceContainer>
   );
 };
diff --git a/src/custom/ResponsiveDataTable.tsx b/src/custom/ResponsiveDataTable.tsx
@@ -179,7 +179,7 @@ const ResponsiveDataTable = ({
           if (colToAdd) {
             if (colToAdd.options) {
               colToAdd.options.display = true;
-              updateCols && updateCols([...columns]);
+              if (updateCols) updateCols([...columns]);
             }
           }
           break;
@@ -189,7 +189,7 @@ const ResponsiveDataTable = ({
           if (colToRemove) {
             if (colToRemove.options) {
               colToRemove.options.display = false;
-              updateCols && updateCols([...columns]);
+              if (updateCols) updateCols([...columns]);
             }
           }
           break;
@@ -236,7 +236,7 @@ const ResponsiveDataTable = ({
         }
       }
     });
-    updateCols && updateCols([...columns]);
+    if (updateCols) updateCols([...columns]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [columnVisibility, updateCols]);
 
diff --git a/src/custom/ShareModal/ShareModal.tsx b/src/custom/ShareModal/ShareModal.tsx
@@ -82,7 +82,7 @@ const AccessListActor: React.FC<AccessListActorProps> = ({
           src={actorData.avatar_url}
           imgProps={{ referrerPolicy: 'no-referrer' }}
           onClick={() => {
-            hostURL && openInNewTab(`${hostURL}/user/${actorData.id}`);
+            if (hostURL) openInNewTab(`${hostURL}/user/${actorData.id}`);
           }}
         />
       </ListItemAvatar>
diff --git a/src/custom/TeamTable/TeamTableConfiguration.tsx b/src/custom/TeamTable/TeamTableConfiguration.tsx
@@ -227,7 +227,7 @@ export default function TeamTableConfiguration({
                       id={`edit_team-${tableMeta.rowIndex}`}
                       title="Edit Team"
                       onClick={(ev) => {
-                        isEditTeamAllowed && handleTeamView(ev, tableMeta.rowData);
+                        if (isEditTeamAllowed) handleTeamView(ev, tableMeta.rowData);
                       }}
                       iconType="edit"
                     >
@@ -252,9 +252,9 @@ export default function TeamTableConfiguration({
                     id={`remove_team-${tableMeta.rowIndex}`}
                     title={'Move Team'}
                     onClick={() => {
-                      isRemoveTeamFromWorkspaceAllowed &&
-                        handleRemoveTeamFromWorkspace &&
+                      if (isRemoveTeamFromWorkspaceAllowed && handleRemoveTeamFromWorkspace) {
                         handleRemoveTeamFromWorkspace(tableMeta.rowData[0]);
+                      }
                     }}
                     iconType="delete"
                   >
@@ -267,7 +267,7 @@ export default function TeamTableConfiguration({
                     id={`delete_team-${tableMeta.rowIndex}`}
                     title={'Delete Team'}
                     onClick={(ev: React.MouseEvent) => {
-                      isDeleteTeamAllowed && handleDeleteTeam(ev, tableMeta.rowData);
+                      if (isDeleteTeamAllowed) handleDeleteTeam(ev, tableMeta.rowData);
                     }}
                     iconType="delete"
                   >
diff --git a/src/custom/TypingFilter/index.tsx b/src/custom/TypingFilter/index.tsx
@@ -147,7 +147,7 @@ export function TypingFilter({ filterSchema, handleFilter, autoFilter = false }:
       />
       <Popper
         open={filterState.state != FilteringState.IDLE && isPopperOpen}
-        anchorEl={inputFieldRef.current}
+        anchorEl={anchorEl}
         placement="bottom-start"
         style={{ zIndex: 2000 }}
         transition
diff --git a/src/custom/Workspaces/EnvironmentTable.tsx b/src/custom/Workspaces/EnvironmentTable.tsx
@@ -163,11 +163,12 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
               id={`delete_team-${tableMeta.rowIndex}`}
               title="Remove Environment"
               onClick={() => {
-                isRemoveAllowed &&
+                if (isRemoveAllowed) {
                   unassignEnvironmentFromWorkspace({
                     workspaceId,
                     environmentId: tableMeta.rowData[0]
                   });
+                }
               }}
               iconType="delete"
             >
diff --git a/src/custom/Workspaces/WorkspaceContentMoveModal.tsx b/src/custom/Workspaces/WorkspaceContentMoveModal.tsx
@@ -150,7 +150,7 @@ const WorkspaceContentMoveModal: React.FC<WorkspaceContentMoveModalProps> = ({
         message: `Successfully moved ${type === RESOURCE_TYPE.DESIGN ? 'design' : 'view'}${multiSelectedContent.length > 1 ? 's' : ''} to ${selectedWorkspaceForMove!.name}`,
         event_type: EVENT_TYPES.SUCCESS
       });
-    } catch (error) {
+    } catch {
       notify({
         message: `Failed to move ${type === RESOURCE_TYPE.DESIGN ? 'design' : 'view'}. Please try again.`,
         event_type: EVENT_TYPES.ERROR
diff --git a/src/custom/Workspaces/WorkspaceViewsTable.tsx b/src/custom/Workspaces/WorkspaceViewsTable.tsx
@@ -254,11 +254,12 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
               id={`delete_view-${tableMeta.rowIndex}`}
               title="Move View"
               onClick={() => {
-                isRemoveAllowed &&
+                if (isRemoveAllowed) {
                   unassignviewFromWorkspace({
                     workspaceId,
                     viewId: tableMeta.rowData[0]
                   });
+                }
               }}
               iconType="delete"
             >
diff --git a/src/custom/Workspaces/hooks/useEnvironmentAssignment.tsx b/src/custom/Workspaces/hooks/useEnvironmentAssignment.tsx
@@ -136,9 +136,11 @@ const useEnvironmentAssignment = ({
   const handleAssignEnvironmentsData = (updatedAssignedData: Environment[]) => {
     const { addedEnvironmentsIds, removedEnvironmentsIds } =
       getAddedAndRemovedEnvironments(updatedAssignedData);
-    addedEnvironmentsIds.length > 0 || removedEnvironmentsIds.length > 0
-      ? setDisableTransferButton(false)
-      : setDisableTransferButton(true);
+    if (addedEnvironmentsIds.length > 0 || removedEnvironmentsIds.length > 0) {
+      setDisableTransferButton(false);
+    } else {
+      setDisableTransferButton(true);
+    }
 
     setAssignedEnvironments(updatedAssignedData);
   };
diff --git a/src/custom/Workspaces/hooks/useTeamAssignment.tsx b/src/custom/Workspaces/hooks/useTeamAssignment.tsx
@@ -124,9 +124,11 @@ const useTeamAssignment = ({
 
   const handleAssignTeamsData = (updatedAssignedData: Team[]) => {
     const { addedTeamsIds, removedTeamsIds } = getAddedAndRemovedTeams(updatedAssignedData);
-    addedTeamsIds.length > 0 || removedTeamsIds.length > 0
-      ? setDisableTransferButton(false)
-      : setDisableTransferButton(true);
+    if (addedTeamsIds.length > 0 || removedTeamsIds.length > 0) {
+      setDisableTransferButton(false);
+    } else {
+      setDisableTransferButton(true);
+    }
     setAssignedTeams(updatedAssignedData);
   };
 
diff --git a/src/redux-persist/PersistedStateProvider.tsx b/src/redux-persist/PersistedStateProvider.tsx
@@ -23,12 +23,21 @@ export const PersistedStateProvider: FC<PersistedStateProviderProps> = ({
     if (!loading) {
       return;
     }
+    
+    let error: Error | null = null;
     try {
       dispatch(loadPersistedState());
     } catch (e) {
-      setError(e as Error);
+      error = e as Error;
     }
-    setLoading(false);
+    
+    // Use queueMicrotask to defer state updates and avoid cascading renders
+    queueMicrotask(() => {
+      setLoading(false);
+      if (error) {
+        setError(error);
+      }
+    });
   }, [loading, dispatch, loadPersistedState]);
 
   if (error) {
diff --git a/src/redux-persist/initReduxPersist.ts b/src/redux-persist/initReduxPersist.ts
@@ -80,7 +80,7 @@ export const initReduxPersist = (actionsToPersist: ActionsToPersist) => {
             inflatedState = JSON.parse(inflatedState);
             dispatch(rehydrateState(path, inflatedState));
           }
-        } catch (e) {
+        } catch {
           console.error(`Error rehydrating state for reducer ${path}`, inflatedState);
         }
       });

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ const ResponsiveDataTable = ({`
`179`	`179`	`if (colToAdd) {`
`180`	`180`	`if (colToAdd.options) {`
`181`	`181`	`colToAdd.options.display = true;`
`182`		`- updateCols && updateCols([...columns]);`
	`182`	`+ if (updateCols) updateCols([...columns]);`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`break;`
`@@ -189,7 +189,7 @@ const ResponsiveDataTable = ({`
`189`	`189`	`if (colToRemove) {`
`190`	`190`	`if (colToRemove.options) {`
`191`	`191`	`colToRemove.options.display = false;`
`192`		`- updateCols && updateCols([...columns]);`
	`192`	`+ if (updateCols) updateCols([...columns]);`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`break;`
`@@ -236,7 +236,7 @@ const ResponsiveDataTable = ({`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`});`
`239`		`- updateCols && updateCols([...columns]);`
	`239`	`+ if (updateCols) updateCols([...columns]);`
`240`	`240`	`// eslint-disable-next-line react-hooks/exhaustive-deps`
`241`	`241`	`}, [columnVisibility, updateCols]);`
`242`	`242`