Skip to content

ENG-1421: Derive TOP_LEVEL_BLOCK_PROP_KEYS from staticTopLevelEntries #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sid597 wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −19
Open

ENG-1421: Derive TOP_LEVEL_BLOCK_PROP_KEYS from staticTopLevelEntries #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2708f56
ENG-1421: Derive TOP_LEVEL_BLOCK_PROP_KEYS from staticTopLevelEntries
sid597 Mar 13, 2026
5b31b44
ENG-1421: Consolidate into single STATIC_TOP_LEVEL_ENTRIES export
sid597 Mar 25, 2026
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
10 changes: 5 additions & 5 deletions apps/roam/src/components/settings/utils/accessors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { z } from "zod";
import {
DG_BLOCK_PROP_SETTINGS_PAGE_TITLE,
DISCOURSE_NODE_PAGE_PREFIX,
TOP_LEVEL_BLOCK_PROP_KEYS,
STATIC_TOP_LEVEL_ENTRIES,
FeatureFlagsSchema,
GlobalSettingsSchema,
PersonalSettingsSchema,
Expand Down Expand Up @@ -274,7 +274,7 @@ const setBlockPropBasedSettings = ({

export const getFeatureFlags = (): FeatureFlags => {
const { blockProps } = getBlockPropBasedSettings({
keys: [TOP_LEVEL_BLOCK_PROP_KEYS.featureFlags],
keys: [STATIC_TOP_LEVEL_ENTRIES.featureFlags.key],
});

return FeatureFlagsSchema.parse(blockProps || {});
Expand All @@ -292,14 +292,14 @@ export const setFeatureFlag = (
const validatedValue = z.boolean().parse(value);

setBlockPropBasedSettings({
keys: [TOP_LEVEL_BLOCK_PROP_KEYS.featureFlags, key],
keys: [STATIC_TOP_LEVEL_ENTRIES.featureFlags.key, key],
value: validatedValue,
});
};

export const getGlobalSettings = (): GlobalSettings => {
const { blockProps } = getBlockPropBasedSettings({
keys: [TOP_LEVEL_BLOCK_PROP_KEYS.global],
keys: [STATIC_TOP_LEVEL_ENTRIES.global.key],
});

return GlobalSettingsSchema.parse(blockProps || {});
Expand Down Expand Up @@ -337,7 +337,7 @@ export const setGlobalSetting = (keys: string[], value: json): void => {
}

setBlockPropBasedSettings({
keys: [TOP_LEVEL_BLOCK_PROP_KEYS.global, ...keys],
keys: [STATIC_TOP_LEVEL_ENTRIES.global.key, ...keys],
value,
});
};
Expand Down
6 changes: 3 additions & 3 deletions apps/roam/src/components/settings/utils/pullWatchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type json, normalizeProps } from "~/utils/getBlockProps";
import type { AddPullWatch, PullBlock } from "roamjs-components/types";
import {
TOP_LEVEL_BLOCK_PROP_KEYS,
STATIC_TOP_LEVEL_ENTRIES,
getPersonalSettingsKey,
FeatureFlagsSchema,
GlobalSettingsSchema,
Expand Down Expand Up @@ -165,8 +165,8 @@ export const setupPullWatchOnSettingsPage = (
const watches: Parameters<AddPullWatch>[] = [];

const featureFlagsBlockUid =
blockUids[TOP_LEVEL_BLOCK_PROP_KEYS.featureFlags];
const globalSettingsBlockUid = blockUids[TOP_LEVEL_BLOCK_PROP_KEYS.global];
blockUids[STATIC_TOP_LEVEL_ENTRIES.featureFlags.key];
const globalSettingsBlockUid = blockUids[STATIC_TOP_LEVEL_ENTRIES.global.key];
const personalSettingsKey = getPersonalSettingsKey();
const personalSettingsBlockUid = blockUids[personalSettingsKey];

Expand Down
15 changes: 4 additions & 11 deletions apps/roam/src/components/settings/utils/zodSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,26 +272,19 @@ export const getPersonalSettingsKey = (): string => {
return cachedPersonalSettingsKey;
};

const staticTopLevelEntries = [
{
propKey: "featureFlags" as const,
export const STATIC_TOP_LEVEL_ENTRIES = {
featureFlags: {
key: "Feature Flags",
schema: FeatureFlagsSchema,
},
{
propKey: "global" as const,
global: {
key: "Global",
schema: GlobalSettingsSchema,
},
];

export const TOP_LEVEL_BLOCK_PROP_KEYS = {
featureFlags: "Feature Flags",
global: "Global",
} as const;

export const getTopLevelBlockPropsConfig = () => [
...staticTopLevelEntries,
...Object.values(STATIC_TOP_LEVEL_ENTRIES),
{ key: getPersonalSettingsKey(), schema: PersonalSettingsSchema },
];

Expand Down
Loading