Merge branch 'dev' into private-http-ha

This commit is contained in:
Owen
2026-04-13 20:52:47 -07:00
46 changed files with 3017 additions and 2559 deletions

View File

@@ -142,6 +142,7 @@ export async function getUserResources(
let siteResourcesData: Array<{
siteResourceId: number;
name: string;
niceId: string;
destination: string;
mode: string;
scheme: string | null;
@@ -154,6 +155,7 @@ export async function getUserResources(
.select({
siteResourceId: siteResources.siteResourceId,
name: siteResources.name,
niceId: siteResources.niceId,
destination: siteResources.destination,
mode: siteResources.mode,
scheme: siteResources.scheme,
@@ -249,7 +251,7 @@ export async function getUserResources(
});
return response(res, {
data: {
data: {
resources: resourcesWithAuth,
siteResources: siteResourcesFormatted
},