awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 05:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed PR suggestions

Browse Source
This commit is contained in:
Carlos Monastyrski
2025-07-10 16:15:15 -03:00
parent 706447d5c6
commit 6bb634f5ed
20 changed files with 216 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/api/secretFolders/types.ts
+7 -1
View File
@@ -4,13 +4,19 @@ export enum ReservedFolders {
SecretReplication = "__reserve_replication_"
}
export enum PendingAction {
Create = "create",
Update = "update",
Delete = "delete"
}
export type TSecretFolder = {
id: string;
name: string;
description?: string;
parentId?: string | null;
isPending?: boolean;
pendingAction?: string;
pendingAction?: PendingAction;
};
export type TSecretFolderWithPath = TSecretFolder & { path: string };
frontend/src/hooks/api/secrets/mutations.tsx
+30 -9
View File
@@ -9,6 +9,7 @@ import {
import { commitKeys } from "../folderCommits/queries";
import { secretApprovalRequestKeys } from "../secretApprovalRequest/queries";
import { PendingAction } from "../secretFolders/types";
import { secretSnapshotKeys } from "../secretSnapshots/queries";
import { secretKeys } from "./queries";
import {
@@ -440,9 +441,20 @@ export const useCreateCommit = () => {
>({
mutationFn: async ({ workspaceId, environment, secretPath, pendingChanges, message }) => {
const transformedSecretUpdates = pendingChanges.secrets
.filter((change) => change.type === "update")
.filter((change) => change.type === PendingAction.Update)
.map((change: PendingSecretUpdate) => {
const updatePayload: any = {
const updatePayload: {
secretKey: string;
newSecretName?: string;
secretValue?: string;
secretComment?: string;
skipMultilineEncoding?: boolean;
tagIds?: string[];
secretMetadata?: {
key: string;
value: string;
}[];
} = {
secretKey: change.secretKey
};
@@ -469,14 +481,14 @@ export const useCreateCommit = () => {
return updatePayload;
});
const { data } = await apiRequest.post("/api/v1/pit/batch/commit", {
workspaceId,
projectId: workspaceId,
environment,
secretPath,
changes: {
secrets: {
create:
pendingChanges.secrets
.filter((change) => change.type === "create")
.filter((change) => change.type === PendingAction.Create)
.map((change) => ({
secretKey: change.secretKey,
secretValue: change.secretValue,
@@ -485,13 +497,22 @@ export const useCreateCommit = () => {
tagIds: change.tags?.map((tag) => tag.id),
secretMetadata: change.secretMetadata
})) || [],
update: transformedSecretUpdates,
delete: pendingChanges.secrets.filter((change) => change.type === "delete") || []
update: transformedSecretUpdates || [],
delete:
pendingChanges.secrets.filter((change) => change.type === PendingAction.Delete) || []
},
folders: {
create: pendingChanges.folders.filter((change) => change.type === "create") || [],
update: pendingChanges.folders.filter((change) => change.type === "update") || [],
delete: pendingChanges.folders.filter((change) => change.type === "delete") || []
create:
pendingChanges.folders.filter((change) => change.type === PendingAction.Create) || [],
update:
pendingChanges.folders
.filter((change) => change.type === PendingAction.Update)
.map((change) => ({
...change,
description: change.description || null
})) || [],
delete:
pendingChanges.folders.filter((change) => change.type === PendingAction.Delete) || []
}
},
message
frontend/src/hooks/api/secrets/types.ts
+2 -1
View File
@@ -1,5 +1,6 @@
import { ProjectPermissionActions } from "@app/context";
import { PendingAction } from "../secretFolders/types";
import type { WsTag } from "../tags/types";
export enum SecretType {
@@ -67,7 +68,7 @@ export type SecretV3RawSanitized = {
secretReminderRecipients?: SecretReminderRecipient[];
rotationId?: string;
isPending?: boolean;
pendingAction?: "create" | "update" | "delete";
pendingAction?: PendingAction;
};
export type SecretV3Raw = {
frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+32 -24
View File
@@ -47,7 +47,9 @@ import { useGetProjectSecretsDetails } from "@app/hooks/api/dashboard";
import { DashboardSecretsOrderBy } from "@app/hooks/api/dashboard/types";
import { useGetFolderCommitsCount } from "@app/hooks/api/folderCommits";
import { OrderByDirection } from "@app/hooks/api/generic/types";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import { useCreateCommit } from "@app/hooks/api/secrets/mutations";
import { SecretV3RawSanitized } from "@app/hooks/api/types";
import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
import { SecretRotationListView } from "@app/pages/secret-manager/SecretDashboardPage/components/SecretRotationListView";
@@ -136,14 +138,22 @@ const Page = () => {
}
}, [isBatchMode, workspaceId, environment, secretPath, loadPendingChanges]);
const handleCreateCommit = (changes: PendingChanges, message: string) => {
createCommit({
workspaceId,
environment,
secretPath,
pendingChanges: changes,
message
});
const handleCreateCommit = async (changes: PendingChanges, message: string) => {
try {
await createCommit({
workspaceId,
environment,
secretPath,
pendingChanges: changes,
message
});
} catch (error) {
createNotification({
text: "Failed to commit changes",
type: "error"
});
console.error(error);
}
};
const canReadSecret = hasSecretReadValueOrDescribePermission(
@@ -521,7 +531,7 @@ const Page = () => {
pendingChanges.secrets.forEach((change) => {
switch (change.type) {
case "create":
case PendingAction.Create:
mergedSecrets.unshift({
id: change.id,
key: change.secretKey,
@@ -534,11 +544,11 @@ const Page = () => {
updatedAt: new Date().toISOString(),
version: 1,
isPending: true,
pendingAction: "create"
} as any);
pendingAction: PendingAction.Create
} as unknown as SecretV3RawSanitized);
break;
case "update":
case PendingAction.Update:
const updateIndex = mergedSecrets.findIndex((s) => s.key === change.secretKey);
if (updateIndex >= 0) {
mergedSecrets[updateIndex] = {
@@ -558,18 +568,18 @@ const Page = () => {
: mergedSecrets[updateIndex].skipMultilineEncoding,
secretMetadata: change.secretMetadata || mergedSecrets[updateIndex].secretMetadata,
isPending: true,
pendingAction: "update"
pendingAction: PendingAction.Update
};
}
break;
case "delete":
case PendingAction.Delete:
const deleteIndex = mergedSecrets.findIndex((s) => s.key === change.secretKey);
if (deleteIndex >= 0) {
mergedSecrets[deleteIndex] = {
...mergedSecrets[deleteIndex],
isPending: true,
pendingAction: "delete"
pendingAction: PendingAction.Delete
};
}
break;
@@ -591,18 +601,18 @@ const Page = () => {
pendingChanges.folders.forEach((change) => {
switch (change.type) {
case "create":
case PendingAction.Create:
mergedFolders.unshift({
id: change.id,
name: change.folderName,
description: change.description,
parentId: null,
isPending: true,
pendingAction: "create"
pendingAction: PendingAction.Create
} as any);
break;
case "update":
case PendingAction.Update:
const updateIndex = mergedFolders.findIndex((f) => f.id === change.id);
if (updateIndex >= 0) {
mergedFolders[updateIndex] = {
@@ -613,18 +623,18 @@ const Page = () => {
? change.description
: mergedFolders[updateIndex].description,
isPending: true,
pendingAction: "update"
pendingAction: PendingAction.Update
};
}
break;
case "delete":
case PendingAction.Delete:
const deleteIndex = mergedFolders.findIndex((f) => f.id === change.id);
if (deleteIndex >= 0) {
mergedFolders[deleteIndex] = {
...mergedFolders[deleteIndex],
isPending: true,
pendingAction: "delete"
pendingAction: PendingAction.Delete
};
}
break;
@@ -758,9 +768,7 @@ const Page = () => {
)}
{(pendingChanges.secrets.length > 0 || pendingChanges.folders.length > 0) && (
<CommitForm
onCommit={async (changes, commitMessage) => {
await handleCreateCommit(changes, commitMessage);
}}
onCommit={handleCreateCommit}
environment={environment}
workspaceId={workspaceId}
secretPath={secretPath}
frontend/src/pages/secret-manager/SecretDashboardPage/SecretMainPage.store.tsx
+37 -34
View File
@@ -4,6 +4,7 @@ import { useRouter } from "@tanstack/react-router";
import { createStore, StateCreator, StoreApi, useStore } from "zustand";
import { useShallow } from "zustand/react/shallow";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import { SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
// akhilmhdh: Don't remove this file if ur thinking why use zustand just for selected selects state
@@ -19,7 +20,7 @@ export interface BasePendingChange {
// Secret-related change types
export interface PendingSecretCreate extends BasePendingChange {
resourceType: "secret";
type: "create";
type: PendingAction.Create;
secretKey: string;
secretValue: string;
secretComment?: string;
@@ -31,7 +32,7 @@ export interface PendingSecretCreate extends BasePendingChange {
export interface PendingSecretUpdate extends BasePendingChange {
resourceType: "secret";
type: "update";
type: PendingAction.Update;
secretKey: string;
newSecretName?: string;
originalValue?: string;
@@ -48,7 +49,7 @@ export interface PendingSecretUpdate extends BasePendingChange {
export interface PendingSecretDelete extends BasePendingChange {
resourceType: "secret";
type: "delete";
type: PendingAction.Delete;
secretKey: string;
secretValue: string;
}
@@ -56,7 +57,7 @@ export interface PendingSecretDelete extends BasePendingChange {
// Folder-related change types
export interface PendingFolderCreate extends BasePendingChange {
resourceType: "folder";
type: "create";
type: PendingAction.Create;
id: string;
folderName: string;
description?: string;
@@ -65,7 +66,7 @@ export interface PendingFolderCreate extends BasePendingChange {
export interface PendingFolderUpdate extends BasePendingChange {
resourceType: "folder";
type: "update";
type: PendingAction.Update;
originalFolderName: string;
folderName: string;
id: string;
@@ -75,7 +76,7 @@ export interface PendingFolderUpdate extends BasePendingChange {
export interface PendingFolderDelete extends BasePendingChange {
resourceType: "folder";
type: "delete";
type: PendingAction.Delete;
id: string;
folderName: string;
folderPath: string;
@@ -248,43 +249,45 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
const newChanges = { ...state.pendingChanges };
if (change.resourceType === "folder") {
if (
change.type === "create" &&
(state.existingFolderNames.has(change.folderName) ||
newChanges.folders.some((f) => f.folderName === change.folderName))
) {
const existingFolder =
state.existingFolderNames.has(change.folderName) ||
newChanges.folders.some((f) => f.folderName === change.folderName);
if (change.type === PendingAction.Create && existingFolder) {
return { pendingChanges: newChanges };
}
if (
change.type === "update" &&
change.type === PendingAction.Update &&
change.folderName !== change.originalFolderName &&
(state.existingFolderNames.has(change.folderName) ||
newChanges.folders.some((f) => f.folderName === change.folderName))
existingFolder
) {
return { pendingChanges: newChanges };
}
}
if (change.resourceType === "secret") {
if (
change.type === "create" &&
(state.existingSecretKeys.has(change.secretKey) ||
newChanges.secrets.some((s) => s.secretKey === change.secretKey))
) {
const existingSecret =
state.existingSecretKeys.has(change.secretKey) ||
newChanges.secrets.some((s) => s.secretKey === change.secretKey);
if (change.type === PendingAction.Create && existingSecret) {
return { pendingChanges: newChanges };
}
if (
change.type === "update" &&
const existingNewSecretName =
change.type === PendingAction.Update &&
change.newSecretName &&
change.newSecretName !== change.secretKey &&
(state.existingSecretKeys.has(change.newSecretName) ||
newChanges.secrets.some(
(s) =>
(s.secretKey === change.newSecretName ||
(s.type === "update" && s.newSecretName === change.newSecretName)) &&
(s.type === PendingAction.Update &&
s.newSecretName === change.newSecretName)) &&
s.id !== change.id
))
) {
));
if (existingNewSecretName) {
return { pendingChanges: newChanges };
}
}
@@ -292,10 +295,10 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
if (change.resourceType === "secret") {
const secretChanges = [...newChanges.secrets];
if (change.type === "create") {
if (change.type === PendingAction.Create) {
const existingCreateIndex = secretChanges.findIndex(
(c) =>
c.type === "create" &&
c.type === PendingAction.Create &&
(c.secretKey === change.secretKey || c.secretKey === change.originalKey)
);
@@ -308,9 +311,9 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
} else {
secretChanges.push(change);
}
} else if (change.type === "update") {
} else if (change.type === PendingAction.Update) {
const existingCreateIndex = secretChanges.findIndex(
(c) => c.type === "create" && c.id === change.id
(c) => c.type === PendingAction.Create && c.id === change.id
);
if (existingCreateIndex >= 0) {
@@ -339,7 +342,7 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
};
} else {
const existingUpdateIndex = secretChanges.findIndex(
(c) => c.type === "update" && c.id === change.id
(c) => c.type === PendingAction.Update && c.id === change.id
);
if (existingUpdateIndex >= 0) {
@@ -394,9 +397,9 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
} else if (change.resourceType === "folder") {
const folderChanges = [...newChanges.folders];
if (change.type === "create") {
if (change.type === PendingAction.Create) {
const existingCreateIndex = folderChanges.findIndex(
(c) => c.type === "create" && c.folderName === change.folderName
(c) => c.type === PendingAction.Create && c.folderName === change.folderName
);
if (existingCreateIndex >= 0) {
@@ -408,9 +411,9 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
} else {
folderChanges.push(change);
}
} else if (change.type === "update") {
} else if (change.type === PendingAction.Update) {
const existingCreateIndex = folderChanges.findIndex(
(c) => c.type === "create" && c.folderName === change.originalFolderName
(c) => c.type === PendingAction.Create && c.folderName === change.originalFolderName
);
if (existingCreateIndex >= 0) {
@@ -426,7 +429,7 @@ const createBatchModeStore: StateCreator<CombinedState, [], [], BatchModeState>
};
} else {
const existingUpdateIndex = folderChanges.findIndex(
(c) => c.type === "update" && c.id === change.id
(c) => c.type === PendingAction.Update && c.id === change.id
);
if (existingUpdateIndex >= 0) {
frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/ActionBar.tsx
+2 -1
View File
@@ -74,6 +74,7 @@ import {
} from "@app/hooks/api/dashboard/queries";
import { UsedBySecretSyncs } from "@app/hooks/api/dashboard/types";
import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import { fetchProjectSecrets, secretKeys } from "@app/hooks/api/secrets/queries";
import { ApiErrorTypes, SecretType, TApiErrors, WsTag } from "@app/hooks/api/types";
import { SecretSearchInput } from "@app/pages/secret-manager/OverviewPage/components/SecretSearchInput";
@@ -193,7 +194,7 @@ export const ActionBar = ({
const pendingFolderCreate: PendingFolderCreate = {
id: folderId,
resourceType: "folder",
type: "create",
type: PendingAction.Create,
folderName,
description: description || undefined,
parentPath: secretPath,
frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
+22 -24
View File
@@ -12,6 +12,7 @@ import {
Modal,
ModalContent
} from "@app/components/v2";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import {
PendingChange,
@@ -106,11 +107,11 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
}) => {
const getChangeBadge = (type: PendingChange["type"]) => {
switch (type) {
case "create":
case PendingAction.Create:
return <Badge variant="success">Created</Badge>;
case "update":
case PendingAction.Update:
return <Badge variant="primary">Updated</Badge>;
case "delete":
case PendingAction.Delete:
return <Badge variant="danger">Deleted</Badge>;
default:
return null;
@@ -120,7 +121,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
const renderSecretChanges = () => {
if (change.resourceType !== "secret") return null;
if (change.type === "create") {
if (change.type === PendingAction.Create) {
return (
<div className="mt-3 overflow-hidden rounded-md border border-mineshaft-700 bg-mineshaft-900">
<table className="w-full text-sm">
@@ -171,7 +172,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
);
}
if (change.type === "update") {
if (change.type === PendingAction.Update) {
const hasKeyChange = change.newSecretName && change.secretKey !== change.newSecretName;
const hasValueChange = change.secretValue !== change.originalValue;
const hasCommentChange = change.secretComment !== change.originalComment;
@@ -252,7 +253,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
);
}
if (change.type === "delete") {
if (change.type === PendingAction.Delete) {
return (
<div className="mt-3 overflow-hidden rounded-md border border-mineshaft-700 bg-mineshaft-900">
<table className="w-full text-sm">
@@ -275,7 +276,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
const renderFolderChanges = () => {
if (change.resourceType !== "folder") return null;
if (change.type === "create") {
if (change.type === PendingAction.Create) {
return (
<div className="mt-3 overflow-hidden rounded-md border border-mineshaft-700 bg-mineshaft-900">
<table className="w-full text-sm">
@@ -300,7 +301,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
);
}
if (change.type === "update") {
if (change.type === PendingAction.Update) {
const hasNameChange = change.folderName !== change.originalFolderName;
const hasDescriptionChange = change.description !== change.originalDescription;
@@ -334,7 +335,7 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
);
}
if (change.type === "delete") {
if (change.type === PendingAction.Delete) {
return (
<div className="mt-3 overflow-hidden rounded-md border border-mineshaft-700 bg-mineshaft-900">
<table className="w-full text-sm">
@@ -356,10 +357,12 @@ const ChangeTable: React.FC<ChangeTableProps> = ({
const getChangeName = () => {
if (change.resourceType === "secret") {
return change.type === "update" ? change.newSecretName || change.secretKey : change.secretKey;
return change.type === PendingAction.Update
? change.newSecretName || change.secretKey
: change.secretKey;
}
if (change.resourceType === "folder") {
return change.type === "update" ? change.originalFolderName : change.folderName;
return change.type === PendingAction.Update ? change.originalFolderName : change.folderName;
}
return "Unknown";
};
@@ -417,19 +420,14 @@ export const CommitForm: React.FC<CommitFormProps> = ({
if (!commitMessage.trim()) {
return;
}
try {
await onCommit(pendingChanges, commitMessage);
clearAllPendingChanges({
workspaceId,
environment,
secretPath
});
setIsModalOpen(false);
setCommitMessage("");
} catch (error) {
console.error("Failed to commit changes:", error);
}
await onCommit(pendingChanges, commitMessage);
clearAllPendingChanges({
workspaceId,
environment,
secretPath
});
setIsModalOpen(false);
setCommitMessage("");
};
return (
frontend/src/pages/secret-manager/SecretDashboardPage/components/CreateSecretForm/CreateSecretForm.tsx
+2 -1
View File
@@ -12,6 +12,7 @@ import { InfisicalSecretInput } from "@app/components/v2/InfisicalSecretInput";
import { ProjectPermissionActions, ProjectPermissionSub, useProjectPermission } from "@app/context";
import { getKeyValue } from "@app/helpers/parseEnvVar";
import { useCreateSecretV3, useCreateWsTag, useGetWsTags } from "@app/hooks/api";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import { SecretType } from "@app/hooks/api/types";
import {
@@ -96,7 +97,7 @@ export const CreateSecretForm = ({
if (isBatchMode) {
const pendingSecretCreate: PendingSecretCreate = {
id: key,
type: "create",
type: PendingAction.Create,
secretKey: key,
secretValue: value || "",
secretComment: "",
frontend/src/pages/secret-manager/SecretDashboardPage/components/FolderListView/FolderListView.tsx
+11 -9
View File
@@ -12,7 +12,7 @@ import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
import { usePopUp } from "@app/hooks";
import { useDeleteFolder, useUpdateFolder } from "@app/hooks/api";
import { TSecretFolder } from "@app/hooks/api/secretFolders/types";
import { PendingAction, TSecretFolder } from "@app/hooks/api/secretFolders/types";
import {
PendingFolderCreate,
@@ -60,15 +60,17 @@ export const FolderListView = ({
oldFolderDescription?: string
) => {
try {
const { id: folderId, pendingAction, isPending } = popUp.updateFolder.data as TSecretFolder;
const updateFolderData = popUp.updateFolder.data;
if (!updateFolderData) throw new Error("Update folder data is required");
const { id: folderId, pendingAction, isPending } = updateFolderData as TSecretFolder;
if (isBatchMode) {
const isEditingPendingCreation = isPending && pendingAction === "create";
const isEditingPendingCreation = isPending && pendingAction === PendingAction.Create;
if (isEditingPendingCreation) {
const updatedCreate: PendingFolderCreate = {
id: folderId,
type: "create",
type: PendingAction.Create,
folderName: newFolderName,
description: newFolderDescription || undefined,
parentPath: secretPath,
@@ -84,7 +86,7 @@ export const FolderListView = ({
} else {
const updateChange: PendingFolderUpdate = {
id: folderId,
type: "update",
type: PendingAction.Update,
originalFolderName: oldFolderName || "",
folderName: newFolderName,
originalDescription: oldFolderDescription,
@@ -144,7 +146,7 @@ export const FolderListView = ({
folderName: folderData.name,
folderPath: secretPath,
resourceType: "folder",
type: "delete",
type: PendingAction.Delete,
timestamp: Date.now()
};
@@ -197,9 +199,9 @@ export const FolderListView = ({
className={twMerge(
"group flex cursor-pointer border-b border-mineshaft-600 hover:bg-mineshaft-700",
isPending && "bg-mineshaft-700/60",
pendingAction === "delete" && "border-l-2 border-l-red-600/75",
pendingAction === "update" && "border-l-2 border-l-yellow-600/75",
pendingAction === "create" && "border-l-2 border-l-green-600/75"
pendingAction === PendingAction.Delete && "border-l-2 border-l-red-600/75",
pendingAction === PendingAction.Update && "border-l-2 border-l-yellow-600/75",
pendingAction === PendingAction.Create && "border-l-2 border-l-green-600/75"
)}
>
<div className="flex w-11 items-center px-5 py-3 text-yellow-700">
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx
+10 -8
View File
@@ -50,6 +50,7 @@ import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionCo
import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faEyeSlash, faKey, faRotate } from "@fortawesome/free-solid-svg-icons";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import {
FontAwesomeSpriteName,
formSchema,
@@ -88,7 +89,7 @@ type Props = {
}[];
}[];
isPending?: boolean;
pendingAction?: "create" | "update" | "delete";
pendingAction?: PendingAction;
};
export const SecretItem = memo(
@@ -201,6 +202,8 @@ export const SecretItem = memo(
secretTags: selectedTagSlugs
})
);
const isReadOnlySecret =
isReadOnly || isRotatedSecret || (isPending && pendingAction !== PendingAction.Update);
const { secretValueHidden } = secret;
@@ -289,9 +292,9 @@ export const SecretItem = memo(
isDirty && "border-primary-400/50",
isRotatedSecret && "bg-mineshaft-700/60",
isPending && "bg-mineshaft-700/60",
pendingAction === "delete" && "border-l-2 border-l-red-600/75",
pendingAction === "update" && "border-l-2 border-l-yellow-600/75",
pendingAction === "create" && "border-l-2 border-l-green-600/75"
pendingAction === PendingAction.Delete && "border-l-2 border-l-red-600/75",
pendingAction === PendingAction.Update && "border-l-2 border-l-yellow-600/75",
pendingAction === PendingAction.Create && "border-l-2 border-l-green-600/75"
)}
>
<div className="group flex">
@@ -383,9 +386,7 @@ export const SecretItem = memo(
control={control}
render={({ field }) => (
<InfisicalSecretInput
isReadOnly={
isReadOnly || isRotatedSecret || (isPending && pendingAction !== "update")
}
isReadOnly={isReadOnlySecret}
key="secret-value"
isVisible={isVisible && !secretValueHidden}
canEditButNotView={secretValueHidden && !isOverriden}
@@ -398,7 +399,8 @@ export const SecretItem = memo(
)}
/>
)}
{pendingAction !== "create" && pendingAction !== "delete" && (
{/* Only allow to open the side panel if the secret is not in a pending create or delete state */}
{pendingAction !== PendingAction.Create && pendingAction !== PendingAction.Delete && (
<div
key="actions"
className="flex h-full flex-shrink-0 self-start transition-all group-hover:gap-x-2"
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx
+5 -4
View File
@@ -11,6 +11,7 @@ import { dashboardKeys } from "@app/hooks/api/dashboard/queries";
import { UsedBySecretSyncs } from "@app/hooks/api/dashboard/types";
import { commitKeys } from "@app/hooks/api/folderCommits/queries";
import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";
import { PendingAction } from "@app/hooks/api/secretFolders/types";
import { secretKeys } from "@app/hooks/api/secrets/queries";
import { SecretType, SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
import { secretSnapshotKeys } from "@app/hooks/api/secretSnapshots/queries";
@@ -300,12 +301,12 @@ export const SecretListView = ({
// shared secret change
if (!isSharedSecUnchanged && !personalAction) {
if (isBatchMode) {
const isEditingPendingCreation = isPending && pendingAction === "create";
const isEditingPendingCreation = isPending && pendingAction === PendingAction.Create;
if (isEditingPendingCreation) {
const updatedCreate: PendingSecretCreate = {
id: orgSecret.id,
type: "create",
type: PendingAction.Create,
secretKey: key,
secretValue: value || "",
secretComment: comment || "",
@@ -327,7 +328,7 @@ export const SecretListView = ({
const updateChange: PendingSecretUpdate = {
id: orgSecret.id,
type: "update",
type: PendingAction.Update,
secretKey: trueOriginalSecret.key,
...(key !== trueOriginalSecret.key && { newSecretName: key }),
...(value !== trueOriginalSecret.value && {
@@ -457,7 +458,7 @@ export const SecretListView = ({
if (isBatchMode) {
const deleteChange: PendingSecretDelete = {
id: `${secretId}`,
type: "delete",
type: PendingAction.Delete,
secretKey: key,
secretValue: value || "",
timestamp: Date.now(),