Skip to content

ENG-839: Guard incomplete relation types in canvas #1095

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
trangdoan982 wants to merge 4 commits into
base: main
Choose a base branch
from
+39 −2
Open

ENG-839: Guard incomplete relation types in canvas #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f279112
ENG-839: Guard incomplete relation types in canvas
trangdoan982 May 28, 2026
f0167d1
cleanup
trangdoan982 May 28, 2026
9720281
ENG-839: Remove dead validation from referenced node tools
trangdoan982 May 28, 2026
c12eac8
ENG-839: Treat placeholder relation fields as incomplete in dropdown
trangdoan982 May 28, 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
18 changes: 18 additions & 0 deletions apps/roam/src/components/canvas/DiscourseRelationShape/DiscourseRelationTool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,24 @@ export const createAllRelationShapeTools = (
override onEnter = () => {
this.didTimeout = false;

const selectedRelations = discourseContext.relations[name] || [];
const hasIncompleteSelectedRelation = selectedRelations.some(
(relation) =>
!relation.label?.trim?.() ||
!relation.complement?.trim?.() ||
relation.complement === "?" ||
!relation.source?.trim?.() ||
relation.source === "?" ||
!relation.destination?.trim?.() ||
relation.destination === "?",
);
if (hasIncompleteSelectedRelation) {
this.cancelAndWarn(
"Relation type is incomplete. Set label, complement, source, and destination in settings.",
);
return;
}

const target = this.editor.getShapeAtPoint(
this.editor.inputs.currentPagePoint,
// {
Expand Down
11 changes: 11 additions & 0 deletions apps/roam/src/components/canvas/overlays/RelationTypeDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ export const RelationTypeDropdown = ({
const seenLabels = new Set<string>();

for (const relation of allRelations) {
if (
!relation.label?.trim?.() ||
!relation.complement?.trim?.() ||
relation.complement === "?" ||
!relation.source?.trim?.() ||
relation.source === "?" ||
!relation.destination?.trim?.() ||
relation.destination === "?"
) {
continue;
}
Comment thread
trangdoan982 marked this conversation as resolved.
const { isDirect: isForward, isReverse } = checkConnectionType(
relation,
startNodeType,
Expand Down
12 changes: 10 additions & 2 deletions apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,15 @@ export const RelationEditPanel = ({
const relationEl = document.getElementById("relation-label");
relationEl?.focus();
}
}, []);
}, [label]);

const isRelationComplete =
label.trim().length > 0 &&
complement.trim().length > 0 &&
source.trim().length > 0 &&
source !== "?" &&
destination.trim().length > 0 &&
destination !== "?";

return (
<>
Expand All @@ -535,7 +543,7 @@ export const RelationEditPanel = ({
icon={"floppy-disk"}
text={"Save"}
intent={Intent.PRIMARY}
disabled={loading || !hasChanges}
disabled={loading || !hasChanges || !isRelationComplete}
className="select-none"
onClick={() => {
setLoading(true);
Expand Down