mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-30 23:55:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

store last visited org in cookie

Browse source
This commit is contained in:
miloschwartz 2025-06-24 14:54:07 -04:00
parent 34180ca454
commit 9bb4d8b2a3
No known key found for this signature in database
6 changed files with 14229 additions and 14065 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/routers/org/createOrg.ts
View file

@ -180,7 +180,7 @@ export async function createOrg(
// Get all actions and create role actions
const actionIds = await trx.select().from(actions).execute();
if (actionIds.length > 0) {
await trx
.insert(roleActions)
@ -193,12 +193,14 @@ export async function createOrg(
);
}
await trx.insert(orgDomains).values(
allDomains.map((domain) => ({
orgId: newOrg[0].orgId,
domainId: domain.domainId
}))
);
if (allDomains.length) {
await trx.insert(orgDomains).values(
allDomains.map((domain) => ({
orgId: newOrg[0].orgId,
domainId: domain.domainId
}))
);
}
if (req.user) {
await trx.insert(userOrgs).values({

22
server/routers/org/listUserOrgs.ts
View file

@ -5,7 +5,7 @@ import { Org, orgs, userOrgs } from "@server/db";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";
import { sql, inArray, eq } from "drizzle-orm";
import { sql, inArray, eq, and } from "drizzle-orm";
import logger from "@server/logger";
import { fromZodError } from "zod-validation-error";
import { OpenAPITags, registry } from "@server/openApi";
@ -40,8 +40,10 @@ const listOrgsSchema = z.object({
// responses: {}
// });
type ResponseOrg = Org & { isOwner?: boolean };
export type ListUserOrgsResponse = {
orgs: Org[];
orgs: ResponseOrg[];
pagination: { total: number; limit: number; offset: number };
};
@ -106,6 +108,10 @@ export async function listUserOrgs(
.select()
.from(orgs)
.where(inArray(orgs.orgId, userOrgIds))
.leftJoin(
userOrgs,
and(eq(userOrgs.orgId, orgs.orgId), eq(userOrgs.userId, userId))
)
.limit(limit)
.offset(offset);
@ -115,9 +121,19 @@ export async function listUserOrgs(
.where(inArray(orgs.orgId, userOrgIds));
const totalCount = totalCountResult[0].count;
const responseOrgs = organizations.map((val) => {
const res = {
...val.orgs
} as ResponseOrg;
if (val.userOrgs && val.userOrgs.isOwner) {
res.isOwner = val.userOrgs.isOwner;
}
return res;
});
return response<ListUserOrgsResponse>(res, {
data: {
orgs: organizations,
orgs: responseOrgs,
pagination: {
total: totalCount,
limit,