Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(frontend): decouple the project store from Pinia (#20482)

boojack4f454cd02a9b
diff --git a/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx
index 4a10f714e9..95a6be7bdb 100644
--- a/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx
+++ b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx
@@ -17,11 +17,7 @@ import {
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
import { ensureWorkloadIdentityFullName } from "@/react/stores/app/workloadIdentity";
-import {
- pushNotification,
- useActuatorV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useActuatorV1Store } from "@/store";
import {
getWorkloadIdentityNameInBinding,
getWorkloadIdentitySuffix,
@@ -133,7 +129,8 @@ function WorkloadIdentityForm({
}: Omit<CreateWorkloadIdentitySheetProps, "open">) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const getProjectIamPolicy = useAppStore((state) => state.getProjectIamPolicy);
const updateProjectIamPolicy = useAppStore(
(state) => state.updateProjectIamPolicy
@@ -149,8 +146,9 @@ function WorkloadIdentityForm({
);
const projectEntity = useVueState(() =>
- project ? projectStore.getProjectByName(project) : undefined
+ project ? useAppStore.getState().getProjectByName(project) : undefined
);
+ void projectsByName;
const isEditMode = !!workloadIdentity && !!workloadIdentity.email;
diff --git a/frontend/src/react/components/IssueTable.tsx b/frontend/src/react/components/IssueTable.tsx
index 7b1ee84c08..4c31a38c7b 100644
--- a/frontend/src/react/components/IssueTable.tsx
+++ b/frontend/src/react/components/IssueTable.tsx
@@ -35,7 +35,7 @@ import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";
import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import {
getTimeForPbTimestampProtoEs,
isValidProjectName,
@@ -322,21 +322,23 @@ export function useIssueSearchScopeOptions(
): ScopeOption[] {
const { t } = useTranslation();
const listUsers = useAppStore((state) => state.listUsers);
- const projectStore = useProjectV1Store();
const me = useCurrentUser();
const [projectLabels, setProjectLabels] = useState<Label[]>([]);
useEffect(() => {
if (!projectName || !isValidProjectName(projectName)) return;
- projectStore.getOrFetchProjectByName(projectName).then((project) => {
- const labels = new Map<string, Label>();
- for (const label of project.issueLabels) {
- labels.set(`${label.value}-${label.color}`, label);
- }
- setProjectLabels([...labels.values()]);
- });
- }, [projectName, projectStore]);
+ useAppStore
+ .getState()
+ .getOrFetchProjectByName(projectName)
+ .then((project) => {
+ const labels = new Map<string, Label>();
+ for (const label of project.issueLabels) {
+ labels.set(`${label.value}-${label.color}`, label);
+ }
+ setProjectLabels([...labels.values()]);
+ });
+ }, [projectName]);
const searchPrincipal = useCallback(
async (keyword: string): Promise<ValueOption[]> => {
diff --git a/frontend/src/react/components/ProjectSelect.tsx b/frontend/src/react/components/ProjectSelect.tsx
index 585103ffec..d2156a5a65 100644
--- a/frontend/src/react/components/ProjectSelect.tsx
+++ b/frontend/src/react/components/ProjectSelect.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { Combobox } from "@/react/components/ui/combobox";
-import { useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import { isValidProjectName } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import { extractProjectResourceName, getDefaultPagination } from "@/utils";
@@ -37,7 +37,6 @@ export function ProjectSelect({
portal,
}: ProjectSelectProps) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
const [projects, setProjects] = useState<Project[]>([]);
// Projects referenced by `value` that aren't in the paged fetch.
// Mirrors Vue's `additionalOptions` so deep-linked URLs (e.g.
@@ -57,17 +56,15 @@ export function ProjectSelect({
const excludeDefaultRef = useRef(excludeDefault);
excludeDefaultRef.current = excludeDefault;
- const fetchProjects = useCallback(
- (query: string) => {
- projectStore
- .fetchProjectList({
- filter: { query, excludeDefault: excludeDefaultRef.current },
- pageSize: getDefaultPagination(),
- })
- .then(({ projects: result }) => setProjects(result));
- },
- [projectStore]
- );
+ const fetchProjects = useCallback((query: string) => {
+ useAppStore
+ .getState()
+ .fetchProjectList({
+ filter: { query, excludeDefault: excludeDefaultRef.current },
+ pageSize: getDefaultPagination(),
+ })
+ .then(({ projects: result }) => setProjects(result));
+ }, []);
// Fetch the first page on mount, and re-fetch only when
// `excludeDefault` actually flips (rare — typically once after
@@ -83,17 +80,22 @@ export function ProjectSelect({
useEffect(() => {
if (!isValidProjectName(value)) return;
let cancelled = false;
- void projectStore.getOrFetchProjectByName(value).then((p) => {
- if (cancelled) return;
- if (!isValidProjectName(p.name)) return;
- setAdditionalProjects((prev) =>
- prev.some((existing) => existing.name === p.name) ? prev : [...prev, p]
- );
- });
+ void useAppStore
+ .getState()
+ .getOrFetchProjectByName(value)
+ .then((p) => {
+ if (cancelled) return;
+ if (!isValidProjectName(p.name)) return;
+ setAdditionalProjects((prev) =>
+ prev.some((existing) => existing.name === p.name)
+ ? prev
+ : [...prev, p]
+ );
+ });
return () => {
cancelled = true;
};
- }, [value, projectStore]);
+ }, [value]);
const allProjects = useMemo(() => {
const seen = new Set<string>();
diff --git a/frontend/src/react/components/ProjectSidebar.tsx b/frontend/src/react/components/ProjectSidebar.tsx
index 4578c368be..2a8d42d7d1 100644
--- a/frontend/src/react/components/ProjectSidebar.tsx
+++ b/frontend/src/react/components/ProjectSidebar.tsx
@@ -15,6 +15,7 @@ import { effectScope } from "vue";
import logoFull from "@/assets/logo-full.svg";
import { useWorkspace } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import {
PROJECT_V1_ROUTE_ACCESS_GRANTS,
@@ -36,7 +37,7 @@ import {
PROJECT_V1_ROUTE_WORKLOAD_IDENTITIES,
} from "@/router/dashboard/projectV1";
import { useRecentVisit } from "@/router/useRecentVisit";
-import { useActuatorV1Store, useProjectV1Store } from "@/store";
+import { useActuatorV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
// ---------------------------------------------------------------------------
@@ -250,8 +251,6 @@ export function ProjectSidebar() {
const customLogo = useWorkspace()?.logo ?? "";
- const projectStore = useProjectV1Store();
-
// Create a Vue effectScope so we can call the Vue composable useRecentVisit.
const recordVisitRef = useRef<((path: string) => void) | null>(null);
useEffect(() => {
@@ -269,12 +268,11 @@ export function ProjectSidebar() {
// ProjectRouteShell also fetches it, but this guards against race conditions.
useEffect(() => {
if (projectId) {
- projectStore.getOrFetchProjectByName(
- `${projectNamePrefix}${projectId}`,
- true
- );
+ useAppStore
+ .getState()
+ .getOrFetchProjectByName(`${projectNamePrefix}${projectId}`, true);
}
- }, [projectId, projectStore]);
+ }, [projectId]);
// -- Expand / collapse state -----------------------------------------------
const [expandedSet, setExpandedSet] = useState<Set<string>>(new Set());
diff --git a/frontend/src/react/components/Quickstart.tsx b/frontend/src/react/components/Quickstart.tsx
index baf818e189..35af07263a 100644
--- a/frontend/src/react/components/Quickstart.tsx
+++ b/frontend/src/react/components/Quickstart.tsx
@@ -15,11 +15,7 @@ import {
WORKSPACE_ROUTE_USERS,
} from "@/router/dashboard/workspaceRoutes";
import { SQL_EDITOR_WORKSHEET_MODULE } from "@/router/sqlEditor";
-import {
- pushNotification,
- useActuatorV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useActuatorV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Permission } from "@/types";
import { isValidProjectName, UNKNOWN_PROJECT_NAME } from "@/types";
@@ -66,7 +62,6 @@ interface IntroItem {
export function Quickstart() {
const { t } = useTranslation();
const navigate = useNavigate();
- const projectStore = useProjectV1Store();
const actuatorStore = useActuatorV1Store();
const loadProjectIamPolicy = useAppStore(
(state) => state.loadProjectIamPolicy
@@ -108,10 +103,12 @@ export function Quickstart() {
}
let cancelled = false;
void (async () => {
- const project = await projectStore.getOrFetchProjectByName(
- `${projectNamePrefix}${SAMPLE_PROJECT_NAME}`,
- true /* silent */
- );
+ const project = await useAppStore
+ .getState()
+ .getOrFetchProjectByName(
+ `${projectNamePrefix}${SAMPLE_PROJECT_NAME}`,
+ true /* silent */
+ );
if (cancelled) return;
if (!isValidProjectName(project.name)) {
setSampleProject(undefined);
@@ -124,7 +121,7 @@ export function Quickstart() {
return () => {
cancelled = true;
};
- }, [quickStartEnabled, projectStore, loadProjectIamPolicy]);
+ }, [quickStartEnabled, loadProjectIamPolicy]);
useEffect(() => {
if (!sampleProject) {
diff --git a/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx
index 93af7fe5cf..44c9d76e51 100644
--- a/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx
+++ b/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx
@@ -119,32 +119,31 @@ const mocks = vi.hoisted(() => ({
currentUser: { name: "users/[email protected]", email: "[email protected]" },
}));
-// Stable store singletons — returning a new object on every render causes the
-// useEffect([..., projectStore]) dependency to fire on every render, creating
-// an infinite update loop that exhausts the V8 heap.
-const stableProjectStore = {
+vi.mock("@/store", () => ({
+ useEnvironmentV1Store: () => ({ environmentList: [] }),
+ pushNotification: vi.fn(),
+}));
+
+// The app store exposes both a callable selector form
+// (`useAppStore((s) => s.projectsByName)`) and an imperative
+// `useAppStore.getState()` form. The project methods that previously lived on
+// the Pinia `useProjectV1Store` now live here.
+const appStoreState = {
get getOrFetchProjectByName() {
return mocks.getOrFetchProjectByName;
},
get getProjectByName() {
return mocks.getProjectByName;
},
+ getOrFetchInstanceByName: mocks.getOrFetchInstanceByName,
fetchProjectList: vi.fn().mockResolvedValue({ projects: [] }),
+ projectsByName: {},
};
-vi.mock("@/store", () => ({
- useProjectV1Store: () => stableProjectStore,
- useEnvironmentV1Store: () => ({ environmentList: [] }),
- pushNotification: vi.fn(),
-}));
-
vi.mock("@/react/stores/app", () => ({
useAppStore: Object.assign(
- (selector: (state: unknown) => unknown) =>
- selector({ getOrFetchInstanceByName: mocks.getOrFetchInstanceByName }),
+ (selector: (state: unknown) => unknown) => selector(appStoreState),
{
- getState: () => ({
- getOrFetchInstanceByName: mocks.getOrFetchInstanceByName,
- }),
+ getState: () => appStoreState,
}
),
}));
diff --git a/frontend/src/react/components/database/CreateDatabaseSheet.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
index 72332c3272..e6ea92c775 100644
--- a/frontend/src/react/components/database/CreateDatabaseSheet.tsx
+++ b/frontend/src/react/components/database/CreateDatabaseSheet.tsx
@@ -23,11 +23,7 @@ import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { experimentalCreateIssueByPlan } from "@/react/stores/app/issue";
import { router } from "@/router";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import {
defaultCharsetOfEngineV1,
defaultCollationOfEngineV1,
@@ -64,7 +60,8 @@ export function CreateDatabaseSheet({
projectName: fixedProjectName,
}: CreateDatabaseSheetProps) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const environmentStore = useEnvironmentV1Store();
const currentUser = useCurrentUser();
@@ -110,9 +107,10 @@ export function CreateDatabaseSheet({
// for BYT-9310. Do not collapse these back together without a separate spec.
const projectReactive = useVueState(() =>
effectiveProjectName
- ? projectStore.getProjectByName(effectiveProjectName)
+ ? useAppStore.getState().getProjectByName(effectiveProjectName)
: undefined
);
+ void projectsByName;
// Note on hydration: projectStore.getProjectByName returns an
// unknownProject() sentinel when the project is not yet cached. The sentinel
@@ -130,7 +128,8 @@ export function CreateDatabaseSheet({
setSelectedProject(undefined);
if (!effectiveProjectName) return;
const fetchId = ++projectFetchRef.current;
- projectStore
+ useAppStore
+ .getState()
.getOrFetchProjectByName(effectiveProjectName)
.then((project) => {
if (fetchId !== projectFetchRef.current) return;
@@ -165,7 +164,7 @@ export function CreateDatabaseSheet({
// effect to re-fire spuriously in test harnesses where `useTranslation`
// is mocked to return a fresh closure per render. Same convention as
// the auto-fill effect below.
- }, [effectiveProjectName, projectStore]);
+ }, [effectiveProjectName]);
// Auto-fill when the project doesn't enforce manual titles.
// Intentional omissions from the dep array: `title` and `titleEdited` are
@@ -256,8 +255,9 @@ export function CreateDatabaseSheet({
if (!allowCreate || creating) return;
setCreating(true);
try {
- const project =
- await projectStore.getOrFetchProjectByName(effectiveProjectName);
+ const project = await useAppStore
+ .getState()
+ .getOrFetchProjectByName(effectiveProjectName);
const engine = selectedInstance?.engine ?? 0;
const createDatabaseConfig = create(Plan_CreateDatabaseConfigSchema, {
target: instanceName,
diff --git a/frontend/src/react/components/sql-review/Panels.tsx b/frontend/src/react/components/sql-review/Panels.tsx
index 118ebf707e..0847aca258 100644
--- a/frontend/src/react/components/sql-review/Panels.tsx
+++ b/frontend/src/react/components/sql-review/Panels.tsx
@@ -14,18 +14,16 @@ import {
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { useVueState } from "@/react/hooks/useVueState";
import { getRuleKey } from "@/react/lib/sql-review/utils";
+import { useAppStore } from "@/react/stores/app";
import { useSQLReviewStore } from "@/react/stores/sqlReview";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import {
environmentNamePrefix,
projectNamePrefix,
} from "@/store/modules/v1/common";
import type { SQLReviewPolicy } from "@/types";
import type { Engine } from "@/types/proto-es/v1/common_pb";
+import { State } from "@/types/proto-es/v1/common_pb";
import type { SQLReviewRule_Type } from "@/types/proto-es/v1/review_config_service_pb";
import type { RuleTemplateV2 } from "@/types/sqlReview";
import { isBuiltinRule, ruleTemplateMapV2 } from "@/types/sqlReview";
@@ -159,17 +157,23 @@ export function AttachResourcesPanel({
const { t } = useTranslation();
const sqlReviewStore = useSQLReviewStore();
const envStore = useEnvironmentV1Store();
- const projStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const environments = useVueState(() => envStore.environmentList ?? []);
- const projects = useVueState(() => [...(projStore.getProjectList() ?? [])]);
+ const projects = useMemo(
+ () =>
+ Object.values(projectsByName).filter(
+ (project) => project.state === State.ACTIVE
+ ),
+ [projectsByName]
+ );
const [resources, setResources] = useState<string[]>([]);
// Fetch projects on mount so the checkbox list is populated
useEffect(() => {
- projStore.fetchProjectList({});
- }, [projStore]);
+ useAppStore.getState().fetchProjectList({});
+ }, []);
useEffect(() => {
setResources([...review.resources]);
diff --git a/frontend/src/react/components/sql-review/ResourceLink.tsx b/frontend/src/react/components/sql-review/ResourceLink.tsx
index 54d509a8a3..2ecdc1d93d 100644
--- a/frontend/src/react/components/sql-review/ResourceLink.tsx
+++ b/frontend/src/react/components/sql-review/ResourceLink.tsx
@@ -2,8 +2,8 @@ import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import { useProjectV1Store } from "@/store";
import {
environmentNamePrefix,
projectNamePrefix,
@@ -41,15 +41,19 @@ function EnvironmentResourceLink({ resource }: { resource: string }) {
function ProjectResourceLink({ resource }: { resource: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
useEffect(() => {
if (hasWorkspacePermissionV2("bb.projects.get")) {
- projectStore.getOrFetchProjectByName(resource, true);
+ useAppStore.getState().getOrFetchProjectByName(resource, true);
}
- }, [projectStore, resource]);
+ }, [resource]);
- const project = useVueState(() => projectStore.getProjectByName(resource));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(resource)
+ );
+ void projectsByName;
return (
<a
diff --git a/frontend/src/react/components/sql-review/TemplateSelector.test.tsx b/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
index e0b1d2cc0c..534993147d 100644
--- a/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
+++ b/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
@@ -25,7 +25,8 @@ const mocks = vi.hoisted(() => ({
})),
useVueState: vi.fn((getter: () => unknown) => getter()),
rulesToTemplate: vi.fn(() => reviewTemplate),
- useProjectV1Store: vi.fn(),
+ getOrFetchProjectByName: vi.fn(),
+ getProjectByName: vi.fn(() => undefined),
useSQLReviewStore: vi.fn(),
}));
@@ -58,8 +59,25 @@ vi.mock("@/types", () => ({
],
}));
-vi.mock("@/store", () => ({
- useProjectV1Store: mocks.useProjectV1Store,
+// The project getters that previously lived on the Pinia `useProjectV1Store`
+// now live on the Zustand app store, accessed via both the callable selector
+// form (`useAppStore((s) => s.projectsByName)`) and `useAppStore.getState()`.
+const appStoreState = {
+ get getOrFetchProjectByName() {
+ return mocks.getOrFetchProjectByName;
+ },
+ get getProjectByName() {
+ return mocks.getProjectByName;
+ },
+ projectsByName: {},
+};
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: Object.assign(
+ (selector: (state: unknown) => unknown) => selector(appStoreState),
+ {
+ getState: () => appStoreState,
+ }
+ ),
}));
vi.mock("@/react/stores/sqlReview", () => ({
@@ -93,11 +111,9 @@ beforeEach(async () => {
mocks.useVueState.mockImplementation((getter: () => unknown) => getter());
mocks.rulesToTemplate.mockReset();
mocks.rulesToTemplate.mockReturnValue(reviewTemplate);
- mocks.useProjectV1Store.mockReset();
- mocks.useProjectV1Store.mockReturnValue({
- getOrFetchProjectByName: vi.fn(),
- getProjectByName: vi.fn(() => undefined),
- });
+ mocks.getOrFetchProjectByName.mockReset();
+ mocks.getProjectByName.mockReset();
+ mocks.getProjectByName.mockReturnValue(undefined);
mocks.useSQLReviewStore.mockReset();
mocks.useSQLReviewStore.mockReturnValue({
reviewPolicyList: [{ id: "policy-1" }],
diff --git a/frontend/src/react/components/sql-review/TemplateSelector.tsx b/frontend/src/react/components/sql-review/TemplateSelector.tsx
index 1b9809ffef..5e43b42ffb 100644
--- a/frontend/src/react/components/sql-review/TemplateSelector.tsx
+++ b/frontend/src/react/components/sql-review/TemplateSelector.tsx
@@ -7,8 +7,8 @@ import { Separator } from "@/react/components/ui/separator";
import { useVueState } from "@/react/hooks/useVueState";
import { rulesToTemplate } from "@/react/lib/sql-review/utils";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { useSQLReviewStore } from "@/react/stores/sqlReview";
-import { useProjectV1Store } from "@/store";
import {
environmentNamePrefix,
projectNamePrefix,
@@ -31,19 +31,21 @@ interface TemplateSelectorProps {
function ResourceBadge({ resource }: { resource: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
useEffect(() => {
if (resource.startsWith(projectNamePrefix)) {
- projectStore.getOrFetchProjectByName(resource, true);
+ useAppStore.getState().getOrFetchProjectByName(resource, true);
}
- }, [projectStore, resource]);
+ }, [resource]);
const projectTitle = useVueState(() =>
resource.startsWith(projectNamePrefix)
- ? projectStore.getProjectByName(resource)?.title
+ ? useAppStore.getState().getProjectByName(resource)?.title
: undefined
);
+ void projectsByName;
if (resource.startsWith(environmentNamePrefix)) {
return (
diff --git a/frontend/src/react/lib/plan/issue.ts b/frontend/src/react/lib/plan/issue.ts
index a1bae1146d..c56dac9f50 100644
--- a/frontend/src/react/lib/plan/issue.ts
+++ b/frontend/src/react/lib/plan/issue.ts
@@ -1,7 +1,6 @@
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL } from "@/router/dashboard/projectV1";
-import { useProjectV1Store } from "@/store";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
import {
extractDatabaseGroupName,
@@ -13,7 +12,6 @@ import { applyPlanTitleToQuery } from "./title";
export const preCreateIssue = async (project: string, targets: string[]) => {
const type = "bb.plan.change-database";
- const projectStore = useProjectV1Store();
const databaseNames: string[] = [];
for (const target of targets) {
@@ -31,7 +29,9 @@ export const preCreateIssue = async (project: string, targets: string[]) => {
);
// Fetch project to check enforce_issue_title setting
- const projectEntity = await projectStore.getOrFetchProjectByName(project);
+ const projectEntity = await useAppStore
+ .getState()
+ .getOrFetchProjectByName(project);
// Navigate to plan detail page
const query: Record<string, string> = {
diff --git a/frontend/src/react/pages/auth/SetupPage.test.tsx b/frontend/src/react/pages/auth/SetupPage.test.tsx
index 25ba6cb0ce..78facb4705 100644
--- a/frontend/src/react/pages/auth/SetupPage.test.tsx
+++ b/frontend/src/react/pages/auth/SetupPage.test.tsx
@@ -39,10 +39,6 @@ vi.mock("@/store", () => ({
setupSample: mocks.setupSample,
}),
useAppFeature: () => ({ value: 0 }),
- useProjectV1Store: () => ({
- getOrFetchProjectByName: mocks.getOrFetchProjectByName,
- createProject: mocks.createProject,
- }),
useSettingV1Store: () => ({
updateWorkspaceProfile: mocks.updateWorkspaceProfile,
}),
@@ -58,6 +54,8 @@ vi.mock("@/react/stores/app", () => ({
getState: () => ({
listRoles: mocks.listRoles,
fetchWorkspaceIamPolicy: mocks.fetchIamPolicy,
+ getOrFetchProjectByName: mocks.getOrFetchProjectByName,
+ createProject: mocks.createProject,
}),
}
),
diff --git a/frontend/src/react/pages/auth/SetupPage.tsx b/frontend/src/react/pages/auth/SetupPage.tsx
index b54f19c2ae..c38df97eb7 100644
--- a/frontend/src/react/pages/auth/SetupPage.tsx
+++ b/frontend/src/react/pages/auth/SetupPage.tsx
@@ -17,15 +17,9 @@ import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";
-import {
- useActuatorV1Store,
- useAppFeature,
- useProjectV1Store,
- useSettingV1Store,
-} from "@/store";
+import { useActuatorV1Store, useAppFeature, useSettingV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { DatabaseChangeMode } from "@/types/proto-es/v1/setting_service_pb";
-import { unknownProject } from "@/types/v1/project";
import { extractGrpcErrorMessage, getErrorCode } from "@/utils/connect";
type Purpose = "edit-schema" | "query-data";
@@ -137,8 +131,6 @@ function SetupWizard() {
setCurrentStep(next);
};
- const projectV1Store = useProjectV1Store();
-
const skip = () => router.push("/");
const finish = async () => {
@@ -146,8 +138,7 @@ function SetupWizard() {
setLoading(true);
try {
if (data === "self-setup") {
- const project = { ...unknownProject(), title: projectTitle };
- await projectV1Store.createProject(project, resourceId);
+ await useAppStore.getState().createProject(projectTitle, resourceId);
} else {
await useActuatorV1Store().setupSample();
}
@@ -166,10 +157,12 @@ function SetupWizard() {
const validateProjectResourceID = useCallback(
async (id: string) => {
try {
- await projectV1Store.getOrFetchProjectByName(
- `${projectNamePrefix}${id}`,
- true /* silent */
- );
+ await useAppStore
+ .getState()
+ .getOrFetchProjectByName(
+ `${projectNamePrefix}${id}`,
+ true /* silent */
+ );
return [
{
type: "error" as const,
@@ -190,7 +183,7 @@ function SetupWizard() {
];
}
},
- [projectV1Store, t]
+ [t]
);
return (
diff --git a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
index 3c549a59f7..fcd5cf7576 100644
--- a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
@@ -36,7 +36,7 @@ import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
import type { AccessGrantFilter as AccessFilter } from "@/react/stores/app/types";
import { router } from "@/router";
-import { featureToRef, pushNotification, useProjectV1Store } from "@/store";
+import { featureToRef, pushNotification } from "@/store";
import { extractUserEmail, projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs } from "@/types";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
@@ -106,7 +106,9 @@ function mapDatabase(db: Database) {
export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const listUsers = useAppStore((state) => state.listUsers);
const listAccessGrants = useAppStore((state) => state.listAccessGrants);
const activateAccessGrant = useAppStore((state) => state.activateAccessGrant);
@@ -114,7 +116,9 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
const currentUser = useCurrentUser();
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const hasJITFeature = useVueState(
() => featureToRef(PlanFeature.FEATURE_JIT).value
diff --git a/frontend/src/react/pages/project/ProjectAuditLogPage.tsx b/frontend/src/react/pages/project/ProjectAuditLogPage.tsx
index 36a41f3532..56acd6e64b 100644
--- a/frontend/src/react/pages/project/ProjectAuditLogPage.tsx
+++ b/frontend/src/react/pages/project/ProjectAuditLogPage.tsx
@@ -2,15 +2,19 @@ import { useMemo } from "react";
import { AuditLogTable } from "@/react/components/AuditLogTable";
import { FeatureAttention } from "@/react/components/FeatureAttention";
import { useVueState } from "@/react/hooks/useVueState";
-import { useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import { hasProjectPermissionV2 } from "@/utils";
export function ProjectAuditLogPage({ projectId }: { projectId: string }) {
const projectName = `${projectNamePrefix}${projectId}`;
- const projectStore = useProjectV1Store();
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const canExport = project
? hasProjectPermissionV2(project, "bb.auditLogs.export")
diff --git a/frontend/src/react/pages/project/ProjectDataExportPage.tsx b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
index 7a696b020b..b319cb762c 100644
--- a/frontend/src/react/pages/project/ProjectDataExportPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
@@ -17,7 +17,6 @@ import { displayRoleTitleFromList } from "@/react/lib/role";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs, unknownUser } from "@/types";
import { ApprovalStatus, RiskLevel } from "@/types/proto-es/v1/common_pb";
@@ -42,13 +41,17 @@ import { DataExportPrepSheet } from "./export-center/DataExportPrepSheet";
export function ProjectDataExportPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [showDrawer, setShowDrawer] = useState(false);
@@ -449,7 +452,9 @@ function IssueListItem({
highlightText?: string;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const creatorUser = useAppStore((state) =>
state.getUserByIdentifier(issue.creator)
@@ -457,9 +462,11 @@ function IssueListItem({
const creator = creatorUser || unknownUser(issue.creator);
const issueProject = useVueState(() =>
- projectStore.getProjectByName(
- `${projectNamePrefix}${extractProjectResourceName(issue.name)}`
- )
+ useAppStore
+ .getState()
+ .getProjectByName(
+ `${projectNamePrefix}${extractProjectResourceName(issue.name)}`
+ )
);
const createTimeTs = Math.floor(
diff --git a/frontend/src/react/pages/project/ProjectDatabaseGroupCreatePage.tsx b/frontend/src/react/pages/project/ProjectDatabaseGroupCreatePage.tsx
index 2a3d4ceeb7..48f661873d 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseGroupCreatePage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseGroupCreatePage.tsx
@@ -1,8 +1,8 @@
import { DatabaseGroupForm } from "@/react/components/DatabaseGroupForm";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL } from "@/router/dashboard/projectV1";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
export function ProjectDatabaseGroupCreatePage({
@@ -10,9 +10,13 @@ export function ProjectDatabaseGroupCreatePage({
}: {
projectId: string;
}) {
- const projectStore = useProjectV1Store();
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
if (!project) return null;
diff --git a/frontend/src/react/pages/project/ProjectDatabaseGroupDetailPage.tsx b/frontend/src/react/pages/project/ProjectDatabaseGroupDetailPage.tsx
index b07310cf01..45badb290f 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseGroupDetailPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseGroupDetailPage.tsx
@@ -21,7 +21,7 @@ import { preCreateIssue } from "@/react/lib/plan/issue";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_DATABASE_GROUPS } from "@/router/dashboard/projectV1";
-import { hasFeature, useProjectV1Store } from "@/store";
+import { hasFeature } from "@/store";
import {
databaseGroupNamePrefix,
projectNamePrefix,
@@ -42,10 +42,14 @@ export function ProjectDatabaseGroupDetailPage({
databaseGroupName: string;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const resourceName = `${projectName}/${databaseGroupNamePrefix}${databaseGroupName}`;
diff --git a/frontend/src/react/pages/project/ProjectDatabaseGroupsPage.tsx b/frontend/src/react/pages/project/ProjectDatabaseGroupsPage.tsx
index b9a76a3402..795c34c8f7 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseGroupsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseGroupsPage.tsx
@@ -17,7 +17,6 @@ import {
PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL,
PROJECT_V1_ROUTE_DATABASE_GROUPS_CREATE,
} from "@/router/dashboard/projectV1";
-import { useProjectV1Store } from "@/store";
import {
getProjectNameAndDatabaseGroupName,
projectNamePrefix,
@@ -33,10 +32,14 @@ export function ProjectDatabaseGroupsPage({
projectId: string;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [dbGroupList, setDbGroupList] = useState<DatabaseGroup[]>([]);
const [loading, setLoading] = useState(true);
diff --git a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
index d6cf89d1b8..8f7fc61db8 100644
--- a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
@@ -33,7 +33,6 @@ import {
pushNotification,
useActuatorV1Store,
useEnvironmentV1Store,
- useProjectV1Store,
} from "@/store";
import {
environmentNamePrefix,
@@ -74,10 +73,14 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
const databasesByName = useAppStore((s) => s.databasesByName);
const actuatorStore = useActuatorV1Store();
const environmentStore = useEnvironmentV1Store();
- const projectStore = useProjectV1Store();
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const isDefault = isDefaultProject(projectName);
const hasProjectPermission = useCallback(
diff --git a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
index fd1c5ed2ff..c62f45be3b 100644
--- a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
@@ -20,7 +20,7 @@ import { useAppStore } from "@/react/stores/app";
import { extractWorkloadIdentityId } from "@/react/stores/app/workloadIdentity";
import { router } from "@/router";
import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
-import { useActuatorV1Store, useProjectV1Store } from "@/store";
+import { useActuatorV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
@@ -37,7 +37,7 @@ import {
export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const listWorkloadIdentities = useAppStore(
(state) => state.listWorkloadIdentities
);
@@ -46,7 +46,11 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [showCreateDrawer, setShowCreateDrawer] = useState(false);
const [selectedIdentityName, setSelectedIdentityName] = useState("");
diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
index 9b19863f27..115afbbd82 100644
--- a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
@@ -26,12 +26,7 @@ import { rewriteResourceDatabase } from "@/react/lib/sensitive-data/exemptionDat
import { getExpressionsForDatabaseResource } from "@/react/lib/sensitive-data/utils";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import {
- hasFeature,
- pushNotification,
- useProjectV1Store,
- useSettingV1Store,
-} from "@/store";
+import { hasFeature, pushNotification, useSettingV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { DatabaseResource } from "@/types";
import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";
@@ -64,11 +59,15 @@ export function ProjectMaskingExemptionCreatePage({
projectId: string;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const settingStore = useSettingV1Store();
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
// Ensure classification config is loaded
useEffect(() => {
diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
index 56fa7488b4..2b54ad0852 100644
--- a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
@@ -52,7 +52,6 @@ import {
extractUserEmail,
hasFeature,
pushNotification,
- useProjectV1Store,
useSettingV1Store,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
@@ -94,12 +93,16 @@ export function ProjectMaskingExemptionPage({
projectId: string;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const listUsers = useAppStore((state) => state.listUsers);
const currentUser = useCurrentUser();
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const showDatabaseLink = useMemo(
() =>
project ? hasProjectPermissionV2(project, "bb.databases.get") : false,
diff --git a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
index ecefcdcb69..2dba08bfdd 100644
--- a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
+++ b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
@@ -59,11 +59,7 @@ import {
PROJECT_V1_ROUTE_PLAN_DETAIL,
PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL,
} from "@/router/dashboard/projectV1";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
formatEnvironmentName,
@@ -116,13 +112,17 @@ const TASK_STATUS_FILTERS: Task_Status[] = [
export function ProjectPlanDashboardPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const listUsers = useAppStore((state) => state.listUsers);
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const me = useCurrentUser();
const [showAddSpecDrawer, setShowAddSpecDrawer] = useState(false);
diff --git a/frontend/src/react/pages/project/ProjectReleaseDetailPage.tsx b/frontend/src/react/pages/project/ProjectReleaseDetailPage.tsx
index a29c5fddb5..427012064c 100644
--- a/frontend/src/react/pages/project/ProjectReleaseDetailPage.tsx
+++ b/frontend/src/react/pages/project/ProjectReleaseDetailPage.tsx
@@ -27,7 +27,7 @@ import {
} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs } from "@/types";
import { State, VCSType } from "@/types/proto-es/v1/common_pb";
@@ -45,23 +45,28 @@ export function ProjectReleaseDetailPage({
const fetchRelease = useAppStore((state) => state.fetchRelease);
const deleteRelease = useAppStore((state) => state.deleteRelease);
const undeleteRelease = useAppStore((state) => state.undeleteRelease);
- const projectV1Store = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const projectName = `${projectNamePrefix}${projectId}`;
const releaseName = `${projectName}/releases/${releaseId}`;
const release = useAppStore((state) => state.getReleaseByName(releaseName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
const project = useVueState(() =>
- projectV1Store.getProjectByName(projectName)
+ useAppStore.getState().getProjectByName(projectName)
);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
let cancelled = false;
setIsLoading(true);
- void projectV1Store.getOrFetchProjectByName(projectName).catch((error) => {
- if (!cancelled) console.error("Failed to fetch project", error);
- });
+ void useAppStore
+ .getState()
+ .getOrFetchProjectByName(projectName)
+ .catch((error) => {
+ if (!cancelled) console.error("Failed to fetch project", error);
+ });
void fetchRelease(releaseName)
.catch((error) => {
if (!cancelled) console.error("Failed to fetch release", error);
@@ -72,7 +77,7 @@ export function ProjectReleaseDetailPage({
return () => {
cancelled = true;
};
- }, [projectV1Store, fetchRelease, projectName, releaseName]);
+ }, [fetchRelease, projectName, releaseName]);
useEffect(() => {
if (project?.title) {
diff --git a/frontend/src/react/pages/project/ProjectSettingsPage.tsx b/frontend/src/react/pages/project/ProjectSettingsPage.tsx
index 19b3356548..cb0efd140f 100644
--- a/frontend/src/react/pages/project/ProjectSettingsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectSettingsPage.tsx
@@ -27,11 +27,7 @@ import {
WORKSPACE_ROUTE_SQL_REVIEW_CREATE,
WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,
} from "@/router/dashboard/workspaceRoutes";
-import {
- pushNotification,
- useProjectV1Store,
- useSubscriptionV1Store,
-} from "@/store";
+import { pushNotification, useSubscriptionV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Permission, SQLReviewPolicy } from "@/types";
import { isDefaultProject } from "@/types";
@@ -130,7 +126,7 @@ function ApprovalFlowIndicator({
// ---------------------------------------------------------------------------
export function ProjectSettingsPage() {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const reviewStore = useSQLReviewStore();
const subscriptionStore = useSubscriptionV1Store();
@@ -138,7 +134,11 @@ export function ProjectSettingsPage() {
() => router.currentRoute.value.params.projectId as string
);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const isDefault = isDefaultProject(projectName);
const hasPermission = useCallback(
@@ -523,7 +523,7 @@ export function ProjectSettingsPage() {
updateMask.push("parallel_tasks_per_rollout");
}
if (updateMask.length > 0) {
- await projectStore.updateProject(projectPatch, updateMask);
+ await useAppStore.getState().updateProject(projectPatch, updateMask);
}
pushNotification({
@@ -542,7 +542,6 @@ export function ProjectSettingsPage() {
}
}, [
project,
- projectStore,
reviewStore,
projectName,
title,
@@ -577,21 +576,21 @@ export function ProjectSettingsPage() {
setExecuting(true);
try {
if (dangerAction === "archive") {
- await projectStore.archiveProject(project);
+ await useAppStore.getState().archiveProject(project);
pushNotification({
module: "bytebase",
style: "SUCCESS",
title: `${project.title || project.name} ${t("common.archived")}`,
});
} else if (dangerAction === "restore") {
- await projectStore.restoreProject(project);
+ await useAppStore.getState().restoreProject(project);
pushNotification({
module: "bytebase",
style: "SUCCESS",
title: `${project.title || project.name} ${t("common.restored")}`,
});
} else if (dangerAction === "delete") {
- await projectStore.deleteProject(project.name);
+ await useAppStore.getState().deleteProject(project.name);
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -603,7 +602,7 @@ export function ProjectSettingsPage() {
setExecuting(false);
setDangerAction(null);
}
- }, [project, dangerAction, projectStore, t]);
+ }, [project, dangerAction, t]);
// Label validation errors (set by LabelListEditor via onErrorsChange)
const [labelErrors, setLabelErrors] = useState<string[]>([]);
diff --git a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
index 2607cb99a7..fef6309026 100644
--- a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
+++ b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
@@ -51,11 +51,7 @@ import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL } from "@/router/dashboard/projectV1";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
getDateForPbTimestampProtoEs,
@@ -142,10 +138,14 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
const fetchPreviousChangelog = useAppStore(
(state) => state.fetchPreviousChangelog
);
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [isLoading, setIsLoading] = useState(true);
const [currentStep, setCurrentStep] = useState<Step>(
diff --git a/frontend/src/react/pages/project/ProjectWebhookCreatePage.tsx b/frontend/src/react/pages/project/ProjectWebhookCreatePage.tsx
index 82aa4368de..5b4bd122b5 100644
--- a/frontend/src/react/pages/project/ProjectWebhookCreatePage.tsx
+++ b/frontend/src/react/pages/project/ProjectWebhookCreatePage.tsx
@@ -1,7 +1,7 @@
import { create as createProto } from "@bufbuild/protobuf";
import { useMemo } from "react";
import { useVueState } from "@/react/hooks/useVueState";
-import { useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { State, WebhookType } from "@/types/proto-es/v1/common_pb";
import {
@@ -12,9 +12,13 @@ import { hasProjectPermissionV2 } from "@/utils";
import { ProjectWebhookForm } from "./ProjectWebhookForm";
export function ProjectWebhookCreatePage({ projectId }: { projectId: string }) {
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const allowEdit = useMemo(() => {
if (!project) return false;
diff --git a/frontend/src/react/pages/project/ProjectWebhookDetailPage.tsx b/frontend/src/react/pages/project/ProjectWebhookDetailPage.tsx
index 0db73af9d7..7abe25f611 100644
--- a/frontend/src/react/pages/project/ProjectWebhookDetailPage.tsx
+++ b/frontend/src/react/pages/project/ProjectWebhookDetailPage.tsx
@@ -2,7 +2,6 @@ import { create as createProto } from "@bufbuild/protobuf";
import { useMemo } from "react";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { State } from "@/types/proto-es/v1/common_pb";
import { WebhookSchema } from "@/types/proto-es/v1/project_service_pb";
@@ -16,12 +15,16 @@ export function ProjectWebhookDetailPage({
projectId: string;
webhookResourceId: string;
}) {
- const projectStore = useProjectV1Store();
const getProjectWebhookFromProjectById = useAppStore(
(state) => state.getProjectWebhookFromProjectById
);
+ const projectsByName = useAppStore((s) => s.projectsByName);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const webhook = useMemo(() => {
if (!project) return undefined;
diff --git a/frontend/src/react/pages/project/ProjectWebhookForm.tsx b/frontend/src/react/pages/project/ProjectWebhookForm.tsx
index f7e33d44d4..9c7de00a10 100644
--- a/frontend/src/react/pages/project/ProjectWebhookForm.tsx
+++ b/frontend/src/react/pages/project/ProjectWebhookForm.tsx
@@ -31,7 +31,6 @@ import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSet
import {
pushNotification,
useActuatorV1Store,
- useProjectV1Store,
useSettingV1Store,
} from "@/store";
import {
@@ -62,7 +61,6 @@ export function ProjectWebhookForm({
}: Props) {
const { t } = useTranslation();
const settingStore = useSettingV1Store();
- const projectStore = useProjectV1Store();
const actuatorStore = useActuatorV1Store();
const createProjectWebhook = useAppStore(
(state) => state.createProjectWebhook
@@ -218,7 +216,9 @@ export function ProjectWebhookForm({
const createWebhook = useCallback(() => {
withLoading(async () => {
const updatedProject = await createProjectWebhook(project.name, state);
- projectStore.updateProjectCache({ ...project, ...updatedProject });
+ useAppStore
+ .getState()
+ .updateProjectCache({ ...project, ...updatedProject });
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -241,7 +241,7 @@ export function ProjectWebhookForm({
});
}
});
- }, [project, state, projectStore, createProjectWebhook, t, withLoading]);
+ }, [project, state, createProjectWebhook, t, withLoading]);
const updateWebhook = useCallback(() => {
withLoading(async () => {
@@ -254,7 +254,9 @@ export function ProjectWebhookForm({
updateMask.push("notification_type");
const updatedProject = await updateProjectWebhook(state, updateMask);
- projectStore.updateProjectCache({ ...project, ...updatedProject });
+ useAppStore
+ .getState()
+ .updateProjectCache({ ...project, ...updatedProject });
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -263,21 +265,15 @@ export function ProjectWebhookForm({
}),
});
});
- }, [
- project,
- state,
- webhook,
- projectStore,
- updateProjectWebhook,
- t,
- withLoading,
- ]);
+ }, [project, state, webhook, updateProjectWebhook, t, withLoading]);
const deleteWebhook = useCallback(() => {
withLoading(async () => {
const name = state.title;
const updatedProject = await deleteProjectWebhook(state);
- projectStore.updateProjectCache({ ...project, ...updatedProject });
+ useAppStore
+ .getState()
+ .updateProjectCache({ ...project, ...updatedProject });
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -285,15 +281,7 @@ export function ProjectWebhookForm({
});
cancel();
});
- }, [
- project,
- state,
- projectStore,
- deleteProjectWebhook,
- t,
- withLoading,
- cancel,
- ]);
+ }, [project, state, deleteProjectWebhook, t, withLoading, cancel]);
const testWebhook = useCallback(() => {
withLoading(async () => {
diff --git a/frontend/src/react/pages/project/ProjectWebhooksPage.tsx b/frontend/src/react/pages/project/ProjectWebhooksPage.tsx
index a2dc9e5d88..ceed2737bd 100644
--- a/frontend/src/react/pages/project/ProjectWebhooksPage.tsx
+++ b/frontend/src/react/pages/project/ProjectWebhooksPage.tsx
@@ -30,7 +30,7 @@ import {
PROJECT_V1_ROUTE_WEBHOOK_CREATE,
PROJECT_V1_ROUTE_WEBHOOK_DETAIL,
} from "@/router/dashboard/projectV1";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { projectWebhookV1ActivityItemList } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
@@ -40,13 +40,17 @@ import { extractProjectWebhookID, hasProjectPermissionV2 } from "@/utils";
export function ProjectWebhooksPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const deleteProjectWebhook = useAppStore(
(state) => state.deleteProjectWebhook
);
const projectName = `${projectNamePrefix}${projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [deleteTarget, setDeleteTarget] = useState<Webhook | null>(null);
@@ -84,7 +88,7 @@ export function ProjectWebhooksPage({ projectId }: { projectId: string }) {
try {
const name = deleteTarget.title;
const updatedProject = await deleteProjectWebhook(deleteTarget);
- projectStore.updateProjectCache({
+ useAppStore.getState().updateProjectCache({
...project,
...updatedProject,
});
@@ -101,7 +105,7 @@ export function ProjectWebhooksPage({ projectId }: { projectId: string }) {
});
}
setDeleteTarget(null);
- }, [deleteTarget, project, deleteProjectWebhook, projectStore, t]);
+ }, [deleteTarget, project, deleteProjectWebhook, t]);
return (
<div className="py-4 flex flex-col">
diff --git a/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx b/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx
index 9068fc49b0..5c9f17f600 100644
--- a/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx
+++ b/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx
@@ -6,7 +6,6 @@ import { Button } from "@/react/components/ui/button";
import { useVueState } from "@/react/hooks/useVueState";
import { preCreateIssue } from "@/react/lib/plan/issue";
import { useAppStore } from "@/react/stores/app";
-import { useProjectV1Store } from "@/store";
import type { Permission } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { DatabaseExportSchemaButton } from "./DatabaseExportSchemaButton";
@@ -27,7 +26,8 @@ export function DatabaseDetailActions({
onOpenTransferProject: () => void;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const hasProjectPermissionFn = useAppStore(
(state) => state.hasProjectPermission
);
@@ -35,8 +35,9 @@ export function DatabaseDetailActions({
(state) => state.hasWorkspacePermission
);
const project = useVueState(() =>
- projectStore.getProjectByName(database.project)
+ useAppStore.getState().getProjectByName(database.project)
);
+ void projectsByName;
const hasProjectPermission = useMemo(
() => (permission: Permission) => {
if (hasWorkspacePermissionFn(permission)) {
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
index 7ddabfea0b..eb0a11e4eb 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
@@ -189,25 +189,22 @@ const mocks = vi.hoisted(() => ({
currentUser: { name: "users/[email protected]", email: "[email protected]" },
}));
-const stableProjectStore = {
- get getProjectByName() {
- return mocks.getProjectByName;
- },
-};
-
const stableSettingStore = {
workspaceProfile: { sqlResultSize: BigInt(100 * 1024 * 1024) },
};
vi.mock("@/store", () => ({
DEFAULT_MAX_RESULT_SIZE_IN_MB: 100,
- useProjectV1Store: () => stableProjectStore,
useSettingV1Store: () => stableSettingStore,
pushNotification: mocks.pushNotification,
}));
vi.mock("@/react/stores/app", () => {
const appState = () => ({
+ // The project getter that previously lived on the Pinia
+ // `useProjectV1Store` now lives on the app store.
+ getProjectByName: mocks.getProjectByName,
+ projectsByName: {} as Record<string, unknown>,
fetchDatabases: mocks.fetchDatabases,
getOrFetchDatabaseByName: mocks.getOrFetchDatabaseByName,
getDatabaseByName: mocks.getDatabaseByName,
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
index 4aa12a599d..81e01a46c2 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
@@ -30,7 +30,6 @@ import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
import {
DEFAULT_MAX_RESULT_SIZE_IN_MB,
pushNotification,
- useProjectV1Store,
useSettingV1Store,
} from "@/store";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
@@ -93,10 +92,14 @@ export function DataExportPrepSheet({
}: DataExportPrepSheetProps) {
const { t } = useTranslation();
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
const settingStore = useSettingV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const [step, setStep] = useState<Step>(1);
const [creating, setCreating] = useState(false);
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
index 36d1663067..1518f3d4bd 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
@@ -6,7 +6,7 @@ import { Alert } from "@/react/components/ui/alert";
import { Checkbox } from "@/react/components/ui/checkbox";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { useEnvironmentV1Store, useProjectV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { isValidDatabaseName } from "@/types";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
@@ -19,13 +19,17 @@ import { useIssueDetailContext } from "../context/IssueDetailContext";
export function IssueDetailAccessGrantDetails() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const fetchAccessGrant = useAppStore((state) => state.fetchAccessGrant);
const searchMyAccessGrants = useAppStore(
(state) => state.searchMyAccessGrants
);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const [isLoading, setIsLoading] = useState(true);
const [accessGrant, setAccessGrant] = useState<AccessGrant | undefined>();
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
index 131d7041ea..b9802fd7ae 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
@@ -54,7 +54,7 @@ import {
buildPlanDeployRouteFromPlanName,
buildPlanDeployRouteFromRolloutName,
} from "@/router/dashboard/projectV1RouteHelpers";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
ApproveIssueRequestSchema,
@@ -95,7 +95,8 @@ import { IssueDetailTaskRolloutActionPanel } from "./IssueDetailTaskRolloutActio
export function IssueDetailActionBar() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const currentUser = useCurrentUser();
const [pendingConfirmAction, setPendingConfirmAction] =
useState<ActionDefinition>();
@@ -107,7 +108,10 @@ export function IssueDetailActionBar() {
const menuRef = useRef<HTMLDivElement>(null);
const [menuOpen, setMenuOpen] = useState(false);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const { isSpecEmpty } = useIssueDetailSpecValidation(page.plan?.specs ?? []);
useClickOutside(menuRef, menuOpen, () => setMenuOpen(false));
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
index 65551e81f0..f2691a5a4d 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx
@@ -20,7 +20,7 @@ import { displayRoleTitleFromList } from "@/react/lib/role";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { ensureGroupIdentifier } from "@/react/stores/app/group";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";
import {
ApprovalStatus,
@@ -52,7 +52,6 @@ type ApprovalStepStatus = "approved" | "rejected" | "current" | "pending";
export function IssueDetailApprovalFlow() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
const loadProjectIamPolicy = useAppStore(
(state) => state.loadProjectIamPolicy
);
@@ -60,11 +59,12 @@ export function IssueDetailApprovalFlow() {
const issue = page.issue;
useEffect(() => {
- void projectStore
+ void useAppStore
+ .getState()
.getOrFetchProjectByName(projectName)
.catch(() => undefined);
void loadProjectIamPolicy(projectName).catch(() => undefined);
- }, [loadProjectIamPolicy, projectName, projectStore]);
+ }, [loadProjectIamPolicy, projectName]);
if (!issue) {
return null;
@@ -500,7 +500,8 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {
const roleList = useAppStore((state) => state.roleList);
const page = useIssueDetailContext();
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
@@ -521,7 +522,10 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {
const [reRequesting, setReRequesting] = useState(false);
const projectName = `${projectNamePrefix}${page.projectId}`;
const currentUserEmail = currentUser?.email ?? "";
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const stepApprover = issue.approvers[stepIndex];
const status = useMemo<ApprovalStepStatus>(() => {
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailChecks.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailChecks.tsx
index ae1c757f45..f87f20511a 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailChecks.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailChecks.tsx
@@ -5,7 +5,8 @@ import { planServiceClientConnect } from "@/connect";
import { PlanCheckSection } from "@/react/components/plan-check/PlanCheckSection";
import { useCurrentUser } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification } from "@/store";
import { extractUserEmail, projectNamePrefix } from "@/store/modules/v1/common";
import {
GetPlanCheckRunRequestSchema,
@@ -20,11 +21,15 @@ import { useIssueDetailContext } from "../context/IssueDetailContext";
export function IssueDetailChecks() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const currentUser = useCurrentUser();
const [isRunningChecks, setIsRunningChecks] = useState(false);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const summary = useMemo(
() =>
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
index def6ea92f4..2fe9bc1f30 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
@@ -38,7 +38,7 @@ import {
} from "@/react/stores/app/issueComment";
import { router } from "@/router";
import { buildPlanDeployRouteFromPlanName } from "@/router/dashboard/projectV1RouteHelpers";
-import { extractUserEmail, pushNotification, useProjectV1Store } from "@/store";
+import { extractUserEmail, pushNotification } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs, unknownUser } from "@/types";
import { ApprovalStatus } from "@/types/proto-es/v1/common_pb";
@@ -102,14 +102,18 @@ export function IssueDetailCommentList() {
const { t } = useTranslation();
const page = useIssueDetailContext();
const { setEditing } = page;
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
const currentUser = useCurrentUser();
const routeHash = useVueState(() => router.currentRoute.value.hash);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const issueName = page.issue?.name || page.plan?.issue || "";
// `getIssueComments` returns a stable empty array on miss, so reading it
// inside the selector won't loop.
@@ -361,9 +365,13 @@ function IssueDescriptionCommentRow({
const { t } = useTranslation();
const page = useIssueDetailContext();
const { setEditing } = page;
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const creatorUser = useAppStore((state) =>
state.getUserByIdentifier(page.issue?.creator || "")
);
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
index 5832ee78bb..40e27744ac 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
@@ -8,7 +8,7 @@ import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { INSTANCE_ROUTE_DETAIL } from "@/router/dashboard/instance";
-import { useEnvironmentV1Store, useProjectV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
formatEnvironmentName,
@@ -33,10 +33,14 @@ import { IssueDetailTaskRunTable } from "./IssueDetailTaskRunTable";
export function IssueDetailDatabaseCreateView() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
const environmentStore = useEnvironmentV1Store();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
+ void projectsByName;
const createDatabaseSpec = useMemo(() => {
return page.plan?.specs.find(
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailLabels.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailLabels.tsx
index 73cecc967e..0dc341e2d4 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailLabels.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailLabels.tsx
@@ -14,9 +14,10 @@ import { LAYER_SURFACE_CLASS } from "@/react/components/ui/layer";
import { useClickOutside } from "@/react/hooks/useClickOutside";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_SETTINGS } from "@/router/dashboard/projectV1";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { getProjectName, projectNamePrefix } from "@/store/modules/v1/common";
import {
IssueSchema,
@@ -34,12 +35,16 @@ type IssueLabelOption = {
export function IssueDetailLabels() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
const containerRef = useRef<HTMLDivElement>(null);
const [open, setOpen] = useState(false);
const [isUpdating, setIsUpdating] = useState(false);
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
useClickOutside(containerRef, open, () => setOpen(false));
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
index 16f2dafbc6..24bcdd8a1b 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
@@ -11,11 +11,7 @@ import { useCurrentUser, useReleaseByName } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
-import {
- projectNamePrefix,
- pushNotification,
- useProjectV1Store,
-} from "@/store";
+import { projectNamePrefix, pushNotification } from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
import {
isValidDatabaseName,
@@ -59,10 +55,14 @@ export function IssueDetailStatementSection({
const page = useIssueDetailContext();
const { setEditing } = page;
const fetchRelease = useAppStore((state) => state.fetchRelease);
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const currentUser = useCurrentUser();
const project = useVueState(() =>
- projectStore.getProjectByName(`${projectNamePrefix}${page.projectId}`)
+ useAppStore
+ .getState()
+ .getProjectByName(`${projectNamePrefix}${page.projectId}`)
);
const releaseName =
spec.config?.case === "changeDatabaseConfig"
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
index 6b4c28dfc8..683567b352 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
@@ -22,11 +22,7 @@ import { useCurrentUser } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";
import {
@@ -87,10 +83,14 @@ export function IssueDetailTaskRolloutActionPanel({
}) {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
const currentUser = useCurrentUser();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [loading, setLoading] = useState(false);
const [permissionLoading, setPermissionLoading] = useState(false);
const [canRun, setCanRun] = useState(true);
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
index d4a76e10eb..ecc62dcf16 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
@@ -17,7 +17,7 @@ import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
-import { useEnvironmentV1Store, useProjectV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
getDateForPbTimestampProtoEs,
@@ -51,9 +51,13 @@ export function IssueDetailTaskRunTable({
}) {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const projectStore = useProjectV1Store();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const taskByUID = useMemo(() => {
const map = new Map<string, Task>();
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTitleInput.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTitleInput.tsx
index 376f5f66f5..3dcf92c190 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTitleInput.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTitleInput.tsx
@@ -4,7 +4,8 @@ import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { issueServiceClientConnect } from "@/connect";
import { useVueState } from "@/react/hooks/useVueState";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
IssueSchema,
@@ -17,9 +18,13 @@ export function IssueDetailTitleInput() {
const { t } = useTranslation();
const page = useIssueDetailContext();
const { setEditing } = page;
- const projectStore = useProjectV1Store();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const [title, setTitle] = useState(page.issue?.title || "");
const [isEditing, setIsEditing] = useState(false);
diff --git a/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailPage.ts b/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailPage.ts
index e96e0b1c2f..4521cdbd89 100644
--- a/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailPage.ts
+++ b/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailPage.ts
@@ -8,12 +8,13 @@ import {
rolloutServiceClientConnect,
} from "@/connect";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_403,
WORKSPACE_ROUTE_404,
} from "@/router/dashboard/workspaceRoutes";
-import { projectNamePrefix, useProjectV1Store } from "@/store";
+import { projectNamePrefix } from "@/store";
import { State } from "@/types/proto-es/v1/common_pb";
import {
GetIssueRequestSchema,
@@ -281,9 +282,11 @@ export const useIssueDetailPage = ({
pageHost: HTMLDivElement | null;
}): IssueDetailPageState => {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const project = useVueState(() =>
- projectStore.getProjectByName(`${projectNamePrefix}${projectId}`)
+ useAppStore.getState().getProjectByName(`${projectNamePrefix}${projectId}`)
);
const [snapshot, setSnapshot] = useState<IssueDetailPageSnapshot>(() =>
buildDefaultSnapshot(projectId, issueId)
diff --git a/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts b/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
index 37ae732c06..479c5a03a7 100644
--- a/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
+++ b/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
@@ -1,6 +1,5 @@
import { uniq } from "lodash-es";
import { useAppStore } from "@/react/stores/app";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
@@ -10,12 +9,13 @@ import {
// candidatesOfApprovalStepV1 returns a user name list in users/{email} format.
// The list could include users/ALL_USERS_USER_EMAIL.
-// Reads the project-IAM policy from the app store's iam slice; still reads the
-// project Pinia store, which remains until that store is migrated.
+// Reads the project-IAM policy and project from the app store.
export const candidatesOfApprovalStepV1 = (issue: Issue, role: string) => {
- const project = useProjectV1Store().getProjectByName(
- `${projectNamePrefix}${extractProjectResourceName(issue.name)}`
- );
+ const project = useAppStore
+ .getState()
+ .getProjectByName(
+ `${projectNamePrefix}${extractProjectResourceName(issue.name)}`
+ );
const candidatesForRoles = (role: string) => {
const iamPolicy = useAppStore.getState().getProjectIamPolicy(project.name);
const memberMap = memberMapToRolesInProjectIAM(iamPolicy, role);
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
index e0eb208a5e..f791c2843a 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx
@@ -77,7 +77,6 @@ vi.mock("@/connect", () => ({
vi.mock("@/store", () => ({
pushNotification: mocks.pushNotification,
- useProjectV1Store: () => mocks.projectStore,
}));
vi.mock("@/react/hooks/useAppState", () => ({
@@ -97,11 +96,16 @@ vi.mock("@/react/stores/app", () => ({
// The approval flow now subscribes to projectPoliciesByName directly
// so the candidate list re-renders when the policy resolves.
projectPoliciesByName: { "projects/p1": { bindings: [] } },
+ // The approval flow subscribes to projectsByName so the project
+ // useVueState getter re-renders when the cache changes.
+ projectsByName: { "projects/p1": { allowSelfApproval: false } },
getIssueComments: mocks.issueCommentStore.getIssueComments,
}),
{
getState: () => ({
listIssueComments: mocks.issueCommentStore.listIssueComments,
+ getOrFetchProjectByName: mocks.projectStore.getOrFetchProjectByName,
+ getProjectByName: mocks.projectStore.getProjectByName,
}),
}
),
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
index 90a2e3d5f4..c55c3b6909 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx
@@ -26,7 +26,7 @@ import {
} from "@/react/stores/app/issueComment";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";
import {
ApprovalStatus,
@@ -80,7 +80,6 @@ function PlanDetailApprovalFlowContent({
}) {
const { t } = useTranslation();
const page = usePlanDetailContext();
- const projectStore = useProjectV1Store();
const loadProjectIamPolicy = useAppStore(
(state) => state.loadProjectIamPolicy
);
@@ -88,11 +87,12 @@ function PlanDetailApprovalFlowContent({
const issue = page.issue;
useEffect(() => {
- void projectStore
+ void useAppStore
+ .getState()
.getOrFetchProjectByName(projectName)
.catch(() => undefined);
void loadProjectIamPolicy(projectName).catch(() => undefined);
- }, [loadProjectIamPolicy, projectName, projectStore]);
+ }, [loadProjectIamPolicy, projectName]);
useEffect(() => {
if (mode !== "review") {
@@ -659,7 +659,9 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {
const page = usePlanDetailContext();
const { patchState } = page;
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
@@ -680,7 +682,9 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {
const [reRequesting, setReRequesting] = useState(false);
const projectName = `${projectNamePrefix}${page.projectId}`;
const currentUserEmail = currentUser?.email ?? "";
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
// Subscribe directly to the Zustand project IAM cache so this step
// re-renders the moment loadProjectIamPolicy() resolves. Wrapping the
// Zustand getter in useVueState would only react to Vue dependencies
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
index a2932d21d4..ff3bdce7f8 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
@@ -266,7 +266,6 @@ vi.mock("@/store", () => ({
name.split("/databaseGroups/"),
pushNotification: vi.fn(),
useEnvironmentV1Store: () => mocks.environmentStore,
- useProjectV1Store: () => mocks.projectStore,
}));
// The migrated component reads resource state via imperative
@@ -293,15 +292,34 @@ vi.mock("@/react/stores/app", async () => {
get: (_t, key) =>
typeof key === "string" ? DatabaseGroupView.FULL : undefined,
});
+ const projectsByName = new Proxy({} as Record<string, unknown>, {
+ get: (_t, key) =>
+ typeof key === "string"
+ ? mocks.projectStore.getProjectByName(key)
+ : undefined,
+ });
const useAppStore = Object.assign(
(
selector: (s: {
databasesByName: Record<string, unknown>;
dbGroupsByName: Record<string, unknown>;
dbGroupViewByName: Record<string, unknown>;
+ projectsByName: Record<string, unknown>;
}) => unknown
- ) => selector({ databasesByName, dbGroupsByName, dbGroupViewByName }),
- { getState: () => ({ ...mocks.databaseStore, ...mocks.dbGroupStore }) }
+ ) =>
+ selector({
+ databasesByName,
+ dbGroupsByName,
+ dbGroupViewByName,
+ projectsByName,
+ }),
+ {
+ getState: () => ({
+ ...mocks.databaseStore,
+ ...mocks.dbGroupStore,
+ getProjectByName: mocks.projectStore.getProjectByName,
+ }),
+ }
);
return { useAppStore };
});
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
index 0c1390872b..ad6ed5a28d 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
@@ -67,11 +67,7 @@ import {
PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL,
PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL,
} from "@/router/dashboard/projectV1";
-import {
- getProjectNameAndDatabaseGroupName,
- pushNotification,
- useProjectV1Store,
-} from "@/store";
+import { getProjectNameAndDatabaseGroupName, pushNotification } from "@/store";
import {
isValidDatabaseGroupName,
isValidDatabaseName,
@@ -193,9 +189,11 @@ export function PlanDetailChangesBranch({
const page = usePlanDetailContext();
const { patchState } = page;
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const project = useVueState(() =>
- projectStore.getProjectByName(`projects/${page.projectId}`)
+ useAppStore.getState().getProjectByName(`projects/${page.projectId}`)
);
const [showAddSpecSheet, setShowAddSpecSheet] = useState(false);
const [showTargetSelectorSheet, setShowTargetSelectorSheet] = useState(false);
@@ -713,9 +711,11 @@ function OptionsSection({
const page = usePlanDetailContext();
const { patchState, refreshState } = page;
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const project = useVueState(() =>
- projectStore.getProjectByName(`projects/${page.projectId}`)
+ useAppStore.getState().getProjectByName(`projects/${page.projectId}`)
);
const databasesByName = useAppStore((s) => s.databasesByName);
const [sheetStatement, setSheetStatementValue] = useState("");
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
index dc55f96881..98fea4d87c 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
@@ -26,7 +26,7 @@ import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL } from "@/router/dashboard/projectV1";
-import { pushNotification, useProjectV1Store } from "@/store";
+import { pushNotification } from "@/store";
import {
CreatePlanRequestSchema,
Plan_ChangeDatabaseConfigSchema,
@@ -64,12 +64,14 @@ export function PlanDetailRollbackSheet({
}>;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const normalizedProjectName = projectName.startsWith("projects/")
? projectName
: `projects/${projectName}`;
const project = useVueState(() =>
- projectStore.getProjectByName(normalizedProjectName)
+ useAppStore.getState().getProjectByName(normalizedProjectName)
);
const [loading, setLoading] = useState(false);
const [selectedTaskRunNames, setSelectedTaskRunNames] = useState<string[]>(
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRolloutActionPanel.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRolloutActionPanel.tsx
index 8def234dd4..569fbd0a2f 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRolloutActionPanel.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRolloutActionPanel.tsx
@@ -20,11 +20,8 @@ import { Textarea } from "@/react/components/ui/textarea";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useCurrentUser } from "@/react/hooks/useAppState";
import { cn } from "@/react/lib/utils";
-import {
- pushNotification,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification, useEnvironmentV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";
import type { Stage, Task } from "@/types/proto-es/v1/rollout_service_pb";
@@ -78,10 +75,13 @@ export function PlanDetailTaskRolloutActionPanel({
}) {
const { t } = useTranslation();
const page = usePlanDetailContext();
- const projectStore = useProjectV1Store();
const currentUser = useCurrentUser();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = projectStore.getProjectByName(projectName);
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ const project = useMemo(
+ () => useAppStore.getState().getProjectByName(projectName),
+ [projectsByName, projectName]
+ );
const [loading, setLoading] = useState(false);
const [permissionLoading, setPermissionLoading] = useState(false);
const [canRun, setCanRun] = useState(true);
diff --git a/frontend/src/react/pages/project/plan-detail/components/deploy/DeployBranch.tsx b/frontend/src/react/pages/project/plan-detail/components/deploy/DeployBranch.tsx
index c06a3197de..ee33168ec6 100644
--- a/frontend/src/react/pages/project/plan-detail/components/deploy/DeployBranch.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/deploy/DeployBranch.tsx
@@ -1,8 +1,8 @@
import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/react/components/ui/button";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Plan } from "@/types/proto-es/v1/plan_service_pb";
import type { Rollout, Task } from "@/types/proto-es/v1/rollout_service_pb";
@@ -49,11 +49,13 @@ export function DeployBranch({
}: DeployBranchProps) {
const { t } = useTranslation();
const page = usePlanDetailContext();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const project = useMemo(
() =>
- projectStore.getProjectByName(`${projectNamePrefix}${page.projectId}`),
- [page.projectId, projectStore]
+ useAppStore
+ .getState()
+ .getProjectByName(`${projectNamePrefix}${page.projectId}`),
+ [page.projectId, projectsByName]
);
const projectName = `projects/${page.projectId}`;
const [pendingOpen, setPendingOpen] = useState(false);
diff --git a/frontend/src/react/pages/project/plan-detail/hooks/usePlanCheckActions.tsx b/frontend/src/react/pages/project/plan-detail/hooks/usePlanCheckActions.tsx
index 9dedfe8b26..8fba585d41 100644
--- a/frontend/src/react/pages/project/plan-detail/hooks/usePlanCheckActions.tsx
+++ b/frontend/src/react/pages/project/plan-detail/hooks/usePlanCheckActions.tsx
@@ -4,11 +4,8 @@ import { useTranslation } from "react-i18next";
import { planServiceClientConnect } from "@/connect";
import { useCurrentUser } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
-import {
- projectNamePrefix,
- pushNotification,
- useProjectV1Store,
-} from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { projectNamePrefix, pushNotification } from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
import {
GetPlanCheckRunRequestSchema,
@@ -25,10 +22,14 @@ export function usePlanCheckActions() {
const { t } = useTranslation();
const page = usePlanDetailContext();
const { patchState, isRunningChecks, setIsRunningChecks } = page;
- const projectStore = useProjectV1Store();
+ // subscribe to re-render on project cache change
+ const projectsByName = useAppStore((s) => s.projectsByName);
+ void projectsByName;
const currentUser = useCurrentUser();
const projectName = `${projectNamePrefix}${page.projectId}`;
- const project = useVueState(() => projectStore.getProjectByName(projectName));
+ const project = useVueState(() =>
+ useAppStore.getState().getProjectByName(projectName)
+ );
const allowRunChecks = useMemo(() => {
if (page.plan.hasRollout) return false;
diff --git a/frontend/src/react/pages/settings/DatabasesPage.tsx b/frontend/src/react/pages/settings/DatabasesPage.tsx
index b104fa028a..f223ed3392 100644
--- a/frontend/src/react/pages/settings/DatabasesPage.tsx
+++ b/frontend/src/react/pages/settings/DatabasesPage.tsx
@@ -30,7 +30,6 @@ import {
pushNotification,
useActuatorV1Store,
useEnvironmentV1Store,
- useProjectV1Store,
} from "@/store";
import {
environmentNamePrefix,
@@ -122,7 +121,6 @@ export function DatabasesPage() {
() => environmentStore.environmentList ?? []
);
- const projectStore = useProjectV1Store();
// `serverInfo.defaultProject` is fetched asynchronously by the actuator
// store; wrap with `useVueState` so the filter value updates the moment
// it arrives instead of being captured as an empty string on first
@@ -149,7 +147,7 @@ export function DatabasesPage() {
);
const searchProjects = useCallback(
async (keyword: string): Promise<ValueOption[]> => {
- const { projects } = await projectStore.fetchProjectList({
+ const { projects } = await useAppStore.getState().fetchProjectList({
pageSize: getDefaultPagination(),
filter: keyword.trim() ? { query: keyword } : undefined,
});
@@ -163,7 +161,7 @@ export function DatabasesPage() {
});
return matchesUnassigned ? [unassignedProjectOption, ...remote] : remote;
},
- [projectStore, defaultProjectId, unassignedProjectOption]
+ [defaultProjectId, unassignedProjectOption]
);
const searchInstances = useCallback(
diff --git a/frontend/src/react/pages/settings/InstanceDetailPage.tsx b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
index 600a37b558..dcf71226c0 100644
--- a/frontend/src/react/pages/settings/InstanceDetailPage.tsx
+++ b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
@@ -42,7 +42,6 @@ import {
pushNotification,
useActuatorV1Store,
useEnvironmentV1Store,
- useProjectV1Store,
} from "@/store";
import {
environmentNamePrefix,
@@ -321,7 +320,6 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
() => environmentStore.environmentList ?? []
);
- const projectStore = useProjectV1Store();
const actuatorStore = useActuatorV1Store();
// Reactive: the actuator's `defaultProject` is fetched asynchronously, so
// we must subscribe through `useVueState` — otherwise the value is
@@ -344,7 +342,7 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
);
const searchProjects = useCallback(
async (keyword: string): Promise<ValueOption[]> => {
- const { projects } = await projectStore.fetchProjectList({
+ const { projects } = await useAppStore.getState().fetchProjectList({
pageSize: getDefaultPagination(),
filter: keyword.trim() ? { query: keyword } : undefined,
});
@@ -357,7 +355,7 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
};
});
},
- [projectStore, defaultProjectId, unassignedProjectOption]
+ [defaultProjectId, unassignedProjectOption]
);
const scopeOptions: ScopeOption[] = useMemo(
diff --git a/frontend/src/react/pages/settings/LandingPage.tsx b/frontend/src/react/pages/settings/LandingPage.tsx
index f1262f8ebd..7377c3a82e 100644
--- a/frontend/src/react/pages/settings/LandingPage.tsx
+++ b/frontend/src/react/pages/settings/LandingPage.tsx
@@ -35,6 +35,7 @@ import {
useServerState,
} from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import {
DATABASE_ROUTE_DASHBOARD,
@@ -63,7 +64,6 @@ import {
SETTING_ROUTE_WORKSPACE_SUBSCRIPTION,
} from "@/router/dashboard/workspaceSetting";
import { useRecentVisit } from "@/router/useRecentVisit";
-import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { UNKNOWN_PROJECT_NAME } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
@@ -300,12 +300,14 @@ function useLastVisitedProject() {
}
const projectName = `${projectNamePrefix}${extractProjectResourceName(lastVisitProjectPath)}`;
- const projectStore = useProjectV1Store();
let cancelled = false;
- projectStore.getOrFetchProjectByName(projectName).then((p) => {
- if (cancelled) return;
- setProject(p.name === UNKNOWN_PROJECT_NAME ? undefined : p);
- });
+ useAppStore
+ .getState()
+ .getOrFetchProjectByName(projectName)
+ .then((p) => {
+ if (cancelled) return;
+ setProject(p.name === UNKNOWN_PROJECT_NAME ? undefined : p);
+ });
return () => {
cancelled = true;
};
diff --git a/frontend/src/react/pages/settings/MembersPage.test.tsx b/frontend/src/react/pages/settings/MembersPage.test.tsx
index 54ff7b0f43..b8f823a786 100644
--- a/frontend/src/react/pages/settings/MembersPage.test.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.test.tsx
@@ -280,14 +280,6 @@ vi.mock("@/store", () => ({
isSaaSMode: false,
userCountInIam: 1,
}),
- useProjectV1Store: () => ({
- getProjectByName: (name: string) => ({
- allowRequestRole: true,
- name,
- permissions: ["bb.projects.setIamPolicy"],
- state: 1,
- }),
- }),
useSettingV1Store: () => ({
getOrFetchSettingByName: vi.fn(),
getSettingByName: () => undefined,
@@ -306,24 +298,35 @@ vi.mock("@/react/hooks/useAppState", () => ({
}),
}));
-vi.mock("@/react/stores/app", () => ({
- useAppStore: (selector: (state: unknown) => unknown) =>
- selector({
- batchGetOrFetchUsers: vi.fn(async () => []),
- roleList: [{ name: "roles/sqlEditorUser", permissions: [] }],
- workspacePolicy: { bindings: [] },
- patchWorkspaceIamPolicy: vi.fn(),
- findWorkspaceRolesByMember: () => [],
- fetchWorkspaceIamPolicy: vi.fn(async () => undefined),
- // MembersPage now subscribes to projectPoliciesByName directly so it
- // re-renders when loadProjectIamPolicy() resolves. The getter form is
- // still used inside async handlers.
- projectPoliciesByName: { "projects/sample-project": projectIamPolicy },
- getProjectIamPolicy: () => projectIamPolicy,
- updateProjectIamPolicy: mockUpdateProjectIamPolicy,
- loadProjectIamPolicy: vi.fn(async () => undefined),
+vi.mock("@/react/stores/app", () => {
+ const buildState = () => ({
+ batchGetOrFetchUsers: vi.fn(async () => []),
+ roleList: [{ name: "roles/sqlEditorUser", permissions: [] }],
+ workspacePolicy: { bindings: [] },
+ patchWorkspaceIamPolicy: vi.fn(),
+ findWorkspaceRolesByMember: () => [],
+ fetchWorkspaceIamPolicy: vi.fn(async () => undefined),
+ // MembersPage now subscribes to projectPoliciesByName directly so it
+ // re-renders when loadProjectIamPolicy() resolves. The getter form is
+ // still used inside async handlers.
+ projectPoliciesByName: { "projects/sample-project": projectIamPolicy },
+ getProjectIamPolicy: () => projectIamPolicy,
+ updateProjectIamPolicy: mockUpdateProjectIamPolicy,
+ loadProjectIamPolicy: vi.fn(async () => undefined),
+ // Project store methods, migrated off the Pinia useProjectV1Store mock.
+ projectsByName: {},
+ getProjectByName: (name: string) => ({
+ allowRequestRole: true,
+ name,
+ permissions: ["bb.projects.setIamPolicy"],
+ state: 1,
}),
-}));
+ });
+ const useAppStore = (selector?: (state: unknown) => unknown) =>
+ selector ? selector(buildState()) : buildState();
+ useAppStore.getState = () => buildState();
+ return { useAppStore };
+});
vi.mock("./MemberBindingEnvironmentBanner", () => ({
MemberBindingEnvironmentBanner: () => null,
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
index 451da5e61e..59425c85c8 100644
--- a/frontend/src/react/pages/settings/MembersPage.tsx
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -85,7 +85,6 @@ import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
useActuatorV1Store,
- useProjectV1Store,
useSettingV1Store,
useSubscriptionV1Store,
} from "@/store";
@@ -2049,10 +2048,12 @@ export function MembersPage({ projectId }: { projectId?: string }) {
const actuatorStore = useActuatorV1Store();
const subscriptionStore = useSubscriptionV1Store();
const currentUser = useCurrentUser();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const updateProjectIamPolicy = useAppStore(
(state) => state.updateProjectIamPolicy
);
+ // subscribe to re-render on project cache change
+ void projectsByName;
const userCountInIam = useVueState(() => actuatorStore.userCountInIam);
const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);
@@ -2065,7 +2066,9 @@ export function MembersPage({ projectId }: { projectId?: string }) {
? `${projectNamePrefix}${projectId}`
: undefined;
const project = useVueState(() =>
- projectName ? projectStore.getProjectByName(projectName) : undefined
+ projectName
+ ? useAppStore.getState().getProjectByName(projectName)
+ : undefined
);
const [memberSearchText, setMemberSearchText] = useState("");
diff --git a/frontend/src/react/pages/settings/ProjectsPage.tsx b/frontend/src/react/pages/settings/ProjectsPage.tsx
index d7bb3796f9..65afb5bf76 100644
--- a/frontend/src/react/pages/settings/ProjectsPage.tsx
+++ b/frontend/src/react/pages/settings/ProjectsPage.tsx
@@ -36,7 +36,7 @@ import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_ISSUES } from "@/router/dashboard/projectV1";
-import { pushNotification, useAuthStore, useProjectV1Store } from "@/store";
+import { pushNotification, useAuthStore } from "@/store";
import { getProjectName } from "@/store/modules/v1/common";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
@@ -149,7 +149,6 @@ function ProjectActionDropdown({
onAction: () => void;
}) {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
const canDelete = hasProjectPermissionV2(project, "bb.projects.delete");
const canUndelete = hasProjectPermissionV2(project, "bb.projects.undelete");
@@ -164,24 +163,24 @@ function ProjectActionDropdown({
) {
return;
}
- await projectStore.archiveProject(project);
+ await useAppStore.getState().archiveProject(project);
pushNotification({
module: "bytebase",
style: "SUCCESS",
title: t("common.archived"),
});
onAction();
- }, [project, projectStore, t, onAction]);
+ }, [project, t, onAction]);
const handleRestore = useCallback(async () => {
- await projectStore.restoreProject(project);
+ await useAppStore.getState().restoreProject(project);
pushNotification({
module: "bytebase",
style: "SUCCESS",
title: t("common.restored"),
});
onAction();
- }, [project, projectStore, t, onAction]);
+ }, [project, t, onAction]);
if (!canDelete && !canUndelete) return null;
@@ -228,7 +227,6 @@ function ProjectActionDropdown({
export function ProjectsPage() {
const { t } = useTranslation();
- const projectStore = useProjectV1Store();
const authStore = useAuthStore();
// Search state — managed as SearchParams (query + scopes)
@@ -383,7 +381,7 @@ export function ProjectsPage() {
try {
const token = isRefresh ? "" : nextPageTokenRef.current;
- const result = await projectStore.fetchProjectList({
+ const result = await useAppStore.getState().fetchProjectList({
pageToken: token,
pageSize,
filter: {
@@ -422,7 +420,6 @@ export function ProjectsPage() {
selectedState,
selectedLabels,
orderBy,
- projectStore,
]
);
@@ -462,9 +459,9 @@ export function ProjectsPage() {
const selectedProjectList = useMemo(() => {
if (selectedNames.size === 0) return [];
return Array.from(selectedNames)
- .map((name) => projectStore.getProjectByName(name))
+ .map((name) => useAppStore.getState().getProjectByName(name))
.filter((p): p is Project => p !== undefined);
- }, [selectedNames, projectStore]);
+ }, [selectedNames]);
const handleBatchOperation = useCallback(() => {
setSelectedNames(new Set());
@@ -488,7 +485,9 @@ export function ProjectsPage() {
const activeProjects = selectedProjectList.filter(
(p) => p.state === State.ACTIVE
);
- await projectStore.batchDeleteProjects(activeProjects.map((p) => p.name));
+ await useAppStore
+ .getState()
+ .batchDeleteProjects(activeProjects.map((p) => p.name));
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -507,7 +506,7 @@ export function ProjectsPage() {
description: err.message,
});
}
- }, [selectedProjectList, projectStore, t, handleBatchOperation]);
+ }, [selectedProjectList, t, handleBatchOperation]);
const handleBatchRestore = useCallback(async () => {
try {
@@ -515,7 +514,9 @@ export function ProjectsPage() {
(p) => p.state === State.DELETED
);
await Promise.all(
- archivedProjects.map((project) => projectStore.restoreProject(project))
+ archivedProjects.map((project) =>
+ useAppStore.getState().restoreProject(project)
+ )
);
pushNotification({
module: "bytebase",
@@ -533,13 +534,13 @@ export function ProjectsPage() {
description: err.message,
});
}
- }, [selectedProjectList, projectStore, t, handleBatchOperation]);
+ }, [selectedProjectList, t, handleBatchOperation]);
const handleBatchDelete = useCallback(async () => {
try {
- await projectStore.batchPurgeProjects(
- selectedProjectList.map((p) => p.name)
- );
+ await useAppStore
+ .getState()
+ .batchPurgeProjects(selectedProjectList.map((p) => p.name));
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -558,7 +559,7 @@ export function ProjectsPage() {
description: err.message,
});
}
- }, [selectedProjectList, projectStore, t, handleBatchOperation]);
+ }, [selectedProjectList, t, handleBatchOperation]);
const batchActions: SelectionAction[] = [
{
diff --git a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
index e02b548e80..12b143d2d5 100644
--- a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
+++ b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
@@ -35,11 +35,7 @@ import {
ensureServiceAccountFullName,
serviceAccountToUser,
} from "@/react/stores/app/serviceAccount";
-import {
- pushNotification,
- useActuatorV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useActuatorV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
getServiceAccountNameInBinding,
@@ -434,14 +430,16 @@ function ServiceAccountForm({
(state) => state.patchWorkspaceIamPolicy
);
const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const getProjectIamPolicy = useAppStore((state) => state.getProjectIamPolicy);
const updateProjectIamPolicy = useAppStore(
(state) => state.updateProjectIamPolicy
);
+ // subscribe to re-render on project cache change
+ void projectsByName;
const projectEntity = useVueState(() =>
- project ? projectStore.getProjectByName(project) : undefined
+ project ? useAppStore.getState().getProjectByName(project) : undefined
);
const parent = useVueState(
@@ -676,15 +674,19 @@ function ServiceAccountForm({
export function ServiceAccountsPage({ projectId }: { projectId?: string }) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const listServiceAccounts = useAppStore((state) => state.listServiceAccounts);
const getServiceAccount = useAppStore((state) => state.getServiceAccount);
const projectName = projectId
? `${projectNamePrefix}${projectId}`
: undefined;
+ // subscribe to re-render on project cache change
+ void projectsByName;
const project = useVueState(() =>
- projectName ? projectStore.getProjectByName(projectName) : undefined
+ projectName
+ ? useAppStore.getState().getProjectByName(projectName)
+ : undefined
);
const parent = useVueState(
diff --git a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
index 190fee6bb5..decb0f5ead 100644
--- a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
+++ b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
@@ -22,11 +22,7 @@ import {
ensureWorkloadIdentityFullName,
workloadIdentityToUser,
} from "@/react/stores/app/workloadIdentity";
-import {
- pushNotification,
- useActuatorV1Store,
- useProjectV1Store,
-} from "@/store";
+import { pushNotification, useActuatorV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
@@ -238,7 +234,7 @@ function WorkloadIdentityTable({
export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
- const projectStore = useProjectV1Store();
+ const projectsByName = useAppStore((s) => s.projectsByName);
const listWorkloadIdentities = useAppStore(
(state) => state.listWorkloadIdentities
);
@@ -249,8 +245,12 @@ export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {
const projectName = projectId
? `${projectNamePrefix}${projectId}`
: undefined;
+ // subscribe to re-render on project cache change
+ void projectsByName;
const project = useVueState(() =>
- projectName ? projectStore.getProjectByName(projectName) : undefined
+ projectName
+ ? useAppStore.getState().getProjectByName(projectName)
+ : undefined
);
const parent = useVueState(
diff --git a/frontend/src/react/plugins/agent/logic/context.ts b/frontend/src/react/plugins/agent/logic/context.ts
index 8f3ca8bc40..34c6e85036 100644
--- a/frontend/src/react/plugins/agent/logic/context.ts
+++ b/frontend/src/react/plugins/agent/logic/context.ts
@@ -38,9 +38,9 @@ export async function extractRouteContext(
// Project context
if (projectId) {
try {
- const { useProjectV1Store } = await import("@/store");
- const store = useProjectV1Store();
- const project = store.getProjectByName(`projects/${projectId}`);
+ const project = useAppStore
+ .getState()
+ .getProjectByName(`projects/${projectId}`);
if (project?.name) {
ctx.project = {
name: project.name,
diff --git a/frontend/src/react/stores/app/project.ts b/frontend/src/react/stores/app/project.ts
index ae80e59ef9..a92e11d15a 100644
--- a/frontend/src/react/stores/app/project.ts
+++ b/frontend/src/react/stores/app/project.ts
@@ -1,17 +1,52 @@
import { create as createProto } from "@bufbuild/protobuf";
+import { createContextValues } from "@connectrpc/connect";
import { projectServiceClientConnect } from "@/connect";
+import { silentContextKey } from "@/connect/context-key";
import { isValidProjectName } from "@/react/lib/resourceName";
import { UNKNOWN_ID } from "@/types/const";
import { State } from "@/types/proto-es/v1/common_pb";
import {
+ BatchDeleteProjectsRequestSchema,
BatchGetProjectsRequestSchema,
CreateProjectRequestSchema,
+ DeleteProjectRequestSchema,
GetProjectRequestSchema,
+ ListProjectsRequestSchema,
+ type Project,
ProjectSchema,
SearchProjectsRequestSchema,
+ UndeleteProjectRequestSchema,
+ UpdateProjectRequestSchema,
} from "@/types/proto-es/v1/project_service_pb";
-import type { AppSliceCreator, ProjectSlice } from "./types";
-import { buildProjectFilter, defaultProjectName, toError } from "./utils";
+import { hasWorkspacePermissionV2 } from "@/utils";
+import { setProjectAccess } from "./projectAccess";
+import type { AppSliceCreator, ProjectFilter, ProjectSlice } from "./types";
+import {
+ buildProjectFilter,
+ defaultProjectName,
+ getLabelFilter,
+ toError,
+} from "./utils";
+
+const getListProjectFilter = (params: ProjectFilter): string => {
+ const list: string[] = [];
+ const search = params.query?.trim().toLowerCase();
+ if (search) {
+ list.push(
+ `(name.contains("${search}") || resource_id.contains("${search}"))`
+ );
+ }
+ if (params.labels) {
+ list.push(...getLabelFilter(params.labels));
+ }
+ if (params.excludeDefault) {
+ list.push("exclude_default == true");
+ }
+ if (params.state === State.DELETED) {
+ list.push(`state == "${State[params.state]}"`);
+ }
+ return list.join(" && ");
+};
const UNKNOWN_PROJECT_NAME = `projects/${UNKNOWN_ID}`;
@@ -42,98 +77,153 @@ function createUnknownProject() {
});
}
-export const createProjectSlice: AppSliceCreator<ProjectSlice> = (
- set,
- get
-) => ({
- projectsByName: {},
- projectRequests: {},
- projectErrorsByName: {},
-
- // Mirrors the Pinia `useProjectV1Store().getProjectByName`: always
- // returns a non-null Project, synthesizing the default-project or
- // unknown-project placeholder when the name is not in the cache.
- getProjectByName: (name) => {
- if (name === UNKNOWN_PROJECT_NAME) return createUnknownProject();
- const defaultProject = defaultProjectName(get);
- if (name && name === defaultProject) {
- return get().projectsByName[name] ?? createDefaultProject(name);
- }
- return get().projectsByName[name] ?? createUnknownProject();
- },
-
- fetchProject: async (name) => {
- const defaultProject = defaultProjectName(get);
- if (name && name === defaultProject) {
- const project = createDefaultProject(name);
- set((state) => ({
- projectsByName: {
- ...state.projectsByName,
- [name]: state.projectsByName[name] ?? project,
- },
- projectErrorsByName: {
- ...state.projectErrorsByName,
- [name]: undefined,
- },
- }));
- return project;
- }
- if (!isValidProjectName(name) || name === UNKNOWN_PROJECT_NAME) {
- return undefined;
- }
- const existing = get().projectsByName[name];
- if (existing) return existing;
- const pending = get().projectRequests[name];
- if (pending) return pending;
-
- const request = projectServiceClientConnect
- .getProject(createProto(GetProjectRequestSchema, { name }))
- .then((project) => {
- set((state) => {
- const { [name]: _, ...projectRequests } = state.projectRequests;
- return {
- projectsByName: {
- ...state.projectsByName,
- [project.name]: project,
- },
- projectErrorsByName: {
- ...state.projectErrorsByName,
- [name]: undefined,
- },
- projectRequests,
- };
- });
+export const createProjectSlice: AppSliceCreator<ProjectSlice> = (set, get) => {
+ // Immutable bulk upsert into the by-name cache.
+ const upsertProjects = (projects: Project[]): void => {
+ set((state) => {
+ const next = { ...state.projectsByName };
+ for (const project of projects) {
+ next[project.name] = project;
+ }
+ return { projectsByName: next };
+ });
+ };
+
+ const slice: ProjectSlice = {
+ projectsByName: {},
+ projectRequests: {},
+ projectErrorsByName: {},
+
+ resetProjects: () => {
+ set({ projectsByName: {}, projectRequests: {}, projectErrorsByName: {} });
+ },
+
+ // Mirrors the Pinia `useProjectV1Store().getProjectByName`: always
+ // returns a non-null Project, synthesizing the default-project or
+ // unknown-project placeholder when the name is not in the cache.
+ getProjectByName: (name) => {
+ if (name === UNKNOWN_PROJECT_NAME) return createUnknownProject();
+ const defaultProject = defaultProjectName(get);
+ if (name && name === defaultProject) {
+ return get().projectsByName[name] ?? createDefaultProject(name);
+ }
+ return get().projectsByName[name] ?? createUnknownProject();
+ },
+
+ fetchProject: async (name, silent = false) => {
+ const defaultProject = defaultProjectName(get);
+ if (name && name === defaultProject) {
+ const project = createDefaultProject(name);
+ set((state) => ({
+ projectsByName: {
+ ...state.projectsByName,
+ [name]: state.projectsByName[name] ?? project,
+ },
+ projectErrorsByName: {
+ ...state.projectErrorsByName,
+ [name]: undefined,
+ },
+ }));
return project;
- })
- .catch((error) => {
- set((state) => {
- const { [name]: _, ...projectRequests } = state.projectRequests;
- return {
- projectErrorsByName: {
- ...state.projectErrorsByName,
- [name]: toError(error),
- },
- projectRequests,
- };
- });
+ }
+ if (!isValidProjectName(name) || name === UNKNOWN_PROJECT_NAME) {
return undefined;
- });
+ }
+ const existing = get().projectsByName[name];
+ if (existing) return existing;
+ const pending = get().projectRequests[name];
+ if (pending) return pending;
- set((state) => ({
- projectRequests: { ...state.projectRequests, [name]: request },
- }));
- return request;
- },
+ const request = projectServiceClientConnect
+ .getProject(createProto(GetProjectRequestSchema, { name }), {
+ contextValues: createContextValues().set(silentContextKey, silent),
+ })
+ .then((project) => {
+ set((state) => {
+ const { [name]: _, ...projectRequests } = state.projectRequests;
+ return {
+ projectsByName: {
+ ...state.projectsByName,
+ [project.name]: project,
+ },
+ projectErrorsByName: {
+ ...state.projectErrorsByName,
+ [name]: undefined,
+ },
+ projectRequests,
+ };
+ });
+ return project;
+ })
+ .catch((error) => {
+ set((state) => {
+ const { [name]: _, ...projectRequests } = state.projectRequests;
+ return {
+ projectErrorsByName: {
+ ...state.projectErrorsByName,
+ [name]: toError(error),
+ },
+ projectRequests,
+ };
+ });
+ return undefined;
+ });
- batchFetchProjects: async (names) => {
- const validNames = [...new Set(names)].filter(
- (name) => isValidProjectName(name) && name !== defaultProjectName(get)
- );
- if (validNames.length === 0) return [];
+ set((state) => ({
+ projectRequests: { ...state.projectRequests, [name]: request },
+ }));
+ return request;
+ },
+
+ batchFetchProjects: async (names) => {
+ const validNames = [...new Set(names)].filter(
+ (name) => isValidProjectName(name) && name !== defaultProjectName(get)
+ );
+ if (validNames.length === 0) return [];
+
+ try {
+ const response = await projectServiceClientConnect.batchGetProjects(
+ createProto(BatchGetProjectsRequestSchema, { names: validNames })
+ );
+ set((state) => ({
+ projectsByName: {
+ ...state.projectsByName,
+ ...Object.fromEntries(
+ response.projects.map((project) => [project.name, project])
+ ),
+ },
+ }));
+ return response.projects;
+ } catch {
+ const projects = await Promise.all(
+ validNames.map((name) => get().fetchProject(name))
+ );
+ return projects.filter(
+ (project): project is NonNullable<typeof project> => Boolean(project)
+ );
+ }
+ },
+
+ batchGetOrFetchProjects: async (names) => {
+ const validNames = [...new Set(names)].filter(
+ (name) => isValidProjectName(name) && name !== defaultProjectName(get)
+ );
+ const pending = validNames.filter(
+ (name) => !isValidProjectName(get().getProjectByName(name).name)
+ );
+ await get().batchFetchProjects(pending);
+ return validNames.map((name) => get().getProjectByName(name));
+ },
- try {
- const response = await projectServiceClientConnect.batchGetProjects(
- createProto(BatchGetProjectsRequestSchema, { names: validNames })
+ searchProjects: async ({ pageSize, pageToken, query }) => {
+ const response = await projectServiceClientConnect.searchProjects(
+ createProto(SearchProjectsRequestSchema, {
+ pageSize,
+ pageToken,
+ filter: buildProjectFilter(query),
+ orderBy: "title",
+ showDeleted: false,
+ })
);
set((state) => ({
projectsByName: {
@@ -143,67 +233,168 @@ export const createProjectSlice: AppSliceCreator<ProjectSlice> = (
),
},
}));
- return response.projects;
- } catch {
- const projects = await Promise.all(
- validNames.map((name) => get().fetchProject(name))
+ return {
+ projects: response.projects.filter(
+ (project) =>
+ project.state === State.ACTIVE &&
+ project.name !== defaultProjectName(get)
+ ),
+ nextPageToken: response.nextPageToken,
+ };
+ },
+
+ createProject: async (title, resourceId) => {
+ const project = createProto(ProjectSchema, {
+ title,
+ state: State.ACTIVE,
+ enforceIssueTitle: true,
+ enforceSqlReview: true,
+ requireIssueApproval: true,
+ requirePlanCheckNoError: true,
+ allowRequestRole: true,
+ });
+ const created = await projectServiceClientConnect.createProject(
+ createProto(CreateProjectRequestSchema, {
+ project,
+ projectId: resourceId,
+ })
);
- return projects.filter(
- (project): project is NonNullable<typeof project> => Boolean(project)
+ upsertProjects([created]);
+ return created;
+ },
+
+ getOrFetchProjectByName: async (name, silent = true) => {
+ const cached = get().getProjectByName(name);
+ if (cached && cached.name !== UNKNOWN_PROJECT_NAME) {
+ return cached;
+ }
+ return (await get().fetchProject(name, silent)) ?? createUnknownProject();
+ },
+
+ fetchProjectList: async (params) => {
+ const filter = getListProjectFilter(params.filter ?? {});
+ const showDeleted = params.filter?.state !== State.ACTIVE;
+ const canList = hasWorkspacePermissionV2("bb.projects.list");
+ let pageToken = params.pageToken;
+ let result: { projects: Project[]; nextPageToken: string };
+ // The API can return an empty page with a non-empty next token; keep
+ // paging until we get rows or run out (mirrors the legacy Pinia store).
+ while (true) {
+ const request = {
+ pageSize: params.pageSize,
+ pageToken,
+ filter,
+ orderBy: params.orderBy,
+ showDeleted,
+ };
+ const response = canList
+ ? await projectServiceClientConnect.listProjects(
+ createProto(ListProjectsRequestSchema, request),
+ {
+ contextValues: createContextValues().set(
+ silentContextKey,
+ params.silent ?? true
+ ),
+ }
+ )
+ : await projectServiceClientConnect.searchProjects(
+ createProto(SearchProjectsRequestSchema, request),
+ {
+ contextValues: createContextValues().set(
+ silentContextKey,
+ params.silent ?? true
+ ),
+ }
+ );
+ result = {
+ projects: response.projects,
+ nextPageToken: response.nextPageToken,
+ };
+ if (result.nextPageToken !== "" && result.projects.length === 0) {
+ pageToken = result.nextPageToken;
+ continue;
+ }
+ break;
+ }
+ if (params.cache) {
+ upsertProjects(result.projects);
+ }
+ return result;
+ },
+
+ updateProject: async (project, updateMask) => {
+ const response = await projectServiceClientConnect.updateProject(
+ createProto(UpdateProjectRequestSchema, {
+ project,
+ updateMask: { paths: updateMask },
+ })
);
- }
- },
-
- searchProjects: async ({ pageSize, pageToken, query }) => {
- const response = await projectServiceClientConnect.searchProjects(
- createProto(SearchProjectsRequestSchema, {
- pageSize,
- pageToken,
- filter: buildProjectFilter(query),
- orderBy: "title",
- showDeleted: false,
- })
- );
- set((state) => ({
- projectsByName: {
- ...state.projectsByName,
- ...Object.fromEntries(
- response.projects.map((project) => [project.name, project])
- ),
- },
- }));
- return {
- projects: response.projects.filter(
- (project) =>
- project.state === State.ACTIVE &&
- project.name !== defaultProjectName(get)
- ),
- nextPageToken: response.nextPageToken,
- };
- },
-
- createProject: async (title, resourceId) => {
- const project = createProto(ProjectSchema, {
- title,
- state: State.ACTIVE,
- enforceIssueTitle: true,
- enforceSqlReview: true,
- requireIssueApproval: true,
- requirePlanCheckNoError: true,
- allowRequestRole: true,
- });
- const created = await projectServiceClientConnect.createProject(
- createProto(CreateProjectRequestSchema, {
- project,
- projectId: resourceId,
- })
- );
- set((state) => ({
- projectsByName: {
- ...state.projectsByName,
- [created.name]: created,
- },
- }));
- return created;
- },
-});
+ upsertProjects([response]);
+ return response;
+ },
+
+ archiveProject: async (project) => {
+ await projectServiceClientConnect.deleteProject(
+ createProto(DeleteProjectRequestSchema, { name: project.name })
+ );
+ upsertProjects([{ ...project, state: State.DELETED }]);
+ },
+
+ restoreProject: async (project) => {
+ const response = await projectServiceClientConnect.undeleteProject(
+ createProto(UndeleteProjectRequestSchema, { name: project.name })
+ );
+ upsertProjects([response]);
+ },
+
+ deleteProject: async (project) => {
+ await projectServiceClientConnect.deleteProject(
+ createProto(DeleteProjectRequestSchema, { name: project, purge: true })
+ );
+ set((state) => {
+ const { [project]: _removed, ...projectsByName } = state.projectsByName;
+ return { projectsByName };
+ });
+ },
+
+ batchDeleteProjects: async (projectNames) => {
+ await projectServiceClientConnect.batchDeleteProjects(
+ createProto(BatchDeleteProjectsRequestSchema, { names: projectNames })
+ );
+ const deleted = projectNames
+ .map((name) => get().projectsByName[name])
+ .filter((project): project is Project => Boolean(project))
+ .map((project) => ({ ...project, state: State.DELETED }));
+ upsertProjects(deleted);
+ },
+
+ batchPurgeProjects: async (projectNames) => {
+ await projectServiceClientConnect.batchDeleteProjects(
+ createProto(BatchDeleteProjectsRequestSchema, {
+ names: projectNames,
+ purge: true,
+ })
+ );
+ set((state) => {
+ const next = { ...state.projectsByName };
+ for (const name of projectNames) {
+ delete next[name];
+ }
+ return { projectsByName: next };
+ });
+ },
+
+ updateProjectCache: (project) => {
+ upsertProjects([project]);
+ },
+ };
+
+ // Wire the cycle-free access layer used by shared `@/utils/*` helpers.
+ setProjectAccess({
+ getProjectByName: slice.getProjectByName,
+ batchGetOrFetchProjects: slice.batchGetOrFetchProjects,
+ fetchProjectList: slice.fetchProjectList,
+ });
+
+ return slice;
+};
diff --git a/frontend/src/react/stores/app/projectAccess.ts b/frontend/src/react/stores/app/projectAccess.ts
new file mode 100644
index 0000000000..c1b2461ce4
--- /dev/null
+++ b/frontend/src/react/stores/app/projectAccess.ts
@@ -0,0 +1,60 @@
+import { create as createProto } from "@bufbuild/protobuf";
+import { UNKNOWN_ID } from "@/types/const";
+import { State } from "@/types/proto-es/v1/common_pb";
+import {
+ type Project,
+ ProjectSchema,
+} from "@/types/proto-es/v1/project_service_pb";
+import type { ProjectFilter } from "./types";
+
+const UNKNOWN_PROJECT_NAME = `projects/${UNKNOWN_ID}`;
+
+export function createUnknownProject(): Project {
+ return createProto(ProjectSchema, {
+ name: UNKNOWN_PROJECT_NAME,
+ state: State.ACTIVE,
+ enforceIssueTitle: true,
+ enforceSqlReview: true,
+ requireIssueApproval: true,
+ requirePlanCheckNoError: true,
+ allowRequestRole: true,
+ });
+}
+
+type ProjectAccess = {
+ getProjectByName: (name: string) => Project;
+ batchGetOrFetchProjects: (names: string[]) => Promise<Project[]>;
+ fetchProjectList: (params: {
+ pageSize?: number;
+ pageToken?: string;
+ silent?: boolean;
+ filter?: ProjectFilter;
+ orderBy?: string;
+ cache?: boolean;
+ }) => Promise<{ projects: Project[]; nextPageToken?: string }>;
+};
+
+// Indirection layer so low-level shared utilities (which sit inside the app
+// store's own load graph via the `@/utils` barrel) can read project state
+// without statically importing the store index — that would form an
+// initialization cycle. The slice registers the real implementation via
+// `setProjectAccess` at store-creation time.
+let projectAccess: ProjectAccess = {
+ getProjectByName: () => createUnknownProject(),
+ batchGetOrFetchProjects: async () => [],
+ fetchProjectList: async () => ({ projects: [], nextPageToken: "" }),
+};
+
+export const setProjectAccess = (access: ProjectAccess) => {
+ projectAccess = access;
+};
+
+export const getProjectByName = (name: string) =>
+ projectAccess.getProjectByName(name);
+
+export const batchGetOrFetchProjects = (names: string[]) =>
+ projectAccess.batchGetOrFetchProjects(names);
+
+export const fetchProjectList = (
+ params: Parameters<ProjectAccess["fetchProjectList"]>[0]
+) => projectAccess.fetchProjectList(params);
diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.ts
index c0efb2a477..c56b5c41a6 100644
--- a/frontend/src/react/stores/app/types.ts
+++ b/frontend/src/react/stores/app/types.ts
@@ -267,18 +267,50 @@ export type IamSlice = {
hasProjectPermission: (project: Project, permission: Permission) => boolean;
};
+export interface ProjectFilter {
+ query?: string;
+ excludeDefault?: boolean;
+ state?: State;
+ // label should be "{label key}:{label value}" format
+ labels?: string[];
+}
+
export type ProjectSlice = {
projectsByName: Record<string, Project>;
projectRequests: Record<string, Promise<Project | undefined>>;
projectErrorsByName: Record<string, Error | undefined>;
getProjectByName: (name: string) => Project;
- fetchProject: (name: string) => Promise<Project | undefined>;
+ fetchProject: (
+ name: string,
+ silent?: boolean
+ ) => Promise<Project | undefined>;
+ getOrFetchProjectByName: (name: string, silent?: boolean) => Promise<Project>;
batchFetchProjects: (names: string[]) => Promise<Project[]>;
+ // Returns ALL requested projects (fetching the missing ones first),
+ // resolved through `getProjectByName` so the placeholder is filled in.
+ batchGetOrFetchProjects: (names: string[]) => Promise<Project[]>;
searchProjects: (params: ProjectListParams) => Promise<{
projects: Project[];
nextPageToken?: string;
}>;
+ fetchProjectList: (params: {
+ pageSize?: number;
+ pageToken?: string;
+ silent?: boolean;
+ filter?: ProjectFilter;
+ orderBy?: string;
+ cache?: boolean;
+ }) => Promise<{ projects: Project[]; nextPageToken?: string }>;
createProject: (title: string, resourceId: string) => Promise<Project>;
+ updateProject: (project: Project, updateMask: string[]) => Promise<Project>;
+ archiveProject: (project: Project) => Promise<void>;
+ restoreProject: (project: Project) => Promise<void>;
+ deleteProject: (project: string) => Promise<void>;
+ batchDeleteProjects: (projectNames: string[]) => Promise<void>;
+ batchPurgeProjects: (projectNames: string[]) => Promise<void>;
+ // Immutably upsert a single project into the by-name cache.
+ updateProjectCache: (project: Project) => void;
+ resetProjects: () => void;
};
export interface InstanceFilter {
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index d404451d81..537d451727 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -10,7 +10,6 @@ import {
useAuthStore,
useRouterStore,
useCurrentUserV1,
- useProjectV1Store,
useSettingV1Store,
} from "@/store";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
@@ -168,10 +167,10 @@ router.beforeEach((to, from, next) => {
// Auth pages: Reset stores and allow access
if (isAuthRelatedRoute(to.name as string)) {
- useProjectV1Store().reset();
void import("@/react/stores/app").then(({ useAppStore }) => {
useAppStore.getState().resetDatabases();
useAppStore.getState().resetInstances();
+ useAppStore.getState().resetProjects();
});
import("@/plugins/ai/store").then(({ useConversationStore }) => {
useConversationStore().reset();
diff --git a/frontend/src/store/modules/v1/index.ts b/frontend/src/store/modules/v1/index.ts
index c5d6ac045a..0dbcf8f237 100644
--- a/frontend/src/store/modules/v1/index.ts
+++ b/frontend/src/store/modules/v1/index.ts
@@ -5,7 +5,6 @@ export * from "./environment";
export * from "./group";
export * from "./permission";
export * from "./policy";
-export * from "./project";
export * from "./projectIamPolicy";
export * from "./setting";
export * from "./subscription";
diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.ts
deleted file mode 100644
index 4e47c052e6..0000000000
--- a/frontend/src/store/modules/v1/project.ts
+++ /dev/null
@@ -1,391 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { orderBy, uniq } from "lodash-es";
-import { defineStore } from "pinia";
-import { computed, reactive, ref, unref, watch } from "vue";
-import { useRoute } from "vue-router";
-import { projectServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-import type { MaybeRef, ResourceId } from "@/types";
-import {
- defaultProject,
- isDefaultProject,
- isValidProjectName,
- UNKNOWN_PROJECT_NAME,
- unknownProject,
-} from "@/types";
-import { State } from "@/types/proto-es/v1/common_pb";
-import {
- BatchDeleteProjectsRequestSchema,
- BatchGetProjectsRequestSchema,
- CreateProjectRequestSchema,
- DeleteProjectRequestSchema,
- GetProjectRequestSchema,
- ListProjectsRequestSchema,
- type Project,
- SearchProjectsRequestSchema,
- UndeleteProjectRequestSchema,
- UpdateProjectRequestSchema,
-} from "@/types/proto-es/v1/project_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
-import { projectNamePrefix } from "./common";
-
-export interface ProjectFilter {
- query?: string;
- excludeDefault?: boolean;
- state?: State;
- // label should be "{label key}:{label value}" format
- labels?: string[];
-}
-
-const getLabelFilter = (labels: string[]): string[] => {
- const labelMap = new Map<string, string[]>();
- for (const label of labels) {
- const sections = label.split(":");
- if (sections.length !== 2) {
- continue;
- }
- const [key, rawValue] = sections;
- const values = rawValue.split(",");
- if (!labelMap.has(key)) {
- labelMap.set(key, []);
- }
- labelMap.get(key)?.push(...values);
- }
-
- return [...labelMap.entries()].reduce((result, [key, values]) => {
- switch (values.length) {
- case 0:
- return result;
- case 1:
- result.push(`labels.${key} == "${values[0]}"`);
- return result;
- default:
- result.push(
- `labels.${key} in [${values.map((v) => `"${v}"`).join(", ")}]`
- );
- return result;
- }
- }, [] as string[]);
-};
-
-const getListProjectFilter = (params: ProjectFilter) => {
- const list = [];
- const search = params.query?.trim();
-
- if (search) {
- // It's a regular name/resource_id search
- const searchLower = search.toLowerCase();
- list.push(
- `(name.contains("${searchLower}") || resource_id.contains("${searchLower}"))`
- );
- }
-
- if (params.labels) {
- list.push(...getLabelFilter(params.labels));
- }
-
- if (params.excludeDefault) {
- list.push("exclude_default == true");
- }
- if (params.state === State.DELETED) {
- list.push(`state == "${State[params.state]}"`);
- }
- return list.join(" && ");
-};
-
-export const useProjectV1Store = defineStore("project_v1", () => {
- const projectMapByName = reactive(new Map<ResourceId, Project>());
- const projectRequestCache = new Map<string, Promise<Project>>();
-
- const reset = () => {
- projectMapByName.clear();
- };
-
- // Getters
- const projectList = computed(() => {
- return orderBy(
- Array.from(projectMapByName.values()),
- (project) => project.name,
- "asc"
- );
- });
-
- // Actions
- const updateProjectCache = (project: Project) => {
- projectMapByName.set(project.name, project);
- };
- const upsertProjectsCache = (projectList: Project[]) => {
- projectList.forEach((project) => {
- updateProjectCache(project);
- });
- };
- const getProjectList = (showDeleted = false) => {
- if (showDeleted) {
- return projectList.value;
- }
- return projectList.value.filter(
- (project) => project.state === State.ACTIVE
- );
- };
- const getProjectByName = (name: string) => {
- if (name === UNKNOWN_PROJECT_NAME) return unknownProject();
- if (isDefaultProject(name)) return defaultProject(name);
- return projectMapByName.get(name) ?? unknownProject();
- };
- const fetchProjectByName = async (name: string, silent = false) => {
- const request = create(GetProjectRequestSchema, { name });
- const response = await projectServiceClientConnect.getProject(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- });
-
- upsertProjectsCache([response]);
- return response;
- };
-
- const fetchProjectList = async (params: {
- pageSize?: number;
- pageToken?: string;
- silent?: boolean;
- filter?: ProjectFilter;
- orderBy?: string;
- cache?: boolean;
- }): Promise<{
- projects: Project[];
- nextPageToken?: string;
- }> => {
- const contextValues = createContextValues().set(
- silentContextKey,
- params.silent ?? true
- );
-
- let response: { projects: Project[]; nextPageToken: string } | undefined =
- undefined;
- let pageToken = params.pageToken;
- while (true) {
- let resp;
- if (hasWorkspacePermissionV2("bb.projects.list")) {
- const request = create(ListProjectsRequestSchema, {
- ...params,
- pageToken,
- filter: getListProjectFilter(params.filter ?? {}),
- orderBy: params.orderBy,
- showDeleted: params.filter?.state !== State.ACTIVE,
- });
- const connectResponse = await projectServiceClientConnect.listProjects(
- request,
- { contextValues }
- );
- resp = {
- projects: connectResponse.projects,
- nextPageToken: connectResponse.nextPageToken,
- };
- } else {
- const request = create(SearchProjectsRequestSchema, {
- ...params,
- pageToken,
- filter: getListProjectFilter(params.filter ?? {}),
- orderBy: params.orderBy,
- showDeleted: params.filter?.state !== State.ACTIVE,
- });
- const connectResponse =
- await projectServiceClientConnect.searchProjects(request, {
- contextValues,
- });
- resp = {
- projects: connectResponse.projects,
- nextPageToken: connectResponse.nextPageToken,
- };
- }
- if (resp.nextPageToken !== "" && resp.projects.length === 0) {
- pageToken = resp.nextPageToken;
- continue;
- }
- response = resp;
- break;
- }
-
- if (params.cache) {
- upsertProjectsCache(response.projects);
- }
-
- return {
- projects: response.projects,
- nextPageToken: response.nextPageToken,
- };
- };
-
- const batchGetProjects = async (names: string[], silent = true) => {
- const validNames = names.filter(isValidProjectName);
- if (validNames.length === 0) {
- return [];
- }
- const request = create(BatchGetProjectsRequestSchema, {
- names: validNames,
- });
- const response = await projectServiceClientConnect.batchGetProjects(
- request,
- {
- contextValues: createContextValues().set(silentContextKey, silent),
- }
- );
- upsertProjectsCache(response.projects);
- return response.projects;
- };
-
- const batchGetOrFetchProjects = async (projectNames: string[]) => {
- const validProjectList = uniq(projectNames).filter((projectName) => {
- if (
- !projectName ||
- !isValidProjectName(projectName) ||
- isDefaultProject(projectName)
- ) {
- return false;
- }
- return true;
- });
- const pendingFetch = validProjectList.filter((projectName) => {
- const project = getProjectByName(projectName);
- if (isValidProjectName(project.name)) {
- return false;
- }
- return true;
- });
- await batchGetProjects(pendingFetch, true /* silent */);
- return validProjectList.map(getProjectByName);
- };
-
- const getOrFetchProjectByName = async (name: string, silent = true) => {
- const cachedData = getProjectByName(name);
- if (cachedData && cachedData.name !== UNKNOWN_PROJECT_NAME) {
- return cachedData;
- }
- if (!isValidProjectName(name)) {
- return unknownProject();
- }
-
- const cached = projectRequestCache.get(name);
- if (cached) return cached;
- const request = fetchProjectByName(name, silent);
- projectRequestCache.set(name, request);
- return request;
- };
- const createProject = async (project: Project, resourceId: string) => {
- const request = create(CreateProjectRequestSchema, {
- project,
- projectId: resourceId,
- });
- const response = await projectServiceClientConnect.createProject(request);
- upsertProjectsCache([response]);
- return response;
- };
- const updateProject = async (project: Project, updateMask: string[]) => {
- const request = create(UpdateProjectRequestSchema, {
- project,
- updateMask: { paths: updateMask },
- });
- const response = await projectServiceClientConnect.updateProject(request);
- upsertProjectsCache([project]);
- return response;
- };
- const archiveProject = async (project: Project) => {
- const request = create(DeleteProjectRequestSchema, {
- name: project.name,
- purge: false,
- });
- await projectServiceClientConnect.deleteProject(request);
- project.state = State.DELETED;
- upsertProjectsCache([project]);
- };
- const deleteProject = async (project: string) => {
- const request = create(DeleteProjectRequestSchema, {
- name: project,
- purge: true,
- });
- await projectServiceClientConnect.deleteProject(request);
- projectMapByName.delete(project);
- };
- const batchDeleteProjects = async (projectNames: string[]) => {
- const request = create(BatchDeleteProjectsRequestSchema, {
- names: projectNames,
- purge: false,
- });
- await projectServiceClientConnect.batchDeleteProjects(request);
- // Update local cache - mark all projects as deleted
- const projects = projectNames
- .map((name) => {
- const project = getProjectByName(name);
- if (project && project.name !== UNKNOWN_PROJECT_NAME) {
- return { ...project, state: State.DELETED };
- }
- return null;
- })
- .filter((p): p is Project => p !== null);
-
- upsertProjectsCache(projects);
- };
- const batchPurgeProjects = async (projectNames: string[]) => {
- const request = create(BatchDeleteProjectsRequestSchema, {
- names: projectNames,
- purge: true,
- });
- await projectServiceClientConnect.batchDeleteProjects(request);
- // Remove from local cache
- for (const name of projectNames) {
- projectMapByName.delete(name);
- }
- };
- const restoreProject = async (project: Project) => {
- const request = create(UndeleteProjectRequestSchema, {
- name: project.name,
- });
- const response = await projectServiceClientConnect.undeleteProject(request);
- upsertProjectsCache([response]);
- };
-
- return {
- reset,
- getProjectList,
- getProjectByName,
- getOrFetchProjectByName,
- createProject,
- updateProject,
- archiveProject,
- deleteProject,
- batchDeleteProjects,
- batchPurgeProjects,
- restoreProject,
- updateProjectCache,
- fetchProjectList,
- batchGetOrFetchProjects,
- };
-});
-
-export const useProjectByName = (name: MaybeRef<string>) => {
- const store = useProjectV1Store();
- const ready = ref(false);
- watch(
- () => unref(name),
- () => {
- ready.value = false;
- store.getOrFetchProjectByName(unref(name), /* silent */ true).then(() => {
- ready.value = true;
- });
- },
- { immediate: true }
- );
- const project = computed(() => {
- return store.getProjectByName(unref(name));
- });
- return { project, ready };
-};
-
-export const useCurrentProjectV1 = () => {
- const route = useRoute();
- const projectName = computed(() =>
- route?.params.projectId
- ? `${projectNamePrefix}${route.params.projectId}`
- : unknownProject().name
- );
- return useProjectByName(projectName);
-};
diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.ts
index df7b506cd3..3ceb3228ae 100644
--- a/frontend/src/utils/expr.ts
+++ b/frontend/src/utils/expr.ts
@@ -2,11 +2,14 @@ import {
batchGetOrFetchDatabases,
fetchDatabases,
} from "@/react/stores/app/databaseAccess";
+import {
+ batchGetOrFetchProjects,
+ fetchProjectList,
+} from "@/react/stores/app/projectAccess";
import {
instanceNamePrefix,
projectNamePrefix,
useEnvironmentV1Store,
- useProjectV1Store,
} from "@/store";
import { isValidInstanceName } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
@@ -75,29 +78,26 @@ const getDatabaseIdOptions = (databases: Database[]): LabeledOption[] => {
};
export const getProjectIdOptionConfig = (): OptionConfig => {
- const projectStore = useProjectV1Store();
return {
options: [],
fetch: async (projectIds: string[]) => {
- const projects = await projectStore.batchGetOrFetchProjects(
+ const projects = await batchGetOrFetchProjects(
projectIds.map((projectId) => `${projectNamePrefix}${projectId}`)
);
return projects.map(getProjectIdOption);
},
search: async (params) => {
- return projectStore
- .fetchProjectList({
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- filter: {
- query: params.search,
- excludeDefault: true,
- },
- })
- .then((resp) => ({
- nextPageToken: resp.nextPageToken ?? "",
- options: resp.projects.map(getProjectIdOption),
- }));
+ return fetchProjectList({
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ filter: {
+ query: params.search,
+ excludeDefault: true,
+ },
+ }).then((resp) => ({
+ nextPageToken: resp.nextPageToken ?? "",
+ options: resp.projects.map(getProjectIdOption),
+ }));
},
};
};
diff --git a/frontend/src/utils/v1/database.ts b/frontend/src/utils/v1/database.ts
index c809d9af1a..58277e350b 100644
--- a/frontend/src/utils/v1/database.ts
+++ b/frontend/src/utils/v1/database.ts
@@ -1,8 +1,5 @@
-import {
- checkQuerierPermission,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { getProjectByName } from "@/react/stores/app/projectAccess";
+import { checkQuerierPermission, useEnvironmentV1Store } from "@/store";
import {
databaseNamePrefix,
instanceNamePrefix,
@@ -101,7 +98,7 @@ export const getDatabaseEngine = (database: Database): Engine => {
// Get project entity (sync - assumes cached)
export const getDatabaseProject = (database: Database): Project => {
- return useProjectV1Store().getProjectByName(database.project);
+ return getProjectByName(database.project);
};
// Get effective environment entity
diff --git a/frontend/src/utils/v1/issue/issue.ts b/frontend/src/utils/v1/issue/issue.ts
index d81740723c..a9cf33e7fc 100644
--- a/frontend/src/utils/v1/issue/issue.ts
+++ b/frontend/src/utils/v1/issue/issue.ts
@@ -5,8 +5,9 @@ import {
getDatabaseByName,
getDatabaseList,
} from "@/react/stores/app/databaseAccess";
+import { getProjectByName } from "@/react/stores/app/projectAccess";
import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
-import { projectNamePrefix, useProjectV1Store } from "@/store";
+import { projectNamePrefix } from "@/store";
import { isValidDatabaseName, UNKNOWN_ID, unknownDatabase } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
@@ -126,7 +127,7 @@ export const getIssueRoute = (issue: {
};
export const projectOfIssue = (issue: Issue): Project => {
- return useProjectV1Store().getProjectByName(
+ return getProjectByName(
`${projectNamePrefix}${extractProjectResourceName(issue.name)}`
);
};
diff --git a/frontend/src/utils/v1/worksheet.ts b/frontend/src/utils/v1/worksheet.ts
index cc3cf4ccdc..1e3f8e54dc 100644
--- a/frontend/src/utils/v1/worksheet.ts
+++ b/frontend/src/utils/v1/worksheet.ts
@@ -1,4 +1,5 @@
-import { getCurrentUserV1, useProjectV1Store } from "@/store";
+import { getProjectByName } from "@/react/stores/app/projectAccess";
+import { getCurrentUserV1 } from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
import { UNKNOWN_ID, UNKNOWN_PROJECT_NAME } from "@/types";
import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
@@ -32,7 +33,7 @@ export const isWorksheetReadableV1 = (sheet: Worksheet) => {
return false;
case Worksheet_Visibility.PROJECT_READ:
case Worksheet_Visibility.PROJECT_WRITE: {
- const projectV1 = useProjectV1Store().getProjectByName(sheet.project);
+ const projectV1 = getProjectByName(sheet.project);
if (projectV1.name === UNKNOWN_PROJECT_NAME) {
return false;
}
@@ -58,7 +59,7 @@ export const isWorksheetWritableV1 = (sheet: Worksheet) => {
return true;
}
- const projectV1 = useProjectV1Store().getProjectByName(sheet.project);
+ const projectV1 = getProjectByName(sheet.project);
if (projectV1.name === UNKNOWN_PROJECT_NAME) {
return false;
}