From 50efb8b8bd34fab28879e49be8f5698216182095 Mon Sep 17 00:00:00 2001
From: Akhil Mohan <akhilmhdh@gmail.com>
Date: Tue, 26 Sep 2023 17:11:11 +0530
Subject: [PATCH] feat: resolved minor issues with dashboard v3 on feedback

---
 .../components/ActionBar/ActionBar.tsx        |  1 +
 .../FolderListView/FolderListView.tsx         |  2 +-
 .../SecretDropzone/SecretDropzone.tsx         | 22 +++++++++----------
 .../SecretListView/SecretDetaiSidebar.tsx     |  8 ++++++-
 .../SecretListView/SecretListView.tsx         |  1 -
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
index e9cfe8095..7e5a2bdcb 100644
--- a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
+++ b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
@@ -170,6 +170,7 @@ export const ActionBar = ({
         environment,
         secrets: bulkDeletedSecrets.map(({ key }) => ({ secretName: key, type: "shared" }))
       });
+      onResetSelectedSecret();
       handlePopUpClose("bulkDeleteSecrets");
       createNotification({
         type: "success",
diff --git a/frontend/src/views/SecretMainPage/components/FolderListView/FolderListView.tsx b/frontend/src/views/SecretMainPage/components/FolderListView/FolderListView.tsx
index cc215cf36..fc75ea0e8 100644
--- a/frontend/src/views/SecretMainPage/components/FolderListView/FolderListView.tsx
+++ b/frontend/src/views/SecretMainPage/components/FolderListView/FolderListView.tsx
@@ -168,7 +168,7 @@ export const FolderListView = ({
         isOpen={popUp.updateFolder.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("updateFolder", isOpen)}
       >
-        <ModalContent title="Create Folder">
+        <ModalContent title="Edit Folder">
           <FolderForm
             isEdit
             defaultFolderName={popUp.updateFolder.data as string}
diff --git a/frontend/src/views/SecretMainPage/components/SecretDropzone/SecretDropzone.tsx b/frontend/src/views/SecretMainPage/components/SecretDropzone/SecretDropzone.tsx
index 9491f8793..aeb97e772 100644
--- a/frontend/src/views/SecretMainPage/components/SecretDropzone/SecretDropzone.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretDropzone/SecretDropzone.tsx
@@ -298,15 +298,6 @@ export const SecretDropzone = ({
         <ModalContent
           title={isUploadedDuplicateSecretsEmpty ? "Confirmation" : "Duplicate Secrets!!"}
           footerContent={[
-            <Button
-              key="keep-old-btn"
-              className="mr-4"
-              onClick={() => handlePopUpClose("overlapKeyWarning")}
-              variant="outline_bg"
-              isDisabled={isSubmitting}
-            >
-              Keep old
-            </Button>,
             <Button
               isLoading={isSubmitting}
               isDisabled={isSubmitting}
@@ -314,12 +305,21 @@ export const SecretDropzone = ({
               key="overwrite-btn"
               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>
           ]}
         >
           {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>Your file contains following duplicate secrets</div>
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
index 73201615a..fcabe6e41 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
@@ -1,5 +1,6 @@
 import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { subject } from "@casl/ability";
+import { faCircleQuestion } from "@fortawesome/free-regular-svg-icons";
 import {
   faCheckCircle,
   faCircle,
@@ -28,7 +29,8 @@ import {
   SecretInput,
   Switch,
   Tag,
-  TextArea
+  TextArea,
+  Tooltip
 } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub, useProjectPermission } from "@app/context";
 import { useGetSecretVersion } from "@app/hooks/api";
@@ -231,8 +233,12 @@ export const SecretDetailSidebar = ({
                         isChecked={value}
                         onBlur={onBlur}
                         isDisabled={!isAllowed}
+                        className="items-center"
                       >
                         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>
                     )}
                   </ProjectPermissionCan>
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
index 9d5c113da..722033e96 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
@@ -51,7 +51,6 @@ const reorderSecretGroupByUnderscore = (secrets: DecryptedSecret[], sortDir: Sor
 };
 
 const reorderSecret = (secrets: DecryptedSecret[], sortDir: SortDir, filter?: GroupBy | null) => {
-  console.log(secrets);
   if (filter === GroupBy.PREFIX) {
     return reorderSecretGroupByUnderscore(secrets, sortDir);
   }