feat: scope GitHub integration settings by workspace (#1572)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
|
||||
import { searchUserPRs, searchUserIssues } from "@/lib/api/domains/github-api";
|
||||
import type { GitHubPR, GitHubIssue } from "@/lib/types/github";
|
||||
import type { PresetOption } from "./search-bar";
|
||||
@@ -22,6 +22,16 @@ type FetchArgs = {
|
||||
customQuery: string;
|
||||
repoFilter: string;
|
||||
page: number;
|
||||
workspaceId: string | null;
|
||||
};
|
||||
|
||||
type UseGitHubSearchOptions = {
|
||||
kind: SearchKind;
|
||||
presets: PresetOption[];
|
||||
preset: string;
|
||||
customQuery: string;
|
||||
repoFilter?: string;
|
||||
workspaceId?: string | null;
|
||||
};
|
||||
|
||||
export function buildParams(
|
||||
@@ -40,13 +50,14 @@ export function buildParams(
|
||||
return { filter };
|
||||
}
|
||||
|
||||
export function useGitHubSearch<T extends GitHubPR | GitHubIssue>(
|
||||
kind: SearchKind,
|
||||
presets: PresetOption[],
|
||||
preset: string,
|
||||
customQuery: string,
|
||||
repoFilter: string = "",
|
||||
) {
|
||||
export function useGitHubSearch<T extends GitHubPR | GitHubIssue>({
|
||||
kind,
|
||||
presets,
|
||||
preset,
|
||||
customQuery,
|
||||
repoFilter = "",
|
||||
workspaceId = null,
|
||||
}: UseGitHubSearchOptions) {
|
||||
const [state, setState] = useState<SearchState<T>>({
|
||||
items: [],
|
||||
loading: false,
|
||||
@@ -59,22 +70,33 @@ export function useGitHubSearch<T extends GitHubPR | GitHubIssue>(
|
||||
// a slow page-N request can't overwrite a fresher page-1 result after a
|
||||
// filter change.
|
||||
const requestSeq = useRef(0);
|
||||
const workspaceRef = useRef(workspaceId);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
workspaceRef.current = workspaceId;
|
||||
}, [workspaceId]);
|
||||
|
||||
// Reset to page 1 whenever the filter inputs change.
|
||||
useEffect(() => {
|
||||
setPage(1);
|
||||
}, [preset, customQuery, repoFilter, kind]);
|
||||
}, [preset, customQuery, repoFilter, workspaceId, kind]);
|
||||
|
||||
const fetchData = useCallback(
|
||||
async ({ preset: ep, customQuery: ec, repoFilter: er, page: epage }: FetchArgs) => {
|
||||
async ({
|
||||
preset: ep,
|
||||
customQuery: ec,
|
||||
repoFilter: er,
|
||||
page: epage,
|
||||
workspaceId: ews,
|
||||
}: FetchArgs) => {
|
||||
const seq = ++requestSeq.current;
|
||||
setState((s) => ({ ...s, loading: true, error: null }));
|
||||
try {
|
||||
const base = buildParams(presets, ep, ec, er);
|
||||
const params = { ...base, page: epage, perPage: SEARCH_PAGE_SIZE };
|
||||
const params = { ...base, page: epage, perPage: SEARCH_PAGE_SIZE, workspaceId: ews };
|
||||
const response =
|
||||
kind === "pr" ? await searchUserPRs(params) : await searchUserIssues(params);
|
||||
if (seq !== requestSeq.current) return;
|
||||
if (seq !== requestSeq.current || ews !== workspaceRef.current) return;
|
||||
const items = (kind === "pr"
|
||||
? (response as { prs: GitHubPR[] }).prs
|
||||
: (response as { issues: GitHubIssue[] }).issues) as unknown as T[];
|
||||
@@ -86,7 +108,7 @@ export function useGitHubSearch<T extends GitHubPR | GitHubIssue>(
|
||||
total: response.total_count ?? (items ?? []).length,
|
||||
});
|
||||
} catch (err) {
|
||||
if (seq !== requestSeq.current) return;
|
||||
if (seq !== requestSeq.current || ews !== workspaceRef.current) return;
|
||||
setState((s) => ({
|
||||
items: [],
|
||||
loading: false,
|
||||
@@ -100,12 +122,12 @@ export function useGitHubSearch<T extends GitHubPR | GitHubIssue>(
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
void fetchData({ preset, customQuery, repoFilter, page });
|
||||
}, [fetchData, preset, customQuery, repoFilter, page]);
|
||||
void fetchData({ preset, customQuery, repoFilter, page, workspaceId });
|
||||
}, [fetchData, preset, customQuery, repoFilter, page, workspaceId]);
|
||||
|
||||
const refresh = useCallback(
|
||||
() => fetchData({ preset, customQuery, repoFilter, page }),
|
||||
[fetchData, preset, customQuery, repoFilter, page],
|
||||
() => fetchData({ preset, customQuery, repoFilter, page, workspaceId }),
|
||||
[fetchData, preset, customQuery, repoFilter, page, workspaceId],
|
||||
);
|
||||
|
||||
return { ...state, page, setPage, pageSize: SEARCH_PAGE_SIZE, refresh };
|
||||
|
||||
Reference in New Issue
Block a user