Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: enable slack for all
Marc Seitz82f2ff6a6722
diff --git a/components/settings/settings-header.tsx b/components/settings/settings-header.tsxindex 45f152cf..8c974fc2 100644--- a/components/settings/settings-header.tsx+++ b/components/settings/settings-header.tsx@@ -10,7 +10,6 @@ export function SettingsHeader() {const { data: features } = useSWR<{tokens: boolean;incomingWebhooks: boolean;- slack: boolean;}>(teamInfo?.currentTeam?.id? `/api/feature-flags?teamId=${teamInfo.currentTeam.id}`@@ -72,7 +71,6 @@ export function SettingsHeader() {label: "Slack",href: `/settings/slack`,segment: "slack",- disabled: !features?.slack,},{label: "Tokens",@@ -81,7 +79,7 @@ export function SettingsHeader() {disabled: !features?.tokens,},{- label: "Incoming Webhooks",+ label: "API",href: `/settings/incoming-webhooks`,segment: "incoming-webhooks",disabled: !features?.incomingWebhooks,diff --git a/lib/featureFlags/index.ts b/lib/featureFlags/index.tsindex 60343352..6b03150f 100644--- a/lib/featureFlags/index.ts+++ b/lib/featureFlags/index.ts@@ -9,8 +9,7 @@ export type BetaFeatures =| "dataroomUpload"| "inDocumentLinks"| "usStorage"- | "dataroomIndex"- | "slack";+ | "dataroomIndex";type BetaFeaturesRecord = Record<BetaFeatures, string[]>;@@ -25,7 +24,6 @@ export const getFeatureFlags = async ({ teamId }: { teamId?: string }) => {inDocumentLinks: false,usStorage: false,dataroomIndex: false,- slack: false,};// Return all features as true if edge config is not availablediff --git a/package-lock.json b/package-lock.jsonindex 62b030dc..66a58c84 100644--- a/package-lock.json+++ b/package-lock.json@@ -10134,9 +10134,9 @@}},"node_modules/caniuse-lite": {- "version": "1.0.30001706",- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001706.tgz",- "integrity": "sha512-3ZczoTApMAZwPKYWmwVbQMFpXBDds3/0VciVoUwPUbldlYyVLmRVuRs/PcUZtHpbLRpzzDvrvnFuREsGt6lUug==",+ "version": "1.0.30001741",+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001741.tgz",+ "integrity": "sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw==","funding": [{"type": "opencollective",@@ -10150,7 +10150,8 @@"type": "github","url": "https://github.com/sponsors/ai"}- ]+ ],+ "license": "CC-BY-4.0"},"node_modules/canvas": {"version": "2.11.2",diff --git a/pages/api/teams/[teamId]/integrations/slack/index.ts b/pages/api/teams/[teamId]/integrations/slack/index.tsindex e421371d..ff900775 100644--- a/pages/api/teams/[teamId]/integrations/slack/index.ts+++ b/pages/api/teams/[teamId]/integrations/slack/index.ts@@ -70,8 +70,6 @@ async function handleGet() {const env = getSlackEnv();- console.log("env", env);-try {const integrationFullData = await prisma.installedIntegration.findUnique({where: {diff --git a/pages/settings/slack.tsx b/pages/settings/slack.tsxindex 7d181b81..4d5facd3 100644--- a/pages/settings/slack.tsx+++ b/pages/settings/slack.tsx@@ -6,7 +6,6 @@ import { useTeam } from "@/context/team-context";import { CircleHelpIcon, Hash, Settings, XCircleIcon } from "lucide-react";import { toast } from "sonner";-import { useFeatureFlags } from "@/lib/hooks/use-feature-flags";import {SlackChannelConfig,SlackIntegration,@@ -38,7 +37,6 @@ export default function SlackSettings() {const router = useRouter();const teamInfo = useTeam();const teamId = teamInfo?.currentTeam?.id;- const { features, isLoading } = useFeatureFlags();const [connecting, setConnecting] = useState(false);const [isChannelPopoverOpen, setIsChannelPopoverOpen] = useState(false);const [pendingChannelUpdate, setPendingChannelUpdate] = useState(false);@@ -88,44 +86,31 @@ export default function SlackSettings() {[filteredChannels, ChannelIcon],);- // const handleIntegrationUpdate = (updatedIntegration: SlackIntegration) => {- // mutateIntegration(updatedIntegration, false);- // };-- // useEffect(() => {- // let timeoutId: NodeJS.Timeout | null = null;-- // if (router.query.success) {- // toast.success("Slack integration connected successfully!");- // mutateIntegration();-- // if (router.query.warning) {- // toast.warning(`Warning: ${router.query.warning}`);- // }-- // timeoutId = setTimeout(() => {- // router.replace("/settings/slack", undefined, { shallow: true });- // }, 100);- // } else if (router.query.error) {- // toast.error(`Failed to connect Slack: ${router.query.error}`);- // timeoutId = setTimeout(() => {- // router.replace("/settings/slack", undefined, { shallow: true });- // }, 100);- // }-- // return () => {- // if (timeoutId) clearTimeout(timeoutId);- // };- // }, [router.query, mutateIntegration]);-- // Redirect if Slack feature is not enableduseEffect(() => {- if (isLoading) return;- if (features && !features.slack) {- router.replace("/settings/general");- toast.error("This feature is not available for your team");+ let timeoutId: NodeJS.Timeout | null = null;++ if (router.query.success) {+ toast.success("Slack integration connected successfully!");+ mutateIntegration();++ if (router.query.warning) {+ toast.warning(`Warning: ${router.query.warning}`);+ }++ timeoutId = setTimeout(() => {+ router.replace("/settings/slack", undefined, { shallow: true });+ }, 100);+ } else if (router.query.error) {+ toast.error(`Failed to connect Slack: ${router.query.error}`);+ timeoutId = setTimeout(() => {+ router.replace("/settings/slack", undefined, { shallow: true });+ }, 100);}- }, [features?.slack, isLoading, router]);++ return () => {+ if (timeoutId) clearTimeout(timeoutId);+ };+ }, [router.query, mutateIntegration]);const handleConnect = async () => {if (!teamId) return;