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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ export const DEFAULT_SETTINGS: Settings = {
autoDeleteStaleRepos: true,
reindexIntervalMs: 1000 * 60,
resyncConnectionPollingIntervalMs: 1000,
reindexRepoPollingInternvalMs: 1000,
reindexRepoPollingIntervalMs: 1000,
indexConcurrencyMultiple: 3,
configSyncConcurrencyMultiple: 3,
}
4 changes: 3 additions & 1 deletion packages/backend/src/repoCompileUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@ export const compileGithubConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repoName,
imageUrl: repo.owner.avatar_url,
isFork: repo.fork,
isArchived: !!repo.archived,
org: {
Expand DownExpand Up@@ -80,6 +81,7 @@ export const compileGitlabConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: project.path_with_namespace,
imageUrl: project.avatar_url,
isFork: isFork,
isArchived: !!project.archived,
org: {
Expand DownExpand Up@@ -118,7 +120,6 @@ export const compileGiteaConfig = async (
const hostUrl = config.url ?? 'https://gitea.com';

return giteaRepos.map((repo) => {
const repoUrl = `${hostUrl}/${repo.full_name}`;
const cloneUrl = new URL(repo.clone_url!);

const record: RepoData = {
Expand All@@ -127,6 +128,7 @@ export const compileGiteaConfig = async (
external_codeHostUrl: hostUrl,
cloneUrl: cloneUrl.toString(),
name: repo.full_name!,
imageUrl: repo.owner?.avatar_url,
isFork: repo.fork!,
isArchived: !!repo.archived,
org: {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ export class RepoManager implements IRepoManager {
this.fetchAndScheduleRepoIndexing();
this.garbageCollectRepo();

await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingInternvalMs));
await new Promise(resolve => setTimeout(resolve, this.settings.reindexRepoPollingIntervalMs));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,7 @@ export type Settings = {
/**
* The polling rate (in milliseconds) at which the db should be checked for repos that should be re-indexed.
*/
reindexRepoPollingInternvalMs: number;
reindexRepoPollingIntervalMs: number;
/**
* The multiple of the number of CPUs to use for indexing.
*/
Expand Down
69 changes: 67 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,8 @@ import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole } from "@sourcebot/db";
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -236,6 +236,41 @@ export const createConnection = async (name: string, type: string, connectionCon
}
}));

export const getConnectionInfoAction = async (connectionId: number, domain: string): Promise<{ connection: Connection, linkedRepos: Repo[] } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection) {
return notFound();
}

const linkedRepos = await getLinkedRepos(connectionId, orgId);

return {
connection,
linkedRepos: linkedRepos.map((repo) => repo.repo),
}
})
);

export const getOrgFromDomainAction = async (domain: string): Promise<Org | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const org = await prisma.org.findUnique({
where: {
id: orgId,
},
});

if (!org) {
return notFound();
}

return org;
})
);


export const updateConnectionDisplayName = async (connectionId: number, name: string, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand DownExpand Up@@ -298,6 +333,36 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
}
}));

export const flagConnectionForSync = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
const connection = await getConnection(connectionId, orgId);
if (!connection || connection.orgId !== orgId) {
return notFound();
}

if (connection.syncStatus !== "FAILED") {
return {
statusCode: StatusCodes.BAD_REQUEST,
errorCode: ErrorCode.CONNECTION_NOT_FAILED,
message: "Connection is not in a failed state. Cannot flag for sync.",
} satisfies ServiceError;
}

await prisma.connection.update({
where: {
id: connection.id,
},
data: {
syncStatus: "SYNC_NEEDED",
}
});

return {
success: true,
}
}));

export const deleteConnection = async (connectionId: number, domain: string): Promise<{ success: boolean } | ServiceError> =>
withAuth((session) =>
withOrgMembership(session, domain, async (orgId) => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ export const RepoListItem = ({
case RepoIndexingStatus.NEW:
return 'Waiting...';
case RepoIndexingStatus.IN_INDEX_QUEUE:
return 'In index queue...';
case RepoIndexingStatus.INDEXING:
return 'Indexing...';
case RepoIndexingStatus.INDEXED:
Expand Down
158 changes: 116 additions & 42 deletions packages/web/src/app/[domain]/connections/[id]/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
"use client";

import { NotFound } from "@/app/[domain]/components/notFound";
import {
Breadcrumb,
Expand All@@ -10,58 +12,108 @@ import {
import { ScrollArea } from "@/components/ui/scroll-area";
import { TabSwitcher } from "@/components/ui/tab-switcher";
import { Tabs, TabsContent } from "@/components/ui/tabs";
import { getConnection, getLinkedRepos } from "@/data/connection";
import { ConnectionIcon } from "../components/connectionIcon";
import { Header } from "../../components/header";
import { ConfigSetting } from "./components/configSetting";
import { DeleteConnectionSetting } from "./components/deleteConnectionSetting";
import { DisplayNameSetting } from "./components/displayNameSetting";
import { RepoListItem } from "./components/repoListItem";
import { getOrgFromDomain } from "@/data/org";
import { PageNotFound } from "../../components/pageNotFound";

interface ConnectionManagementPageProps {
params: {
id: string;
domain: string;
},
searchParams: {
tab?: string;
}
}
import { useParams, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import { Connection, Repo, Org } from "@sourcebot/db";
import { getConnectionInfoAction, getOrgFromDomainAction, flagConnectionForSync } from "@/actions";
import { isServiceError } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { ReloadIcon } from "@radix-ui/react-icons";
import { useToast } from "@/components/hooks/use-toast";

export default async function ConnectionManagementPage({
params,
searchParams,
}: ConnectionManagementPageProps) {
const org = await getOrgFromDomain(params.domain);
if (!org) {
return <PageNotFound />
}
export default function ConnectionManagementPage() {
const params = useParams();
const searchParams = useSearchParams();
const { toast } = useToast();
const [org, setOrg] = useState<Org | null>(null);
const [connection, setConnection] = useState<Connection | null>(null);
const [linkedRepos, setLinkedRepos] = useState<Repo[]>([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
/>
)
useEffect(() => {
const loadData = async () => {
try {
const orgResult = await getOrgFromDomainAction(params.domain as string);
if (isServiceError(orgResult)) {
setError(orgResult.message);
setLoading(false);
return;
}
setOrg(orgResult);

const connectionId = Number(params.id);
if (isNaN(connectionId)) {
setError("Invalid connection ID");
setLoading(false);
return;
}

const connectionInfoResult = await getConnectionInfoAction(connectionId, params.domain as string);
if (isServiceError(connectionInfoResult)) {
setError(connectionInfoResult.message);
setLoading(false);
return;
}

connectionInfoResult.linkedRepos.sort((a, b) => {
// Helper function to get priority of indexing status
const getPriority = (status: string) => {
switch (status) {
case 'FAILED': return 0;
case 'IN_INDEX_QUEUE':
case 'INDEXING': return 1;
case 'INDEXED': return 2;
default: return 3;
}
};

const priorityA = getPriority(a.repoIndexingStatus);
const priorityB = getPriority(b.repoIndexingStatus);

// First sort by priority
if (priorityA !== priorityB) {
return priorityA - priorityB;
}

// If same priority, sort by createdAt
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
});

setConnection(connectionInfoResult.connection);
setLinkedRepos(connectionInfoResult.linkedRepos);
setLoading(false);
} catch (err) {
setError(err instanceof Error ? err.message : "An error occurred while loading the connection. If the problem persists, please contact us at team@sourcebot.dev");
setLoading(false);
}
};

loadData();
const intervalId = setInterval(loadData, 1000);
return () => clearInterval(intervalId);
}, [params.domain, params.id]);

if (loading) {
return <div>Loading...</div>;
}

const connection = await getConnection(Number(params.id), org.id);
if (!connection) {
if (error || !org || !connection) {
return (
<NotFound
className="flex w-full h-full items-center justify-center"
message="Connection not found"
message={error || "Not found"}
/>
)
);
}

const linkedRepos = await getLinkedRepos(connectionId, org.id);

const currentTab = searchParams.tab || "overview";
const currentTab = searchParams.get("tab") || "overview";

return (
<Tabs
Expand DownExpand Up@@ -116,7 +168,30 @@ export default async function ConnectionManagementPage({
</div>
<div className="rounded-lg border border-border p-4 bg-background">
<h2 className="text-sm font-medium text-muted-foreground">Status</h2>
<p className="mt-2 text-sm">{connection.syncStatus}</p>
<div className="flex items-center gap-2">
<p className="mt-2 text-sm">{connection.syncStatus}</p>
{connection.syncStatus === "FAILED" && (
<Button
variant="outline"
size="sm"
className="mt-2 rounded-full"
onClick={async () => {
const result = await flagConnectionForSync(connection.id, params.domain as string);
if (isServiceError(result)) {
toast({
description: `❌ Failed to flag connection for sync. Reason: ${result.message}`,
})
} else {
toast({
description: "✅ Connection flagged for sync.",
})
}
}}
>
<ReloadIcon className="h-4 w-4" />
</Button>
)}
</div>
</div>
</div>
</div>
Expand All@@ -127,12 +202,12 @@ export default async function ConnectionManagementPage({
<div className="flex flex-col gap-4">
{linkedRepos
.sort((a, b) => {
const aIndexedAt = a.repo.indexedAt ?? new Date();
const bIndexedAt = b.repo.indexedAt ?? new Date();
const aIndexedAt = a.indexedAt ?? new Date();
const bIndexedAt = b.indexedAt ?? new Date();

return bIndexedAt.getTime() - aIndexedAt.getTime();
})
.map(({ repo }) => (
.map((repo) => (
<RepoListItem
key={repo.id}
imageUrl={repo.imageUrl ?? undefined}
Expand DownExpand Up@@ -162,6 +237,5 @@ export default async function ConnectionManagementPage({
/>
</TabsContent>
</Tabs>

)
);
}
Loading