This commit is contained in:
lukylix 2023-07-05 22:00:33 +02:00
parent 02f24d3abd
commit 1bd300e497
2 changed files with 7 additions and 9 deletions

View File

@ -15,8 +15,6 @@ const columnMap = [
]; ];
export default function List({ group, services, layout, isGroup = false }) { export default function List({ group, services, layout, isGroup = false }) {
//console.log({ group, services, layout });
console.log({ services });
return ( return (
<ul <ul
className={classNames( className={classNames(
@ -24,19 +22,19 @@ export default function List({ group, services, layout, isGroup = false }) {
isGroup ? undefined : "mt-3" isGroup ? undefined : "mt-3"
)} )}
> >
{services.map((service, i) => { {services.map((service) =>
return service.type == "grouped-service" ? ( service.type === "grouped-service" ? (
<List <List
key={service.name} key={service.name}
group={service.name} group={service.name}
services={service.services} services={service.services}
layout={{ columns: parseInt(service.name) || service.services.length, style: "row" }} layout={{ columns: parseInt(service.name, 10) || service.services.length, style: "row" }}
isGroup={true} isGroup
/> />
) : ( ) : (
<Item key={service.container ?? service.app ?? service.name} service={service} group={group} /> <Item key={service.container ?? service.app ?? service.name} service={service} group={group} />
); )
})} )}
</ul> </ul>
); );
} }

View File

@ -53,7 +53,7 @@ export async function servicesFromConfig() {
servicesArray[groupIndex].services[serviceIndex].weight = (serviceIndex + 1) * 100; servicesArray[groupIndex].services[serviceIndex].weight = (serviceIndex + 1) * 100;
} }
if (service.type === "grouped-service") { if (service.type === "grouped-service") {
service.weight = (serviceIndex + 1) * 100; servicesArray[groupIndex].services[serviceIndex].weight = (serviceIndex + 1) * 100;
service.services.forEach((groupedService, groupedServiceIndex) => { service.services.forEach((groupedService, groupedServiceIndex) => {
if (!groupedService.weight) { if (!groupedService.weight) {
servicesArray[groupIndex].services[serviceIndex].services[groupedServiceIndex].weight = servicesArray[groupIndex].services[serviceIndex].services[groupedServiceIndex].weight =