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
Expand Up @@ -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';
Expand Down Expand Up @@ -185,14 +185,14 @@ export const SquadActions = (): ReactElement => {
return (
<div className="flex items-center gap-2 pb-1">
{canEdit && (
<Tooltip content="Edit page">
<Tooltip content="Squad settings">
<Button
tag="a"
href={editUrl}
variant={ButtonVariant.Subtle}
size={ButtonSize.Small}
icon={<EditIcon />}
aria-label="Edit page"
icon={<SettingsIcon />}
aria-label="Squad settings"
onClick={(event: MouseEvent) => {
event.preventDefault();
router.push(editUrl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,12 @@ const ManageMenu = ({
label={
<>
<LockIcon size={IconSize.Size16} />
{item.lockedPlan}
Upgrade
</>
}
size={PillSize.XSmall}
className="ml-auto gap-0.5 bg-overlay-float-cabbage text-accent-cabbage-default"
alignment="self-center"
className="ml-auto shrink-0 gap-0.5 bg-overlay-float-cabbage text-accent-cabbage-default"
/>
)}
{!!item.badge && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,14 @@ export const SquadManagePage = ({
const router = useRouter();
const { squad, viewer, isViewerReady } = useSquadPageContext();
const groups = useSquadManageGroups();
const sections = groups.flatMap(({ items }) => items.map(({ id }) => id));
const items = groups.flatMap((group) => group.items);
// Locked sections only lead to Subscription
const sections = items
.filter(({ lockedPlan }) => !lockedPlan)
.map(({ id }) => id);
const isLocked = items.some(
({ id, lockedPlan }) => id === section && !!lockedPlan,
);
const isAllowed = !section || sections.includes(section);

useEffect(() => {
Expand All @@ -125,10 +132,16 @@ export const SquadManagePage = ({
}

if (!isAllowed) {
router.replace(getSquadManageUrl(squad.handle));
router.replace(
getSquadManageUrl(
squad.handle,
isLocked ? SquadManageSection.Plan : undefined,
),
);
}
}, [
isAllowed,
isLocked,
isViewerReady,
router,
section,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,31 @@ const PlanChoice = ({
);
};

// Enterprise is sold by our team: what it adds and how to reach us
const EnterpriseCard = ({ onClick }: { onClick: () => void }): ReactElement => (
<div className="flex flex-wrap items-center justify-between gap-3 rounded-16 border border-border-subtlest-tertiary p-4">
<div className="flex min-w-0 flex-1 flex-col gap-1">
<p className="font-bold typo-callout">Enterprise</p>
<p className="text-text-tertiary typo-footnote">
Verified badge, jobs board, homepage placement, campaigns and an account
team.
</p>
</div>
<Button
tag="a"
href={startupsEnterpriseUrl}
target="_blank"
rel="noopener"
onClick={onClick}
variant={ButtonVariant.Float}
size={ButtonSize.Small}
icon={<OpenLinkIcon />}
>
Talk to our team
</Button>
</div>
);

const ChoosePlan = ({ isAdmin }: { isAdmin: boolean }): ReactElement => {
const { squad } = useSquadPageContext();
const prices = useSquadPlanPrices();
Expand Down Expand Up @@ -209,26 +234,7 @@ const ChoosePlan = ({ isAdmin }: { isAdmin: boolean }): ReactElement => {
Only an admin of this Squad can choose a plan.
</p>
)}
<div className="flex flex-wrap items-center justify-between gap-3 rounded-16 border border-border-subtlest-tertiary p-4">
<div className="flex min-w-0 flex-1 flex-col gap-1">
<p className="font-bold typo-callout">Enterprise</p>
<p className="text-text-tertiary typo-footnote">
Verified badge, homepage placement, campaigns and an account team.
</p>
</div>
<Button
tag="a"
href={startupsEnterpriseUrl}
target="_blank"
rel="noopener"
onClick={() => logUpgrade('enterprise')}
variant={ButtonVariant.Float}
size={ButtonSize.Small}
icon={<OpenLinkIcon />}
>
Talk to our team
</Button>
</div>
<EnterpriseCard onClick={() => logUpgrade('enterprise')} />
</div>
);
};
Expand Down Expand Up @@ -575,6 +581,16 @@ const ActivePlan = ({
</div>
{isSelfServe && <SetupSection plan={plan} />}
<SquadManageSeats subscription={subscription} isAdmin={isAdmin} />
{isSelfServe && (
<EnterpriseCard
onClick={() =>
logStartups(LogEvent.UpgradeSubscription, 'enterprise', {
origin: Origin.SquadManagePlan,
source_id: sourceId,
})
}
/>
)}
</>
);
};
Expand Down
59 changes: 50 additions & 9 deletions packages/shared/src/features/squads/lib/manage.spec.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -35,24 +35,65 @@ 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.Enterprise,
[SquadManageSection.Intel]: SquadManageLockedPlan.Startups,
[SquadManageSection.Agent]: SquadManageLockedPlan.Startups,
});
});

it('locks nothing for a squad on a 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 },
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([]);
});

Expand Down
107 changes: 78 additions & 29 deletions packages/shared/src/features/squads/lib/manage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 with an
* Upgrade chip that links to Subscription. Holds the plan that unlocks it
* (daily.dev for Startups or Enterprise).
*/
lockedPlan?: string;
lockedPlan?: SquadManageLockedPlan;
}

export interface SquadManageGroup {
Expand All @@ -60,22 +61,61 @@ export const squadManageTitles: Record<SquadManageSection, string> = {
[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<Record<SquadManageSection, SquadManagePlanGate>> = {
[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'),
},
// 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.Enterprise,
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);

switch (section) {
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:
Expand All @@ -95,9 +135,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:
Expand All @@ -107,20 +146,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,
Expand Down Expand Up @@ -180,13 +229,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);
Expand Down
Loading
Loading