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

feat(ui): allow user to merge secrets while uploading file

Browse Source
This commit is contained in:
Kanhaiya M
2023-02-05 18:07:54 +05:30
parent 8ae43cdcf6
commit b56d9287e4
2 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/dashboard/[id].tsx
+41 -2
View File
@@ -22,6 +22,7 @@ import Button from '@app/components/basic/buttons/Button';
import ListBox from '@app/components/basic/Listbox';
import BottonRightPopup from '@app/components/basic/popups/BottomRightPopup';
import { useNotificationContext } from '@app/components/context/Notifications/NotificationProvider';
import ConfirmEnvOverwriteModal from '@app/components/dashboard/ConfirmEnvOverwriteModal';
import DownloadSecretMenu from '@app/components/dashboard/DownloadSecretsMenu';
import DropZone from '@app/components/dashboard/DropZone';
import KeyPair from '@app/components/dashboard/KeyPair';
@@ -125,6 +126,7 @@ export default function Dashboard() {
const [snapshotData, setSnapshotData] = useState<SnapshotProps>();
const [numSnapshots, setNumSnapshots] = useState<number>();
const [saveLoading, setSaveLoading] = useState(false);
const [dropZoneData, setDropZoneData] = useState<SecretDataProps[]>();
const { t } = useTranslation();
const { createNotification } = useNotificationContext();
@@ -504,11 +506,33 @@ export default function Dashboard() {
return undefined;
};
const addData = (newData: SecretDataProps[]) => {
setData(data!.concat(newData));
const addDataWithMerge = (newData: SecretDataProps[], preserve?: 'old' | 'new') => {
setData((oldData) => {
let filteredOldData = oldData!;
let filteredNewData = newData;
if (preserve === 'new')
filteredOldData = oldData!.filter(
(oldDataPoint) => !newData.find((newDataPoint) => newDataPoint.key === oldDataPoint.key)
);
if (preserve === 'old')
filteredNewData = newData.filter(
(newDataPoint) => !oldData?.find((oldDataPoint) => oldDataPoint.key === newDataPoint.key)
);
return filteredOldData.concat(filteredNewData);
});
setButtonReady(true);
};
const addData = (newData: SecretDataProps[]) => {
if (
newData.some((newDataPoint) => data?.find((dataPoint) => dataPoint.key === newDataPoint.key)) // if newData contains duplicates
) {
setDropZoneData(newData);
return;
}
addDataWithMerge(newData);
};
const changeBlurred = () => {
setBlurred(!blurred);
};
@@ -527,6 +551,21 @@ export default function Dashboard() {
<meta name="og:description" content={String(t('dashboard:og-description'))} />
</Head>
<div className="flex flex-row h-full">
<ConfirmEnvOverwriteModal
isOpen={!!dropZoneData}
onClose={() => setDropZoneData(undefined)}
onOverwriteConfirm={(preserve) => {
addDataWithMerge(dropZoneData!, preserve);
setDropZoneData(undefined);
}}
duplicateKeys={
dropZoneData
?.filter((newDataPoint) =>
data?.find((dataPoint) => dataPoint.key === newDataPoint.key)
)
.map((duplicate) => duplicate.key) ?? []
}
/>
{sidebarSecretId !== 'None' && (
<SideBar
toggleSidebar={toggleSidebar}