Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { FaSlack } from "react-icons/fa";
import { HiArrowPath, HiCheck } from "react-icons/hi2";
import { SiGithub, SiLinear } from "react-icons/si";
import { SiLinear } from "react-icons/si";

const SYNCED_ITEMS = [
{ id: "1", type: "issue", name: "SUP-142: Fix auth flow", status: "synced" },
{ id: "2", type: "pr", name: "PR #89: Add workspace sync", status: "synced" },
{
id: "2",
type: "message",
name: "#eng: Add workspace sync",
status: "synced",
},
{
id: "3",
type: "issue",
Expand Down Expand Up @@ -45,10 +51,10 @@ export function IntegrationsDemo() {
<div className="w-6 h-px bg-foreground/20" />
</div>
<div className="flex flex-col items-center gap-1.5">
<div className="w-10 h-10 rounded-lg bg-[#24292e] flex items-center justify-center">
<SiGithub className="w-5 h-5 text-white" />
<div className="w-10 h-10 rounded-lg bg-[#4A154B] flex items-center justify-center">
<FaSlack className="w-5 h-5 text-white" />
</div>
<span className="text-[10px] text-muted-foreground">GitHub</span>
<span className="text-[10px] text-muted-foreground">Slack</span>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/renderer/components/Paywall/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const PRO_FEATURES: ProFeature[] = [
id: "integrations",
title: "Integrations",
description:
"Connect Linear, GitHub, and more to sync issues and PRs directly with your workspaces.",
"Connect Linear, Slack, and more to sync issues and conversations directly with your workspaces.",
icon: HiOutlinePuzzlePiece,
iconColor: "text-purple-500",
gradientColors: ["#7c3aed", "#6d28d9", "#4c1d95", "#1a1a2e"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const PLANS: Record<PlanTier, Plan> = {
{ id: "workspaces", name: "Up to 5 workspaces", included: true },
{ id: "local-only", name: "Local workspaces only", included: true },
{ id: "desktop-app", name: "Desktop app", included: true },
{ id: "github", name: "GitHub integration", included: true },
],
cta: { text: "Current plan", action: "current", disabled: true },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const COMPARISON_SECTIONS: ComparisonSection[] = [
},
{
label: "GitHub integration",
values: [null, true, true],
values: [true, true, true],
},
{
label: "Cloud workspaces",
Expand All @@ -152,6 +152,10 @@ const COMPARISON_SECTIONS: ComparisonSection[] = [
label: "Linear integration",
values: [null, true, true],
},
{
label: "Slack integration",
values: [null, true, true],
},
{
label: "Team collaboration",
values: [null, true, true],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ export function IntegrationsSettings({
useState<GithubInstallation | null>(null);
const [isLoadingGithub, setIsLoadingGithub] = useState(true);

const hasGithubAccess = useFeatureFlagEnabled(
FEATURE_FLAGS.GITHUB_INTEGRATION_ACCESS,
);
const hasSlackAccess = useFeatureFlagEnabled(
FEATURE_FLAGS.SLACK_INTEGRATION_ACCESS,
);
Expand All @@ -71,9 +68,10 @@ export function IntegrationsSettings({
SETTING_ITEM_ID.INTEGRATIONS_LINEAR,
visibleItems,
);
const showGithub =
hasGithubAccess &&
isItemVisible(SETTING_ITEM_ID.INTEGRATIONS_GITHUB, visibleItems);
const showGithub = isItemVisible(
SETTING_ITEM_ID.INTEGRATIONS_GITHUB,
visibleItems,
);

const fetchGithubInstallation = useCallback(async () => {
if (!activeOrganizationId) {
Expand Down Expand Up @@ -161,11 +159,7 @@ export function IntegrationsSettings({
isConnected={isGithubConnected}
connectedOrgName={githubInstallation?.accountLogin}
isLoading={isLoadingGithub}
onManage={() =>
gateFeature(GATED_FEATURES.INTEGRATIONS, () =>
handleOpenWeb("/integrations/github"),
)
}
onManage={() => handleOpenWeb("/integrations/github")}
/>
)}

Expand Down
6 changes: 1 addition & 5 deletions apps/web/src/app/(dashboard-legacy)/integrations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,17 @@ const integrations: IntegrationCardProps[] = [
];

export default function IntegrationsPage() {
const hasGithubAccess = useFeatureFlagEnabled(
FEATURE_FLAGS.GITHUB_INTEGRATION_ACCESS,
);
const hasSlackAccess = useFeatureFlagEnabled(
FEATURE_FLAGS.SLACK_INTEGRATION_ACCESS,
);

const visibleIntegrations = useMemo(
() =>
integrations.filter((i) => {
if (i.id === "github") return hasGithubAccess;
if (i.id === "slack") return hasSlackAccess;
return true;
}),
[hasGithubAccess, hasSlackAccess],
[hasSlackAccess],
);

return (
Expand Down
Loading