Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Enable object store for self-hosted instance (#1739)
Luke Vellafbccc4f98b31
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsxindex 052e62f4c..c222ba9a7 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx@@ -9,7 +9,7 @@ import { z } from "zod";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import { Trans } from "@/components/trans";import { useUser } from "@/components/user-provider";-import { IfCloudHosted } from "@/contexts/environment";+import { useFeatureFlag } from "@/features/feature-flags/client";import { useTranslation } from "@/i18n/client";import { trpc } from "@/trpc/client";@@ -178,12 +178,11 @@ export function ProfilePicture({name: string;image?: string;}) {+ const isStorageEnabled = useFeatureFlag("storage");return (<div className="flex items-center gap-x-4"><OptimizedAvatarImage src={image} name={name} size="lg" />- <IfCloudHosted>- <Upload />- </IfCloudHosted>+ {isStorageEnabled ? <Upload /> : null}</div>);}diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsxindex a4b03b4ff..129e1e8f1 100644--- a/apps/web/src/app/[locale]/layout.tsx+++ b/apps/web/src/app/[locale]/layout.tsx@@ -19,6 +19,8 @@ import { auth, getUserId } from "@/next-auth";import { TRPCProvider } from "@/trpc/client/provider";import { ConnectedDayjsProvider } from "@/utils/dayjs";+import { FeatureFlagsProvider } from "@/features/feature-flags/client";+import { isStorageEnabled } from "@/features/storage";import { getUser } from "@/features/user/queries";import { PostHogPageView } from "../posthog-page-view";@@ -56,57 +58,59 @@ export default async function Root({return (<html lang={locale} className={inter.className}><body>- <Toaster />- <I18nProvider locale={locale}>- <TRPCProvider>- <LazyMotion features={domAnimation}>- <PostHogProvider client={posthog}>- <PostHogPageView />- <TooltipProvider>- <UserProvider- user={- user- ? {- id: user.id,- name: user.name,- email: user.email,- tier: user- ? user.isPro- ? "pro"- : "hobby"- : "guest",- image: user.image,- role: user.role,- }- : session?.user+ <FeatureFlagsProvider value={{ storage: isStorageEnabled }}>+ <Toaster />+ <I18nProvider locale={locale}>+ <TRPCProvider>+ <LazyMotion features={domAnimation}>+ <PostHogProvider client={posthog}>+ <PostHogPageView />+ <TooltipProvider>+ <UserProvider+ user={+ user? {- id: session.user.id,- tier: "guest",- role: "guest",+ id: user.id,+ name: user.name,+ email: user.email,+ tier: user+ ? user.isPro+ ? "pro"+ : "hobby"+ : "guest",+ image: user.image,+ role: user.role,}- : undefined- }- >- <PreferencesProvider- initialValue={{- timeFormat: user?.timeFormat,- timeZone: user?.timeZone,- weekStart: user?.weekStart,- }}+ : session?.user+ ? {+ id: session.user.id,+ tier: "guest",+ role: "guest",+ }+ : undefined+ }>- <TimezoneProvider initialTimezone={user?.timeZone}>- <ConnectedDayjsProvider>- {children}- <TimeZoneChangeDetector />- </ConnectedDayjsProvider>- </TimezoneProvider>- </PreferencesProvider>- </UserProvider>- </TooltipProvider>- </PostHogProvider>- </LazyMotion>- </TRPCProvider>- </I18nProvider>+ <PreferencesProvider+ initialValue={{+ timeFormat: user?.timeFormat,+ timeZone: user?.timeZone,+ weekStart: user?.weekStart,+ }}+ >+ <TimezoneProvider initialTimezone={user?.timeZone}>+ <ConnectedDayjsProvider>+ {children}+ <TimeZoneChangeDetector />+ </ConnectedDayjsProvider>+ </TimezoneProvider>+ </PreferencesProvider>+ </UserProvider>+ </TooltipProvider>+ </PostHogProvider>+ </LazyMotion>+ </TRPCProvider>+ </I18nProvider>+ </FeatureFlagsProvider></body></html>);diff --git a/apps/web/src/app/api/storage/[...key]/route.ts b/apps/web/src/app/api/storage/[...key]/route.tsindex b08370b9e..d36cb025f 100644--- a/apps/web/src/app/api/storage/[...key]/route.ts+++ b/apps/web/src/app/api/storage/[...key]/route.ts@@ -3,7 +3,7 @@ import type { NextRequest } from "next/server";import { NextResponse } from "next/server";import { env } from "@/env";-import { getS3Client } from "@/utils/s3";+import { getS3Client } from "@/features/storage/s3";async function getAvatar(key: string) {const s3Client = getS3Client();diff --git a/apps/web/src/features/feature-flags/client.tsx b/apps/web/src/features/feature-flags/client.tsxnew file mode 100644index 000000000..4841f952f--- /dev/null+++ b/apps/web/src/features/feature-flags/client.tsx@@ -0,0 +1,37 @@+"use client";++import React from "react";++interface Features {+ storage: boolean;+}++const FeatureFlagsContext = React.createContext<Features | undefined>(+ undefined,+);++interface FeatureFlagsProviderProps {+ value: Features;+ children: React.ReactNode;+}++export function FeatureFlagsProvider({+ value,+ children,+}: FeatureFlagsProviderProps) {+ return (+ <FeatureFlagsContext.Provider value={value}>+ {children}+ </FeatureFlagsContext.Provider>+ );+}++export function useFeatureFlag(featureName: keyof Features): boolean {+ const context = React.useContext(FeatureFlagsContext);+ if (context === undefined) {+ throw new Error(+ "useFeatureFlag must be used within a FeatureFlagsProvider",+ );+ }+ return context[featureName] ?? false;+}diff --git a/apps/web/src/features/storage/index.ts b/apps/web/src/features/storage/index.tsnew file mode 100644index 000000000..240c01c3a--- /dev/null+++ b/apps/web/src/features/storage/index.ts@@ -0,0 +1,4 @@+export const isStorageEnabled =+ !!process.env.S3_BUCKET_NAME &&+ !!process.env.S3_ACCESS_KEY_ID &&+ !!process.env.S3_SECRET_ACCESS_KEY;diff --git a/apps/web/src/utils/s3.ts b/apps/web/src/features/storage/s3.tssimilarity index 100%rename from apps/web/src/utils/s3.tsrename to apps/web/src/features/storage/s3.tsdiff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.tsindex 1d3675c7d..1631bfd61 100644--- a/apps/web/src/trpc/routers/user.ts+++ b/apps/web/src/trpc/routers/user.ts@@ -7,7 +7,7 @@ import { waitUntil } from "@vercel/functions";import { z } from "zod";import { env } from "@/env";-import { getS3Client } from "@/utils/s3";+import { getS3Client } from "@/features/storage/s3";import { createToken } from "@/utils/session";import {