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

refactor: set data as a map instead of list

Browse Source
This commit is contained in:
lemmy mwaura
2022-12-10 22:24:02 +03:00
parent 6d1dc3845b
commit 968af64ee7
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/utilities/secrets/getSecretsForProject.js
+8 -7
View File
@@ -68,13 +68,14 @@ const getSecretsForProject = async ({
setFileState(tempFileState); setFileState(tempFileState);
setData( setData(
tempFileState.map((line, index) => [ tempFileState.map((line, index) => {
guidGenerator(), return {
index, id: guidGenerator(),
line["key"], key: line["key"],
line["value"], value: line["value"],
line["type"], type: line["type"]
]) }
})
// .sort((a, b) => // .sort((a, b) =>
// sortMethod == "alphabetical" // sortMethod == "alphabetical"
// ? a[2].localeCompare(b[2]) // ? a[2].localeCompare(b[2])
frontend/pages/dashboard/[id].js
+29 -29
View File
@@ -74,7 +74,7 @@ const KeyPair = ({
onChangeHandler={modifyKey} onChangeHandler={modifyKey}
type="varName" type="varName"
index={keyPair[1]} index={keyPair[1]}
value={keyPair[2]} value={keyPair.key}
duplicates={duplicates} duplicates={duplicates}
/> />
</div> </div>
@@ -85,7 +85,7 @@ const KeyPair = ({
onChangeHandler={modifyValue} onChangeHandler={modifyValue}
type="value" type="value"
index={keyPair[1]} index={keyPair[1]}
value={keyPair[3]} value={keyPair.value}
blurred={isBlurred} blurred={isBlurred}
/> />
</div> </div>
@@ -114,7 +114,7 @@ const KeyPair = ({
<div <div
onClick={() => onClick={() =>
modifyVisibility( modifyVisibility(
keyPair[4] == "personal" ? "shared" : "personal", keyPair.type == "personal" ? "shared" : "personal",
keyPair[1] keyPair[1]
) )
} }
@@ -122,10 +122,10 @@ const KeyPair = ({
> >
<FontAwesomeIcon <FontAwesomeIcon
className="text-lg pl-1.5 pr-3" className="text-lg pl-1.5 pr-3"
icon={keyPair[4] == "personal" ? faPeopleGroup : faPerson} icon={keyPair.type == "personal" ? faPeopleGroup : faPerson}
/> />
<div className="text-sm"> <div className="text-sm">
{keyPair[4] == "personal" ? "Make Shared" : "Make Personal"} {keyPair.type == "personal" ? "Make Shared" : "Make Personal"}
</div> </div>
</div> </div>
<div <div
@@ -190,7 +190,7 @@ const KeyPair = ({
<div className="w-2"></div> <div className="w-2"></div>
<div className="opacity-50 hover:opacity-100 duration-200"> <div className="opacity-50 hover:opacity-100 duration-200">
<Button <Button
onButtonPressed={() => deleteRow(keyPair[0])} onButtonPressed={() => deleteRow(keyPair.id)}
color="red" color="red"
size="icon-sm" size="icon-sm"
icon={faX} icon={faX}
@@ -322,12 +322,12 @@ export default function Dashboard() {
const deleteRow = (id) => { const deleteRow = (id) => {
setButtonReady(true); setButtonReady(true);
setData(data.filter((row) => row[0] !== id)); setData(data.filter((row) => row.id !== id));
}; };
const modifyValue = (value, id) => { const modifyValue = (value, id) => {
setData((oldData) => { setData((oldData) => {
oldData[id][3] = value; oldData[id].value = value;
return [...oldData]; return [...oldData];
}); });
setButtonReady(true); setButtonReady(true);
@@ -335,7 +335,7 @@ export default function Dashboard() {
const modifyKey = (value, id) => { const modifyKey = (value, id) => {
setData((oldData) => { setData((oldData) => {
oldData[id][2] = value; oldData[id].key = value;
return [...oldData]; return [...oldData];
}); });
setButtonReady(true); setButtonReady(true);
@@ -343,7 +343,7 @@ export default function Dashboard() {
const modifyVisibility = (value, id) => { const modifyVisibility = (value, id) => {
setData((oldData) => { setData((oldData) => {
oldData[id][4] = value; oldData[id].type = value;
return [...oldData]; return [...oldData];
}); });
setButtonReady(true); setButtonReady(true);
@@ -369,7 +369,7 @@ export default function Dashboard() {
// Format the new object with environment variables // Format the new object with environment variables
let obj = Object.assign( let obj = Object.assign(
{}, {},
...data.map((row) => ({ [row[2]]: [row[3], row[4]] })) ...data.map((row) => ({ [row.key]: [row.value, row.type] }))
); );
// Checking if any of the secret keys start with a number - if so, don't do anything // Checking if any of the secret keys start with a number - if so, don't do anything
@@ -378,9 +378,9 @@ export default function Dashboard() {
.every((v) => v === false); .every((v) => v === false);
const duplicatesExist = const duplicatesExist =
data data
?.map((item) => item[2]) ?.map((item) => item.key)
.filter( .filter(
(item, index) => index !== data?.map((item) => item[2]).indexOf(item) (item, index) => index !== data?.map((item) => item.key).indexOf(item)
).length > 0; ).length > 0;
if (nameErrors) { if (nameErrors) {
@@ -415,7 +415,7 @@ export default function Dashboard() {
) { ) {
let objIntegration = Object.assign( let objIntegration = Object.assign(
{}, {},
...data.map((row) => ({ [row[2]]: row[3] })) ...data.map((row) => ({ [row.key]: row.value }))
); );
await pushKeysIntegration({ await pushKeysIntegration({
obj: objIntegration, obj: objIntegration,
@@ -442,7 +442,7 @@ export default function Dashboard() {
// This function downloads the secrets as a .env file // This function downloads the secrets as a .env file
const download = () => { const download = () => {
const file = data.map((item) => [item[2], item[3]].join("=")).join("\n"); const file = data.map((item) => [item.key, item.value].join("=")).join("\n");
const blob = new Blob([file]); const blob = new Blob([file]);
const fileDownloadUrl = URL.createObjectURL(blob); const fileDownloadUrl = URL.createObjectURL(blob);
let alink = document.createElement("a"); let alink = document.createElement("a");
@@ -648,19 +648,19 @@ export default function Dashboard() {
{data {data
.filter( .filter(
(keyPair) => (keyPair) =>
keyPair[2] keyPair.key
.toLowerCase() .toLowerCase()
.includes(searchKeys.toLowerCase()) && .includes(searchKeys.toLowerCase()) &&
keyPair[4] == "personal" keyPair.type == "personal"
) )
.sort((a, b) => .sort((a, b) =>
sortMethod == "alphabetical" sortMethod == "alphabetical"
? a[2].localeCompare(b[2]) ? a.key.localeCompare(b.key)
: b[2].localeCompare(a[2]) : b.key.localeCompare(a.key)
) )
?.map((keyPair, index) => ( ?.map((keyPair, index) => (
<KeyPair <KeyPair
key={keyPair[0]} key={keyPair.id}
keyPair={keyPair} keyPair={keyPair}
deleteRow={deleteCertainRow} deleteRow={deleteCertainRow}
modifyValue={listenChangeValue} modifyValue={listenChangeValue}
@@ -668,11 +668,11 @@ export default function Dashboard() {
modifyVisibility={listenChangeVisibility} modifyVisibility={listenChangeVisibility}
isBlurred={blurred} isBlurred={blurred}
duplicates={data duplicates={data
?.map((item) => item[2]) ?.map((item) => item.key)
.filter( .filter(
(item, index) => (item, index) =>
index !== index !==
data?.map((item) => item[2]).indexOf(item) data?.map((item) => item.key).indexOf(item)
)} )}
/> />
))} ))}
@@ -702,19 +702,19 @@ export default function Dashboard() {
{data {data
.filter( .filter(
(keyPair) => (keyPair) =>
keyPair[2] keyPair.key
.toLowerCase() .toLowerCase()
.includes(searchKeys.toLowerCase()) && .includes(searchKeys.toLowerCase()) &&
keyPair[4] == "shared" keyPair.type == "shared"
) )
.sort((a, b) => .sort((a, b) =>
sortMethod == "alphabetical" sortMethod == "alphabetical"
? a[2].localeCompare(b[2]) ? a.key.localeCompare(b.key)
: b[2].localeCompare(a[2]) : b.key.localeCompare(a.key)
) )
?.map((keyPair, index) => ( ?.map((keyPair, index) => (
<KeyPair <KeyPair
key={keyPair[0]} key={keyPair.id}
keyPair={keyPair} keyPair={keyPair}
deleteRow={deleteCertainRow} deleteRow={deleteCertainRow}
modifyValue={listenChangeValue} modifyValue={listenChangeValue}
@@ -722,11 +722,11 @@ export default function Dashboard() {
modifyVisibility={listenChangeVisibility} modifyVisibility={listenChangeVisibility}
isBlurred={blurred} isBlurred={blurred}
duplicates={data duplicates={data
?.map((item) => item[2]) ?.map((item) => item.key)
.filter( .filter(
(item, index) => (item, index) =>
index !== index !==
data?.map((item) => item[2]).indexOf(item) data?.map((item) => item.key).indexOf(item)
)} )}
/> />
))} ))}