Compare commits

...
+24 -22
View File
@@ -613,7 +613,7 @@ export const boardRouter = createTRPCRouter({
boardId: board.id, boardId: board.id,
}); });
const sortedLayouts = board.layouts.sort((layoutA, layoutB) => layoutA.columnCount - layoutB.columnCount); const sortedLayouts = board.layouts.toSorted((layoutA, layoutB) => layoutA.columnCount - layoutB.columnCount);
// Fallback to biggest if none exists with columnCount bigger than addedLayout.columnCount // Fallback to biggest if none exists with columnCount bigger than addedLayout.columnCount
const layoutToClone = const layoutToClone =
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -1215,7 +1215,7 @@ export const boardRouter = createTRPCRouter({
}); });
return { return {
inherited: dbGroupPermissions.sort((permissionA, permissionB) => { inherited: dbGroupPermissions.toSorted((permissionA, permissionB) => {
return permissionA.group.name.localeCompare(permissionB.group.name); return permissionA.group.name.localeCompare(permissionB.group.name);
}), }),
users: userPermissions users: userPermissions
@@ -1223,7 +1223,7 @@ export const boardRouter = createTRPCRouter({
user, user,
permission, permission,
})) }))
.sort((permissionA, permissionB) => { .toSorted((permissionA, permissionB) => {
return (permissionA.user.name ?? "").localeCompare(permissionB.user.name ?? ""); return (permissionA.user.name ?? "").localeCompare(permissionB.user.name ?? "");
}), }),
groups: dbGroupBoardPermission groups: dbGroupBoardPermission
@@ -1234,7 +1234,7 @@ export const boardRouter = createTRPCRouter({
}, },
permission, permission,
})) }))
.sort((permissionA, permissionB) => { .toSorted((permissionA, permissionB) => {
return permissionA.group.name.localeCompare(permissionB.group.name); return permissionA.group.name.localeCompare(permissionB.group.name);
}), }),
}; };
@@ -1586,7 +1586,7 @@ const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, use
...otherBoardProperties, ...otherBoardProperties,
layouts: layouts layouts: layouts
.map(({ boardId: _, ...layout }) => layout) .map(({ boardId: _, ...layout }) => layout)
.sort((layoutA, layoutB) => layoutA.breakpoint - layoutB.breakpoint), .toSorted((layoutA, layoutB) => layoutA.breakpoint - layoutB.breakpoint),
sections: sections.map(({ collapseStates, ...section }) => sections: sections.map(({ collapseStates, ...section }) =>
parseSection({ parseSection({
...section, ...section,
@@ -1604,22 +1604,24 @@ const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, use
collapsed: collapseStates.at(0)?.collapsed ?? false, collapsed: collapseStates.at(0)?.collapsed ?? false,
}), }),
), ),
items: items.map(({ integrations: itemIntegrations, ...item }) => items: items
parseItem({ .map(({ integrations: itemIntegrations, ...item }) =>
...item, parseItem({
layouts: item.layouts.map((layout) => ({ ...item,
xOffset: layout.xOffset, layouts: item.layouts.map((layout) => ({
yOffset: layout.yOffset, xOffset: layout.xOffset,
width: layout.width, yOffset: layout.yOffset,
height: layout.height, width: layout.width,
layoutId: layout.layoutId, height: layout.height,
sectionId: layout.sectionId, layoutId: layout.layoutId,
})), sectionId: layout.sectionId,
integrationIds: itemIntegrations.map((item) => item.integration.id), })),
advancedOptions: superjson.parse<BoardItemAdvancedOptions>(item.advancedOptions), integrationIds: itemIntegrations.map((item) => item.integration.id),
options: superjson.parse<Record<string, unknown>>(item.options), advancedOptions: superjson.parse<BoardItemAdvancedOptions>(item.advancedOptions),
}), options: superjson.parse<Record<string, unknown>>(item.options),
), }),
)
.filter((item) => item !== null),
}; };
}; };
@@ -1635,7 +1637,7 @@ const parseItem = (item: unknown) => {
const result = outputItemSchema.safeParse(item); const result = outputItemSchema.safeParse(item);
if (!result.success) { if (!result.success) {
throw new Error(result.error.message); return null;
} }
return result.data; return result.data;
}; };