Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions apps/mobile/src/app/inbox/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { usePostHog } from "posthog-react-native";
import { useCallback, useEffect, useMemo, useState } from "react";
import { ActivityIndicator, Pressable, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useUserQuery } from "@/features/auth/hooks/useUserQuery";
import { MarkdownText } from "@/features/chat/components/MarkdownText";
import { getReportRepository } from "@/features/inbox/api";
import { DiscussReportSheet } from "@/features/inbox/components/DiscussReportSheet";
Expand All @@ -34,7 +35,10 @@ import type {
SignalReportStatus,
SuggestedReviewer,
} from "@/features/inbox/types";
import { inboxStatusLabel } from "@/features/inbox/utils";
import {
inboxStatusLabel,
orderSuggestedReviewers,
} from "@/features/inbox/utils";
import { useThemeColors } from "@/lib/theme";

const statusColorMap: Record<string, { bg: string; text: string }> = {
Expand Down Expand Up @@ -114,6 +118,7 @@ export default function ReportDetailScreen() {
const insets = useSafeAreaInsets();
const posthog = usePostHog();
const { data: report, isLoading, error } = useInboxReport(reportId ?? null);
const { data: user } = useUserQuery();
const [reportRepo, setReportRepo] = useState<string | null>(null);
const [dismissOpen, setDismissOpen] = useState(false);
const [discussOpen, setDiscussOpen] = useState(false);
Expand Down Expand Up @@ -151,11 +156,12 @@ export default function ReportDetailScreen() {
const suggestedReviewers = useMemo((): SuggestedReviewer[] => {
for (const a of artefacts) {
if (a.type === "suggested_reviewers") {
return (a.content as SuggestedReviewer[]) ?? [];
const reviewers = (a.content as SuggestedReviewer[]) ?? [];
return orderSuggestedReviewers(reviewers, user?.uuid);
}
}
return [];
}, [artefacts]);
}, [artefacts, user?.uuid]);

const findingsBySignalId = useMemo(() => {
const map = new Map<string, SignalFindingContent>();
Expand Down Expand Up @@ -358,7 +364,10 @@ export default function ReportDetailScreen() {
)}

{/* Suggested reviewers */}
<SuggestedReviewers reviewers={suggestedReviewers} />
<SuggestedReviewers
reviewers={suggestedReviewers}
meUuid={user?.uuid}
/>

{/* Signals */}
{signals.length > 0 && (
Expand Down
57 changes: 57 additions & 0 deletions apps/mobile/src/features/inbox/utils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { describe, expect, it } from "vitest";
import type { SuggestedReviewer } from "./types";
import { orderSuggestedReviewers } from "./utils";

function reviewer(login: string, uuid?: string): SuggestedReviewer {
return {
github_login: login,
github_name: login,
relevant_commits: [],
user: uuid
? {
id: 1,
uuid,
email: `${login}@posthog.com`,
first_name: login,
last_name: "",
}
: null,
};
}

describe("orderSuggestedReviewers", () => {
it("moves the current user to the front", () => {
const reviewers = [
reviewer("a", "uuid-a"),
reviewer("me", "uuid-me"),
reviewer("c", "uuid-c"),
];
const ordered = orderSuggestedReviewers(reviewers, "uuid-me");
expect(ordered.map((r) => r.github_login)).toEqual(["me", "a", "c"]);
});

it.each([
{
label: "already first",
reviewers: [reviewer("me", "uuid-me"), reviewer("a", "uuid-a")],
meUuid: "uuid-me" as string | null | undefined,
},
{
label: "absent",
reviewers: [reviewer("a", "uuid-a"), reviewer("b", "uuid-b")],
meUuid: "uuid-me" as string | null | undefined,
},
{
label: "null meUuid",
reviewers: [reviewer("a", "uuid-a"), reviewer("me", "uuid-me")],
meUuid: null as string | null | undefined,
},
{
label: "undefined meUuid",
reviewers: [reviewer("a", "uuid-a"), reviewer("me", "uuid-me")],
meUuid: undefined as string | null | undefined,
},
])("is a no-op when $label", ({ reviewers, meUuid }) => {
expect(orderSuggestedReviewers(reviewers, meUuid)).toBe(reviewers);
});
});
11 changes: 11 additions & 0 deletions apps/mobile/src/features/inbox/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {
SignalReport,
SignalReportOrderingField,
SignalReportStatus,
SuggestedReviewer,
} from "./types";

export function inboxStatusLabel(status: SignalReportStatus): string {
Expand Down Expand Up @@ -87,3 +88,13 @@ export function getActionableReports(reports: SignalReport[]): SignalReport[] {
!r.already_addressed,
);
}

export function orderSuggestedReviewers(
reviewers: SuggestedReviewer[],
meUuid: string | null | undefined,
): SuggestedReviewer[] {
if (!meUuid) return reviewers;
const meIndex = reviewers.findIndex((r) => r.user?.uuid === meUuid);
if (meIndex <= 0) return reviewers;
return [reviewers[meIndex], ...reviewers.filter((_, i) => i !== meIndex)];
}
Loading