From a464c3d1d4476ea1b8b4e941167dd1d099f717d3 Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Sun, 10 Dec 2023 23:43:02 -0300
Subject: [PATCH] Removed ability to share with API keys

---
 src/frontend/src/modals/shareModal/index.tsx  | 52 +++++--------------
 .../extraSidebarComponent/index.tsx           |  2 +-
 .../components/nodeToolbarComponent/index.tsx |  2 +-
 src/frontend/src/utils/styleUtils.ts          |  2 +
 4 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/src/frontend/src/modals/shareModal/index.tsx b/src/frontend/src/modals/shareModal/index.tsx
index 996f36dda..96f21e991 100644
--- a/src/frontend/src/modals/shareModal/index.tsx
+++ b/src/frontend/src/modals/shareModal/index.tsx
@@ -44,7 +44,6 @@ export default function ShareModal({
   const { hasApiKey, hasStore } = useContext(StoreContext);
   const { setSuccessData, setErrorData } = useContext(alertContext);
   const { reactFlowInstance } = useContext(typesContext);
-  const [checked, setChecked] = useState(false);
   const [internalOpen, internalSetOpen] = useState(children ? false : true);
   const [openConfirmationModal, setOpenConfirmationModal] = useState(false);
   const nameComponent = is_component ? "component" : "flow";
@@ -99,23 +98,14 @@ export default function ShareModal({
   const handleShareComponent = async (update = false) => {
     //remove file names from flows before sharing
     removeFileNameFromComponents(component);
-    const flow: FlowType = checked
-      ? {
-          id: component!.id,
-          data: component!.data,
-          description,
-          name,
-          last_tested_version: version,
-          is_component: is_component,
-        }
-      : removeApiKeys({
-          id: component!.id,
-          data: component!.data,
-          description,
-          name,
-          last_tested_version: version,
-          is_component: is_component,
-        });
+    const flow: FlowType = removeApiKeys({
+      id: component!.id,
+      data: component!.data,
+      description,
+      name,
+      last_tested_version: version,
+      is_component: is_component,
+    });
 
     function successShare() {
       if (!is_component) {
@@ -157,9 +147,7 @@ export default function ShareModal({
   };
 
   const handleExportComponent = () => {
-    if (!checked) {
-      component = removeApiKeys(component);
-    }
+    component = removeApiKeys(component);
     downloadNode(component);
   };
 
@@ -221,7 +209,7 @@ export default function ShareModal({
         >
           <span className="pr-2">Share</span>
           <IconComponent
-            name="Share2"
+            name="Share"
             className="h-6 w-6 pl-1 text-foreground"
             aria-hidden="true"
           />
@@ -239,35 +227,21 @@ export default function ShareModal({
               setSelectedTags={setSelectedTags}
             />
           </div>
-          <div className="mt-5 flex items-center space-x-2">
+          <div className="mb-2 mt-5 flex items-center space-x-2">
             <Checkbox
               id="public"
               checked={sharePublic}
               onCheckedChange={(event: boolean) => {
                 setSharePublic(event);
-                setChecked(false);
               }}
             />
             <label htmlFor="public" className="export-modal-save-api text-sm ">
               Make {nameComponent} public
             </label>
           </div>
-          <div className="mt-3 flex items-center space-x-2">
-            <Checkbox
-              id="terms"
-              checked={checked}
-              onCheckedChange={(event: boolean) => {
-                setChecked(event);
-              }}
-              disabled={sharePublic}
-            />
-            <label htmlFor="terms" className="export-modal-save-api text-sm ">
-              Save with my API keys
-            </label>
-          </div>
           <span className=" text-xs text-destructive ">
-            Warning: Deselecting this box will exclusively eliminate API keys
-            from fields explicitly designated for API keys.
+            <b>Warning:</b> The {nameComponent} will be shared without the API
+            keys for its specific fields.
           </span>
         </BaseModal.Content>
 
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index be9a98e6d..43ddf9946 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -200,7 +200,7 @@ export default function ExtraSidebar(): JSX.Element {
           )}
         >
           <IconComponent
-            name="Share2"
+            name="Share"
             className={classNames(
               "side-bar-button-size",
               !hasApiKey || !validApiKey || !hasStore
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 18d242453..5c0a502f0 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -250,7 +250,7 @@ export default function NodeToolbarComponent({
                 >
                   <div className="flex">
                     <IconComponent
-                      name="Share2"
+                      name="Share"
                       className="relative top-0.5 mr-2 h-4 w-4"
                     />{" "}
                     Share{" "}
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index fae4be1f0..664ce8592 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -75,6 +75,7 @@ import {
   Scissors,
   Search,
   Settings2,
+  Share,
   Share2,
   Shield,
   Sparkles,
@@ -358,6 +359,7 @@ export const nodeIconsLucide: iconsType = {
   Maximize2,
   SaveAll,
   Share2,
+  Share,
   GitBranchPlus,
   Loader2,
   BookmarkPlus,