Skip to content

ENG-1580 Fix command palette availability #939

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

Closed
trangdoan982 wants to merge 2 commits into from
+14 −15
Closed

ENG-1580 Fix command palette availability #939

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
58e57d7
ENG-1580 fix template not applied during node creation from command p…
trangdoan982 Apr 3, 2026
524d134
fix lint
trangdoan982 Apr 3, 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
12 changes: 6 additions & 6 deletions apps/obsidian/src/utils/registerCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type ModifyNodeSubmitParams = {

const createModifyNodeModalSubmitHandler = (
plugin: DiscourseGraphPlugin,
editor: Editor,
editor?: Editor,
): ((params: ModifyNodeSubmitParams) => Promise<void>) => {
return async ({
nodeType,
Expand All @@ -36,7 +36,7 @@ const createModifyNodeModalSubmitHandler = (
relationshipTargetFile,
}: ModifyNodeSubmitParams) => {
if (selectedExistingNode) {
editor.replaceSelection(`[[${selectedExistingNode.basename}]]`);
editor?.replaceSelection(`[[${selectedExistingNode.basename}]]`);
await addRelationIfRequested(plugin, selectedExistingNode, {
relationshipId,
relationshipTargetFile,
Expand Down Expand Up @@ -91,10 +91,10 @@ export const registerCommands = (plugin: DiscourseGraphPlugin) => {
plugin.addCommand({
id: "create-discourse-node",
name: "Create discourse node",
editorCallback: (editor: Editor) => {
const currentFile =
plugin.app.workspace.getActiveViewOfType(MarkdownView)?.file ||
undefined;
callback: () => {
const activeView = plugin.app.workspace.getActiveViewOfType(MarkdownView);
const editor = activeView?.editor;
const currentFile = activeView?.file || undefined;
new ModifyNodeModal(plugin.app, {
nodeTypes: plugin.settings.nodeTypes,
plugin,
Expand Down
17 changes: 8 additions & 9 deletions apps/obsidian/src/utils/templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,17 @@ export const applyTemplate = async ({

const templateFrontmatter =
app.metadataCache.getFileCache(templateFile)?.frontmatter || {};
const currentFrontmatter =
app.metadataCache.getFileCache(targetFile)?.frontmatter || {};

const mergedFrontmatter = mergeFrontmatter(
templateFrontmatter,
currentFrontmatter,
// Read the actual current frontmatter inside processFrontMatter to avoid
// stale metadata cache (newly created files may not be indexed yet).
await app.fileManager.processFrontMatter(
targetFile,
(fm: Record<string, unknown>) => {
const mergedFrontmatter = mergeFrontmatter(templateFrontmatter, fm);
Object.assign(fm, mergedFrontmatter);
},
);

await app.fileManager.processFrontMatter(targetFile, (fm) => {
Object.assign(fm, mergedFrontmatter);
});

const frontmatterInfo = getFrontMatterInfo(templateContent);
const templateBody = frontmatterInfo.exists
? templateContent.slice(frontmatterInfo.contentStart)
Expand Down
Loading