Skip to content

Commit 19f90c0

Browse files
committed
Merge origin/main into migration-block-init-staging-branch
Resolved 11 conflicts: - Replaced getFeatureFlag("Reified relation triples") with getStoredRelationsEnabled() (main moved reified relations from FeatureFlags to PersonalSettings) - Removed "Reified relation triples" from FeatureFlagsSchema, kept "Use new settings store" - Kept toDiscourseNode + added migrateNodeBlockProps in accessors.ts (both needed) - Dropped MigrationTab from AdminPanel (moved to HomePersonalSettings on main) - Migrated DiscourseContextOverlay score validation to use accessors instead of legacy tree reads (getSubTree/getSettingValueFromTree/getBasicTreeByParentUid) - Removed dead legacy imports (getSetting, AUTO_CANVAS_RELATIONS_KEY from Tldraw.tsx; USE_REIFIED_RELATIONS from accessors.ts) - Zero net increase in legacy reader call sites
2 parents 4877527 + f575944 commit 19f90c0

73 files changed

Lines changed: 2470 additions & 1123 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/database-deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
1212
SUPABASE_PROJECT_ID: ${{ secrets.SUPABASE_PROJECT_ID_PROD }}
1313
SUPABASE_DB_PASSWORD: ${{ secrets.SUPABASE_DB_PASSWORD_PROD }}
14+
SUPABASE_SECRET_KEY: ${{ secrets.SUPABASE_SECRET_KEY }}
1415
steps:
1516
- name: Checkout Code
1617
uses: actions/checkout@v4

.github/workflows/roam-main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
env:
1515
BLOB_READ_WRITE_TOKEN: ${{ secrets.BLOB_READ_WRITE_TOKEN }}
1616
SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
17+
SUPABASE_PUBLISHABLE_KEY: ${{ secrets.SUPABASE_PUBLISHABLE_KEY }}
1718
SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
1819

1920
jobs:

.github/workflows/roam-pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
GITHUB_REF_NAME: ${{ github.ref_name }}
1717
SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
1818
SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
19+
SUPABASE_PUBLISHABLE_KEY: ${{ secrets.SUPABASE_PUBLISHABLE_KEY }}
1920

2021
jobs:
2122
deploy:

.github/workflows/roam-release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
APP_ID: ${{ secrets.APP_ID }}
99
SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
1010
SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
11+
SUPABASE_PUBLISHABLE_KEY: ${{ secrets.SUPABASE_PUBLISHABLE_KEY }}
1112

1213
jobs:
1314
update-extension:

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lint-staged

apps/obsidian/README.md

Lines changed: 119 additions & 116 deletions
Large diffs are not rendered by default.

apps/obsidian/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "Discourse Graph",
44
"version": "0.1.0",
55
"minAppVersion": "1.7.0",
6-
"description": "Discourse Graph Plugin for Obsidian",
6+
"description": "Add semantic structure to your notes with the Discourse Graph protocol.",
77
"author": "Discourse Graphs",
88
"authorUrl": "https://discoursegraphs.com",
99
"isDesktopOnly": false

apps/obsidian/src/components/GeneralSettings.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,13 @@ const GeneralSettings = () => {
231231

232232
<div className="setting-item">
233233
<div className="setting-item-info">
234-
<div className="setting-item-name">Discourse nodes folder path</div>
234+
<div className="setting-item-name">
235+
Default discourse nodes folder path
236+
</div>
235237
<div className="setting-item-description">
236-
Specify the folder where new discourse nodes should be created.
237-
Leave empty to create nodes in the root folder.
238+
Default folder where new discourse nodes will be created. This is
239+
used as a fallback when a node type does not have a specific folder
240+
path set. Leave empty to create nodes in the root folder.
238241
</div>
239242
</div>
240243
<div className="setting-item-control">
@@ -306,7 +309,6 @@ const GeneralSettings = () => {
306309
}}
307310
placeholder="\\"
308311
maxLength={1}
309-
className="setting-item-control"
310312
/>
311313
</div>
312314
</div>

apps/obsidian/src/components/ImportNodesModal.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
getPublishedNodesForGroups,
99
getLocalNodeInstanceIds,
1010
getSpaceNameFromIds,
11+
getSpaceUris,
1112
importSelectedNodes,
1213
} from "~/utils/importNodes";
1314
import { getLoggedInClient, getSupabaseContext } from "~/utils/supabaseContext";
@@ -68,7 +69,25 @@ const ImportNodesContent = ({ plugin, onClose }: ImportNodesModalProps) => {
6869
const uniqueSpaceIds = [
6970
...new Set(importableNodes.map((n) => n.space_id)),
7071
];
71-
const spaceNames = await getSpaceNameFromIds(client, uniqueSpaceIds);
72+
const [spaceNames, spaceUris] = await Promise.all([
73+
getSpaceNameFromIds(client, uniqueSpaceIds),
74+
getSpaceUris(client, uniqueSpaceIds),
75+
]);
76+
77+
// Populate plugin settings with current space names so they stay up to date
78+
if (uniqueSpaceIds.length > 0) {
79+
if (!plugin.settings.spaceNames) plugin.settings.spaceNames = {};
80+
81+
for (const spaceId of uniqueSpaceIds) {
82+
const spaceUri = spaceUris.get(spaceId);
83+
const spaceName = spaceNames.get(spaceId);
84+
if (spaceUri && spaceName) {
85+
plugin.settings.spaceNames[spaceUri] = spaceName;
86+
}
87+
}
88+
await plugin.saveSettings();
89+
}
90+
7291
const grouped: Map<string, GroupWithNodes> = new Map();
7392

7493
for (const node of importableNodes) {

0 commit comments

Comments
 (0)