Skip to content

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

fix(secrets): improve search all folders scoping and results (#8166)

Andrew Huang88485a616d71
diff --git a/backend/src/lib/api-docs/constants.ts b/backend/src/lib/api-docs/constants.ts
index 0ee8b130b8..c68da31e6a 100644
--- a/backend/src/lib/api-docs/constants.ts
+++ b/backend/src/lib/api-docs/constants.ts
@@ -1511,6 +1511,10 @@ export const SECRET_IMPORTS = {
} as const;
export const DASHBOARD = {
+ SECRET_METADATA_SEARCH: {
+ searchLimit: "The candidate limit applied independently to plaintext matches and encrypted metadata candidates.",
+ tags: "The tags attached to the secret, including each tag's ID and slug."
+ },
SECRET_METADATA_LIST: {
projectId: "The ID of the project containing the secrets.",
environment: "The slug of the environment containing the secrets.",
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 99eb6b7532..229df1e045 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -1081,9 +1081,11 @@ export const registerRoutes = async (
});
const resourceMetadataService = resourceMetadataServiceFactory({
+ db,
resourceMetadataDAL,
permissionService,
folderDAL,
+ projectEnvDAL,
kmsService
});
diff --git a/backend/src/server/routes/v1/dashboard-router.ts b/backend/src/server/routes/v1/dashboard-router.ts
index 0fd5b65411..24a369386e 100644
--- a/backend/src/server/routes/v1/dashboard-router.ts
+++ b/backend/src/server/routes/v1/dashboard-router.ts
@@ -102,6 +102,15 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
.object({
projectId: z.string().trim().describe(DASHBOARD.SECRET_OVERVIEW_LIST.projectId),
operator: z.nativeEnum(SecretMetadataSearchLogicalOperator).optional(),
+ environments: z
+ .string()
+ .trim()
+ .max(65535)
+ .transform((value) => value.split(","))
+ .pipe(slugSchema({ field: "Environment slug" }).array().min(1).max(1000))
+ .optional()
+ .describe(DASHBOARD.SECRET_OVERVIEW_LIST.environments),
+ secretPath: SecretMetadataQuerySchema.shape.secretPath,
tags: z.string().trim().transform(decodeURIComponent).optional()
})
.describe(
@@ -109,12 +118,18 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
),
response: {
200: z.object({
+ searchLimit: z.number().describe(DASHBOARD.SECRET_METADATA_SEARCH.searchLimit),
secrets: z
.object({
secretId: z.string(),
secretKey: z.string(),
environment: z.string(),
secretPath: z.string(),
+ tags: z
+ .object({ id: z.string(), slug: z.string() })
+ .array()
+ .describe(DASHBOARD.SECRET_METADATA_SEARCH.tags),
+ secretValueHidden: z.boolean().describe(DASHBOARD.SECRET_METADATA_LIST.secretValueHidden),
metadata: z
.object({
key: z.string(),
@@ -133,13 +148,16 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
const { projectId } = req.query;
const tagSlugs = req.query.tags?.split(",").filter((tag) => Boolean(tag.trim())) ?? [];
- const { secrets } = await server.services.resourceMetadata.searchSecretMetadata({
+ const result = await server.services.resourceMetadata.searchSecretMetadata({
filters,
operator,
tagSlugs,
+ environments: req.query.environments,
+ secretPath: req.query.secretPath,
actor: req.permission,
projectId
});
+ const { secrets } = result;
await server.services.auditLog.createAuditLog({
projectId,
@@ -161,7 +179,7 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
}
});
- return { secrets };
+ return result;
}
});
diff --git a/backend/src/server/routes/v1/dashboard-search-permission.test.ts b/backend/src/server/routes/v1/dashboard-search-permission.test.ts
new file mode 100644
index 0000000000..0f5971338e
--- /dev/null
+++ b/backend/src/server/routes/v1/dashboard-search-permission.test.ts
@@ -0,0 +1,85 @@
+import { createMongoAbility } from "@casl/ability";
+import { vi } from "vitest";
+
+import { hasSecretReadValueOrDescribePermission } from "@app/ee/services/permission/permission-fns";
+import {
+ ProjectPermissionSecretActions,
+ ProjectPermissionSet,
+ ProjectPermissionSub
+} from "@app/ee/services/permission/project-permission";
+
+import { registerDashboardRouter } from "./dashboard-router";
+
+test.each(["/team", "/team/team"])("deep search checks the actual path for a grant on %s", async (allowedPath) => {
+ const routes = new Map<string, (req: unknown) => Promise<{ secrets: { secretPath: string }[] }>>();
+ const permission = createMongoAbility<ProjectPermissionSet>([
+ {
+ action: ProjectPermissionSecretActions.DescribeSecret,
+ subject: ProjectPermissionSub.Secrets,
+ conditions: { environment: "dev", secretPath: allowedPath }
+ }
+ ]);
+ const folders = [
+ { id: "team", path: "/team", environment: "dev" },
+ { id: "child", path: "/team/child", environment: "dev" }
+ ];
+ const getSecretsRawByFolderMappings = vi.fn(
+ async ({ folderMappings }: { folderMappings: { path: string; folderId: string }[] }) => ({
+ secrets: folderMappings
+ .filter(({ path }: { path: string }) =>
+ hasSecretReadValueOrDescribePermission(permission, ProjectPermissionSecretActions.DescribeSecret, {
+ environment: "dev",
+ secretPath: path,
+ secretName: "KEY",
+ secretTags: []
+ })
+ )
+ .map(({ path, folderId }: { path: string; folderId: string }) => ({
+ id: folderId,
+ secretKey: "KEY",
+ secretPath: path,
+ environment: "dev"
+ })),
+ isLimitReached: false
+ })
+ );
+ const listDynamicSecretsByFolderIds = vi.fn().mockResolvedValue({ dynamicSecrets: [], isLimitReached: false });
+ const getQuickSearchSecretRotations = vi.fn().mockResolvedValue({ secretRotations: [], isLimitReached: false });
+ const server = {
+ route: ({
+ url,
+ handler
+ }: {
+ url: string;
+ handler: (req: unknown) => Promise<{ secrets: { secretPath: string }[] }>;
+ }) => routes.set(url, handler),
+ services: {
+ folder: { getFoldersDeepByEnvs: vi.fn().mockResolvedValue(folders) },
+ secret: { getSecretsRawByFolderMappings },
+ dynamicSecret: { listDynamicSecretsByFolderIds },
+ secretRotationV2: { getQuickSearchSecretRotations },
+ auditLog: { createAuditLog: vi.fn() },
+ telemetry: { sendPostHogEvents: vi.fn() }
+ }
+ } as unknown as Parameters<typeof registerDashboardRouter>[0];
+ await registerDashboardRouter(server);
+ const result = await routes.get("/secrets-deep-search")!({
+ query: { projectId: "project", environments: "dev", secretPath: "/team", search: "KEY", limit: 25, offset: 0 },
+ permission: { orgId: "org" },
+ auth: { actor: "user", user: { username: "review-test" } },
+ auditLogInfo: {},
+ headers: {}
+ });
+
+ expect(result.secrets.map(({ secretPath }) => secretPath)).toEqual(allowedPath === "/team" ? ["/team"] : []);
+ const expectedMappings = [
+ { folderId: "team", path: "/team", environment: "dev" },
+ { folderId: "child", path: "/team/child", environment: "dev" }
+ ];
+ for (const method of [getSecretsRawByFolderMappings, listDynamicSecretsByFolderIds, getQuickSearchSecretRotations]) {
+ expect(method).toHaveBeenCalledWith(
+ expect.objectContaining({ folderMappings: expectedMappings }),
+ expect.anything()
+ );
+ }
+});
diff --git a/backend/src/server/routes/v1/project-router.ts b/backend/src/server/routes/v1/project-router.ts
index 5380d92087..3b6c3ce065 100644
--- a/backend/src/server/routes/v1/project-router.ts
+++ b/backend/src/server/routes/v1/project-router.ts
@@ -20,7 +20,7 @@ import {
} from "@app/ee/services/audit-log/audit-log-settings-schemas";
import { EventType } from "@app/ee/services/audit-log/audit-log-types";
import { InfisicalProjectTemplate } from "@app/ee/services/project-template/project-template-types";
-import { ApiDocsTags, AUDIT_LOG_SETTINGS, PROJECTS } from "@app/lib/api-docs";
+import { ApiDocsTags, AUDIT_LOG_SETTINGS, FOLDERS, PROJECTS } from "@app/lib/api-docs";
import { CharacterType, characterValidator } from "@app/lib/validator/validate-string";
import { re2Validator } from "@app/lib/zod";
import { JobState } from "@app/queue/queue-service";
@@ -1149,6 +1149,9 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
params: z.object({
projectId: z.string().trim()
}),
+ querystring: z.object({
+ environment: slugSchema({ field: "Environment slug" }).optional().describe(FOLDERS.LIST.environment)
+ }),
response: {
200: z.record(
ProjectEnvironmentsSchema.extend({ folders: SecretFoldersSchema.extend({ path: z.string() }).array() })
@@ -1159,7 +1162,8 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
handler: async (req) => {
const environmentsFolders = await server.services.folder.getProjectEnvironmentsFolders(
req.params.projectId,
- req.permission
+ req.permission,
+ req.query.environment
);
return environmentsFolders;
diff --git a/backend/src/services/resource-metadata/resource-metadata-dal.test.ts b/backend/src/services/resource-metadata/resource-metadata-dal.test.ts
new file mode 100644
index 0000000000..58deacd9f1
--- /dev/null
+++ b/backend/src/services/resource-metadata/resource-metadata-dal.test.ts
@@ -0,0 +1,76 @@
+import knex from "knex";
+import { vi } from "vitest";
+
+import { TDbClient } from "@app/db";
+
+import { resourceMetadataDALFactory } from "./resource-metadata-dal";
+import { SecretMetadataSearchLogicalOperator, SecretMetadataSearchOperator } from "./resource-metadata-types";
+
+describe("metadata candidate SQL scope", () => {
+ test.each(["searchSecretMetadata", "searchSecretMetadataWithEncryptedValues"] as const)(
+ "%s scopes root searches by project and environment without a folder ID list",
+ async (method) => {
+ const db = knex({ client: "pg" });
+ vi.spyOn(db.client, "acquireConnection").mockResolvedValue({});
+ vi.spyOn(db.client, "releaseConnection").mockResolvedValue(undefined);
+ const query = vi.spyOn(db.client, "query").mockImplementation(async (_connection, statement) => ({
+ ...(statement as object),
+ response: { rows: [], command: "SELECT" }
+ }));
+ await resourceMetadataDALFactory(db as TDbClient)[method](
+ {
+ orgId: "org",
+ projectId: "project",
+ filters: [{ key: "team", value: "platform", operator: SecretMetadataSearchOperator.Is }],
+ operator: SecretMetadataSearchLogicalOperator.And,
+ environments: ["dev"],
+ limit: 100
+ },
+ db
+ );
+ const statement = query.mock.calls[0][1] as { sql: string; bindings: unknown[] };
+ expect(statement.sql).toMatch(/"projectId" = \?.*"isReserved" = \?.*"slug" in \(\?\).*limit \?/);
+ expect(statement.sql).toMatch(/^with recursive "metadata_search_folders"/);
+ expect(statement.sql).toContain('"root"."parentId" is null');
+ expect(statement.sql).toContain('"child"."envId" = "metadata_search_folders"."envId"');
+ expect(statement.sql).toContain('"child"."isReserved" = ?');
+ expect(statement.sql).toContain('"folderId" in (select "id" from "metadata_search_folders")');
+ expect(statement.sql).toContain(" union ");
+ expect(statement.sql).not.toContain("union all");
+ expect(statement.sql).not.toMatch(/"folderId" in \(\?/);
+ expect(statement.bindings).toEqual(expect.arrayContaining(["org", "project", false, "dev", 100]));
+ await db.destroy();
+ }
+ );
+
+ test.each(["searchSecretMetadata", "searchSecretMetadataWithEncryptedValues"] as const)(
+ "%s constrains folders before the candidate limit",
+ async (method) => {
+ const db = knex({ client: "pg" });
+ vi.spyOn(db.client, "acquireConnection").mockResolvedValue({});
+ vi.spyOn(db.client, "releaseConnection").mockResolvedValue(undefined);
+ const query = vi.spyOn(db.client, "query").mockImplementation(async (_connection, statement) => ({
+ ...(statement as object),
+ response: { rows: [], command: "SELECT" }
+ }));
+ const dal = resourceMetadataDALFactory(db as TDbClient);
+ await dal[method](
+ {
+ orgId: "org",
+ projectId: "project",
+ filters: [{ key: "team", value: "platform", operator: SecretMetadataSearchOperator.Is }],
+ operator: SecretMetadataSearchLogicalOperator.And,
+ folderIds: ["parent", "child"],
+ tagSlugs: ["backend"],
+ limit: 100
+ },
+ db
+ );
+ const statement = query.mock.calls[0][1] as { sql: string; bindings: unknown[] };
+ expect(statement.sql).toMatch(/"folderId" in \(\?, \?\).*limit \?/);
+ expect(statement.bindings).toEqual(expect.arrayContaining(["org", "project", "parent", "child", "backend", 100]));
+ expect(statement.sql).not.toContain("encryptedSecretValue");
+ await db.destroy();
+ }
+ );
+});
diff --git a/backend/src/services/resource-metadata/resource-metadata-dal.ts b/backend/src/services/resource-metadata/resource-metadata-dal.ts
index 3a96857568..77d7490105 100644
--- a/backend/src/services/resource-metadata/resource-metadata-dal.ts
+++ b/backend/src/services/resource-metadata/resource-metadata-dal.ts
@@ -11,7 +11,7 @@ export type TResourceMetadataDALFactory = ReturnType<typeof resourceMetadataDALF
// defensive cap on the number of matched secrets scanned before permission filtering.
// full pagination is intentionally out of scope for now.
-const MAX_SECRET_METADATA_SEARCH_SECRETS = 100;
+export const MAX_SECRET_METADATA_SEARCH_SECRETS = 100;
export const resourceMetadataDALFactory = (db: TDbClient) => {
const orm = ormify(db, TableName.ResourceMetadata);
@@ -27,7 +27,14 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
});
};
- const buildScopedSecretMetadataQuery = (knex: Knex, orgId: string, projectId: string, tagSlugs?: string[]) => {
+ const buildScopedSecretMetadataQuery = (
+ knex: Knex,
+ orgId: string,
+ projectId: string,
+ tagSlugs?: string[],
+ folderIds?: string[],
+ environments?: string[]
+ ) => {
const query = knex(TableName.ResourceMetadata)
.join(TableName.SecretV2, `${TableName.SecretV2}.id`, `${TableName.ResourceMetadata}.secretId`)
.join(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.SecretV2}.folderId`)
@@ -40,6 +47,42 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
.whereNull(`${TableName.Project}.deleteAfter`)
.where(`${TableName.SecretV2}.type`, SecretType.Shared);
+ if (folderIds) {
+ void query.whereIn(`${TableName.SecretV2}.folderId`, folderIds);
+ } else {
+ void query
+ .withRecursive("metadata_search_folders", ["id", "envId"], (folders) => {
+ void folders
+ .select("root.id", "root.envId")
+ .from({ root: TableName.SecretFolder })
+ .join({ scope_env: TableName.Environment }, "scope_env.id", "root.envId")
+ .whereNull("root.parentId")
+ .where("scope_env.projectId", projectId)
+ .whereNull("scope_env.deleteAfter")
+ .modify((roots) => {
+ if (environments) void roots.whereIn("scope_env.slug", environments);
+ })
+ .union((children) => {
+ void children
+ .select("child.id", "child.envId")
+ .from({ child: TableName.SecretFolder })
+ .join("metadata_search_folders", (join) => {
+ join
+ .on("child.parentId", "metadata_search_folders.id")
+ .andOn("child.envId", "metadata_search_folders.envId");
+ })
+ .where("child.isReserved", false);
+ });
+ })
+ .whereIn(`${TableName.SecretV2}.folderId`, (subQuery) => {
+ void subQuery.select("id").from("metadata_search_folders");
+ });
+ }
+
+ if (environments) {
+ void query.whereIn(`${TableName.Environment}.slug`, environments);
+ }
+
// optional tag filter: keep only secrets carrying at least one of the requested tag slugs. A
// correlated existence check keeps the candidate rows 1:1 with the secret so the later
// distinct/limit stays correct (a leftJoin would multiply rows per tag).
@@ -131,6 +174,8 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
filters,
operator,
tagSlugs,
+ folderIds,
+ environments,
limit = MAX_SECRET_METADATA_SEARCH_SECRETS
}: TSearchSecretMetadataDALDTO,
tx?: Knex
@@ -139,7 +184,14 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
const knex = tx || db.replicaNode();
// step 1: resolve the bounded set of matching secret ids (scoping + tag filter enforced by the shared builder).
- const matchedSecretIdsQuery = buildScopedSecretMetadataQuery(knex, orgId, projectId, tagSlugs);
+ const matchedSecretIdsQuery = buildScopedSecretMetadataQuery(
+ knex,
+ orgId,
+ projectId,
+ tagSlugs,
+ folderIds,
+ environments
+ );
if (operator === SecretMetadataSearchLogicalOperator.And) {
// and: every condition must match a row of the secret. Drive the scan from the first condition
@@ -191,7 +243,15 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
// separate query so the common plaintext path stays untouched, and it returns early (no hydration) when
// a project has no encrypted metadata for the requested keys.
const searchSecretMetadataWithEncryptedValues = async (
- { orgId, projectId, filters, tagSlugs, limit = MAX_SECRET_METADATA_SEARCH_SECRETS }: TSearchSecretMetadataDALDTO,
+ {
+ orgId,
+ projectId,
+ filters,
+ tagSlugs,
+ folderIds,
+ environments,
+ limit = MAX_SECRET_METADATA_SEARCH_SECRETS
+ }: TSearchSecretMetadataDALDTO,
tx?: Knex
) => {
try {
@@ -200,7 +260,14 @@ export const resourceMetadataDALFactory = (db: TDbClient) => {
// step 1: bounded set of secrets holding at least one encrypted metadata row for a requested key
// — narrowed by the (orgId, key) partial index, and by the optional tag filter.
- const matchedSecretRows = await buildScopedSecretMetadataQuery(knex, orgId, projectId, tagSlugs)
+ const matchedSecretRows = await buildScopedSecretMetadataQuery(
+ knex,
+ orgId,
+ projectId,
+ tagSlugs,
+ folderIds,
+ environments
+ )
.whereNotNull(`${TableName.ResourceMetadata}.encryptedValue`)
.whereIn(`${TableName.ResourceMetadata}.key`, keys)
.distinct(`${TableName.ResourceMetadata}.secretId`)
diff --git a/backend/src/services/resource-metadata/resource-metadata-service.test.ts b/backend/src/services/resource-metadata/resource-metadata-service.test.ts
new file mode 100644
index 0000000000..3662407b60
--- /dev/null
+++ b/backend/src/services/resource-metadata/resource-metadata-service.test.ts
@@ -0,0 +1,202 @@
+import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
+import { Knex } from "knex";
+import { vi } from "vitest";
+
+import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
+import {
+ ProjectPermissionSecretActions as Actions,
+ ProjectPermissionSet,
+ ProjectPermissionSub
+} from "@app/ee/services/permission/project-permission";
+
+import { resourceMetadataServiceFactory } from "./resource-metadata-service";
+import {
+ SecretMetadataSearchLogicalOperator,
+ SecretMetadataSearchOperator,
+ TSearchSecretMetadataDTO
+} from "./resource-metadata-types";
+
+const dto = {
+ projectId: "project",
+ filters: [{ key: "team", value: "platform", operator: SecretMetadataSearchOperator.Is }],
+ operator: SecretMetadataSearchLogicalOperator.And,
+ actor: { type: "user", id: "user", orgId: "org" }
+} as TSearchSecretMetadataDTO;
+
+const candidate = (id: string, encrypted = false) => ({
+ secretId: id,
+ secretKey: "API_KEY",
+ folderId: "child",
+ tags: [{ id: "tag", slug: "backend" }],
+ metadata: [
+ { key: "team", value: encrypted ? null : "platform", encryptedValue: encrypted ? Buffer.from("cipher") : null }
+ ]
+});
+
+const setup = (
+ rules: RawRuleOf<MongoAbility<ProjectPermissionSet>>[] = [
+ { action: Actions.DescribeSecret, subject: ProjectPermissionSub.Secrets }
+ ]
+) => {
+ const db = vi.fn() as unknown as Knex;
+ const tx = {};
+ const getProjectPermission = vi.fn().mockResolvedValue({
+ permission: createMongoAbility<ProjectPermissionSet>(rules)
+ }) as unknown as TPermissionServiceFactory["getProjectPermission"];
+ const find = vi.fn().mockResolvedValue([{ slug: "dev" }, { slug: "prod" }]);
+ const findBySecretPathMultiEnv = vi.fn().mockResolvedValue([{ id: "parent" }]);
+ const findByEnvsDeep = vi.fn().mockResolvedValue([{ id: "parent" }, { id: "child" }]);
+ const findSecretPathByFolderIds = vi
+ .fn()
+ .mockResolvedValue([{ id: "child", path: "/app/nested", environmentSlug: "dev" }]);
+ const searchSecretMetadata = vi.fn().mockResolvedValue([]);
+ const searchSecretMetadataWithEncryptedValues = vi.fn().mockResolvedValue([]);
+ const createCipherPairWithDataKey = vi
+ .fn()
+ .mockResolvedValue({ decryptor: vi.fn().mockReturnValue(Buffer.from("unmatched")) });
+ const service = resourceMetadataServiceFactory({
+ db,
+ permissionService: { getProjectPermission },
+ projectEnvDAL: { find },
+ folderDAL: { findBySecretPathMultiEnv, findByEnvsDeep, findSecretPathByFolderIds },
+ resourceMetadataDAL: {
+ searchSecretMetadata,
+ searchSecretMetadataWithEncryptedValues,
+ transaction: async <T>(callback: (transaction: Knex) => Promise<T>) => callback(tx as Knex)
+ },
+ kmsService: { createCipherPairWithDataKey }
+ });
+ return {
+ service,
+ db,
+ tx,
+ find,
+ findBySecretPathMultiEnv,
+ findByEnvsDeep,
+ findSecretPathByFolderIds,
+ searchSecretMetadata,
+ searchSecretMetadataWithEncryptedValues,
+ createCipherPairWithDataKey
+ };
+};
+
+describe("metadata search scope and candidate limits", () => {
+ test.each([0, 99, 100])("does not disclose whether %s unauthorized candidates reach the cap", async (count) => {
+ const state = setup([]);
+ state.searchSecretMetadata.mockResolvedValue(Array.from({ length: count }, (_, index) => candidate(String(index))));
+ state.searchSecretMetadataWithEncryptedValues.mockResolvedValue(
+ Array.from({ length: count }, (_, index) => candidate(`encrypted-${index}`, true))
+ );
+ expect(await state.service.searchSecretMetadata(dto)).toEqual({ secrets: [], searchLimit: 100 });
+ });
+
+ test("resolves the recursive subtree before running both scoped candidate queries in the transaction", async () => {
+ const state = setup();
+ await state.service.searchSecretMetadata({ ...dto, environments: ["dev"], secretPath: "/app" });
+ expect(state.find).not.toHaveBeenCalled();
+ expect(state.findBySecretPathMultiEnv).toHaveBeenCalledWith("project", ["dev"], "/app", state.db);
+ expect(state.findByEnvsDeep).toHaveBeenCalledWith({ parentIds: ["parent"] }, state.db);
+ for (const search of [state.searchSecretMetadata, state.searchSecretMetadataWithEncryptedValues]) {
+ expect(search).toHaveBeenCalledWith(expect.objectContaining({ folderIds: ["parent", "child"] }), state.tx);
+ }
+ });
+
+ test.each([undefined, ["dev"]])("searches root scope %s without expanding a folder tree", async (environments) => {
+ const state = setup();
+ await state.service.searchSecretMetadata({ ...dto, environments });
+ expect(state.find).not.toHaveBeenCalled();
+ expect(state.findBySecretPathMultiEnv).not.toHaveBeenCalled();
+ expect(state.findByEnvsDeep).not.toHaveBeenCalled();
+ for (const search of [state.searchSecretMetadata, state.searchSecretMetadataWithEncryptedValues]) {
+ expect(search).toHaveBeenCalledWith(expect.objectContaining({ folderIds: undefined, environments }), state.tx);
+ }
+ });
+
+ test("searches all project environments and returns no matches for a missing non-root path", async () => {
+ const state = setup();
+ state.findBySecretPathMultiEnv.mockResolvedValue([]);
+ expect(await state.service.searchSecretMetadata({ ...dto, secretPath: "/missing" })).toEqual({
+ secrets: [],
+ searchLimit: 100
+ });
+ expect(state.find).toHaveBeenCalledWith({ projectId: "project" }, { tx: state.db });
+ expect(state.findBySecretPathMultiEnv).toHaveBeenCalledWith("project", ["dev", "prod"], "/missing", state.db);
+ expect(state.searchSecretMetadata).not.toHaveBeenCalled();
+ expect(state.searchSecretMetadataWithEncryptedValues).not.toHaveBeenCalled();
+ });
+
+ test("returns no matches when a non-root subtree disappears before expansion", async () => {
+ const state = setup();
+ state.findByEnvsDeep.mockResolvedValue([]);
+ expect(await state.service.searchSecretMetadata({ ...dto, secretPath: "/app" })).toEqual({
+ secrets: [],
+ searchLimit: 100
+ });
+ expect(state.searchSecretMetadata).not.toHaveBeenCalled();
+ expect(state.searchSecretMetadataWithEncryptedValues).not.toHaveBeenCalled();
+ });
+
+ test("preserves the cap signal when permissions hide every plaintext match", async () => {
+ const state = setup([]);
+ state.searchSecretMetadata.mockResolvedValue(Array.from({ length: 100 }, (_, index) => candidate(String(index))));
+ expect(await state.service.searchSecretMetadata(dto)).toEqual({
+ secrets: [],
+ searchLimit: 100
+ });
+ });
+
+ test("preserves the cap signal when encrypted candidates do not match", async () => {
+ const state = setup();
+ state.searchSecretMetadataWithEncryptedValues.mockResolvedValue(
+ Array.from({ length: 100 }, (_, index) => candidate(String(index), true))
+ );
+ expect(await state.service.searchSecretMetadata(dto)).toEqual({
+ secrets: [],
+ searchLimit: 100
+ });
+ });
+
+ test.each([Actions.ReadValue, Actions.DescribeAndReadValue])(
+ "returns tags and permits value access using %s with path, name, environment and tag conditions",
+ async (action) => {
+ const state = setup([
+ { action: Actions.DescribeSecret, subject: ProjectPermissionSub.Secrets },
+ {
+ action,
+ subject: ProjectPermissionSub.Secrets,
+ conditions: {
+ environment: "dev",
+ secretPath: "/app/nested",
+ secretName: "API_KEY",
+ secretTags: { $in: ["backend"] }
+ }
+ }
+ ]);
+ state.searchSecretMetadata.mockResolvedValue([candidate("secret")]);
+ const result = await state.service.searchSecretMetadata(dto);
+ expect(state.findSecretPathByFolderIds).toHaveBeenCalledWith("project", ["child"], state.db);
+ expect(result.searchLimit).toBe(100);
+ expect(result.secrets).toEqual([
+ expect.objectContaining({ tags: [{ id: "tag", slug: "backend" }], secretValueHidden: false })
+ ]);
+ expect(state.createCipherPairWithDataKey).not.toHaveBeenCalled();
+ }
+ );
+
+ test("keeps values hidden without a matching read-value permission and filters non-describable secrets", async () => {
+ const state = setup([
+ {
+ action: Actions.DescribeSecret,
+ subject: ProjectPermissionSub.Secrets,
+ conditions: { secretName: "API_KEY", secretTags: { $in: ["backend"] } }
+ },
+ { action: Actions.ReadValue, subject: ProjectPermissionSub.Secrets, conditions: { environment: "prod" } }
+ ]);
+ state.searchSecretMetadata.mockResolvedValue([
+ candidate("allowed"),
+ { ...candidate("denied"), secretKey: "OTHER_KEY" }
+ ]);
+ const result = await state.service.searchSecretMetadata(dto);
+ expect(result.secrets).toEqual([expect.objectContaining({ secretId: "allowed", secretValueHidden: true })]);
+ });
+});
diff --git a/backend/src/services/resource-metadata/resource-metadata-service.ts b/backend/src/services/resource-metadata/resource-metadata-service.ts
index 30c64ee600..1e8974f814 100644
--- a/backend/src/services/resource-metadata/resource-metadata-service.ts
+++ b/backend/src/services/resource-metadata/resource-metadata-service.ts
@@ -1,3 +1,4 @@
+import { TDbClient } from "@app/db";
import { ActionProjectType } from "@app/db/schemas";
import { hasSecretReadValueOrDescribePermission } from "@app/ee/services/permission/permission-fns";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
@@ -6,19 +7,22 @@ import { BadRequestError } from "@app/lib/errors";
import { logger } from "@app/lib/logger";
import { TKmsServiceFactory } from "@app/services/kms/kms-service";
import { KmsDataKey } from "@app/services/kms/kms-types";
+import { TProjectEnvDALFactory } from "@app/services/project-env/project-env-dal";
import { TSecretFolderDALFactory } from "@app/services/secret-folder/secret-folder-dal";
-import { TResourceMetadataDALFactory } from "./resource-metadata-dal";
+import { MAX_SECRET_METADATA_SEARCH_SECRETS, TResourceMetadataDALFactory } from "./resource-metadata-dal";
import { dedupeMetadata, matchesSecretMetadataFilters } from "./resource-metadata-fns";
import { TResolvedSecretMetadata, TSearchSecretMetadataDTO } from "./resource-metadata-types";
type TResourceMetadataServiceFactoryDep = {
+ db: TDbClient;
resourceMetadataDAL: Pick<
TResourceMetadataDALFactory,
"searchSecretMetadata" | "searchSecretMetadataWithEncryptedValues" | "transaction"
>;
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
- folderDAL: Pick<TSecretFolderDALFactory, "findSecretPathByFolderIds">;
+ folderDAL: Pick<TSecretFolderDALFactory, "findSecretPathByFolderIds" | "findBySecretPathMultiEnv" | "findByEnvsDeep">;
+ projectEnvDAL: Pick<TProjectEnvDALFactory, "find">;
kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
};
@@ -35,15 +39,25 @@ type TMatchedSecret = {
};
export const resourceMetadataServiceFactory = ({
+ db,
resourceMetadataDAL,
permissionService,
folderDAL,
+ projectEnvDAL,
kmsService
}: TResourceMetadataServiceFactoryDep) => {
// Project-scoped secret metadata search. The base query matches on org + project + key/value; the
// results are then filtered so the requester actually has DescribeSecret permission on each returned
// secret (path/tag aware). Requesting a project the actor cannot access throws (via getProjectPermission).
- const searchSecretMetadata = async ({ projectId, filters, operator, tagSlugs, actor }: TSearchSecretMetadataDTO) => {
+ const searchSecretMetadata = async ({
+ projectId,
+ filters,
+ operator,
+ tagSlugs,
+ environments,
+ secretPath = "/",
+ actor
+ }: TSearchSecretMetadataDTO) => {
if (!filters.length) {
throw new BadRequestError({ message: "At least one metadata filter is required" });
}
@@ -57,16 +71,28 @@ export const resourceMetadataServiceFactory = ({
actionProjectType: ActionProjectType.SecretManager
});
+ const searchLimit = MAX_SECRET_METADATA_SEARCH_SECRETS;
+ let scopedFolderIds: string[] | undefined;
+ if (secretPath !== "/") {
+ const environmentSlugs =
+ environments ?? (await projectEnvDAL.find({ projectId }, { tx: db })).map((env) => env.slug);
+ const parents = await folderDAL.findBySecretPathMultiEnv(projectId, environmentSlugs, secretPath, db);
+ if (!parents.length) return { secrets: [], searchLimit };
+ const scopedFolders = await folderDAL.findByEnvsDeep({ parentIds: parents.map((folder) => folder.id) }, db);
+ scopedFolderIds = scopedFolders.map((folder) => folder.id);
+ if (!scopedFolderIds.length) return { secrets: [], searchLimit };
+ }
+
// run both searches on primary via a transaction so recently written metadata is visible (avoids
// replica lag). Plaintext values are matched in SQL; encrypted values can't be (non-deterministic
// ciphertext), so their candidates are fetched by key and matched in-app after decryption below.
const { plaintextMatched, encryptedCandidates } = await resourceMetadataDAL.transaction(async (tx) => {
const plaintext = await resourceMetadataDAL.searchSecretMetadata(
- { orgId: actor.orgId, projectId, filters, operator, tagSlugs },
+ { orgId: actor.orgId, projectId, filters, operator, tagSlugs, folderIds: scopedFolderIds, environments },
tx
);
const encrypted = await resourceMetadataDAL.searchSecretMetadataWithEncryptedValues(
- { orgId: actor.orgId, projectId, filters, operator, tagSlugs },
+ { orgId: actor.orgId, projectId, filters, operator, tagSlugs, folderIds: scopedFolderIds, environments },
tx
);
return { plaintextMatched: plaintext, encryptedCandidates: encrypted };
@@ -129,10 +155,10 @@ export const resourceMetadataServiceFactory = ({
}
const matchedSecrets = [...matchedSecretById.values()];
- if (!matchedSecrets.length) return { secrets: [] };
+ if (!matchedSecrets.length) return { secrets: [], searchLimit };
const folderIds = [...new Set(matchedSecrets.map((secret) => secret.folderId))];
- const foldersWithPath = await folderDAL.findSecretPathByFolderIds(projectId, folderIds);
+ const foldersWithPath = await folderDAL.findSecretPathByFolderIds(projectId, folderIds, db);
const folderPathById: Record<string, { path: string; environmentSlug: string }> = {};
foldersWithPath.forEach((folder) => {
if (folder) folderPathById[folder.id] = { path: folder.path, environmentSlug: folder.environmentSlug };
@@ -161,12 +187,23 @@ export const resourceMetadataServiceFactory = ({
secretKey: secret.secretKey,
environment: folder.environmentSlug,
secretPath: folder.path,
+ tags: secret.tags,
+ secretValueHidden: !hasSecretReadValueOrDescribePermission(
+ permission,
+ ProjectPermissionSecretActions.ReadValue,
+ {
+ environment: folder.environmentSlug,
+ secretPath: folder.path,
+ secretName: secret.secretKey,
+ secretTags: secret.tags.map((tag) => tag.slug)
+ }
+ ),
metadata: dedupeMetadata(secret.metadata)
}
];
});
- return { secrets };
+ return { secrets, searchLimit };
};
return { searchSecretMetadata };
diff --git a/backend/src/services/resource-metadata/resource-metadata-types.ts b/backend/src/services/resource-metadata/resource-metadata-types.ts
index fab4695317..f6a87614d6 100644
--- a/backend/src/services/resource-metadata/resource-metadata-types.ts
+++ b/backend/src/services/resource-metadata/resource-metadata-types.ts
@@ -28,6 +28,8 @@ export type TSearchSecretMetadataDALDTO = {
filters: TSecretMetadataSearchFilter[];
operator: SecretMetadataSearchLogicalOperator;
tagSlugs?: string[];
+ folderIds?: string[];
+ environments?: string[];
limit?: number;
};
@@ -37,5 +39,7 @@ export type TSearchSecretMetadataDTO = {
filters: TSecretMetadataSearchFilter[];
operator: SecretMetadataSearchLogicalOperator;
tagSlugs?: string[];
+ environments?: string[];
+ secretPath?: string;
actor: OrgServiceActor;
};
diff --git a/backend/src/services/secret-folder/secret-folder-service.ts b/backend/src/services/secret-folder/secret-folder-service.ts
index 677e50cc4e..98df639c02 100644
--- a/backend/src/services/secret-folder/secret-folder-service.ts
+++ b/backend/src/services/secret-folder/secret-folder-service.ts
@@ -1100,7 +1100,7 @@ export const secretFolderServiceFactory = ({
}));
};
- const getProjectEnvironmentsFolders = async (projectId: string, actor: OrgServiceActor) => {
+ const getProjectEnvironmentsFolders = async (projectId: string, actor: OrgServiceActor, environment?: string) => {
// folder list is allowed to be read by anyone
// permission is to check if user has access
await permissionService.getProjectPermission({
@@ -1112,7 +1112,7 @@ export const secretFolderServiceFactory = ({
actionProjectType: ActionProjectType.SecretManager
});
- const environments = await projectEnvDAL.find({ projectId });
+ const environments = await projectEnvDAL.find({ projectId, ...(environment && { slug: environment }) });
const folders = await folderDAL.find({
$in: {
diff --git a/frontend/src/hooks/api/dashboard/queries.tsx b/frontend/src/hooks/api/dashboard/queries.tsx
index cf332476a5..b8939fc2c1 100644
--- a/frontend/src/hooks/api/dashboard/queries.tsx
+++ b/frontend/src/hooks/api/dashboard/queries.tsx
@@ -546,6 +546,8 @@ export const useGetProjectSecretsQuickSearch = (
export const fetchSearchSecretsByMetadata = async ({
projectId,
+ environments,
+ secretPath,
operator,
filters,
tags
@@ -554,6 +556,8 @@ export const fetchSearchSecretsByMetadata = async ({
// raw querystring, so build it explicitly rather than relying on axios' default array serialization.
const params = new URLSearchParams();
params.append("projectId", projectId);
+ if (environments?.length) params.append("environments", environments.join(","));
+ if (secretPath) params.append("secretPath", secretPath);
params.append("operator", operator);
filters.forEach((filter, index) => {
params.append(`filters[${index}][key]`, filter.key);
@@ -575,7 +579,7 @@ export const fetchSearchSecretsByMetadata = async ({
};
export const useSearchSecretsByMetadata = (
- { projectId, operator, filters, tags }: TSearchSecretsByMetadataDTO,
+ { projectId, operator, filters, tags, environments, secretPath }: TSearchSecretsByMetadataDTO,
options?: Omit<
UseQueryOptions<
TSearchSecretsByMetadataResponse,
@@ -589,8 +593,23 @@ export const useSearchSecretsByMetadata = (
return useQuery({
...options,
enabled: (options?.enabled ?? true) && filters.length > 0 && Boolean(projectId),
- queryKey: dashboardKeys.searchSecretsByMetadata({ projectId, operator, filters, tags }),
- queryFn: () => fetchSearchSecretsByMetadata({ projectId, operator, filters, tags }),
+ queryKey: dashboardKeys.searchSecretsByMetadata({
+ projectId,
+ operator,
+ filters,
+ tags,
+ environments,
+ secretPath
+ }),
+ queryFn: () =>
+ fetchSearchSecretsByMetadata({
+ projectId,
+ operator,
+ filters,
+ tags,
+ environments,
+ secretPath
+ }),
placeholderData: (previousData) => previousData
});
};
diff --git a/frontend/src/hooks/api/dashboard/types.ts b/frontend/src/hooks/api/dashboard/types.ts
index fb331eedf2..b2d5a3452f 100644
--- a/frontend/src/hooks/api/dashboard/types.ts
+++ b/frontend/src/hooks/api/dashboard/types.ts
@@ -215,6 +215,8 @@ export type TSecretMetadataSearchFilter = {
export type TSearchSecretsByMetadataDTO = {
projectId: string;
+ environments?: string[];
+ secretPath?: string;
operator: SecretMetadataSearchLogicalOperator;
filters: TSecretMetadataSearchFilter[];
tags: Record<string, boolean>;
@@ -226,10 +228,13 @@ export type TMetadataMatchedSecret = {
environment: string;
secretPath: string;
metadata: { key: string; value: string | null }[];
+ tags: { id: string; slug: string }[];
+ secretValueHidden: boolean;
};
export type TSearchSecretsByMetadataResponse = {
secrets: TMetadataMatchedSecret[];
+ searchLimit: number;
};
export type TGetDashboardProjectSecretsByKeys = {
diff --git a/frontend/src/hooks/api/secretFolders/queries.tsx b/frontend/src/hooks/api/secretFolders/queries.tsx
index fd358a8663..f0cd3bae1c 100644
--- a/frontend/src/hooks/api/secretFolders/queries.tsx
+++ b/frontend/src/hooks/api/secretFolders/queries.tsx
@@ -29,7 +29,9 @@ export const folderQueryKeys = {
getSecretFolders: ({ projectId, environment, path }: TGetProjectFoldersDTO) =>
["secret-folders", { projectId, environment, path }] as const,
getProjectEnvironmentsFolders: (projectId: string) =>
- ["secret-folders", "environment", projectId] as const
+ ["secret-folders", "environment", projectId] as const,
+ getProjectEnvironmentFolders: (projectId: string, environment: string) =>
+ [...folderQueryKeys.getProjectEnvironmentsFolders(projectId), environment] as const
};
const fetchProjectFolders = async (projectId: string, environment: string, path = "/") => {
@@ -45,21 +47,28 @@ const fetchProjectFolders = async (projectId: string, environment: string, path
export const useListProjectEnvironmentsFolders = (
projectId: string,
- options?: Omit<
+ {
+ environment,
+ ...options
+ }: Omit<
UseQueryOptions<
TProjectEnvironmentsFolders,
unknown,
TProjectEnvironmentsFolders,
- ReturnType<typeof folderQueryKeys.getProjectEnvironmentsFolders>
+ | ReturnType<typeof folderQueryKeys.getProjectEnvironmentsFolders>
+ | ReturnType<typeof folderQueryKeys.getProjectEnvironmentFolders>
>,
"queryKey" | "queryFn"
- >
+ > & { environment?: string } = {}
) =>
useQuery({
- queryKey: folderQueryKeys.getProjectEnvironmentsFolders(projectId),
+ queryKey: environment
+ ? folderQueryKeys.getProjectEnvironmentFolders(projectId, environment)
+ : folderQueryKeys.getProjectEnvironmentsFolders(projectId),
queryFn: async () => {
const { data } = await apiRequest.get<TProjectEnvironmentsFolders>(
- `/api/v1/projects/${projectId}/environment-folder-tree`
+ `/api/v1/projects/${projectId}/environment-folder-tree`,
+ { params: { environment } }
);
return data;
},
diff --git a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
index f2150a55aa..f8e24ad621 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
@@ -281,7 +281,8 @@ import {
SecretRotationTableRow,
SecretSyncStatusBadgeOverview,
SecretTableRow,
- TableEmptyRow
+ TableEmptyRow,
+ TableFilteredEmptyRow
} from "./components";
export enum EntryType {
@@ -407,6 +408,7 @@ const OverviewPageContent = () => {
const isProjectV3 = currentProject?.version === ProjectVersion.V3;
const projectSlug = currentProject?.slug as string;
const [searchFilter, setSearchFilter] = useState("");
+ const [isSearchAllFoldersOpen, setIsSearchAllFoldersOpen] = useState(false);
const secretPath = (routerSearch?.secretPath as string) || "/";
const { subscription } = useSubscription();
const { mutateAsync: importVaultSecrets } = useImportVaultSecrets();
@@ -2852,6 +2854,7 @@ const OverviewPageContent = () => {
}
return "table" as const;
})();
+ const isTableVisible = tableView !== "no-environments";
let quickAddSaveLabel: string | undefined;
if (isBatchModeActive) quickAddSaveLabel = "Add Pending Change";
@@ -3036,6 +3039,8 @@ const OverviewPageContent = () => {
tags={tags}
onChange={setSearchFilter}
onSelectResult={({ search }) => setSearchFilter(search)}
+ isSearchAllFoldersOpen={isSearchAllFoldersOpen}
+ onSearchAllFoldersOpenChange={setIsSearchAllFoldersOpen}
environments={userAvailableEnvs}
projectId={currentProject?.id}
/>
@@ -3145,7 +3150,7 @@ const OverviewPageContent = () => {
<div
className={twMerge(
"flex h-10 min-w-0 items-center border border-border bg-container-hover whitespace-nowrap",
- tableView === "table" ? "rounded-t-md border-b-0" : "mb-3 rounded-md"
+ isTableVisible ? "rounded-t-md border-b-0" : "mb-3 rounded-md"
)}
>
<FolderBreadcrumb secretPath={secretPath} />
@@ -3172,11 +3177,7 @@ const OverviewPageContent = () => {
}}
/>
)}
- {tableView === "tag-filter-empty" && <EmptyResourceDisplay isFiltered />}
- {tableView === "filter-empty" && (
- <EmptyResourceDisplay isFiltered={isTableFiltered || Boolean(searchFilter)} />
- )}
- {tableView === "table" && (
+ {isTableVisible && (
<>
<DragDropProvider onDragEnd={handleSecretImportReorder}>
<Table
@@ -3528,6 +3529,18 @@ const OverviewPageContent = () => {
"[&>tr>td>*:not([data-table-row-filter-contents])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:filter-[opacity(40%)]"
)}
>
+ {tableView !== "table" && (
+ <TableFilteredEmptyRow
+ colSpan={visibleEnvs.length + 2}
+ isFiltered={
+ tableView === "tag-filter-empty" ||
+ isTableFiltered ||
+ Boolean(searchFilter.trim())
+ }
+ hasSearch={Boolean(searchFilter.trim())}
+ onSearchAllFolders={() => setIsSearchAllFoldersOpen(true)}
+ />
+ )}
{showOverviewSkeleton ? (
Array.from({ length: prevPageSize.current || perPage }).map((_, index) => (
<TableRow className="group" key={`loading-row-${index + 1}`}>
@@ -3802,21 +3815,24 @@ const OverviewPageContent = () => {
onActivityChange={handleTableRowActivityChange}
/>
))}
- <SecretNoAccessTableRow
- environments={visibleEnvs}
- count={Math.max(
- (page * perPage > totalCount ? totalCount % perPage : perPage) -
- (totalUniqueFoldersInPage || 0) -
- (totalUniqueDynamicSecretsInPage || 0) -
- (totalUniqueSecretsInPage || 0) -
- (totalUniqueSecretImportsInPage || 0) -
- (totalUniqueSecretRotationsInPage || 0) -
- (totalUniqueHoneyTokensInPage || 0) -
- (totalUniqueProxiedServicesInPage || 0),
- 0
- )}
- />
+ {tableView === "table" && (
+ <SecretNoAccessTableRow
+ environments={visibleEnvs}
+ count={Math.max(
+ (page * perPage > totalCount ? totalCount % perPage : perPage) -
+ (totalUniqueFoldersInPage || 0) -
+ (totalUniqueDynamicSecretsInPage || 0) -
+ (totalUniqueSecretsInPage || 0) -
+ (totalUniqueSecretImportsInPage || 0) -
+ (totalUniqueSecretRotationsInPage || 0) -
+ (totalUniqueHoneyTokensInPage || 0) -
+ (totalUniqueProxiedServicesInPage || 0),
+ 0
+ )}
+ />
+ )}
{visibleEnvs.length > 0 &&
+ tableView === "table" &&
canCreateSecretsInAllVisibleEnvs &&
isLastPage &&
!isTableEmpty && (
@@ -3851,7 +3867,7 @@ const OverviewPageContent = () => {
secretPath={secretPath}
/>
)}
- {isTableEmpty && (
+ {tableView === "table" && isTableEmpty && (
<TableEmptyRow
colSpan={visibleEnvs.length + 2}
onImportSecrets={(step) => {
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/EmptyResourceDisplay/EmptyResourceDisplay.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/EmptyResourceDisplay/EmptyResourceDisplay.tsx
index 8b359918c7..8dad682837 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/EmptyResourceDisplay/EmptyResourceDisplay.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/EmptyResourceDisplay/EmptyResourceDisplay.tsx
@@ -1,4 +1,4 @@
-import { FolderPlusIcon, LayersIcon, PlusIcon, SearchIcon } from "lucide-react";
+import { FolderPlusIcon, GlobeIcon, LayersIcon, PlusIcon, SearchIcon } from "lucide-react";
import { ProjectPermissionCan } from "@app/components/permissions";
import {
@@ -16,9 +16,19 @@ type Props = {
isFiltered?: boolean;
variant?: "secrets" | "no-environments";
onAddEnvironment?: () => void;
+ hasSearch?: boolean;
+ onSearchAllFolders?: () => void;
+ isTableRow?: boolean;
};
-export function EmptyResourceDisplay({ isFiltered, variant = "secrets", onAddEnvironment }: Props) {
+export function EmptyResourceDisplay({
+ isFiltered,
+ variant = "secrets",
+ onAddEnvironment,
+ hasSearch,
+ onSearchAllFolders,
+ isTableRow
+}: Props) {
if (variant === "no-environments") {
return (
<Empty className="border">
@@ -49,23 +59,35 @@ export function EmptyResourceDisplay({ isFiltered, variant = "secrets", onAddEnv
);
}
- const { title, description } = isFiltered
- ? {
- title: "No resources match your search",
- description: "Adjust your search and try again"
- }
- : {
- title: "This project doesn't have any secrets",
- description: "Add some secrets to get started"
- };
+ let title = "This project doesn't have any secrets";
+ let description = "Add some secrets to get started";
+
+ if (isFiltered && hasSearch) {
+ title = "No matches in this folder";
+ description = "Try another search, or look across every folder in this project.";
+ } else if (isFiltered) {
+ title = "No resources match these filters";
+ description = "Adjust or clear your filters and try again.";
+ }
return (
- <Empty className="border">
+ <Empty
+ variant={isTableRow ? "unstyled" : "default"}
+ className={isTableRow ? "h-full" : "border"}
+ >
<EmptyHeader>
<EmptyMedia variant="icon">{isFiltered ? <SearchIcon /> : <FolderPlusIcon />}</EmptyMedia>
<EmptyTitle>{title}</EmptyTitle>
<EmptyDescription>{description}</EmptyDescription>
</EmptyHeader>
+ {hasSearch && onSearchAllFolders && (
+ <EmptyContent>
+ <Button variant="outline" size="xs" onClick={onSearchAllFolders}>
+ <GlobeIcon />
+ Search All Folders
+ </Button>
+ </EmptyContent>
+ )}
</Empty>
);
}
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/ResourceSearchInput/ResourceSearchInput.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/ResourceSearchInput/ResourceSearchInput.tsx
index 7103b0ff70..d08e1da5b7 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/ResourceSearchInput/ResourceSearchInput.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/ResourceSearchInput/ResourceSearchInput.tsx
@@ -20,6 +20,8 @@ type Props = Omit<QuickSearchModalProps, "isOpen" | "onClose" | "onOpenChange" |
value: string;
onChange: (search: string) => void;
className?: string;
+ isSearchAllFoldersOpen?: boolean;
+ onSearchAllFoldersOpenChange?: (isOpen: boolean) => void;
};
export const ResourceSearchInput = ({
@@ -27,9 +29,11 @@ export const ResourceSearchInput = ({
onChange,
className,
isSingleEnv,
+ isSearchAllFoldersOpen,
+ onSearchAllFoldersOpenChange,
...props
}: Props) => {
- const [isOpen, setIsOpen] = useState(false);
+ const [isInternalOpen, setIsInternalOpen] = useState(false);
const [isFocused, setIsFocused] = useState(false);
const [isOptionHighlighted, setIsOptionHighlighted] = useState(false);
const deepSearchBtnRef = useRef<HTMLButtonElement>(null);
@@ -70,6 +74,11 @@ export const ResourceSearchInput = ({
};
const hasSearch = Boolean(inputValue.trim());
+ const isOpen = isSearchAllFoldersOpen ?? isInternalOpen;
+ const handleOpenChange = (open: boolean) => {
+ if (isSearchAllFoldersOpen === undefined) setIsInternalOpen(open);
+ onSearchAllFoldersOpenChange?.(open);
+ };
return (
<>
@@ -112,7 +121,7 @@ export const ResourceSearchInput = ({
setIsOptionHighlighted(true);
} else if (e.key === "Enter" && isOptionHighlighted) {
e.preventDefault();
- setIsOpen(true);
+ handleOpenChange(true);
setIsFocused(false);
setIsOptionHighlighted(false);
} else if (e.key === "Escape") {
@@ -160,7 +169,7 @@ export const ResourceSearchInput = ({
}
}}
onClick={() => {
- setIsOpen(true);
+ handleOpenChange(true);
setIsFocused(false);
setIsOptionHighlighted(false);
}}
@@ -175,10 +184,10 @@ export const ResourceSearchInput = ({
<QuickSearchModal
isSingleEnv={isSingleEnv}
isOpen={isOpen}
- onOpenChange={setIsOpen}
+ onOpenChange={handleOpenChange}
initialValue={inputValue}
onClose={(clearSearch = true) => {
- setIsOpen(false);
+ handleOpenChange(false);
if (clearSearch) handleClear();
}}
{...props}
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
index 7c05d916df..48d354dba6 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
@@ -54,6 +54,7 @@ export const QuickSearchDynamicSecretItem = ({
<TooltipContent className="max-w-lg">{dynamicSecret.path}</TooltipContent>
</Tooltip>
</TableCell>
+ <TableCell className="text-muted">—</TableCell>
<TableCell className="text-right">
<ChevronRightIcon className="ml-auto size-4 text-muted" />
</TableCell>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchEnvTable.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchEnvTable.tsx
index 992cac1855..ab4fb7b0d8 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchEnvTable.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchEnvTable.tsx
@@ -4,21 +4,20 @@ import { Table, TableBody, TableHead, TableHeader, TableRow } from "@app/compone
type Props = {
envName: string;
- // trailing header cell; defaults to the empty actions column used by the deep-search results
- trailingHead?: ReactNode;
children: ReactNode;
};
-export const QuickSearchEnvTable = ({ envName, trailingHead, children }: Props) => (
+export const QuickSearchEnvTable = ({ envName, children }: Props) => (
<div>
<h3 className="mb-2 text-sm font-normal text-foreground">{envName}</h3>
- <Table>
+ <Table className="[&_td:first-child]:w-10 [&_td:first-child]:max-w-10 [&_td:first-child]:min-w-10 [&_td:first-child]:px-2 [&_th:first-child]:w-10 [&_th:first-child]:max-w-10 [&_th:first-child]:min-w-10 [&_th:first-child]:px-2">
<TableHeader>
<TableRow>
<TableHead className="w-8" />
- <TableHead>Name</TableHead>
- <TableHead>Location</TableHead>
- {trailingHead ?? <TableHead className="w-24" />}
+ <TableHead className="min-w-60">Name</TableHead>
+ <TableHead className="min-w-36">Location</TableHead>
+ <TableHead className="min-w-56">Metadata</TableHead>
+ <TableHead className="w-24" />
</TableRow>
</TableHeader>
<TableBody>{children}</TableBody>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
index 229d6e80ae..ad251bda57 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
@@ -49,6 +49,7 @@ export const QuickSearchFolderItem = ({ folder, envSlug, onClose, onSelectResult
<TooltipContent className="max-w-lg">{folder.path}</TooltipContent>
</Tooltip>
</TableCell>
+ <TableCell className="text-muted">—</TableCell>
<TableCell className="text-right">
<ChevronRightIcon className="ml-auto size-4 text-muted" />
</TableCell>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderPicker.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderPicker.tsx
new file mode 100644
index 0000000000..b769672f3f
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderPicker.tsx
@@ -0,0 +1,58 @@
+import { useMemo } from "react";
+import { CheckIcon, FolderIcon } from "lucide-react";
+
+import { Combobox, InputGroup, InputGroupAddon } from "@app/components/v3";
+import { useListProjectEnvironmentsFolders } from "@app/hooks/api/secretFolders/queries";
+
+type Props = {
+ projectId: string;
+ environment?: string;
+ value: string;
+ onChange: (path: string) => void;
+};
+
+export const QuickSearchFolderPicker = ({ projectId, environment, value, onChange }: Props) => {
+ const { data, isPending, isError } = useListProjectEnvironmentsFolders(projectId, {
+ environment,
+ enabled: Boolean(projectId && environment)
+ });
+ const options = useMemo(
+ () =>
+ [...new Set((data?.[environment ?? ""]?.folders ?? []).map(({ path }) => path))]
+ .filter((path) => path !== "/")
+ .sort((left, right) => left.localeCompare(right)),
+ [data, environment]
+ );
+
+ return (
+ <InputGroup data-disabled={!environment || undefined}>
+ <InputGroupAddon align="inline-start" className="pr-0 [&>svg]:text-folder">
+ <FolderIcon aria-hidden="true" />
+ </InputGroupAddon>
+ <Combobox
+ id="quick-search-folder-path"
+ variant="input-group"
+ modal
+ options={options}
+ value={value === "/" ? null : value}
+ onValueChange={(path) => onChange(path ?? "/")}
+ onClear={() => onChange("/")}
+ isDisabled={!environment}
+ isLoading={Boolean(environment && isPending)}
+ placeholder="All folders"
+ searchPlaceholder="Search folders..."
+ searchAriaLabel="Search folders"
+ clearAriaLabel="Search all folders"
+ emptyMessage={isError ? "Could not load folders." : "No folders found."}
+ loadingMessage="Loading folders..."
+ getOptionValue={(path) => path}
+ getOptionLabel={(path) => path}
+ renderOption={(path) => <span className="truncate font-mono text-xs">{path}</span>}
+ renderOptionIndicator={(_, { isSelected }) =>
+ isSelected ? <CheckIcon className="size-4" /> : null
+ }
+ aria-describedby="quick-search-folder-help"
+ />
+ </InputGroup>
+ );
+};
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataList.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataList.tsx
new file mode 100644
index 0000000000..94f54ee69f
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataList.tsx
@@ -0,0 +1,58 @@
+import { FilterIcon } from "lucide-react";
+
+import { Badge, Button, HoverCard, HoverCardContent, HoverCardTrigger } from "@app/components/v3";
+
+export type QuickSearchMetadata = { key: string; value: string | null };
+
+type Props = {
+ metadata?: QuickSearchMetadata[];
+ onApplyFilter: (metadata: QuickSearchMetadata) => void;
+};
+
+export const QuickSearchMetadataList = ({ metadata = [], onApplyFilter }: Props) => {
+ if (metadata.length === 0) return <span className="text-muted">—</span>;
+
+ return (
+ <div className="flex flex-wrap items-center gap-1.5">
+ {metadata.map((entry) => (
+ <HoverCard key={`${entry.key}-${entry.value ?? ""}`} openDelay={200} closeDelay={150}>
+ <HoverCardTrigger asChild>
+ <Badge
+ variant="outline"
+ tabIndex={0}
+ aria-label={`${entry.key}: ${entry.value || "empty"}`}
+ className="cursor-default gap-1.5 border-border font-mono font-normal"
+ >
+ <span className="text-muted">{entry.key}</span>
+ <span className="text-foreground">{entry.value || "—"}</span>
+ </Badge>
+ </HoverCardTrigger>
+ <HoverCardContent
+ align="start"
+ className="w-56"
+ onClick={(event) => event.stopPropagation()}
+ >
+ <div className="flex flex-col gap-2.5">
+ <div className="min-w-0 font-mono text-xs">
+ <p className="break-all text-muted">{entry.key}</p>
+ <p className="break-all text-foreground">{entry.value || "—"}</p>
+ </div>
+ <Button
+ variant="outline"
+ size="xs"
+ isDisabled={!entry.value}
+ onClick={(event) => {
+ event.stopPropagation();
+ onApplyFilter(entry);
+ }}
+ >
+ <FilterIcon />
+ Apply Filter
+ </Button>
+ </div>
+ </HoverCardContent>
+ </HoverCard>
+ ))}
+ </div>
+ );
+};
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataSecretItem.tsx
index 6d1baa9046..56ecad71a8 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchMetadataSecretItem.tsx
@@ -1,16 +1,12 @@
import { useNavigate } from "@tanstack/react-router";
import { ChevronRightIcon, KeyIcon } from "lucide-react";
-import {
- Badge,
- TableCell,
- TableRow,
- Tooltip,
- TooltipContent,
- TooltipTrigger
-} from "@app/components/v3";
+import { TableCell, TableRow, Tooltip, TooltipContent, TooltipTrigger } from "@app/components/v3";
import { TMetadataMatchedSecret } from "@app/hooks/api/dashboard/types";
+import { QuickSearchMetadata, QuickSearchMetadataList } from "./QuickSearchMetadataList";
+import { QuickSearchSecretCopyButton } from "./QuickSearchSecretCopyButton";
+import { QuickSearchSecretDetails } from "./QuickSearchSecretDetails";
import { QuickSearchSelection } from "./quickSearchTypes";
type Props = {
@@ -18,15 +14,15 @@ type Props = {
envSlug: string;
onClose: (clearSearch?: boolean) => void;
onSelectResult: (selection: QuickSearchSelection) => void;
+ onApplyMetadataFilter: (metadata: QuickSearchMetadata) => void;
};
-const MAX_VISIBLE_BADGES = 3;
-
export const QuickSearchMetadataSecretItem = ({
secret,
envSlug,
onClose,
- onSelectResult
+ onSelectResult,
+ onApplyMetadataFilter
}: Props) => {
const navigate = useNavigate({
from: "/organizations/$orgId/projects/secret-management/$projectId/overview"
@@ -47,9 +43,6 @@ export const QuickSearchMetadataSecretItem = ({
onClose(false);
};
- const visibleMetadata = secret.metadata.slice(0, MAX_VISIBLE_BADGES);
- const overflowCount = secret.metadata.length - visibleMetadata.length;
-
return (
<TableRow className="group cursor-pointer" onClick={handleNavigate}>
<TableCell>
@@ -67,33 +60,18 @@ export const QuickSearchMetadataSecretItem = ({
</Tooltip>
</TableCell>
<TableCell>
- <div className="flex items-center gap-2">
- {visibleMetadata.map((meta) => (
- <Badge
- key={`${meta.key}-${meta.value}`}
- variant="outline"
- className="gap-1.5 border-border font-mono font-normal"
- >
- <span className="text-muted">{meta.key}</span>
- <span className="text-foreground">{meta.value ?? ""}</span>
- </Badge>
- ))}
- {overflowCount > 0 && (
- <Tooltip>
- <TooltipTrigger asChild>
- <Badge variant="outline" className="border-border font-mono font-normal text-muted">
- {`+${overflowCount}`}
- </Badge>
- </TooltipTrigger>
- <TooltipContent className="max-w-lg">
- {secret.metadata
- .slice(MAX_VISIBLE_BADGES)
- .map((meta) => `${meta.key}=${meta.value ?? ""}`)
- .join(", ")}
- </TooltipContent>
- </Tooltip>
- )}
- <ChevronRightIcon className="ml-auto size-4 shrink-0 text-muted" />
+ <QuickSearchMetadataList metadata={secret.metadata} onApplyFilter={onApplyMetadataFilter} />
+ </TableCell>
+ <TableCell>
+ <div className="ml-auto flex items-center justify-end gap-1">
+ <QuickSearchSecretDetails tags={secret.tags} />
+ <QuickSearchSecretCopyButton
+ environment={envSlug}
+ secretPath={secret.secretPath}
+ secretKey={secret.secretKey}
+ secretValueHidden={secret.secretValueHidden}
+ />
+ <ChevronRightIcon className="size-4 shrink-0 text-muted" />
</div>
</TableCell>
</TableRow>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchModal.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchModal.tsx
index cc171d4a0d..e28a08e6f4 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchModal.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchModal.tsx
@@ -8,43 +8,45 @@ import {
useState
} from "react";
import {
- FilterIcon,
FingerprintIcon,
FolderIcon,
KeyIcon,
+ ListFilterIcon,
RefreshCw,
SearchIcon
} from "lucide-react";
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
+ Button,
+ Checkbox,
+ Combobox,
Empty,
EmptyDescription,
EmptyHeader,
EmptyTitle,
- IconButton,
+ Field,
+ FieldDescription,
+ FieldLabel,
InputGroup,
InputGroupAddon,
InputGroupInput,
Pagination,
ScrollableContent,
Sheet,
+ SheetClose,
SheetContent,
SheetDescription,
+ SheetFooter,
SheetHeader,
SheetTitle,
+ SheetTrigger,
Skeleton,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
- TableRow,
- Tooltip,
- TooltipContent,
- TooltipTrigger
+ TableRow
} from "@app/components/v3";
import { useDebounce, useResetPageHelper } from "@app/hooks";
import {
@@ -59,16 +61,15 @@ import { ProjectEnv } from "@app/hooks/api/projects/types";
import { WsTag } from "@app/hooks/api/tags/types";
import { groupBy } from "@app/lib/fn/array";
import { ResourceCount } from "@app/pages/secret-manager/OverviewPage/components/ResourceCount";
-import {
- ResourceFilterMenuContent,
- type ResourceTypeOption
-} from "@app/pages/secret-manager/OverviewPage/components/ResourceFilter";
+import { type ResourceTypeOption } from "@app/pages/secret-manager/OverviewPage/components/ResourceFilter";
import { QuickSearchSecretRotationItem } from "@app/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem";
import { RowType } from "@app/pages/secret-manager/SecretDashboardPage/SecretMainPage.types";
import { QuickSearchDynamicSecretItem } from "./QuickSearchDynamicSecretItem";
import { QuickSearchEnvTable } from "./QuickSearchEnvTable";
import { QuickSearchFolderItem } from "./QuickSearchFolderItem";
+import { QuickSearchFolderPicker } from "./QuickSearchFolderPicker";
+import { QuickSearchMetadata } from "./QuickSearchMetadataList";
import { QuickSearchMetadataSecretItem } from "./QuickSearchMetadataSecretItem";
import { QuickSearchSecretItem } from "./QuickSearchSecretItem";
import { QuickSearchSelection } from "./quickSearchTypes";
@@ -132,12 +133,13 @@ const QuickSearchResultsSkeleton = () => (
<div className="mb-2 flex h-5 items-center">
<Skeleton className="h-3.5 w-28" />
</div>
- <Table>
+ <Table className="[&_td:first-child]:w-10 [&_td:first-child]:max-w-10 [&_td:first-child]:min-w-10 [&_td:first-child]:px-2 [&_th:first-child]:w-10 [&_th:first-child]:max-w-10 [&_th:first-child]:min-w-10 [&_th:first-child]:px-2">
<TableHeader>
<TableRow>
<TableHead className="w-8" />
- <TableHead>Name</TableHead>
- <TableHead>Location</TableHead>
+ <TableHead className="min-w-60">Name</TableHead>
+ <TableHead className="min-w-36">Location</TableHead>
+ <TableHead className="min-w-56">Metadata</TableHead>
<TableHead className="w-24" />
</TableRow>
</TableHeader>
@@ -160,6 +162,7 @@ const QuickSearchResultsSkeleton = () => (
</div>
</TableCell>
<TableCell />
+ <TableCell />
</TableRow>
))}
</TableBody>
@@ -183,19 +186,41 @@ const Content = ({
const [page, setPage] = useState(1);
const [perPage, setPerPage] = useState(QUICK_SEARCH_PER_PAGE_OPTIONS[0]);
const [filterTags, setFilterTags] = useState<Record<string, boolean>>({});
+ const [isMobile, setIsMobile] = useState(
+ () => typeof window !== "undefined" && window.matchMedia("(max-width: 767px)").matches
+ );
+ const [isFiltersOpen, setIsFiltersOpen] = useState(false);
+ const [selectedEnvironments, setSelectedEnvironments] = useState<string[]>([]);
+ const [folderPath, setFolderPath] = useState("/");
+ const environmentSlugs = selectedEnvironments.length
+ ? selectedEnvironments
+ : environments.map((env) => env.slug);
+ const folderEnvironment = environmentSlugs.length === 1 ? environmentSlugs[0] : undefined;
+ const secretPath = folderEnvironment ? folderPath : "/";
const [showFilter, setShowFilter] = useState<Record<ResourceType, boolean>>({
- [RowType.Secret]: false,
- [RowType.Folder]: false,
- [RowType.DynamicSecret]: false,
- [RowType.SecretRotation]: false
+ [RowType.Secret]: true,
+ [RowType.Folder]: true,
+ [RowType.DynamicSecret]: true,
+ [RowType.SecretRotation]: true
});
// Metadata search: a structured key/value condition builder backed by /secrets-by-metadata.
// When at least one condition is complete, it "takes over" the results from the free-text search.
- const [metadataConditions, setMetadataConditions] = useState<MetadataSearchCondition[]>([]);
+ const [metadataConditions, setMetadataConditions] = useState<MetadataSearchCondition[]>([
+ { id: "cond-1", key: "", value: "", operator: SecretMetadataSearchOperator.Is }
+ ]);
const [metadataMatch, setMetadataMatch] = useState<MetadataMatchType>("all");
- const [isBuilderOpen, setIsBuilderOpen] = useState(false);
- const conditionIdRef = useRef(0);
+ const conditionIdRef = useRef(1);
+
+ useEffect(() => {
+ const media = window.matchMedia("(max-width: 767px)");
+ const update = () => {
+ setIsMobile(media.matches);
+ if (!media.matches) setIsFiltersOpen(false);
+ };
+ media.addEventListener("change", update);
+ return () => media.removeEventListener("change", update);
+ }, []);
const createCondition = (): MetadataSearchCondition => {
conditionIdRef.current += 1;
@@ -232,6 +257,8 @@ const Content = ({
} = useSearchSecretsByMetadata(
{
projectId,
+ environments: environmentSlugs,
+ secretPath,
operator:
metadataMatch === "all"
? SecretMetadataSearchLogicalOperator.And
@@ -245,10 +272,14 @@ const Content = ({
const isDeepSearchEnabled =
(Boolean(search.trim()) || Object.values(filterTags).length > 0) && !isMetadataMode;
- const { data, isPending: isDeepSearchPending } = useGetProjectSecretsQuickSearch(
+ const {
+ data,
+ isPending: isDeepSearchPending,
+ isFetching: isDeepSearchFetching
+ } = useGetProjectSecretsQuickSearch(
{
- secretPath: "/",
- environments: environments.map((env) => env.slug),
+ secretPath,
+ environments: environmentSlugs,
projectId,
search: debouncedSearch,
tags: filterTags,
@@ -258,6 +289,9 @@ const Content = ({
{ enabled: isDeepSearchEnabled }
);
+ const isDeepSearchLoading = isDeepSearchPending || isDeepSearchFetching;
+ const isMetadataLoading = isMetadataPending || isMetadataFetching;
+
const {
folders = {},
secrets = {},
@@ -276,10 +310,9 @@ const Content = ({
[environments]
);
- // When no resource types are checked, show all (empty filter = no filter)
const showType = useCallback(
- (type: ResourceType) => !Object.values(showFilter).some(Boolean) || Boolean(showFilter[type]),
- [showFilter]
+ (type: ResourceType) => (isMetadataMode ? type === RowType.Secret : Boolean(showFilter[type])),
+ [isMetadataMode, showFilter]
);
const resultsByEnv = useMemo(() => {
@@ -335,7 +368,7 @@ const Content = ({
useEffect(() => {
setPage(1);
- }, [debouncedSearch, filterTags, showFilter]);
+ }, [debouncedSearch, filterTags, showFilter, secretPath, selectedEnvironments, isMetadataMode]);
// a background refetch can shrink the counts and leave the current offset past the data
useResetPageHelper({
@@ -358,65 +391,71 @@ const Content = ({
.filter((group) => group.secrets.length > 0);
}, [metadataData, environments, debouncedSearch]);
- // count the secrets actually shown (after env + text filtering) so the builder's tally matches the rows
const metadataResultCount = metadataResultsByEnv.reduce(
(total, group) => total + group.secrets.length,
0
);
- const handleToggleTag = (tag: string) => {
- setFilterTags((prev) => {
- const updated = { ...prev };
- if (prev[tag]) {
- delete updated[tag];
- } else {
- updated[tag] = true;
- setShowFilter((f) => ({ ...f, [RowType.Secret]: true }));
- }
- return updated;
- });
- };
-
- const handleClearTags = () => {
- setFilterTags({});
- };
-
- // metadata search only supports secrets, so fully reset it (conditions, builder, match)
+ // metadata search only supports secrets, so clear its conditions and match mode
// whenever it should no longer apply
const resetMetadataSearch = () => {
- setMetadataConditions([]);
- setIsBuilderOpen(false);
+ setMetadataConditions([createCondition()]);
setMetadataMatch("all");
};
- const handleToggleShowType = (type: string) => {
- setShowFilter((prev) => {
- const newValue = !prev[type as ResourceType];
- if (type === RowType.Secret && !newValue) {
- // Secrets turned off: tags and metadata search are secrets-only
- setFilterTags({});
- resetMetadataSearch();
- }
- if (type !== RowType.Secret && newValue) {
- // switched to a non-secret resource type: metadata search only supports secrets
- resetMetadataSearch();
- }
- return {
- ...prev,
- [type]: newValue
- };
+ const handleChangeResourceTypes = (options: ResourceTypeOption[]) => {
+ const selected = options.map((option) => option.type);
+ if (!selected.includes(RowType.Secret)) {
+ setFilterTags({});
+ resetMetadataSearch();
+ } else if (selected.some((type) => type !== RowType.Secret)) {
+ resetMetadataSearch();
+ }
+ setShowFilter({
+ [RowType.Secret]: selected.includes(RowType.Secret),
+ [RowType.Folder]: selected.includes(RowType.Folder),
+ [RowType.DynamicSecret]: selected.includes(RowType.DynamicSecret),
+ [RowType.SecretRotation]: selected.includes(RowType.SecretRotation)
});
};
- const handleOpenMetadata = () => {
- setIsBuilderOpen(true);
- setMetadataConditions((prev) => (prev.length ? prev : [createCondition()]));
- };
-
const handleAddCondition = () => {
setMetadataConditions((prev) => [...prev, createCondition()]);
};
+ const handleApplyMetadataFilter = (metadata: QuickSearchMetadata) => {
+ const { key: metadataKey, value: metadataValue } = metadata;
+ if (!metadataValue) return;
+
+ setMetadataConditions((prev) => {
+ const key = metadataKey.trim();
+ const value = metadataValue.trim();
+ const alreadyApplied = prev.some(
+ (condition) => condition.key.trim() === key && condition.value.trim() === value
+ );
+
+ if (alreadyApplied) return prev;
+
+ const emptyCondition = prev.find(
+ (condition) => !condition.key.trim() && !condition.value.trim()
+ );
+ if (emptyCondition) {
+ return prev.map((condition) =>
+ condition.id === emptyCondition.id ? { ...condition, key, value } : condition
+ );
+ }
+
+ return [
+ ...prev,
+ {
+ ...createCondition(),
+ key,
+ value
+ }
+ ];
+ });
+ };
+
const handleUpdateCondition = (
id: string,
patch: Partial<Pick<MetadataSearchCondition, "key" | "value">>
@@ -427,39 +466,54 @@ const Content = ({
};
const handleRemoveCondition = (id: string) => {
- setMetadataConditions((prev) => prev.filter((condition) => condition.id !== id));
+ setMetadataConditions((prev) =>
+ prev[0].id === id ? prev : prev.filter((condition) => condition.id !== id)
+ );
};
const handleClearMetadata = () => {
- setMetadataConditions([]);
- };
-
- // closing the builder discards the conditions so a metadata filter never stays active while hidden
- const handleCloseBuilder = () => {
resetMetadataSearch();
};
- const hasActiveFilters =
- Object.keys(filterTags).length > 0 ||
- Object.values(showFilter).some(Boolean) ||
- activeConditions.length > 0;
+ const activeFilterCount =
+ Number(selectedEnvironments.length > 0) +
+ Number(Boolean(folderPath.trim().replace(/\//g, ""))) +
+ Number(Object.keys(filterTags).length > 0) +
+ Number(QUICK_SEARCH_RESOURCE_TYPES.some(({ type }) => !showType(type as ResourceType))) +
+ activeConditions.length;
+
+ let folderHelpText = "Select one environment to choose a folder.";
+ if (folderEnvironment) {
+ folderHelpText =
+ folderPath === "/"
+ ? "Choose a folder to narrow the search."
+ : "Includes subfolders. Clear to search all folders.";
+ }
+
+ const handleResetFilters = () => {
+ setSelectedEnvironments([]);
+ setFolderPath("/");
+ setFilterTags({});
+ handleChangeResourceTypes(QUICK_SEARCH_RESOURCE_TYPES);
+ setPage(1);
+ };
const noResultsEmpty = (
- <Empty className="bg-transparent shadow-none">
+ <Empty className="border">
<EmptyHeader>
- <EmptyTitle>No results match search.</EmptyTitle>
- <EmptyDescription>Try updating your search filters...</EmptyDescription>
+ <EmptyTitle>No Matching Resources</EmptyTitle>
+ <EmptyDescription>Try a different search or remove a filter.</EmptyDescription>
</EmptyHeader>
</Empty>
);
let resultsContent: ReactNode;
if (isMetadataMode) {
- if (isMetadataPending) {
+ if (isMetadataLoading) {
resultsContent = <QuickSearchResultsSkeleton />;
} else if (metadataResultsByEnv.length === 0) {
resultsContent = (
- <Empty className="bg-transparent shadow-none">
+ <Empty className="border">
<EmptyHeader>
<EmptyTitle>No secrets match these conditions.</EmptyTitle>
<EmptyDescription>Try removing a condition or switching ALL to ANY.</EmptyDescription>
@@ -470,11 +524,7 @@ const Content = ({
resultsContent = (
<div className="flex flex-col gap-6">
{metadataResultsByEnv.map(({ env, secrets: envSecrets }) => (
- <QuickSearchEnvTable
- key={env.slug}
- envName={env.name}
- trailingHead={<TableHead>Metadata</TableHead>}
- >
+ <QuickSearchEnvTable key={env.slug} envName={env.name}>
{envSecrets.map((secret) => (
<QuickSearchMetadataSecretItem
key={secret.secretId}
@@ -482,6 +532,7 @@ const Content = ({
envSlug={env.slug}
onClose={onClose}
onSelectResult={onSelectResult}
+ onApplyMetadataFilter={handleApplyMetadataFilter}
/>
))}
</QuickSearchEnvTable>
@@ -490,7 +541,7 @@ const Content = ({
);
}
} else if (isDeepSearchEnabled) {
- if (isDeepSearchPending) {
+ if (isDeepSearchLoading) {
resultsContent = <QuickSearchResultsSkeleton />;
} else if (resultsByEnv.length === 0) {
resultsContent = noResultsEmpty;
@@ -542,6 +593,7 @@ const Content = ({
tags={Object.keys(filterTags)}
onClose={onClose}
onSelectResult={onSelectResult}
+ onApplyMetadataFilter={handleApplyMetadataFilter}
/>
))}
</QuickSearchEnvTable>
@@ -550,119 +602,264 @@ const Content = ({
</div>
);
}
- } else if (!isBuilderOpen) {
+ } else {
resultsContent = (
- <Empty className="bg-transparent shadow-none">
+ <Empty className="border">
<EmptyHeader>
- <EmptyTitle>Start typing to begin search...</EmptyTitle>
- <EmptyDescription>Search by resource name, secret metadata or tag...</EmptyDescription>
+ <EmptyTitle>Search Across Folders</EmptyTitle>
+ <EmptyDescription>
+ Enter a resource name, select a tag, or add a metadata condition.
+ </EmptyDescription>
</EmptyHeader>
</Empty>
);
- } else {
- resultsContent = null;
}
- return (
- <div className="flex min-h-0 flex-1 flex-col p-4 pb-6">
- <div className="flex gap-2">
- <DropdownMenu>
- <Tooltip>
- <TooltipTrigger asChild>
- <DropdownMenuTrigger asChild>
- <IconButton variant={hasActiveFilters ? "project" : "outline"}>
- <FilterIcon />
- </IconButton>
- </DropdownMenuTrigger>
- </TooltipTrigger>
- <TooltipContent>Search Filters</TooltipContent>
- </Tooltip>
- <DropdownMenuContent align="start">
- <ResourceFilterMenuContent
- resourceTypes={QUICK_SEARCH_RESOURCE_TYPES}
- resourceTypeFilter={showFilter}
- onToggleResourceType={handleToggleShowType}
- tags={tags}
- selectedTagSlugs={filterTags}
- onToggleTag={handleToggleTag}
- onClearTags={handleClearTags}
- onOpenMetadata={handleOpenMetadata}
- metadataCount={activeConditions.length}
- menuLabel="Filter By"
+ const filtersPanel = (
+ <div
+ id="quick-search-filters"
+ role="complementary"
+ aria-labelledby="quick-search-filters-heading"
+ className={`flex min-h-0 flex-col bg-card select-none [&_input]:select-text ${
+ isMobile ? "flex-1" : "shrink-0 rounded-lg ring-1 ring-border ring-inset md:w-94"
+ }`}
+ >
+ <h3 id="quick-search-filters-heading" className="sr-only">
+ Search filters
+ </h3>
+ <ScrollableContent
+ aria-label="Filter options"
+ outline={false}
+ maxHeight="100%"
+ containerClassName="min-h-0 flex-1"
+ contentClassName="flex flex-col gap-5 p-4"
+ >
+ {environments.length > 1 && (
+ <Field>
+ <FieldLabel htmlFor="quick-search-environments">Environments</FieldLabel>
+ <Combobox
+ id="quick-search-environments"
+ multiple
+ options={environments}
+ value={environments.filter((env) => selectedEnvironments.includes(env.slug))}
+ onValueChange={(options) => {
+ setSelectedEnvironments(options.map((env) => env.slug));
+ setFolderPath("/");
+ }}
+ getOptionValue={(env) => env.slug}
+ getOptionLabel={(env) => env.name}
+ placeholder="All environments"
+ searchPlaceholder="Find environments..."
+ searchAriaLabel="Find environments"
+ clearAriaLabel="Clear environment filters"
+ />
+ </Field>
+ )}
+ <Field>
+ <FieldLabel htmlFor="quick-search-folder-path">Folder Path</FieldLabel>
+ <QuickSearchFolderPicker
+ key={folderEnvironment ?? "all"}
+ projectId={projectId}
+ environment={folderEnvironment}
+ value={folderPath}
+ onChange={setFolderPath}
+ />
+ <FieldDescription id="quick-search-folder-help">{folderHelpText}</FieldDescription>
+ </Field>
+ <div
+ role="group"
+ aria-labelledby="quick-search-resource-types-label"
+ className="flex flex-col gap-3"
+ >
+ <FieldLabel asChild>
+ <span id="quick-search-resource-types-label">Resource Types</span>
+ </FieldLabel>
+ <div className="grid grid-cols-2 gap-x-2 gap-y-3">
+ {QUICK_SEARCH_RESOURCE_TYPES.map((option) => (
+ <Field key={option.type} orientation="horizontal">
+ <Checkbox
+ id={`quick-search-type-${option.type}`}
+ isChecked={showType(option.type as ResourceType)}
+ onCheckedChange={(checked) =>
+ handleChangeResourceTypes(
+ QUICK_SEARCH_RESOURCE_TYPES.filter(({ type }) =>
+ type === option.type ? checked === true : showFilter[type as ResourceType]
+ )
+ )
+ }
+ />
+ <FieldLabel htmlFor={`quick-search-type-${option.type}`}>
+ <span className="flex items-center gap-2 [&_svg]:size-4">
+ {option.icon}
+ {option.label}
+ </span>
+ </FieldLabel>
+ </Field>
+ ))}
+ </div>
+ </div>
+ <Field>
+ <FieldLabel htmlFor="quick-search-tags">Tags</FieldLabel>
+ <Combobox
+ id="quick-search-tags"
+ multiple
+ options={tags ?? []}
+ value={(tags ?? []).filter((tag) => filterTags[tag.slug])}
+ onValueChange={(options) => {
+ setFilterTags(Object.fromEntries(options.map((tag) => [tag.slug, true])));
+ if (options.length > 0) {
+ setShowFilter((previous) => ({ ...previous, [RowType.Secret]: true }));
+ }
+ }}
+ getOptionValue={(tag) => tag.slug}
+ getOptionLabel={(tag) => tag.slug}
+ placeholder="Any tag"
+ searchPlaceholder="Find tags..."
+ searchAriaLabel="Find tags"
+ clearAriaLabel="Clear tag filters"
+ emptyMessage="No tags found."
+ />
+ </Field>
+ <div className="flex flex-col gap-2">
+ <FieldLabel asChild>
+ <span>Metadata</span>
+ </FieldLabel>
+ <div className="rounded-md border border-border bg-container p-4">
+ <SecretMetadataSearchBuilder
+ conditions={metadataConditions}
+ match={metadataMatch}
+ onChangeMatch={setMetadataMatch}
+ onAddCondition={handleAddCondition}
+ onUpdateCondition={handleUpdateCondition}
+ onRemoveCondition={handleRemoveCondition}
+ onClear={handleClearMetadata}
/>
- </DropdownMenuContent>
- </DropdownMenu>
- <InputGroup className="flex-1">
+ </div>
+ </div>
+ </ScrollableContent>
+ <div className="flex shrink-0 items-center justify-between gap-2 border-t border-border px-4 py-2">
+ <span className="text-xs text-accent">
+ {activeFilterCount} {activeFilterCount === 1 ? "filter" : "filters"}
+ </span>
+ <Button variant="ghost" size="sm" onClick={handleResetFilters}>
+ Reset Filters
+ </Button>
+ </div>
+ </div>
+ );
+
+ return (
+ <div className="flex min-h-0 flex-1 flex-col gap-4 p-4 md:flex-row">
+ {!isMobile && filtersPanel}
+ <div className="flex min-h-0 min-w-0 flex-1 flex-col gap-4">
+ <InputGroup className="shrink-0">
<InputGroupAddon>
<SearchIcon />
</InputGroupAddon>
<InputGroupInput
ref={searchInputRef}
+ aria-label="Search resources"
placeholder="Search by resource name, secret metadata or tag..."
value={search}
onChange={(e) => setSearch(e.target.value)}
/>
</InputGroup>
- </div>
-
- <ScrollableContent
- aria-label="Search results"
- edgeBehavior="fade"
- outline={false}
- maxHeight="100%"
- containerClassName="flex min-h-0 flex-1 flex-col"
- className="flex-1 pt-4"
- contentClassName="pb-4"
- >
- {isBuilderOpen && (
- <SecretMetadataSearchBuilder
- conditions={metadataConditions}
- match={metadataMatch}
- matchingCount={metadataResultCount}
- isPending={isMetadataFetching}
- hasActiveConditions={isMetadataMode}
- onChangeMatch={setMetadataMatch}
- onAddCondition={handleAddCondition}
- onUpdateCondition={handleUpdateCondition}
- onRemoveCondition={handleRemoveCondition}
- onClear={handleClearMetadata}
- onClose={handleCloseBuilder}
- />
+ {isMobile && (
+ <Sheet open={isFiltersOpen} onOpenChange={setIsFiltersOpen}>
+ <SheetTrigger asChild>
+ <Button variant="outline" size="sm" className="w-fit">
+ <ListFilterIcon />
+ Filters{activeFilterCount > 0 ? ` (${activeFilterCount})` : ""}
+ </Button>
+ </SheetTrigger>
+ <SheetContent
+ side="left"
+ className="w-full max-w-sm gap-0 p-0"
+ onEscapeKeyDown={(event) => {
+ if (
+ (event.currentTarget as HTMLElement | null)?.querySelector(
+ '[role="combobox"][aria-expanded="true"]'
+ )
+ ) {
+ event.preventDefault();
+ }
+ }}
+ >
+ <SheetHeader>
+ <SheetTitle>Filters</SheetTitle>
+ <SheetDescription>Narrow the search results.</SheetDescription>
+ </SheetHeader>
+ {filtersPanel}
+ <SheetFooter className="border-t">
+ <SheetClose asChild>
+ <Button variant="project" className="w-full">
+ Show Results
+ </Button>
+ </SheetClose>
+ </SheetFooter>
+ </SheetContent>
+ </Sheet>
)}
- {resultsContent}
- </ScrollableContent>
- {isDeepSearchEnabled && !isDeepSearchPending && visibleResultCount > 0 && (
- <div className="mt-3 border-t border-border pt-1">
- <Pagination
- startAdornment={
- <div className="flex items-center gap-3">
- <ResourceCount
- folderCount={showType(RowType.Folder) ? totalFolderCount : 0}
- secretCount={showType(RowType.Secret) ? totalSecretCount : 0}
- dynamicSecretCount={showType(RowType.DynamicSecret) ? totalDynamicSecretCount : 0}
- secretRotationCount={
- showType(RowType.SecretRotation) ? totalSecretRotationCount : 0
- }
- />
- {(isSearchLimitReached || pageableResultCount < visibleResultCount) && (
- <span className="text-xs text-accent">
- {`Only the first ${searchLimit} matches per resource type can be reached. Narrow your search to see the rest.`}
- </span>
- )}
- </div>
- }
- count={pageableResultCount}
- page={page}
- perPage={perPage}
- perPageList={QUICK_SEARCH_PER_PAGE_OPTIONS}
- onChangePage={setPage}
- onChangePerPage={(newPerPage) => {
- setPerPage(newPerPage);
- setPage(1);
- }}
- />
+ <div className="flex min-h-0 min-w-0 flex-1 flex-col">
+ <ScrollableContent
+ aria-label="Search results"
+ edgeBehavior="fade"
+ outline={false}
+ maxHeight="100%"
+ containerClassName="flex min-h-0 flex-1 flex-col"
+ className="flex-1"
+ >
+ {resultsContent}
+ </ScrollableContent>
+ {isMetadataMode && (
+ <div
+ className="shrink-0 space-y-1 border-t border-border py-4 text-xs text-accent"
+ role="status"
+ >
+ <p className="font-medium text-foreground">
+ {isMetadataLoading
+ ? "Searching..."
+ : `${metadataResultCount} matching ${metadataResultCount === 1 ? "secret" : "secrets"} shown`}
+ </p>
+ <p>{`Search checks up to ${metadataData?.searchLimit ?? 100} candidates per metadata query. Results may be incomplete. Narrow your filters to see the rest.`}</p>
+ </div>
+ )}
+ {isDeepSearchEnabled && !isDeepSearchLoading && visibleResultCount > 0 && (
+ <div className="shrink-0 border-t border-border py-2">
+ <Pagination
+ startAdornment={
+ <div className="flex items-center gap-3">
+ <ResourceCount
+ folderCount={showType(RowType.Folder) ? totalFolderCount : 0}
+ secretCount={showType(RowType.Secret) ? totalSecretCount : 0}
+ dynamicSecretCount={
+ showType(RowType.DynamicSecret) ? totalDynamicSecretCount : 0
+ }
+ secretRotationCount={
+ showType(RowType.SecretRotation) ? totalSecretRotationCount : 0
+ }
+ />
+ {(isSearchLimitReached || pageableResultCount < visibleResultCount) && (
+ <span className="text-xs text-accent">
+ {`Only the first ${searchLimit} matches per resource type can be reached. Narrow your search to see the rest.`}
+ </span>
+ )}
+ </div>
+ }
+ count={pageableResultCount}
+ page={page}
+ perPage={perPage}
+ perPageList={QUICK_SEARCH_PER_PAGE_OPTIONS}
+ onChangePage={setPage}
+ onChangePerPage={(newPerPage) => {
+ setPerPage(newPerPage);
+ setPage(1);
+ }}
+ />
+ </div>
+ )}
</div>
- )}
+ </div>
</div>
);
};
@@ -678,7 +875,16 @@ export const QuickSearchModal = ({
return (
<Sheet open={isOpen} onOpenChange={onOpenChange}>
<SheetContent
- className="flex flex-col overflow-hidden sm:max-w-7xl"
+ className="flex w-full flex-col overflow-hidden sm:max-w-7xl"
+ onEscapeKeyDown={(event) => {
+ if (
+ searchInputRef.current
+ ?.closest('[data-slot="sheet-content"]')
+ ?.querySelector('[role="combobox"][aria-expanded="true"]')
+ ) {
+ event.preventDefault();
+ }
+ }}
onOpenAutoFocus={(event) => {
event.preventDefault();
const input = searchInputRef.current;
@@ -686,13 +892,16 @@ export const QuickSearchModal = ({
input.focus();
input.setSelectionRange(input.value.length, input.value.length);
}}
+ onPointerDownOutside={(event) => {
+ if ((event.target as HTMLElement).closest('[data-slot="hover-card-content"]')) {
+ event.preventDefault();
+ }
+ }}
>
<SheetHeader>
<SheetTitle>{`Search All Folders${isSingleEnv ? " In Environment" : ""}`}</SheetTitle>
<SheetDescription>
- {`Search the ${
- isSingleEnv ? "current environment" : "entire project"
- } to quickly reference secrets and navigate deeply.`}
+ {`Find resources across folders in ${isSingleEnv ? "this environment" : "your project"}.`}
</SheetDescription>
</SheetHeader>
<Content {...props} searchInputRef={searchInputRef} />
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretCopyButton.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretCopyButton.tsx
new file mode 100644
index 0000000000..7d92fc133c
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretCopyButton.tsx
@@ -0,0 +1,100 @@
+import { useState } from "react";
+import { isAxiosError } from "axios";
+import { CheckIcon, CopyIcon } from "lucide-react";
+
+import { createNotification } from "@app/components/notifications";
+import { IconButton, Tooltip, TooltipContent, TooltipTrigger } from "@app/components/v3";
+import { useProject } from "@app/context";
+import { useTimedReset } from "@app/hooks";
+import { fetchSecretValue } from "@app/hooks/api/dashboard/queries";
+
+type Props = {
+ environment: string;
+ secretPath: string;
+ secretKey: string;
+ secretValueHidden: boolean;
+};
+
+export const QuickSearchSecretCopyButton = ({
+ environment,
+ secretPath,
+ secretKey,
+ secretValueHidden
+}: Props) => {
+ const { currentProject } = useProject();
+ const [isCopied, , setIsCopied] = useTimedReset<boolean>({ initialState: false });
+ const [isCopying, setIsCopying] = useState(false);
+
+ const handleCopy = async () => {
+ setIsCopying(true);
+ try {
+ const data = await fetchSecretValue({
+ environment,
+ secretPath,
+ secretKey,
+ projectId: currentProject.id
+ }).catch((error: unknown) => {
+ let message = "Could not load the secret value. Try again.";
+ if (isAxiosError<{ message?: string }>(error)) {
+ if (error.response?.status === 403) {
+ message = "You do not have permission to read this secret value.";
+ }
+ if (
+ typeof error.response?.data?.message === "string" &&
+ error.response.data.message.trim()
+ ) {
+ message = error.response.data.message;
+ }
+ }
+ createNotification({ type: "error", text: message });
+ });
+ if (!data) return;
+ const value = data.valueOverride ?? data.value;
+ if (value === undefined) {
+ createNotification({
+ type: "error",
+ text: "Secret value is unavailable. Refresh the results and try again."
+ });
+ return;
+ }
+ try {
+ await navigator.clipboard.writeText(value);
+ } catch {
+ createNotification({
+ type: "error",
+ text: "Could not write to the clipboard. Check your browser's clipboard permissions and try again."
+ });
+ return;
+ }
+ createNotification({ type: "info", title: "Secret value copied.", text: "" });
+ setIsCopied(true);
+ } finally {
+ setIsCopying(false);
+ }
+ };
+
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <IconButton
+ variant="ghost"
+ className="mr-2"
+ size="xs"
+ isDisabled={secretValueHidden || isCopying}
+ aria-label="Copy secret value"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleCopy();
+ }}
+ >
+ {isCopied ? <CheckIcon /> : <CopyIcon />}
+ </IconButton>
+ </TooltipTrigger>
+ <TooltipContent>
+ {secretValueHidden
+ ? "You do not have permission to view this secret value"
+ : "Copy secret value"}
+ </TooltipContent>
+ </Tooltip>
+ );
+};
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretDetails.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretDetails.tsx
new file mode 100644
index 0000000000..17605173d9
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretDetails.tsx
@@ -0,0 +1,31 @@
+import { TagsIcon } from "lucide-react";
+
+import { Badge, Tooltip, TooltipContent, TooltipTrigger } from "@app/components/v3";
+
+type Props = {
+ tags?: { id: string; slug: string }[];
+};
+
+export const QuickSearchSecretDetails = ({ tags = [] }: Props) => {
+ if (tags.length === 0) return null;
+
+ return (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge variant="neutral" tabIndex={0} aria-label={`${tags.length} tags`}>
+ <TagsIcon />
+ {tags.length}
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent className="max-w-lg">
+ <div className="flex flex-col gap-1">
+ {tags.map((tag) => (
+ <span key={tag.id} className="break-all">
+ {tag.slug}
+ </span>
+ ))}
+ </div>
+ </TooltipContent>
+ </Tooltip>
+ );
+};
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
index 7759f8aed3..dbb8038ab4 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
@@ -1,21 +1,19 @@
import { useNavigate } from "@tanstack/react-router";
-import { CheckIcon, ChevronRightIcon, CopyIcon, KeyIcon, SearchIcon } from "lucide-react";
+import { ChevronRightIcon, KeyIcon, SearchIcon } from "lucide-react";
-import { createNotification } from "@app/components/notifications";
import {
Badge,
- IconButton,
TableCell,
TableRow,
Tooltip,
TooltipContent,
TooltipTrigger
} from "@app/components/v3";
-import { useProject } from "@app/context";
-import { useTimedReset } from "@app/hooks";
-import { fetchSecretValue } from "@app/hooks/api/dashboard/queries";
import { SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
+import { QuickSearchMetadata, QuickSearchMetadataList } from "./QuickSearchMetadataList";
+import { QuickSearchSecretCopyButton } from "./QuickSearchSecretCopyButton";
+import { QuickSearchSecretDetails } from "./QuickSearchSecretDetails";
import { QuickSearchSelection } from "./quickSearchTypes";
type Props = {
@@ -25,6 +23,7 @@ type Props = {
tags: string[];
search: string;
onSelectResult: (selection: QuickSearchSelection) => void;
+ onApplyMetadataFilter: (metadata: QuickSearchMetadata) => void;
};
export const QuickSearchSecretItem = ({
@@ -32,17 +31,13 @@ export const QuickSearchSecretItem = ({
envSlug,
onClose,
onSelectResult,
+ onApplyMetadataFilter,
tags,
search
}: Props) => {
const navigate = useNavigate({
from: "/organizations/$orgId/projects/secret-management/$projectId/overview"
});
- const [isUrlCopied, , setIsUrlCopied] = useTimedReset<boolean>({
- initialState: false
- });
-
- const { currentProject } = useProject();
const handleNavigate = () => {
onSelectResult({ search: secret.key, tags });
@@ -59,31 +54,6 @@ export const QuickSearchSecretItem = ({
onClose(false);
};
- const handleCopy = async () => {
- try {
- const data = await fetchSecretValue({
- environment: secret.env,
- secretPath: secret.path!,
- secretKey: secret.key,
- projectId: currentProject.id
- });
-
- navigator.clipboard.writeText(data.valueOverride ?? data.value!);
- createNotification({
- type: "info",
- title: "Secret value copied.",
- text: ""
- });
- setIsUrlCopied(true);
- } catch (error) {
- console.error(error);
- createNotification({
- type: "error",
- text: "Error fetching secret value"
- });
- }
- };
-
const tagMatch =
search.trim() &&
secret.tags?.find((tag) => tag && tag.slug.toLowerCase().includes(search.toLowerCase()));
@@ -113,8 +83,15 @@ export const QuickSearchSecretItem = ({
<TooltipContent className="max-w-lg">{secret.path}</TooltipContent>
</Tooltip>
</TableCell>
+ <TableCell>
+ <QuickSearchMetadataList
+ metadata={secret.secretMetadata}
+ onApplyFilter={onApplyMetadataFilter}
+ />
+ </TableCell>
<TableCell className="text-right">
<div className="flex items-center justify-end gap-1">
+ <QuickSearchSecretDetails tags={secret.tags} />
{tagMatch && (
<Tooltip>
<TooltipTrigger asChild>
@@ -137,28 +114,12 @@ export const QuickSearchSecretItem = ({
<TooltipContent>Search matched metadata</TooltipContent>
</Tooltip>
)}
- <Tooltip>
- <TooltipTrigger asChild>
- <IconButton
- variant="ghost"
- className="mr-2"
- size="xs"
- isDisabled={secret.secretValueHidden}
- aria-label="Copy secret value"
- onClick={(e) => {
- e.stopPropagation();
- handleCopy();
- }}
- >
- {isUrlCopied ? <CheckIcon /> : <CopyIcon />}
- </IconButton>
- </TooltipTrigger>
- <TooltipContent>
- {secret.secretValueHidden
- ? "You do not have permission to view this secret value"
- : "Copy secret value"}
- </TooltipContent>
- </Tooltip>
+ <QuickSearchSecretCopyButton
+ environment={secret.env}
+ secretPath={secret.path ?? "/"}
+ secretKey={secret.key}
+ secretValueHidden={secret.secretValueHidden}
+ />
<ChevronRightIcon className="size-4 text-muted" />
</div>
</TableCell>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
index 82bcc86d5d..be781c2aed 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
@@ -54,6 +54,7 @@ export const QuickSearchSecretRotationItem = ({
<TooltipContent className="max-w-lg">{secretRotation.folder.path}</TooltipContent>
</Tooltip>
</TableCell>
+ <TableCell className="text-muted">—</TableCell>
<TableCell className="text-right">
<ChevronRightIcon className="ml-auto size-4 text-muted" />
</TableCell>
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/SecretMetadataSearchBuilder.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/SecretMetadataSearchBuilder.tsx
index 0963a0086e..88b773f81c 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/SecretMetadataSearchBuilder.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/SecretMetadataSearchBuilder.tsx
@@ -1,16 +1,7 @@
-import { BracesIcon, InfoIcon, PlusIcon, XIcon, ZapIcon } from "lucide-react";
+import { Fragment } from "react";
+import { PlusIcon, XIcon } from "lucide-react";
-import {
- Button,
- IconButton,
- InputGroup,
- InputGroupAddon,
- InputGroupInput,
- InputGroupText,
- Tooltip,
- TooltipContent,
- TooltipTrigger
-} from "@app/components/v3";
+import { Button, Field, FieldLabel, IconButton, Input, Separator } from "@app/components/v3";
import { cn } from "@app/components/v3/utils";
import { SecretMetadataSearchOperator } from "@app/hooks/api/dashboard/types";
@@ -27,9 +18,6 @@ export type MetadataMatchType = "all" | "any";
type Props = {
conditions: MetadataSearchCondition[];
match: MetadataMatchType;
- matchingCount: number;
- isPending: boolean;
- hasActiveConditions: boolean;
onChangeMatch: (match: MetadataMatchType) => void;
onAddCondition: () => void;
onUpdateCondition: (
@@ -38,136 +26,108 @@ type Props = {
) => void;
onRemoveCondition: (id: string) => void;
onClear: () => void;
- onClose: () => void;
};
export const SecretMetadataSearchBuilder = ({
conditions,
match,
- matchingCount,
- isPending,
- hasActiveConditions,
onChangeMatch,
onAddCondition,
onUpdateCondition,
onRemoveCondition,
- onClear,
- onClose
+ onClear
}: Props) => {
return (
- <div className="mb-5 rounded-lg border border-border bg-popover">
- <div className="flex items-center gap-3 border-b border-border px-4 py-3">
- <BracesIcon className="size-4 text-muted" />
- <span className="font-medium">Filter by metadata</span>
- <IconButton
- variant="ghost"
- size="xs"
- className="ml-auto"
- aria-label="Close metadata filter"
- onClick={onClose}
- >
- <XIcon />
- </IconButton>
+ <div className="flex flex-col gap-3">
+ <div
+ role="group"
+ aria-label="Match metadata conditions"
+ className="inline-flex w-fit rounded-md border border-border p-0.5"
+ >
+ {(["all", "any"] as const).map((option) => (
+ <button
+ key={option}
+ type="button"
+ aria-pressed={match === option}
+ aria-label={`Match ${option} conditions`}
+ onClick={() => onChangeMatch(option)}
+ className={cn(
+ "h-6 rounded px-2 text-xs font-medium transition-colors",
+ match === option ? "bg-project/15 text-project" : "text-accent hover:text-foreground"
+ )}
+ >
+ {option.toUpperCase()}
+ </button>
+ ))}
</div>
-
- <div className="p-4">
- <div className="mb-4 flex flex-wrap items-center gap-3 text-sm text-muted">
- <span>Match</span>
- <div className="inline-flex rounded-md border border-border p-0.5">
- {(["all", "any"] as const).map((option) => (
- <button
- key={option}
- type="button"
- onClick={() => onChangeMatch(option)}
- className={cn(
- "h-6 rounded px-3 text-xs font-semibold tracking-wide transition-colors",
- match === option
- ? "bg-project/15 text-project"
- : "text-muted hover:text-foreground"
+ <div className="flex flex-col gap-3">
+ {conditions.map((condition, index) => (
+ <Fragment key={condition.id}>
+ <div className="flex flex-col gap-2">
+ <div className="flex items-end gap-1">
+ <Field className="min-w-0 flex-1">
+ <FieldLabel htmlFor={`metadata-key-${condition.id}`}>Key</FieldLabel>
+ <Input
+ id={`metadata-key-${condition.id}`}
+ aria-label={`Metadata key ${index + 1}`}
+ className="font-mono"
+ placeholder="e.g. owner"
+ value={condition.key}
+ onChange={(e) => onUpdateCondition(condition.id, { key: e.target.value })}
+ />
+ </Field>
+ {index > 0 && (
+ <IconButton
+ variant="ghost"
+ size="sm"
+ className="mb-0.5 flex-none text-accent hover:text-danger"
+ aria-label={`Remove condition ${index + 1}`}
+ onClick={() => onRemoveCondition(condition.id)}
+ >
+ <XIcon />
+ </IconButton>
)}
- >
- {option.toUpperCase()}
- </button>
- ))}
- </div>
- <span>of the conditions below</span>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="cursor-default text-muted">
- <InfoIcon className="size-3.5" />
- </span>
- </TooltipTrigger>
- <TooltipContent className="max-w-xs">
- <span className="font-semibold text-project">ALL</span> returns secrets matching every
- condition (AND). <span className="font-semibold text-project">ANY</span> returns
- secrets matching at least one condition (OR).
- </TooltipContent>
- </Tooltip>
- </div>
-
- <div className="mb-3 flex flex-col gap-2.5">
- {conditions.map((condition) => (
- <div key={condition.id} className="flex items-center gap-2.5">
- <InputGroup className="w-52 flex-none">
- <InputGroupAddon>
- <InputGroupText className="font-mono">#</InputGroupText>
- </InputGroupAddon>
- <InputGroupInput
- className="font-mono"
- placeholder="Key"
- value={condition.key}
- onChange={(e) => onUpdateCondition(condition.id, { key: e.target.value })}
- />
- </InputGroup>
- <span className="flex h-9 flex-none items-center rounded-md border border-border px-3 font-mono text-sm text-muted">
- is
- </span>
- <InputGroup className="flex-1">
- <InputGroupInput
- className="font-mono"
- placeholder="Value"
- value={condition.value}
- onChange={(e) => onUpdateCondition(condition.id, { value: e.target.value })}
- />
- </InputGroup>
- <IconButton
- variant="ghost"
- size="sm"
- className="flex-none text-muted hover:text-danger"
- aria-label="Remove condition"
- onClick={() => onRemoveCondition(condition.id)}
- >
- <XIcon />
- </IconButton>
+ </div>
+ <div className="flex items-center gap-2">
+ <span className="flex h-9 shrink-0 items-center rounded-md border border-border bg-foreground/5 px-3 text-sm text-foreground">
+ is
+ </span>
+ <Field className="min-w-0 flex-1">
+ <FieldLabel className="sr-only" htmlFor={`metadata-value-${condition.id}`}>
+ Value
+ </FieldLabel>
+ <Input
+ id={`metadata-value-${condition.id}`}
+ aria-label={`Metadata value ${index + 1}`}
+ className="font-mono"
+ placeholder="e.g. security"
+ value={condition.value}
+ onChange={(e) => onUpdateCondition(condition.id, { value: e.target.value })}
+ />
+ </Field>
+ </div>
</div>
- ))}
- </div>
+ {index < conditions.length - 1 && (
+ <div className="flex w-full items-center gap-2">
+ <Separator className="min-w-0 flex-1" />
+ <span className="text-xs text-accent">{match === "all" ? "AND" : "OR"}</span>
+ <Separator className="min-w-0 flex-1" />
+ </div>
+ )}
+ </Fragment>
+ ))}
+ </div>
- <Button variant="outline" size="sm" onClick={onAddCondition}>
+ <div className="flex items-center justify-between gap-1">
+ <Button variant="ghost" size="sm" onClick={onAddCondition}>
<PlusIcon />
- Add condition
+ Add Condition
</Button>
- </div>
-
- <div className="flex items-center justify-between border-t border-border px-4 py-3">
- <span className="flex items-center gap-2 text-sm text-muted">
- <ZapIcon className="size-3.5 text-project" />
- {hasActiveConditions ? (
- <span>
- <span className="font-semibold text-foreground">
- {isPending ? "…" : matchingCount}
- </span>{" "}
- matching {matchingCount === 1 && !isPending ? "secret" : "secrets"}
- </span>
- ) : (
- <span>Add a condition to search</span>
- )}
- </span>
- <div className="flex items-center gap-2">
- <Button variant="ghost" size="sm" onClick={onClear}>
+ {conditions.length > 0 && (
+ <Button variant="ghost" size="xs" onClick={onClear}>
Clear
</Button>
- </div>
+ )}
</div>
</div>
);
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/TableFilteredEmptyRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/TableFilteredEmptyRow.tsx
new file mode 100644
index 0000000000..afb59ca16c
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/TableFilteredEmptyRow.tsx
@@ -0,0 +1,54 @@
+import { CSSProperties, useEffect, useRef, useState } from "react";
+
+import { TableCell, TableRow } from "@app/components/v3";
+
+import { EmptyResourceDisplay } from "../EmptyResourceDisplay";
+
+type Props = {
+ colSpan: number;
+ isFiltered: boolean;
+ hasSearch: boolean;
+ onSearchAllFolders: () => void;
+};
+
+export const TableFilteredEmptyRow = ({
+ colSpan,
+ isFiltered,
+ hasSearch,
+ onSearchAllFolders
+}: Props) => {
+ const contentRef = useRef<HTMLDivElement>(null);
+ const [contentStyle, setContentStyle] = useState<CSSProperties>();
+
+ useEffect(() => {
+ const content = contentRef.current;
+ const tableContainer = content?.closest<HTMLElement>('[data-slot="table-container"]');
+ if (!content || !tableContainer) return undefined;
+
+ const updateContentWidth = () => {
+ setContentStyle({ width: tableContainer.clientWidth });
+ };
+
+ updateContentWidth();
+
+ const resizeObserver = new ResizeObserver(updateContentWidth);
+ resizeObserver.observe(tableContainer);
+
+ return () => resizeObserver.disconnect();
+ }, []);
+
+ return (
+ <TableRow className="hover:bg-transparent">
+ <TableCell colSpan={colSpan} className="h-64 p-0 whitespace-normal">
+ <div ref={contentRef} className="sticky left-0 h-full" style={contentStyle}>
+ <EmptyResourceDisplay
+ isTableRow
+ isFiltered={isFiltered}
+ hasSearch={hasSearch}
+ onSearchAllFolders={onSearchAllFolders}
+ />
+ </div>
+ </TableCell>
+ </TableRow>
+ );
+};
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/index.ts b/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/index.ts
new file mode 100644
index 0000000000..0002d1ecd5
--- /dev/null
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/TableFilteredEmptyRow/index.ts
@@ -0,0 +1 @@
+export * from "./TableFilteredEmptyRow";
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/index.ts b/frontend/src/pages/secret-manager/OverviewPage/components/index.ts
index 29a90a9e05..a49bfb2500 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/index.ts
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/index.ts
@@ -18,3 +18,4 @@ export * from "./SecretRotationTableRow";
export * from "./SecretSyncStatusBadgeOverview";
export * from "./SecretTableRow";
export * from "./TableEmptyRow";
+export * from "./TableFilteredEmptyRow";