mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 19:28:09 +00:00
improvement: address feedback
This commit is contained in:
@@ -265,7 +265,8 @@ export const useGetFolderCommitHistory = ({
|
|||||||
],
|
],
|
||||||
queryFn: () =>
|
queryFn: () =>
|
||||||
fetchFolderCommitHistory(workspaceId, environment, directory, offset, limit, search, sort),
|
fetchFolderCommitHistory(workspaceId, environment, directory, offset, limit, search, sort),
|
||||||
enabled: Boolean(workspaceId && environment)
|
enabled: Boolean(workspaceId && environment),
|
||||||
|
placeholderData: (prev) => prev
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+16
-1
@@ -1,5 +1,10 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { faAngleDown, faCodeCommit, faWarning } from "@fortawesome/free-solid-svg-icons";
|
import {
|
||||||
|
faAngleDown,
|
||||||
|
faChevronLeft,
|
||||||
|
faCodeCommit,
|
||||||
|
faWarning
|
||||||
|
} from "@fortawesome/free-solid-svg-icons";
|
||||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||||
import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu";
|
import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu";
|
||||||
import { useSearch } from "@tanstack/react-router";
|
import { useSearch } from "@tanstack/react-router";
|
||||||
@@ -244,6 +249,16 @@ export const CommitDetailsTab = ({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<Button
|
||||||
|
variant="link"
|
||||||
|
type="submit"
|
||||||
|
leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
|
||||||
|
onClick={() => {
|
||||||
|
goBackToHistory();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Commit History
|
||||||
|
</Button>
|
||||||
<PageHeader
|
<PageHeader
|
||||||
title={`${parsedCommitDetails.changes?.message}` || "No message"}
|
title={`${parsedCommitDetails.changes?.message}` || "No message"}
|
||||||
description={
|
description={
|
||||||
|
|||||||
+17
-30
@@ -230,11 +230,6 @@ const renderJsonWithDiffs = (
|
|||||||
: "flex bg-green-500/50 rounded-sm text-green-300";
|
: "flex bg-green-500/50 rounded-sm text-green-300";
|
||||||
};
|
};
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
||||||
const getHighlightClass = (_different: boolean) => {
|
|
||||||
return "";
|
|
||||||
};
|
|
||||||
|
|
||||||
const prefix = isDifferent ? (isOldVersion ? " -" : " +") : " ";
|
const prefix = isDifferent ? (isOldVersion ? " -" : " +") : " ";
|
||||||
const keyDisplay = keyName ? `"${keyName}": ` : "";
|
const keyDisplay = keyName ? `"${keyName}": ` : "";
|
||||||
const comma = !isLastItem ? "," : "";
|
const comma = !isLastItem ? "," : "";
|
||||||
@@ -257,8 +252,8 @@ const renderJsonWithDiffs = (
|
|||||||
<div className="w-4 flex-shrink-0">{prefix}</div>
|
<div className="w-4 flex-shrink-0">{prefix}</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
{keyName && <span className={getHighlightClass(isDifferent)}>{keyDisplay}</span>}
|
{keyName && <span>{keyDisplay}</span>}
|
||||||
<span className={getHighlightClass(isDifferent)}>{valueDisplay}</span>
|
<span>{valueDisplay}</span>
|
||||||
{comma}
|
{comma}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -271,8 +266,8 @@ const renderJsonWithDiffs = (
|
|||||||
<div className="w-4 flex-shrink-0">{prefix}</div>
|
<div className="w-4 flex-shrink-0">{prefix}</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
{keyName && <span className={getHighlightClass(isDifferent)}>{keyDisplay}</span>}
|
{keyName && <span>{keyDisplay}</span>}
|
||||||
<span className={getHighlightClass(isDifferent)}>[]</span>
|
<span>[]</span>
|
||||||
{comma}
|
{comma}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -285,8 +280,8 @@ const renderJsonWithDiffs = (
|
|||||||
<div className="w-4 flex-shrink-0">{prefix}</div>
|
<div className="w-4 flex-shrink-0">{prefix}</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
{keyName && <span className={getHighlightClass(isDifferent)}>{keyDisplay}</span>}
|
{keyName && <span>{keyDisplay}</span>}
|
||||||
<span className={getHighlightClass(isDifferent)}>{"{}"}</span>
|
<span>{"{}"}</span>
|
||||||
{comma}
|
{comma}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -326,12 +321,8 @@ const renderJsonWithDiffs = (
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
{keyName && (
|
{keyName && <span>{keyDisplay}</span>}
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>
|
<span>[</span>
|
||||||
{keyDisplay}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>[</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -363,7 +354,7 @@ const renderJsonWithDiffs = (
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>]</span>
|
<span>]</span>
|
||||||
{comma}
|
{comma}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -382,12 +373,8 @@ const renderJsonWithDiffs = (
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
{keyName && (
|
{keyName && <span>{keyDisplay}</span>}
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>
|
<span>{"{"}</span>
|
||||||
{keyDisplay}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>{"{"}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -420,7 +407,7 @@ const renderJsonWithDiffs = (
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
{indent}
|
{indent}
|
||||||
<span className={isContainerAddedOrRemoved ? getHighlightClass(true) : ""}>{"}"}</span>
|
<span>{"}"}</span>
|
||||||
{comma}
|
{comma}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -630,18 +617,18 @@ export const SecretVersionDiffView = ({
|
|||||||
<div className="overflow-hidden border border-b-0 border-mineshaft-600 bg-mineshaft-800 first:rounded-t last:rounded-b last:border-b">
|
<div className="overflow-hidden border border-b-0 border-mineshaft-600 bg-mineshaft-800 first:rounded-t last:rounded-b last:border-b">
|
||||||
{showHeader && renderHeader()}
|
{showHeader && renderHeader()}
|
||||||
{!collapsed && (
|
{!collapsed && (
|
||||||
<div className="border-t border-mineshaft-700 bg-bunker-900 p-3 text-mineshaft-100">
|
<div className="border-t border-mineshaft-700 bg-mineshaft-900 p-3 text-mineshaft-100">
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="flex gap-3">
|
||||||
<div
|
<div
|
||||||
ref={oldContainerRef}
|
ref={oldContainerRef}
|
||||||
className="thin-scrollbar max-h-96 overflow-auto whitespace-pre rounded border border-mineshaft-600 bg-mineshaft-900 p-4"
|
className="thin-scrollbar max-h-96 flex-1 overflow-auto whitespace-pre"
|
||||||
>
|
>
|
||||||
{oldVersionContent}
|
{oldVersionContent}
|
||||||
</div>
|
</div>
|
||||||
|
<div className="max-h-96 w-[0.05rem] self-stretch bg-mineshaft-600" />
|
||||||
<div
|
<div
|
||||||
ref={newContainerRef}
|
ref={newContainerRef}
|
||||||
className="thin-scrollbar max-h-96 overflow-auto whitespace-pre rounded border border-mineshaft-600 bg-mineshaft-900 p-4"
|
className="thin-scrollbar max-h-96 flex-1 overflow-auto whitespace-pre"
|
||||||
>
|
>
|
||||||
{newVersionContent}
|
{newVersionContent}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user