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
4 changes: 4 additions & 0 deletions __tests__/__snapshots__/settings.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Object {
"enableCardAnimations": true,
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -44,6 +45,7 @@ Object {
"enableCardAnimations": true,
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -80,6 +82,7 @@ Object {
"enableCardAnimations": true,
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down Expand Up @@ -116,6 +119,7 @@ Object {
"enableCardAnimations": true,
"flags": Object {
"clickbaitShieldEnabled": null,
"defaultWriteTab": null,
"sidebarBookmarksExpanded": null,
"sidebarCustomFeedsExpanded": null,
"sidebarOtherExpanded": null,
Expand Down
5 changes: 5 additions & 0 deletions __tests__/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded
sidebarBookmarksExpanded
clickbaitShieldEnabled
defaultWriteTab
}
}
}`;
Expand Down Expand Up @@ -154,6 +155,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
defaultWriteTab: null,
});
});

Expand All @@ -172,6 +174,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
defaultWriteTab: null,
});

const userSettings = await con.getRepository(Settings).findOneOrFail({
Expand Down Expand Up @@ -307,6 +310,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
defaultWriteTab: null,
});
});

Expand Down Expand Up @@ -341,6 +345,7 @@ describe('mutation updateUserSettings', () => {
sidebarSquadExpanded: null,
sidebarBookmarksExpanded: null,
clickbaitShieldEnabled: null,
defaultWriteTab: null,
});
});

Expand Down
9 changes: 9 additions & 0 deletions src/entity/Settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ export enum ChecklistViewState {
Hidden = 'hidden',
}

export enum DefaultWriteTab {
Share = 'Share',
NewPost = 'NewPost',
Poll = 'Poll',
}

export type SettingsFlags = Partial<{
sidebarSquadExpanded: boolean;
sidebarCustomFeedsExpanded: boolean;
Expand All @@ -30,6 +36,7 @@ export type SettingsFlags = Partial<{
prompt: object;
timezoneMismatchIgnore: string;
lastPrompt: string;
defaultWriteTab: DefaultWriteTab;
}>;

export type SettingsFlagsPublic = Pick<
Expand All @@ -43,6 +50,7 @@ export type SettingsFlagsPublic = Pick<
| 'prompt'
| 'timezoneMismatchIgnore'
| 'lastPrompt'
| 'defaultWriteTab'
>;

@Entity()
Expand Down Expand Up @@ -143,5 +151,6 @@ export const SETTINGS_DEFAULT = {
sidebarResourcesExpanded: true,
sidebarBookmarksExpanded: true,
clickbaitShieldEnabled: true,
defaultWriteTab: DefaultWriteTab.NewPost,
},
};
12 changes: 12 additions & 0 deletions src/schema/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { AuthContext, BaseContext } from '../Context';
import {
CampaignCtaPlacement,
ChecklistViewState,
DefaultWriteTab,
Settings,
SETTINGS_DEFAULT,
SettingsFlagsPublic,
Expand Down Expand Up @@ -52,10 +53,12 @@ interface GQLUpdateSettingsInput extends Partial<GQLSettings> {
campaignCtaPlacement?: CampaignCtaPlacement;
customLinks?: string[];
optOutReadingStreak?: boolean;
defaultWriteTab?: DefaultWriteTab;
}

export const typeDefs = /* GraphQL */ `
${toGQLEnum(ChecklistViewState, 'ChecklistViewState')}
${toGQLEnum(DefaultWriteTab, 'DefaultWriteTab')}

type SettingsFlagsPublic {
sidebarSquadExpanded: Boolean
Expand All @@ -66,6 +69,7 @@ export const typeDefs = /* GraphQL */ `
clickbaitShieldEnabled: Boolean
timezoneMismatchIgnore: String
lastPrompt: String
defaultWriteTab: DefaultWriteTab
}

input SettingsFlagsPublicInput {
Expand All @@ -78,6 +82,7 @@ export const typeDefs = /* GraphQL */ `
prompt: JSONObject
timezoneMismatchIgnore: String
lastPrompt: String
defaultWriteTab: DefaultWriteTab
}

"""
Expand Down Expand Up @@ -367,6 +372,13 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
throw new ValidationError(`Invalid value for 'campaignCtaPlacement'`);
}

if (
data?.flags?.defaultWriteTab &&
!Object.values(DefaultWriteTab).includes(data.flags.defaultWriteTab)
) {
throw new ValidationError(`Invalid value for 'defaultWriteTab'`);
}

const promptSchema = z.record(z.string(), z.boolean());
const result = promptSchema.safeParse(data.flags?.prompt);

Expand Down
Loading