Skip to content

Commit 626f17b

Browse files
committed
#4107 remove casting and fix errors
1 parent c3949be commit 626f17b

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const BOMTable: React.FC<BOMTableProps> = ({
152152
rows={rows.concat(materialsWithAssemblies.filter(isAssemblyOpen))}
153153
getRowClassName={(params) => {
154154
const stripe = params.indexRelativeToCurrentPage % 2 === 0 ? 'even' : 'odd';
155-
const isAssemblyRow = String(params.row.id).startsWith('assembly-');
155+
const isAssemblyRow = params.row.id.startsWith('assembly-');
156156
return `super-app-theme--${stripe}${isAssemblyRow ? ' super-app-theme--assembly' : ''}`;
157157
}}
158158
rowsPerPageOptions={[100]}
@@ -164,7 +164,7 @@ const BOMTable: React.FC<BOMTableProps> = ({
164164
processRowUpdate as unknown as (newRow: GridValidRowModel, oldRow: GridValidRowModel) => Promise<GridValidRowModel>
165165
}
166166
onProcessRowUpdateError={onProcessRowUpdateError}
167-
isCellEditable={(params) => editPerms && !String(params.row.id).startsWith('assembly')}
167+
isCellEditable={(params) => editPerms && params.row.id.startsWith('assembly')}
168168
onRowClick={openAssembly}
169169
componentsProps={{
170170
row: {

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTableWrapper.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
9696
}
9797
}, [setHideColumn]);
9898

99-
if (deleteMaterialIsLoading || deleteAssemblyIsLoading || manufacturersIsLoading || materialTypesIsLoading)
100-
return <LoadingIndicator />;
10199
if (manufacturersIsError) return <ErrorPage message={manufacturersError?.message} />;
102100
if (materialTypesIsError) return <ErrorPage message={materialTypesError?.message} />;
103101

102+
if (deleteMaterialIsLoading || deleteAssemblyIsLoading || manufacturersIsLoading || materialTypesIsLoading)
103+
return <LoadingIndicator />;
104+
104105
const assignMaterial = (materialId: string, assemblyId?: string) => async () => {
105106
try {
106107
await assignMaterialToAssembly({ materialId, assemblyId }).finally(() =>

0 commit comments

Comments
 (0)