feat: resolved minor issues with dashboard v3 on feedback

This commit is contained in:
Akhil Mohan
2023-09-28 21:28:43 +05:30
parent 5450c1126a
commit 50efb8b8bd
5 changed files with 20 additions and 14 deletions
@@ -170,6 +170,7 @@ export const ActionBar = ({
environment, environment,
secrets: bulkDeletedSecrets.map(({ key }) => ({ secretName: key, type: "shared" })) secrets: bulkDeletedSecrets.map(({ key }) => ({ secretName: key, type: "shared" }))
}); });
onResetSelectedSecret();
handlePopUpClose("bulkDeleteSecrets"); handlePopUpClose("bulkDeleteSecrets");
createNotification({ createNotification({
type: "success", type: "success",
@@ -168,7 +168,7 @@ export const FolderListView = ({
isOpen={popUp.updateFolder.isOpen} isOpen={popUp.updateFolder.isOpen}
onOpenChange={(isOpen) => handlePopUpToggle("updateFolder", isOpen)} onOpenChange={(isOpen) => handlePopUpToggle("updateFolder", isOpen)}
> >
<ModalContent title="Create Folder"> <ModalContent title="Edit Folder">
<FolderForm <FolderForm
isEdit isEdit
defaultFolderName={popUp.updateFolder.data as string} defaultFolderName={popUp.updateFolder.data as string}
@@ -298,15 +298,6 @@ export const SecretDropzone = ({
<ModalContent <ModalContent
title={isUploadedDuplicateSecretsEmpty ? "Confirmation" : "Duplicate Secrets!!"} title={isUploadedDuplicateSecretsEmpty ? "Confirmation" : "Duplicate Secrets!!"}
footerContent={[ footerContent={[
<Button
key="keep-old-btn"
className="mr-4"
onClick={() => handlePopUpClose("overlapKeyWarning")}
variant="outline_bg"
isDisabled={isSubmitting}
>
Keep old
</Button>,
<Button <Button
isLoading={isSubmitting} isLoading={isSubmitting}
isDisabled={isSubmitting} isDisabled={isSubmitting}
@@ -314,12 +305,21 @@ export const SecretDropzone = ({
key="overwrite-btn" key="overwrite-btn"
onClick={handleSaveSecrets} onClick={handleSaveSecrets}
> >
{isUploadedDuplicateSecretsEmpty ? "Create" : "Overwrite"} {isUploadedDuplicateSecretsEmpty ? "Upload" : "Overwrite"}
</Button>,
<Button
key="keep-old-btn"
className="mr-4"
onClick={() => handlePopUpClose("overlapKeyWarning")}
variant="outline_bg"
isDisabled={isSubmitting}
>
Cancel
</Button> </Button>
]} ]}
> >
{isUploadedDuplicateSecretsEmpty ? ( {isUploadedDuplicateSecretsEmpty ? (
<div>Uploaded secrets will be created.</div> <div>Upload secrets from this file</div>
) : ( ) : (
<div className="flex flex-col space-y-2 text-gray-300"> <div className="flex flex-col space-y-2 text-gray-300">
<div>Your file contains following duplicate secrets</div> <div>Your file contains following duplicate secrets</div>
@@ -1,5 +1,6 @@
import { Controller, useFieldArray, useForm } from "react-hook-form"; import { Controller, useFieldArray, useForm } from "react-hook-form";
import { subject } from "@casl/ability"; import { subject } from "@casl/ability";
import { faCircleQuestion } from "@fortawesome/free-regular-svg-icons";
import { import {
faCheckCircle, faCheckCircle,
faCircle, faCircle,
@@ -28,7 +29,8 @@ import {
SecretInput, SecretInput,
Switch, Switch,
Tag, Tag,
TextArea TextArea,
Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { ProjectPermissionActions, ProjectPermissionSub, useProjectPermission } from "@app/context"; import { ProjectPermissionActions, ProjectPermissionSub, useProjectPermission } from "@app/context";
import { useGetSecretVersion } from "@app/hooks/api"; import { useGetSecretVersion } from "@app/hooks/api";
@@ -231,8 +233,12 @@ export const SecretDetailSidebar = ({
isChecked={value} isChecked={value}
onBlur={onBlur} onBlur={onBlur}
isDisabled={!isAllowed} isDisabled={!isAllowed}
className="items-center"
> >
Disable multi line encoding Disable multi line encoding
<Tooltip content="Infisical encodes multiline secrets by escaping newlines and wrappign in quotes. To disable, enable this option">
<FontAwesomeIcon icon={faCircleQuestion} className="ml-1" size="sm" />
</Tooltip>
</Switch> </Switch>
)} )}
</ProjectPermissionCan> </ProjectPermissionCan>
@@ -51,7 +51,6 @@ const reorderSecretGroupByUnderscore = (secrets: DecryptedSecret[], sortDir: Sor
}; };
const reorderSecret = (secrets: DecryptedSecret[], sortDir: SortDir, filter?: GroupBy | null) => { const reorderSecret = (secrets: DecryptedSecret[], sortDir: SortDir, filter?: GroupBy | null) => {
console.log(secrets);
if (filter === GroupBy.PREFIX) { if (filter === GroupBy.PREFIX) {
return reorderSecretGroupByUnderscore(secrets, sortDir); return reorderSecretGroupByUnderscore(secrets, sortDir);
} }