Skip to content
Open
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
2 changes: 1 addition & 1 deletion apps/obsidian/src/components/ImportNodesModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { StrictMode, useState, useEffect, useCallback } from "react";
import type DiscourseGraphPlugin from "../index";
import type { ImportableNode, GroupWithNodes } from "~/types";
import { getUserNameById } from "~/utils/typeUtils";
import { getAvailableGroupIds } from "@repo/database/lib/groups";
import {
fetchUserNames,
getAvailableGroupIds,
getPublishedNodesForGroups,
getLocalNodeInstanceIds,
getSpaceNameFromIds,
Expand Down
2 changes: 1 addition & 1 deletion apps/obsidian/src/components/PublishGroupDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
publishToSelectedGroupWithNotice,
withPublishedState,
} from "~/utils/publishGroupSelection";
import type { MyGroup } from "~/utils/importNodes";
import type { MyGroup } from "@repo/database/lib/groups";

type PublishGroupDropdownProps = {
plugin: DiscourseGraphPlugin;
Expand Down
48 changes: 0 additions & 48 deletions apps/obsidian/src/utils/importNodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,54 +21,6 @@ import {
import { createTemplateFile } from "./templates";
import { resolveFolderForSpaceUri } from "./importFolderMetadata";

export type MyGroup = {
id: string;
name: string;
};

export const getAvailableGroupIds = async (
client: DGSupabaseClient,
): Promise<string[]> => {
const { data, error } = await client
.from("group_membership")
.select("group_id")
.eq("member_id", (await client.auth.getUser()).data.user?.id || "");

if (error) {
console.error("Error fetching groups:", error);
throw new Error(`Failed to fetch groups: ${error.message}`);
}

return (data || []).map((g) => g.group_id);
};

export const getMyGroups = async (
client: DGSupabaseClient,
): Promise<MyGroup[]> => {
const userId = (await client.auth.getUser()).data.user?.id ?? "";
const { data, error } = await client
.from("group_membership")
.select("group_id, my_groups!group_id(name)")
.eq("member_id", userId);

if (error) {
console.error("Error fetching groups:", error);
throw new Error(`Failed to fetch groups: ${error.message}`);
}

return (data ?? [])
.filter(
(row): row is { group_id: string; my_groups: { name: string | null } } =>
typeof row.group_id === "string" &&
row.my_groups !== null &&
typeof row.my_groups === "object",
)
.map((row) => ({
id: row.group_id,
name: row.my_groups.name ?? row.group_id,
}));
};

type PublishedNode = {
source_local_id: string;
space_id: number;
Expand Down
6 changes: 3 additions & 3 deletions apps/obsidian/src/utils/publishGroupSelection.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Notice, type FrontMatterCache, type TFile } from "obsidian";
import type DiscourseGraphPlugin from "~/index";
import { PublishGroupSuggestModal } from "~/components/PublishGroupSuggestModal";
import {
getAvailableGroupIds,
getMyGroups,
type MyGroup,
} from "~/utils/importNodes";
} from "@repo/database/lib/groups";
import type DiscourseGraphPlugin from "~/index";
import { PublishGroupSuggestModal } from "~/components/PublishGroupSuggestModal";
import { getLoggedInClient } from "~/utils/supabaseContext";
import {
getPublishedToGroups,
Expand Down
2 changes: 1 addition & 1 deletion apps/obsidian/src/utils/publishNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
type RelationsFile,
} from "./relationsStore";
import type { RelationInstance } from "~/types";
import { getAvailableGroupIds } from "./importNodes";
import { getAvailableGroupIds } from "@repo/database/lib/groups";
import {
syncAllNodesAndRelations,
syncPublishedNodeAssets,
Expand Down
2 changes: 1 addition & 1 deletion apps/obsidian/src/utils/templateImport.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable @typescript-eslint/naming-convention -- Supabase query results use snake_case column names */
import type { Json } from "@repo/database/dbTypes";
import { getAvailableGroupIds } from "@repo/database/lib/groups";
import type DiscourseGraphPlugin from "~/index";
import {
fetchUserNames,
getAvailableGroupIds,
getSpaceNameFromIds,
getSpaceUris,
} from "./importNodes";
Expand Down
Loading