calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-25 02:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ labels on proxy resources

Browse Source
This commit is contained in:
Fred KISSIE
2026-05-11 18:37:16 +02:00
parent 549e1ead1d
commit ab494521b1
3 changed files with 114 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/routers/resource/listResources.ts
View File

@@ -417,7 +417,9 @@ export async function listResources(
conditions.push(or(...queryList));
}
const baseQuery = queryResourcesBase(isLabelFeatureEnabled).where(and(...conditions));
const baseQuery = queryResourcesBase(isLabelFeatureEnabled).where(
and(...conditions)
);
// we need to add `as` so that drizzle filters the result as a subquery
const countQuery = db.$count(baseQuery.as("filtered_resources"));
@@ -463,7 +465,8 @@ export async function listResources(
)
.where(
inArray(resourceLabels.resourceId, resourceIdList)
);
)
.orderBy(asc(resourceLabels.resourceLabelId));
}
const allResourceTargets =

3
server/routers/site/listSites.ts
View File

@@ -423,7 +423,8 @@ export async function listSites(
siteLabels,
eq(siteLabels.labelId, labels.labelId)
)
.where(inArray(siteLabels.siteId, siteIds));
.where(inArray(siteLabels.siteId, siteIds))
.orderBy(asc(siteLabels.siteLabelId));
}
const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {