Skip to content

ENG-1504 - Fix relation migration dialog logic, css, and remove unused vars #852

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
mdroidian merged 2 commits into from
Mar 3, 2026
+45 −51
Merged

ENG-1504 - Fix relation migration dialog logic, css, and remove unused vars #852

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
0ce1a1a
Refactor HomePersonalSettings component to streamline migration flow …
mdroidian Mar 3, 2026
08e2c7b
format
mdroidian Mar 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
94 changes: 45 additions & 49 deletions apps/roam/src/components/settings/HomePersonalSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,11 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
}}
style={{ width: "600px" }}
>
{isOngoing ? (
<div className={Classes.DIALOG_BODY}>
<div className={Classes.DIALOG_BODY}>
{isOngoing ? (
<p>Migrating relations, please wait</p>
</div>
) : (
<>
<div className={Classes.DIALOG_BODY}>
) : (
<>
<p>
Activating the faster relations system will migrate all
previously created relations and newly created relations will
Expand All @@ -308,58 +306,56 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
deleted; however, they will not be accessible until you
reactivate the faster relation system.
</p>
{activeRelationMigration === RelationMigrationDialog.activate ? (
<div className="flex justify-center">
<div className="mt-1 inline-block align-middle">
<Label className="!my-0 pr-2">Relations</Label>
</div>
<pre className="m-0 p-1.5 pt-2">{numExistingRelations}</pre>
{activeRelationMigration ===
RelationMigrationDialog.reactivate ? (
<div className="flex flex-col items-center">
<Label className="font-semibold">Relations</Label>
<pre className="m-0 rounded border border-gray-300 bg-gray-50 p-2 text-center">
{numExistingRelations}
</pre>
</div>
) : (
""
)}
</div>
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
small
onClick={() => {
setActiveRelationMigration(RelationMigrationDialog.none);
}}
>
Cancel
</Button>
{activeRelationMigration ===
RelationMigrationDialog.reactivate ? (
<Button
small
intent={Intent.PRIMARY}
onClick={() => {
setStoredRelations(true);
setActiveRelationMigration(RelationMigrationDialog.none);
}}
>
Reactivate without Migration
</Button>
) : (
""
)}
) : null}
</>
)}
</div>
{!isOngoing && (
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
small
onClick={() => {
setActiveRelationMigration(RelationMigrationDialog.none);
}}
>
Cancel
</Button>
{activeRelationMigration ===
RelationMigrationDialog.reactivate ? (
<Button
small
intent={Intent.PRIMARY}
onClick={() => {
setIsOngoing(true);
void startMigration();
setStoredRelations(true);
setActiveRelationMigration(RelationMigrationDialog.none);
}}
>
{activeRelationMigration ===
RelationMigrationDialog.reactivate
? "Migrate again and Reactivate"
: "Activate and Migrate"}
Reactivate without Migration
</Button>
</div>
) : null}
<Button
small
intent={Intent.PRIMARY}
onClick={() => {
setIsOngoing(true);
void startMigration();
}}
>
{activeRelationMigration === RelationMigrationDialog.reactivate
? "Migrate again and Reactivate"
: "Activate and Migrate"}
</Button>
</div>
</>
</div>
)}
</Dialog>
<Dialog
Expand Down
2 changes: 0 additions & 2 deletions apps/roam/src/utils/migrateRelations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import getRelationData from "./getRelationData";
import getBlockProps from "./getBlockProps";
import type { json } from "./getBlockProps";
import setBlockProps from "./setBlockProps";
import { getSetting, setSetting } from "./extensionSettings";
import { USE_REIFIED_RELATIONS } from "~/data/userSettings";
import internalError from "./internalError";
import {
createReifiedRelation,
Expand Down