Skip to content

Commit 6fe5957

Browse files
committed
Merge remote-tracking branch 'origin' into feat/consumption
2 parents e8e8d7c + 53ff5c4 commit 6fe5957

File tree

7 files changed

+339
-284
lines changed

7 files changed

+339
-284
lines changed

ichub-frontend/src/assets/styles/components/_Dialog.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@
5858
}
5959
.MuiInputLabel-shrink{
6060
font-weight: bold;
61+
font-size: 18px;
6162
color: $brand-text!important;
62-
background: $brand-dark!important;
63+
background: $brand-dark-gray!important;
64+
border-radius: 5px;
6365
padding: 0 10px;
6466
}
6567
}
@@ -89,4 +91,13 @@
8991
color: $brand-text !important;
9092
}
9193
}
94+
.add-material-button{
95+
background-color: $brand-header-blue!important;
96+
color: white !important;
97+
98+
&:hover {
99+
background: $header-gradient-bg!important;
100+
border: 2px solid $brand-text!important;
101+
}
102+
}
92103
}

ichub-frontend/src/assets/styles/layout/_MainLayout.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
.contentArea {
6969
padding: 0; // Remove default padding as components handle their own
7070
height: calc(100vh - 68.8px); /* Fixed height minus header */
71-
overflow: hidden; // Prevent content area from scrolling - let components handle it
71+
overflow: auto;
7272
display: flex;
7373
flex-direction: column;
7474
}

ichub-frontend/src/features/catalog-management/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const shareCatalogPart = async (
6060
manufacturerId,
6161
manufacturerPartId,
6262
businessPartnerNumber,
63-
customerPartId: customerPartId && customerPartId.trim() ? customerPartId.trim() : undefined,
63+
customerPartId: customerPartId?.trim() || undefined
6464
};
6565

6666
const response = await axios.post<ApiPartData>(

ichub-frontend/src/features/catalog-management/components/product-detail/InstanceProductsTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ function InstanceProductsTableToolbar(props: Readonly<InstanceProductsTableToolb
233233
</Toolbar>
234234
);
235235
}
236-
export default function InstanceProductsTable({ part }: { part: PartType | null }) {
236+
export default function InstanceProductsTable({ part }: { readonly part: PartType | null }) {
237237
const [order, setOrder] = useState<Order>('asc');
238238
const [orderBy, setOrderBy] = useState<keyof SerializedPart>('customerPartId');
239239
const [selected, setSelected] = useState<readonly number[]>([]);
@@ -248,7 +248,7 @@ export default function InstanceProductsTable({ part }: { part: PartType | null
248248
}
249249
const loadData = async () => {
250250
try {
251-
const data = await fetchSerializedParts(part.manufacturerId!, part.manufacturerPartId!);
251+
const data = await fetchSerializedParts(part.manufacturerId, part.manufacturerPartId);
252252
const rowsWithId = data.map((row, index) => ({
253253
...row,
254254
id: index,

0 commit comments

Comments
 (0)