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

Fixed the bugs with secret overrides and the sidebar

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2022-12-27 16:46:15 -05:00
parent 4c43bdac93
commit 876c5f51c2
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/basic/Toggle.tsx
-1
View File
@@ -64,7 +64,6 @@ export default function Toggle ({
id id
]) ])
} else { } else {
setSharedToHide(sharedToHide!.filter(tempId => tempId != id))
deleteOverride(id); deleteOverride(id);
} }
setEnabled(!enabled); setEnabled(!enabled);
frontend/components/dashboard/SideBar.tsx
+12 -12
View File
@@ -83,8 +83,8 @@ const SideBar = ({
<DashboardInputField <DashboardInputField
onChangeHandler={modifyKey} onChangeHandler={modifyKey}
type="varName" type="varName"
position={data[0].pos} position={data[0]?.pos}
value={data[0].key} value={data[0]?.key}
isDuplicate={false} isDuplicate={false}
blurred={false} blurred={false}
/> />
@@ -116,11 +116,11 @@ const SideBar = ({
enabled={overrideEnabled} enabled={overrideEnabled}
setEnabled={setOverrideEnabled} setEnabled={setOverrideEnabled}
addOverride={addOverride} addOverride={addOverride}
keyName={data[0].key} keyName={data[0]?.key}
value={data[0].value} value={data[0]?.value}
pos={data[0].pos} pos={data[0]?.pos}
id={data[0].id} id={data[0]?.id}
comment={data[0].comment} comment={data[0]?.comment}
deleteOverride={deleteOverride} deleteOverride={deleteOverride}
sharedToHide={sharedToHide} sharedToHide={sharedToHide}
setSharedToHide={setSharedToHide} setSharedToHide={setSharedToHide}
@@ -130,13 +130,13 @@ const SideBar = ({
<DashboardInputField <DashboardInputField
onChangeHandler={modifyValue} onChangeHandler={modifyValue}
type="value" type="value"
position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].pos : data[0].pos} position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.pos : data[0]?.pos}
value={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].value : data[0].value} value={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.value : data[0]?.value}
isDuplicate={false} isDuplicate={false}
blurred={true} blurred={true}
/> />
<div className='absolute right-[0.57rem] top-[0.3rem] z-50'> <div className='absolute right-[0.57rem] top-[0.3rem] z-50'>
<GenerateSecretMenu modifyValue={modifyValue} position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0].pos : data[0].pos} /> <GenerateSecretMenu modifyValue={modifyValue} position={overrideEnabled ? data.filter(secret => secret.type == "personal")[0]?.pos : data[0]?.pos} />
</div> </div>
</div> </div>
</div> </div>
@@ -149,8 +149,8 @@ const SideBar = ({
isFull={true} isFull={true}
/> />
</div> */} </div> */}
<SecretVersionList secretId={data[0].id} /> <SecretVersionList secretId={data[0]?.id} />
<CommentField comment={data.filter(secret => secret.type == "shared")[0]?.comment} modifyComment={modifyComment} position={data[0].pos} /> <CommentField comment={data.filter(secret => secret.type == "shared")[0]?.comment} modifyComment={modifyComment} position={data[0]?.pos} />
</div> </div>
<div className={`flex justify-start max-w-sm mt-4 px-4 mt-full mb-[4.7rem]`}> <div className={`flex justify-start max-w-sm mt-4 px-4 mt-full mb-[4.7rem]`}>
<Button <Button
frontend/pages/dashboard/[id].tsx
+10 -1
View File
@@ -249,6 +249,15 @@ export default function Dashboard() {
*/ */
const deleteOverride = (id: string) => { const deleteOverride = (id: string) => {
setButtonReady(true); setButtonReady(true);
// find which shared secret corresponds to the overriden version
const sharedVersionOfOverride = data!.filter(secret => secret.type == "shared" && secret.key == data!.filter(row => row.id == id)[0]?.key)[0]?.id;
// change the sidebar to this shared secret; and unhide it
toggleSidebar(sharedVersionOfOverride)
setSharedToHide(sharedToHide!.filter(tempId => tempId != sharedVersionOfOverride))
// resort secrets
const tempData = data!.filter((row: SecretDataProps) => !(row.id == id && row.type == 'personal')) const tempData = data!.filter((row: SecretDataProps) => !(row.id == id && row.type == 'personal'))
sortValuesHandler(tempData, sortMethod == "alhpabetical" ? "-alphabetical" : "alphabetical") sortValuesHandler(tempData, sortMethod == "alhpabetical" ? "-alphabetical" : "alphabetical")
}; };
@@ -419,7 +428,7 @@ export default function Dashboard() {
<div className="flex flex-row"> <div className="flex flex-row">
{sidebarSecretId != "None" && <SideBar {sidebarSecretId != "None" && <SideBar
toggleSidebar={toggleSidebar} toggleSidebar={toggleSidebar}
data={data.filter((row: SecretDataProps) => row.id == sidebarSecretId)} data={data.filter((row: SecretDataProps) => row.key == data.filter(row => row.id == sidebarSecretId)[0]?.key)}
modifyKey={listenChangeKey} modifyKey={listenChangeKey}
modifyValue={listenChangeValue} modifyValue={listenChangeValue}
modifyComment={listenChangeComment} modifyComment={listenChangeComment}