Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "./DiscourseRelationUtil";
import { discourseContext } from "~/components/canvas/Tldraw";
import { dispatchToastEvent } from "~/components/canvas/ToastListener";
import { isRelationComplete } from "~/utils/isRelationComplete";

export type AddReferencedNodeType = Record<string, ReferenceFormatType[]>;
type ReferenceFormatType = {
Expand Down Expand Up @@ -341,6 +342,17 @@ export const createAllRelationShapeTools = (
override onEnter = () => {
this.didTimeout = false;

const selectedRelations = discourseContext.relations[name] || [];
const hasIncompleteSelectedRelation = selectedRelations.some(
(relation) => !isRelationComplete(relation),
);
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
getAllRelations,
isDiscourseNodeShape,
} from "~/components/canvas/canvasUtils";
import { isRelationComplete } from "~/utils/isRelationComplete";

type RelationTypeDropdownProps = {
sourceId: TLShapeId;
Expand Down Expand Up @@ -47,6 +48,7 @@ export const RelationTypeDropdown = ({
const seenLabels = new Set<string>();

for (const relation of allRelations) {
if (!isRelationComplete(relation)) continue;
const { isDirect: isForward, isReverse } = checkConnectionType(
relation,
startNodeType,
Expand Down
12 changes: 10 additions & 2 deletions apps/roam/src/components/settings/DiscourseRelationConfigPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageU
import updateBlock from "roamjs-components/writes/updateBlock";
import getTextByBlockUid from "roamjs-components/queries/getTextByBlockUid";
import getDiscourseNodes from "~/utils/getDiscourseNodes";
import { isRelationComplete } from "~/utils/isRelationComplete";
import { getConditionLabels } from "~/utils/conditionToDatalog";
import { formatHexColor } from "./DiscourseNodeCanvasSettings";
import posthog from "posthog-js";
Expand Down Expand Up @@ -516,7 +517,14 @@ export const RelationEditPanel = ({
const relationEl = document.getElementById("relation-label");
relationEl?.focus();
}
}, []);
}, [label]);

const isEditingRelationComplete = isRelationComplete({
label,
complement,
source,
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 || !isEditingRelationComplete}
className="select-none"
onClick={() => {
setLoading(true);
Expand Down
19 changes: 19 additions & 0 deletions apps/roam/src/utils/isRelationComplete.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { DiscourseRelation } from "./getDiscourseRelations";

const PLACEHOLDER_VALUES = new Set(["?"]);

const isNonEmptyNonPlaceholder = (
value: string | null | undefined,
): boolean => {
if (!value) return false;
const trimmed = value.trim();
return trimmed.length > 0 && !PLACEHOLDER_VALUES.has(trimmed);
};

export const isRelationComplete = (
relation: Partial<DiscourseRelation>,
): boolean =>
isNonEmptyNonPlaceholder(relation.label) &&
isNonEmptyNonPlaceholder(relation.complement) &&
isNonEmptyNonPlaceholder(relation.source) &&
isNonEmptyNonPlaceholder(relation.destination);