From c879d3cebdf78b7cdf03c6d8b234dc6431e7a882 Mon Sep 17 00:00:00 2001 From: nimrodkra <41470823+nimrodkra@users.noreply.github.com> Date: Mon, 16 Nov 2026 15:57:23 +0000 Subject: [PATCH 1/3] feat(squads): list every Manage section, locked to the plan that unlocks it --- .../squads/components/header/SquadActions.tsx | 8 +- .../components/manage/SquadManageLayout.tsx | 3 +- .../components/manage/SquadManagePage.tsx | 17 ++- .../components/manage/SquadManagePlan.tsx | 56 ++++++---- .../src/features/squads/lib/manage.spec.tsx | 48 ++++++-- .../shared/src/features/squads/lib/manage.tsx | 105 +++++++++++++----- packages/webapp/__tests__/SquadPage.tsx | 4 +- 7 files changed, 173 insertions(+), 68 deletions(-) diff --git a/packages/shared/src/features/squads/components/header/SquadActions.tsx b/packages/shared/src/features/squads/components/header/SquadActions.tsx index a874f3d5a9..076f936b14 100644 --- a/packages/shared/src/features/squads/components/header/SquadActions.tsx +++ b/packages/shared/src/features/squads/components/header/SquadActions.tsx @@ -12,10 +12,10 @@ import { } from '../../../../components/buttons/Button'; import { BellIcon, - EditIcon, LinkIcon, OpenLinkIcon, SearchIcon, + SettingsIcon, TourIcon, } from '../../../../components/icons'; import { Tooltip } from '../../../../components/tooltip/Tooltip'; @@ -185,14 +185,14 @@ export const SquadActions = (): ReactElement => { return (
{canEdit && ( - + +
+); + const ChoosePlan = ({ isAdmin }: { isAdmin: boolean }): ReactElement => { const { squad } = useSquadPageContext(); const prices = useSquadPlanPrices(); @@ -209,26 +234,7 @@ const ChoosePlan = ({ isAdmin }: { isAdmin: boolean }): ReactElement => { Only an admin of this Squad can choose a plan.

)} -
-
-

Enterprise

-

- Verified badge, homepage placement, campaigns and an account team. -

-
- -
+ logUpgrade('enterprise')} /> ); }; @@ -575,6 +581,16 @@ const ActivePlan = ({ {isSelfServe && } + {isSelfServe && ( + + logStartups(LogEvent.UpgradeSubscription, 'enterprise', { + origin: Origin.SquadManagePlan, + source_id: sourceId, + }) + } + /> + )} ); }; diff --git a/packages/shared/src/features/squads/lib/manage.spec.tsx b/packages/shared/src/features/squads/lib/manage.spec.tsx index 0086e5bbd7..0f7222d7ea 100644 --- a/packages/shared/src/features/squads/lib/manage.spec.tsx +++ b/packages/shared/src/features/squads/lib/manage.spec.tsx @@ -1,6 +1,6 @@ import type { Squad } from '../../../graphql/sources'; import { SourceMemberRole, SourcePermissions } from '../../../graphql/sources'; -import { getSquadManageGroups } from './manage'; +import { getSquadManageGroups, SquadManageLockedPlan } from './manage'; import { SquadManageSection } from './routes'; import { SquadViewer } from './viewer'; @@ -35,27 +35,55 @@ describe('getSquadManageGroups', () => { .filter(({ lockedPlan }) => !!lockedPlan) .map(({ id }) => id); - it('shows plan sections locked to editors of a squad with no plan', () => { + const lockedPlans = (squad: Squad) => + Object.fromEntries( + getSquadManageGroups(squad, SquadViewer.Admin) + .flatMap(({ items }) => items) + .filter(({ lockedPlan }) => !!lockedPlan) + .map(({ id, lockedPlan }) => [id, lockedPlan]), + ); + + it('shows every plan section locked to editors of a squad with no plan', () => { const squad = squadWith([SourcePermissions.Edit]); - expect(locked(squad)).toEqual([ - SquadManageSection.Products, - SquadManageSection.Links, - SquadManageSection.Intel, - SquadManageSection.Agent, - ]); + expect(lockedPlans(squad)).toEqual({ + [SquadManageSection.Products]: SquadManageLockedPlan.Startups, + [SquadManageSection.Jobs]: SquadManageLockedPlan.Enterprise, + [SquadManageSection.Links]: SquadManageLockedPlan.Startups, + [SquadManageSection.Branding]: SquadManageLockedPlan.Startups, + [SquadManageSection.Intel]: SquadManageLockedPlan.Startups, + [SquadManageSection.Agent]: SquadManageLockedPlan.Startups, + }); }); - it('locks nothing for a squad on a plan', () => { + it('locks only Enterprise sections for a squad on a Startups plan', () => { const squad = { ...squadWith([SourcePermissions.Edit]), - features: { links: true, products: true }, + features: { links: true, products: true, cta: true }, + currentMember: { permissions: [SourcePermissions.Edit], seat: true }, + } as unknown as Squad; + + expect(lockedPlans(squad)).toEqual({ + [SquadManageSection.Jobs]: SquadManageLockedPlan.Enterprise, + }); + }); + + it('locks nothing for an Enterprise squad', () => { + const squad = { + ...squadWith([SourcePermissions.Edit]), + features: { verified: true, links: true, products: true, jobs: true }, currentMember: { permissions: [SourcePermissions.Edit], seat: true }, } as unknown as Squad; expect(locked(squad)).toEqual([]); }); + it('shows no locks to staff who cannot edit the squad', () => { + const squad = squadWith([SourcePermissions.ModeratePost]); + + expect(locked(squad)).toEqual([]); + }); + it('opens Agent and API to admins of a Startups plan squad', () => { const squad = { ...squadWith([SourcePermissions.Edit]), diff --git a/packages/shared/src/features/squads/lib/manage.tsx b/packages/shared/src/features/squads/lib/manage.tsx index 4442822eaa..31fb214669 100644 --- a/packages/shared/src/features/squads/lib/manage.tsx +++ b/packages/shared/src/features/squads/lib/manage.tsx @@ -31,10 +31,11 @@ export interface SquadManageItem { icon: ReactElement; badge?: number; /** - * A section the squad's plan doesn't include yet, shown locked to promote - * daily.dev for Startups: it names the plan and links to Subscription. + * A section the squad's plan doesn't include yet, shown locked: it names the + * plan that unlocks it (daily.dev for Startups or Enterprise) and links to + * Subscription. */ - lockedPlan?: string; + lockedPlan?: SquadManageLockedPlan; } export interface SquadManageGroup { @@ -60,6 +61,47 @@ export const squadManageTitles: Record = { [SquadManageSection.DangerZone]: 'Danger zone', }; +export enum SquadManageLockedPlan { + Startups = 'Startups', + Enterprise = 'Enterprise', +} + +interface SquadManagePlanGate { + /** The plan that unlocks the section, named on its lock */ + plan: SquadManageLockedPlan; + isIncluded: (squad: Squad) => boolean; +} + +// Sections a plan unlocks. Every squad lists them, so nobody misses a feature: +// a squad whose plan doesn't include one shows it locked to the plan that does. +const planGates: Partial> = { + [SquadManageSection.Products]: { + plan: SquadManageLockedPlan.Startups, + isIncluded: (squad) => hasSquadFeature(squad, 'products'), + }, + [SquadManageSection.Jobs]: { + plan: SquadManageLockedPlan.Enterprise, + isIncluded: (squad) => hasSquadFeature(squad, 'jobs'), + }, + [SquadManageSection.Links]: { + plan: SquadManageLockedPlan.Startups, + isIncluded: (squad) => hasSquadFeature(squad, 'links'), + }, + [SquadManageSection.Branding]: { + plan: SquadManageLockedPlan.Startups, + isIncluded: canSetSquadButton, + }, + [SquadManageSection.Intel]: { + plan: SquadManageLockedPlan.Startups, + isIncluded: isCompanySquad, + }, + [SquadManageSection.Agent]: { + plan: SquadManageLockedPlan.Startups, + isIncluded: isCompanySquad, + }, +}; + +// Whether the viewer's role opens the section, whatever the squad's plan const canSeeSection = (squad: Squad, section: SquadManageSection): boolean => { const canEdit = verifyPermission(squad, SourcePermissions.Edit); @@ -67,15 +109,11 @@ const canSeeSection = (squad: Squad, section: SquadManageSection): boolean => { case SquadManageSection.Details: case SquadManageSection.Rules: case SquadManageSection.Posting: - return canEdit; case SquadManageSection.Products: - return canEdit && hasSquadFeature(squad, 'products'); case SquadManageSection.Jobs: - return canEdit && hasSquadFeature(squad, 'jobs'); case SquadManageSection.Links: - return canEdit && hasSquadFeature(squad, 'links'); case SquadManageSection.Branding: - return canEdit && canSetSquadButton(squad); + return canEdit; case SquadManageSection.Members: return true; case SquadManageSection.Moderation: @@ -95,9 +133,8 @@ const canSeeSection = (squad: Squad, section: SquadManageSection): boolean => { const role = squad.currentMember?.role; return ( - isCompanySquad(squad) && - (role === SourceMemberRole.Admin || - (role === SourceMemberRole.Moderator && !!squad.currentMember?.seat)) + role === SourceMemberRole.Admin || + (role === SourceMemberRole.Moderator && !!squad.currentMember?.seat) ); } case SquadManageSection.DangerZone: @@ -107,20 +144,30 @@ const canSeeSection = (squad: Squad, section: SquadManageSection): boolean => { } }; -// Plan sections a squad with no plan shows locked -const lockedSections = [ - SquadManageSection.Products, - SquadManageSection.Links, - SquadManageSection.Intel, - SquadManageSection.Agent, -]; - -const isLockedSection = (squad: Squad, section: SquadManageSection): boolean => - lockedSections.includes(section) && - verifyPermission(squad, SourcePermissions.Edit) && - !hasSquadFeature(squad, 'verified') && - // Every plan turns links on - !hasSquadFeature(squad, 'links'); +/** + * The plan a section is locked to, or undefined when it isn't locked. Locks + * show to those who can edit the squad, who reach Subscription from them. + */ +const getLockedPlan = ( + squad: Squad, + section: SquadManageSection, +): SquadManageLockedPlan | undefined => { + const gate = planGates[section]; + + if ( + !gate || + gate.isIncluded(squad) || + !verifyPermission(squad, SourcePermissions.Edit) + ) { + return undefined; + } + + return gate.plan; +}; + +const isOpenSection = (squad: Squad, section: SquadManageSection): boolean => + canSeeSection(squad, section) && + (planGates[section]?.isIncluded(squad) ?? true); const item = ( id: SquadManageSection, @@ -180,13 +227,13 @@ export const getSquadManageGroups = ( .map((group) => ({ ...group, items: group.items.flatMap((groupItem) => { - if (canSeeSection(squad, groupItem.id)) { + if (isOpenSection(squad, groupItem.id)) { return [groupItem]; } - return isLockedSection(squad, groupItem.id) - ? [{ ...groupItem, lockedPlan: 'Starter' }] - : []; + const lockedPlan = getLockedPlan(squad, groupItem.id); + + return lockedPlan ? [{ ...groupItem, lockedPlan }] : []; }), })) .filter((group) => group.items.length > 0); diff --git a/packages/webapp/__tests__/SquadPage.tsx b/packages/webapp/__tests__/SquadPage.tsx index 77b43d90b2..ebec6cd1c9 100644 --- a/packages/webapp/__tests__/SquadPage.tsx +++ b/packages/webapp/__tests__/SquadPage.tsx @@ -331,7 +331,7 @@ describe('squad page viewer matrix', () => { expect(!!screen.queryByLabelText('Squad notifications settings')).toBe( hasBell, ); - expect(!!screen.queryByLabelText('Edit page')).toBe(canEdit); + expect(!!screen.queryByLabelText('Squad settings')).toBe(canEdit); expect(!!screen.queryByText('Public page & URL')).toBe(isStaff); expect(!!screen.queryByLabelText('View as a visitor')).toBe(isStaff); }, @@ -385,7 +385,7 @@ describe('squad page viewer matrix', () => { toggle.click(); await screen.findByText(/viewing the page as a visitor/); - expect(screen.queryByLabelText('Edit page')).not.toBeInTheDocument(); + expect(screen.queryByLabelText('Squad settings')).not.toBeInTheDocument(); expect(screen.queryByText('Public page & URL')).not.toBeInTheDocument(); expect( screen.getAllByText('Join the Squad to create new posts').length, From 5f8080fff6fa69cab5a8e2cdb0e47f508621cba6 Mon Sep 17 00:00:00 2001 From: nimrodkra <41470823+nimrodkra@users.noreply.github.com> Date: Mon, 16 Nov 2026 16:19:52 +0000 Subject: [PATCH 2/3] feat(squads): lock Branding to Enterprise, add a Manage menu per tier story --- .../src/features/squads/lib/manage.spec.tsx | 17 ++- .../shared/src/features/squads/lib/manage.tsx | 4 +- .../squads/SquadManageTiers.stories.tsx | 115 ++++++++++++++++++ 3 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 packages/storybook/stories/features/squads/SquadManageTiers.stories.tsx diff --git a/packages/shared/src/features/squads/lib/manage.spec.tsx b/packages/shared/src/features/squads/lib/manage.spec.tsx index 0f7222d7ea..a1354da5c8 100644 --- a/packages/shared/src/features/squads/lib/manage.spec.tsx +++ b/packages/shared/src/features/squads/lib/manage.spec.tsx @@ -50,13 +50,26 @@ describe('getSquadManageGroups', () => { [SquadManageSection.Products]: SquadManageLockedPlan.Startups, [SquadManageSection.Jobs]: SquadManageLockedPlan.Enterprise, [SquadManageSection.Links]: SquadManageLockedPlan.Startups, - [SquadManageSection.Branding]: SquadManageLockedPlan.Startups, + [SquadManageSection.Branding]: SquadManageLockedPlan.Enterprise, [SquadManageSection.Intel]: SquadManageLockedPlan.Startups, [SquadManageSection.Agent]: SquadManageLockedPlan.Startups, }); }); - it('locks only Enterprise sections for a squad on a Startups plan', () => { + it('locks Enterprise sections for a squad on the Starter plan', () => { + const squad = { + ...squadWith([SourcePermissions.Edit]), + features: { links: true, products: true }, + currentMember: { permissions: [SourcePermissions.Edit], seat: true }, + } as unknown as Squad; + + expect(lockedPlans(squad)).toEqual({ + [SquadManageSection.Jobs]: SquadManageLockedPlan.Enterprise, + [SquadManageSection.Branding]: SquadManageLockedPlan.Enterprise, + }); + }); + + it('opens Branding for the header button on the Team plan', () => { const squad = { ...squadWith([SourcePermissions.Edit]), features: { links: true, products: true, cta: true }, diff --git a/packages/shared/src/features/squads/lib/manage.tsx b/packages/shared/src/features/squads/lib/manage.tsx index 31fb214669..233737c2b7 100644 --- a/packages/shared/src/features/squads/lib/manage.tsx +++ b/packages/shared/src/features/squads/lib/manage.tsx @@ -87,8 +87,10 @@ const planGates: Partial> = { plan: SquadManageLockedPlan.Startups, isIncluded: (squad) => hasSquadFeature(squad, 'links'), }, + // The brand color is Enterprise only, so the section locks to Enterprise. + // The Startups Team plan still opens it for the header button alone. [SquadManageSection.Branding]: { - plan: SquadManageLockedPlan.Startups, + plan: SquadManageLockedPlan.Enterprise, isIncluded: canSetSquadButton, }, [SquadManageSection.Intel]: { diff --git a/packages/storybook/stories/features/squads/SquadManageTiers.stories.tsx b/packages/storybook/stories/features/squads/SquadManageTiers.stories.tsx new file mode 100644 index 0000000000..c358ad5f64 --- /dev/null +++ b/packages/storybook/stories/features/squads/SquadManageTiers.stories.tsx @@ -0,0 +1,115 @@ +import type { ReactElement } from 'react'; +import React from 'react'; +import type { Meta, StoryObj } from '@storybook/react-vite'; +import type { + SourceMember, + Squad, +} from '@dailydotdev/shared/src/graphql/sources'; +import { + SourceMemberRole, + SourcePermissions, +} from '@dailydotdev/shared/src/graphql/sources'; +import { SquadPageContextProvider } from '@dailydotdev/shared/src/features/squads/SquadPageContext'; +import { SquadManagePage } from '@dailydotdev/shared/src/features/squads/components/manage/SquadManagePage'; +import { SquadManageSection } from '@dailydotdev/shared/src/features/squads/lib/routes'; +import { useAuthContext } from '@dailydotdev/shared/src/contexts/AuthContext'; +import defaultUser from '@dailydotdev/shared/__tests__/fixture/loggedUser'; +import { defaultBootData, getBootMock } from '../../../mock/boot'; +import ExtensionProviders from '../../extension/_providers'; +import { squad as data } from './data'; + +// The Manage menu per tier: every squad lists the same sections, and a +// section its plan doesn't include shows locked to the plan that unlocks it. + +const makeSquad = (id: string, features: Partial): Squad => + ({ + id: `manage-tiers-${id}`, + handle: data.handle, + name: data.name, + image: data.image, + type: 'squad', + public: true, + features, + moderationPostCount: 0, + currentMember: { + role: SourceMemberRole.Admin, + seat: Object.keys(features ?? {}).length > 0, + permissions: Object.values(SourcePermissions), + } as unknown as SourceMember, + }) as unknown as Squad; + +const Page = ({ + id, + features, +}: { + id: string; + features: Partial; +}): ReactElement => ( + + + +); + +const WhenUser = ({ children }: { children: ReactElement }) => { + const { user } = useAuthContext(); + + return user ? children : null; +}; + +const meta: Meta = { + title: 'Features/Squads/Manage menu per tier', + parameters: { layout: 'fullscreen' }, + beforeEach: () => { + getBootMock.mockReturnValue({ + ...defaultBootData, + user: defaultUser, + squads: [], + accessToken: { token: '1', expiresIn: '1' }, + visit: { sessionId: '1', visitId: '1' }, + feeds: [], + } as ReturnType); + }, + decorators: [ + (Story) => ( + + + + + + ), + ], +}; + +export default meta; + +type Story = StoryObj; + +// What every daily.dev for Startups plan turns on that the app reads +const base = { links: true, products: true }; + +export const Free: Story = { + render: () => , +}; + +export const StartupsStarter: Story = { + render: () => , +}; + +export const StartupsTeam: Story = { + render: () => , +}; + +export const Enterprise: Story = { + render: () => ( + + ), +}; From d6331096f392787c2a1089f10fa6836156390f81 Mon Sep 17 00:00:00 2001 From: nimrodkra <41470823+nimrodkra@users.noreply.github.com> Date: Mon, 16 Nov 2026 17:09:36 +0000 Subject: [PATCH 3/3] feat(squads): a generic Upgrade chip on locked Manage sections --- .../features/squads/components/manage/SquadManageLayout.tsx | 2 +- packages/shared/src/features/squads/lib/manage.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/shared/src/features/squads/components/manage/SquadManageLayout.tsx b/packages/shared/src/features/squads/components/manage/SquadManageLayout.tsx index 822843b764..df0c02443a 100644 --- a/packages/shared/src/features/squads/components/manage/SquadManageLayout.tsx +++ b/packages/shared/src/features/squads/components/manage/SquadManageLayout.tsx @@ -132,7 +132,7 @@ const ManageMenu = ({ label={ <> - {item.lockedPlan} + Upgrade } size={PillSize.XSmall} diff --git a/packages/shared/src/features/squads/lib/manage.tsx b/packages/shared/src/features/squads/lib/manage.tsx index 233737c2b7..dec0c1f995 100644 --- a/packages/shared/src/features/squads/lib/manage.tsx +++ b/packages/shared/src/features/squads/lib/manage.tsx @@ -31,9 +31,9 @@ export interface SquadManageItem { icon: ReactElement; badge?: number; /** - * A section the squad's plan doesn't include yet, shown locked: it names the - * plan that unlocks it (daily.dev for Startups or Enterprise) and links to - * Subscription. + * A section the squad's plan doesn't include yet, shown locked with an + * Upgrade chip that links to Subscription. Holds the plan that unlocks it + * (daily.dev for Startups or Enterprise). */ lockedPlan?: SquadManageLockedPlan; }