Merge branch 'main' into refactor/handle-seats
This commit is contained in:
commit
8c081fd6b1
|
@ -58,6 +58,7 @@ export async function patchHandler(req: NextApiRequest) {
|
||||||
const { prisma, body, userId } = req;
|
const { prisma, body, userId } = req;
|
||||||
const data = schemaTeamUpdateBodyParams.parse(body);
|
const data = schemaTeamUpdateBodyParams.parse(body);
|
||||||
const { teamId } = schemaQueryTeamId.parse(req.query);
|
const { teamId } = schemaQueryTeamId.parse(req.query);
|
||||||
|
|
||||||
/** Only OWNERS and ADMINS can edit teams */
|
/** Only OWNERS and ADMINS can edit teams */
|
||||||
const _team = await prisma.team.findFirst({
|
const _team = await prisma.team.findFirst({
|
||||||
include: { members: true },
|
include: { members: true },
|
||||||
|
@ -65,6 +66,18 @@ export async function patchHandler(req: NextApiRequest) {
|
||||||
});
|
});
|
||||||
if (!_team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
|
if (!_team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
|
||||||
|
|
||||||
|
const slugAlreadyExists = await prisma.team.findFirst({
|
||||||
|
where: {
|
||||||
|
slug: {
|
||||||
|
mode: "insensitive",
|
||||||
|
equals: data.slug,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (slugAlreadyExists && data.slug !== _team.slug)
|
||||||
|
throw new HttpError({ statusCode: 409, message: "Team slug already exists" });
|
||||||
|
|
||||||
// Check if parentId is related to this user
|
// Check if parentId is related to this user
|
||||||
if (data.parentId && data.parentId === teamId) {
|
if (data.parentId && data.parentId === teamId) {
|
||||||
throw new HttpError({
|
throw new HttpError({
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@calcom/web",
|
"name": "@calcom/web",
|
||||||
"version": "3.6.3",
|
"version": "3.6.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"analyze": "ANALYZE=true next build",
|
"analyze": "ANALYZE=true next build",
|
||||||
|
|
|
@ -74,7 +74,7 @@ export const Day = ({
|
||||||
<span
|
<span
|
||||||
className={classNames(
|
className={classNames(
|
||||||
"bg-brand-default absolute left-1/2 top-1/2 flex h-[5px] w-[5px] -translate-x-1/2 translate-y-[8px] items-center justify-center rounded-full align-middle sm:translate-y-[12px]",
|
"bg-brand-default absolute left-1/2 top-1/2 flex h-[5px] w-[5px] -translate-x-1/2 translate-y-[8px] items-center justify-center rounded-full align-middle sm:translate-y-[12px]",
|
||||||
active && "invert"
|
active && "bg-brand-accent"
|
||||||
)}>
|
)}>
|
||||||
<span className="sr-only">{t("today")}</span>
|
<span className="sr-only">{t("today")}</span>
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user