public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Feature flag user cache (#10359) 

Co-authored-by: zomars <zomars@me.com>
pull/9960/head^2
sean-brydon 2023-07-25 23:00:21 +01:00 committed by GitHub
parent 533371da20
commit ad3bdbbda7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/pages/api/trpc/features/[trpc].ts
View File

@ -1,4 +1,4 @@
import { featureFlagRouter } from "@calcom/features/flags/server/router";
import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";
export default createNextApiHandler(featureFlagRouter);
export default createNextApiHandler(featureFlagRouter, true, "features");

2
packages/features/flags/components/FlagAdminList.tsx
View File

@ -32,7 +32,7 @@ const FlagToggle = (props: { flag: Flag }) => {
flag: { slug, enabled },
} = props;
const utils = trpc.useContext();
const mutation = trpc.viewer.features.toggle.useMutation({
const mutation = trpc.viewer.admin.toggleFeatureFlag.useMutation({
onSuccess: () => {
showToast("Flags successfully updated", "success");
utils.viewer.features.list.invalidate();

13
packages/features/flags/server/router.ts
View File

@ -1,6 +1,3 @@
import { z } from "zod";
import { authedAdminProcedure } from "@calcom/trpc/server/procedures/authedProcedure";
import publicProcedure from "@calcom/trpc/server/procedures/publicProcedure";
import { router } from "@calcom/trpc/server/trpc";
@ -17,14 +14,4 @@ export const featureFlagRouter = router({
const { prisma } = ctx;
return getFeatureFlagMap(prisma);
}),
toggle: authedAdminProcedure
.input(z.object({ slug: z.string(), enabled: z.boolean() }))
.mutation(({ ctx, input }) => {
const { prisma, user } = ctx;
const { slug, enabled } = input;
return prisma.feature.update({
where: { slug },
data: { enabled, updatedBy: user.id },
});
}),
});

9
packages/trpc/server/createNextApiHandler.ts
View File

@ -8,7 +8,7 @@ import type { AnyRouter } from "@trpc/server";
/**
* Creates an API handler executed by Next.js.
*/
export function createNextApiHandler(router: AnyRouter, isPublic = false) {
export function createNextApiHandler(router: AnyRouter, isPublic = false, namespace = "") {
return trpcNext.createNextApiHandler({
router,
/**
@ -64,10 +64,13 @@ export function createNextApiHandler(router: AnyRouter, isPublic = false) {
// Revalidation time here should be 1 second, per https://github.com/calcom/cal.com/pull/6823#issuecomment-1423215321
"slots.getSchedule": `no-cache`, // FIXME
cityTimezones: `max-age=${ONE_DAY_IN_SECONDS}, stale-while-revalidate`,
"features.map": `max-age=${ONE_DAY_IN_SECONDS}, stale-while-revalidate`, // "map" - Feature Flag Map
} as const;
const matchedPath = paths.find((v) => v in cacheRules) as keyof typeof cacheRules;
if (matchedPath) defaultHeaders.headers["cache-control"] = cacheRules[matchedPath];
const prependNamespace = (key: string) =>
(namespace ? `${namespace}.${key}` : key) as keyof typeof cacheRules;
const matchedPath = paths.find((v) => prependNamespace(v) in cacheRules);
if (matchedPath) defaultHeaders.headers["cache-control"] = cacheRules[prependNamespace(matchedPath)];
}
return defaultHeaders;

12
packages/trpc/server/routers/viewer/admin/_router.ts
View File

@ -1,3 +1,5 @@
import { z } from "zod";
import { authedAdminProcedure } from "../../../procedures/authedProcedure";
import { router } from "../../../trpc";
import { ZListMembersSchema } from "./listPaginated.schema";
@ -47,4 +49,14 @@ export const adminRouter = router({
input,
});
}),
toggleFeatureFlag: authedAdminProcedure
.input(z.object({ slug: z.string(), enabled: z.boolean() }))
.mutation(({ ctx, input }) => {
const { prisma, user } = ctx;
const { slug, enabled } = input;
return prisma.feature.update({
where: { slug },
data: { enabled, updatedBy: user.id },
});
}),
});