Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

faster loading times

Matheus Nogueira45bcbe9a3e6c
diff --git a/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx b/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx
index 18dc6ebdaa..1addd656f1 100644
--- a/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx
+++ b/frontend/src/pages/organization/ProjectsPage/components/ProjectCategoryOverview.tsx
@@ -1,4 +1,5 @@
import { useMemo, useState } from "react";
+import { useQueryClient } from "@tanstack/react-query";
import { Link, useNavigate } from "@tanstack/react-router";
import { PreviewBadge } from "@app/components/agent-vault/PreviewBadge";
@@ -41,6 +42,7 @@ import { resolvePamProjectId } from "@app/hooks/api/pam/queries";
import { Project, ProjectType } from "@app/hooks/api/projects/types";
import {
fetchSecretScanningProjectId,
+ secretScanningV2Keys,
useGetSecretScanningInstanceState
} from "@app/hooks/api/secretScanningV2/queries";
@@ -122,6 +124,7 @@ const PRODUCT_TILE_COUNT = Object.keys(ProjectType).length;
export const ProjectCategoryOverview = () => {
const navigate = useNavigate();
+ const queryClient = useQueryClient();
const { currentOrg } = useOrganization();
const { permission } = useOrgPermission();
const canRequestAccess = permission.can(
@@ -421,10 +424,15 @@ export const ProjectCategoryOverview = () => {
};
const enterSecretScanningProject = async () => {
- // Also lazily bootstraps the Secret Scanning project for orgs that don't have one yet.
let secretScanningProjectId: string;
try {
- secretScanningProjectId = await fetchSecretScanningProjectId();
+ // Orgs from before projects were created at signup have none until this creates it.
+ secretScanningProjectId =
+ activeSecretScanningProjectId ??
+ (await queryClient.ensureQueryData({
+ queryKey: secretScanningV2Keys.activeProjectId(currentOrg?.id ?? ""),
+ queryFn: fetchSecretScanningProjectId
+ }));
} catch (err) {
createNotification({
type: "error",
diff --git a/frontend/src/pages/secret-scanning/layout.tsx b/frontend/src/pages/secret-scanning/layout.tsx
index 2c995573d7..b831c457db 100644
--- a/frontend/src/pages/secret-scanning/layout.tsx
+++ b/frontend/src/pages/secret-scanning/layout.tsx
@@ -16,27 +16,27 @@ export const Route = createFileRoute(
)({
component: SecretScanningLayout,
beforeLoad: async ({ params, context }) => {
- // fetchQuery rather than ensureQueryData: joining a project invalidates this list, and a stale
- // copy would ignore the earlier project the user just joined.
- const memberProjects = await context.queryClient.fetchQuery({
- queryKey: projectKeys.getAllUserProjects(),
- queryFn: () => fetchUserWorkspaces(),
- staleTime: 60_000
- });
-
- const pinnedProjectId = resolveSecretScanningProjectId({
- orgId: params.orgId,
- activeProjectId: null,
- memberProjectIds: memberProjects.map((p) => p.id)
- });
-
- // Orgs get their project at creation, but orgs from before that have none until this creates it.
- const projectId: string =
- pinnedProjectId ??
- (await context.queryClient.ensureQueryData<string>({
+ const [activeProjectId, memberProjects] = await Promise.all([
+ // Orgs get their project at creation, but orgs from before that have none until this creates it.
+ context.queryClient.ensureQueryData<string>({
queryKey: secretScanningV2Keys.activeProjectId(params.orgId),
queryFn: fetchSecretScanningProjectId
- }));
+ }),
+ // fetchQuery rather than ensureQueryData: joining a project invalidates this list, and a stale
+ // copy would ignore the earlier project the user just joined.
+ context.queryClient.fetchQuery({
+ queryKey: projectKeys.getAllUserProjects(),
+ queryFn: () => fetchUserWorkspaces(),
+ staleTime: 60_000
+ })
+ ]);
+
+ const projectId =
+ resolveSecretScanningProjectId({
+ orgId: params.orgId,
+ activeProjectId,
+ memberProjectIds: memberProjects.map((p) => p.id)
+ }) ?? activeProjectId;
const [project] = await Promise.all([
context.queryClient.ensureQueryData({