Skip to content

ENG-1440: Port page groups settings in suggestive mode #793

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

Merged
sid597 merged 5 commits into from
Feb 23, 2026
+101 −86
Merged

ENG-1440: Port page groups settings in suggestive mode #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2ed9b5
dual write page group to block props
sid597 Feb 17, 2026
0669b38
fix after restack
sid597 Feb 17, 2026
2eecfac
comment out discoursenode initialization from init.ts
sid597 Feb 23, 2026
c4f0860
restack
sid597 Feb 23, 2026
55037dd
prettier
sid597 Feb 23, 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
4 changes: 0 additions & 4 deletions apps/roam/src/components/DiscourseNodeSearchMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ import getDiscourseNodeFormatExpression from "~/utils/getDiscourseNodeFormatExpr
import { Result } from "~/utils/types";
import { getSetting } from "~/utils/extensionSettings";
import MiniSearch from "minisearch";
import {
getPersonalSetting,
setPersonalSetting,
} from "~/components/settings/utils/accessors";

type Props = {
textarea: HTMLTextAreaElement;
Expand Down
43 changes: 29 additions & 14 deletions apps/roam/src/components/settings/PageGroupPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ import createBlock from "roamjs-components/writes/createBlock";
import deleteBlock from "roamjs-components/writes/deleteBlock";
import getAllPageNames from "roamjs-components/queries/getAllPageNames";
import { type PageGroup } from "~/utils/getSuggestiveModeConfigSettings";
import { setGlobalSetting } from "~/components/settings/utils/accessors";

const syncPageGroupsToBlockProps = (groups: PageGroup[]) => {
setGlobalSetting(
["Suggestive mode", "Page groups"],
groups.map((g) => ({ name: g.name, pages: g.pages.map((p) => p.name) })),
);
};

const PageGroupsPanel = ({
uid,
Expand All @@ -31,7 +39,12 @@ const PageGroupsPanel = ({
parentUid: uid,
node: { text: name },
});
setPageGroups([...pageGroups, { uid: newGroupUid, name, pages: [] }]);
const updatedGroups = [
...pageGroups,
{ uid: newGroupUid, name, pages: [] },
];
setPageGroups(updatedGroups);
syncPageGroupsToBlockProps(updatedGroups);
setNewGroupName("");
setGroupKeys((prev) => prev + 1);
} catch (e) {
Expand All @@ -42,7 +55,9 @@ const PageGroupsPanel = ({
const removeGroup = async (groupUid: string) => {
try {
await deleteBlock(groupUid);
setPageGroups(pageGroups.filter((g) => g.uid !== groupUid));
const updatedGroups = pageGroups.filter((g) => g.uid !== groupUid);
setPageGroups(updatedGroups);
syncPageGroupsToBlockProps(updatedGroups);
} catch (e) {
console.error("Error removing group", e);
}
Expand All @@ -58,13 +73,13 @@ const PageGroupsPanel = ({
parentUid: groupUid,
node: { text: page },
});
setPageGroups(
pageGroups.map((g) =>
g.uid === groupUid
? { ...g, pages: [...g.pages, { uid: newPageUid, name: page }] }
: g,
),
const updatedGroups = pageGroups.map((g) =>
g.uid === groupUid
? { ...g, pages: [...g.pages, { uid: newPageUid, name: page }] }
: g,
);
setPageGroups(updatedGroups);
syncPageGroupsToBlockProps(updatedGroups);
setNewPageInputs((prev) => ({
...prev,
[groupUid]: "",
Expand All @@ -81,13 +96,13 @@ const PageGroupsPanel = ({
const removePageFromGroup = async (groupUid: string, pageUid: string) => {
try {
await deleteBlock(pageUid);
setPageGroups(
pageGroups.map((g) =>
g.uid === groupUid
? { ...g, pages: g.pages.filter((p) => p.uid !== pageUid) }
: g,
),
const updatedGroups = pageGroups.map((g) =>
g.uid === groupUid
? { ...g, pages: g.pages.filter((p) => p.uid !== pageUid) }
: g,
);
setPageGroups(updatedGroups);
syncPageGroupsToBlockProps(updatedGroups);
} catch (e) {
console.error("Error removing page from group", e);
}
Expand Down
138 changes: 71 additions & 67 deletions apps/roam/src/components/settings/utils/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ import { createPage, createBlock } from "roamjs-components/writes";
import setBlockProps from "~/utils/setBlockProps";
import getBlockProps from "~/utils/getBlockProps";
import type { json } from "~/utils/getBlockProps";
import INITIAL_NODE_VALUES from "~/data/defaultDiscourseNodes";
import DEFAULT_RELATIONS_BLOCK_PROPS from "~/components/settings/data/defaultRelationsBlockProps";
import { getAllDiscourseNodes } from "./accessors";
import {
DiscourseNodeSchema,
getTopLevelBlockPropsConfig,
} from "~/components/settings/utils/zodSchema";
import {
DG_BLOCK_PROP_SETTINGS_PAGE_TITLE,
DISCOURSE_NODE_PAGE_PREFIX,
} from "./zodSchema";
import { getTopLevelBlockPropsConfig } from "~/components/settings/utils/zodSchema";
import { DG_BLOCK_PROP_SETTINGS_PAGE_TITLE } from "./zodSchema";
// TODO: Re-enable when initDiscourseNodePages is uncommented
// import INITIAL_NODE_VALUES from "~/data/defaultDiscourseNodes";
// import { getAllDiscourseNodes } from "./accessors";
// import { DiscourseNodeSchema } from "~/components/settings/utils/zodSchema";
// import { DISCOURSE_NODE_PAGE_PREFIX } from "./zodSchema";
import toFlexRegex from "roamjs-components/util/toFlexRegex";

const ensurePageExists = async (pageTitle: string): Promise<string> => {
Expand Down Expand Up @@ -113,61 +110,65 @@ const initSettingsPageBlocks = async (): Promise<Record<string, string>> => {
return blockMap;
};

const hasNonDefaultNodes = (): boolean => {
return getAllDiscourseNodes().some((node) => node.backedBy !== "default");
};

const initSingleDiscourseNode = async (
node: (typeof INITIAL_NODE_VALUES)[number],
): Promise<{ label: string; pageUid: string } | null> => {
if (!node.text) return null;

const pageUid = await ensurePageExists(
`${DISCOURSE_NODE_PAGE_PREFIX}${node.text}`,
);
const existingProps = getBlockProps(pageUid);

if (!existingProps || Object.keys(existingProps).length === 0) {
const nodeData = DiscourseNodeSchema.parse({
text: node.text,
type: node.type,
format: node.format || "",
shortcut: node.shortcut || "",
tag: node.tag || "",
graphOverview: node.graphOverview ?? false,
canvasSettings: node.canvasSettings || {},
backedBy: "default",
});

setBlockProps(pageUid, nodeData, false);
}

return { label: node.text, pageUid };
};

const initDiscourseNodePages = async (): Promise<Record<string, string>> => {
if (hasNonDefaultNodes()) {
const existingNodes = getAllDiscourseNodes();
const nodePageUids: Record<string, string> = {};
for (const node of existingNodes) {
nodePageUids[node.text] = node.type;
}
return nodePageUids;
}

const results = await Promise.all(
INITIAL_NODE_VALUES.map((node) => initSingleDiscourseNode(node)),
);

const nodePageUids: Record<string, string> = {};
for (const result of results) {
if (result) {
nodePageUids[result.label] = result.pageUid;
}
}

return nodePageUids;
};
// TODO: Enable once we start reading discourse nodes from block props.
// Currently initializeDiscourseNodes() (called earlier in index.ts) already
// creates the node pages, so these are unused.
//
// const hasNonDefaultNodes = (): boolean => {
// return getAllDiscourseNodes().some((node) => node.backedBy !== "default");
// };
//
// const initSingleDiscourseNode = async (
// node: (typeof INITIAL_NODE_VALUES)[number],
// ): Promise<{ label: string; pageUid: string } | null> => {
// if (!node.text) return null;
//
// const pageUid = await ensurePageExists(
// `${DISCOURSE_NODE_PAGE_PREFIX}${node.text}`,
// );
// const existingProps = getBlockProps(pageUid);
//
// if (!existingProps || Object.keys(existingProps).length === 0) {
// const nodeData = DiscourseNodeSchema.parse({
// text: node.text,
// type: node.type,
// format: node.format || "",
// shortcut: node.shortcut || "",
// tag: node.tag || "",
// graphOverview: node.graphOverview ?? false,
// canvasSettings: node.canvasSettings || {},
// backedBy: "default",
// });
//
// setBlockProps(pageUid, nodeData, false);
// }
//
// return { label: node.text, pageUid };
// };
//
// const initDiscourseNodePages = async (): Promise<Record<string, string>> => {
// if (hasNonDefaultNodes()) {
// const existingNodes = getAllDiscourseNodes();
// const nodePageUids: Record<string, string> = {};
// for (const node of existingNodes) {
// nodePageUids[node.text] = node.type;
// }
// return nodePageUids;
// }
//
// const results = await Promise.all(
// INITIAL_NODE_VALUES.map((node) => initSingleDiscourseNode(node)),
// );
//
// const nodePageUids: Record<string, string> = {};
// for (const result of results) {
// if (result) {
// nodePageUids[result.label] = result.pageUid;
// }
// }
//
// return nodePageUids;
// };

/**
* Replace placeholder relation keys (_INFO-rel, etc.) in the Global blockprops
Expand Down Expand Up @@ -244,6 +245,9 @@ export type InitSchemaResult = {

export const initSchema = async (): Promise<InitSchemaResult> => {
const blockUids = await initSettingsPageBlocks();
const nodePageUids = await initDiscourseNodePages();
return { blockUids, nodePageUids };
// TODO: Enable once we start reading discourse nodes from block props.
// Currently initializeDiscourseNodes() (called earlier in index.ts) already
// creates the node pages, so this just duplicates work.
// const nodePageUids = await initDiscourseNodePages();
return { blockUids, nodePageUids: {} };
};
2 changes: 1 addition & 1 deletion apps/roam/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
DISALLOW_DIAGNOSTICS,
} from "./data/userSettings";
import { initSchema } from "./components/settings/utils/init";

export const DEFAULT_CANVAS_PAGE_FORMAT = "Canvas/*";

export default runExtension(async (onloadArgs) => {
Expand Down Expand Up @@ -155,7 +156,6 @@ export default runExtension(async (onloadArgs) => {
}

await initSchema();

return {
elements: [
style,
Expand Down