awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 21:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: update stale/conflict text

Browse Source
This commit is contained in:
Scott Wilson
2025-06-30 16:44:29 -07:00
parent 650ed656e3
commit 447e28511c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChangeItem.tsx
+6 -6
View File
@@ -8,7 +8,7 @@ import {
faExclamationTriangle, faExclamationTriangle,
faEye, faEye,
faEyeSlash, faEyeSlash,
faInfo, faInfoCircle,
faKey faKey
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -69,15 +69,15 @@ export const SecretApprovalRequestChangeItem = ({
<div className="flex items-center px-1 py-1"> <div className="flex items-center px-1 py-1">
<div className="flex-grow">{generateItemTitle(op)}</div> <div className="flex-grow">{generateItemTitle(op)}</div>
{!hasMerged && isStale && ( {!hasMerged && isStale && (
<div className="flex items-center"> <div className="flex items-center text-mineshaft-300">
<FontAwesomeIcon icon={faInfo} className="text-sm text-primary-600" /> <FontAwesomeIcon icon={faInfoCircle} className="text-xs" />
<span className="ml-2 text-xs">Secret has been changed(stale)</span> <span className="ml-1 text-xs">Secret has been changed (stale)</span>
</div> </div>
)} )}
{hasMerged && hasConflict && ( {hasMerged && hasConflict && (
<div className="flex items-center space-x-2 text-sm text-bunker-300"> <div className="flex items-center space-x-1 text-xs text-bunker-300">
<Tooltip content="Merge Conflict"> <Tooltip content="Merge Conflict">
<FontAwesomeIcon icon={faExclamationTriangle} className="text-red-700" /> <FontAwesomeIcon icon={faExclamationTriangle} className="text-xs text-red" />
</Tooltip> </Tooltip>
<div>{generateConflictText(op)}</div> <div>{generateConflictText(op)}</div>
</div> </div>