Integrate create and delete env actions

Author: jsajal

packages/flowtest-electron/src/ipc/collection.js

@@ -161,8 +161,8 @@ const registerRendererEventHandlers = (mainWindow, watcher) => {
   ipcMain.handle('renderer:delete-environment', async (event, collectionPath, name) => {
     try {
       const envDir = path.join(collectionPath, 'environments');
-      deleteFile(path.join(envDir, `${name}.env`));
-      console.log(`Delete file: ${name}.env`);
+      deleteFile(path.join(envDir, name));
+      console.log(`Delete file: ${name}`);
     } catch (error) {
       return Promise.reject(error);
     }

src/components/molecules/flow/index.js

@@ -156,7 +156,7 @@ const Flow = ({ tabId, collectionId, flowData }) => {
 
   useEffect(() => {
     // skip inital render
-    if (isEqual(nodes, []) && isEqual(edges, [])) {
+    if (flowData === undefined || (isEqual(nodes, []) && isEqual(edges, []))) {
       return;
     }
     if (flowData && isEqual(JSON.parse(JSON.stringify(nodes)), flowData.nodes) && isEqual(edges, flowData.edges)) {

src/components/molecules/modals/sidebar/NewLabelModal.js

@@ -39,7 +39,7 @@ const NewLabelModal = ({ closeFn = () => null, open = false, pathName, collectio
                     as='h3'
                     className='pb-4 text-lg font-semibold text-center text-gray-900 border-b border-neutral-300'
                   >
-                    Create a new folder
+                    {`Create a ${menuOption}`}
                   </Dialog.Title>
                   <div className='mt-6'>
                     <input
@@ -97,7 +97,6 @@ const NewLabelModal = ({ closeFn = () => null, open = false, pathName, collectio
                           // wont be needing it here but just putting it for testing
                           console.log(`\n Creating a new collection by the name : ${labelValue} \n`);
                         } else if (menuOption === DirectoryOptionsActions.addNewEnvironment.value) {
-                          console.log(`\n Creating a new environment file by the name : ${labelValue} \n`);
                           createEnvironmentFile(labelValue, collectionId)
                             .then((result) => {
                               console.log(
@@ -106,7 +105,6 @@ const NewLabelModal = ({ closeFn = () => null, open = false, pathName, collectio
                             })
                             .catch((error) => {
                               // TODO: show error in UI
-                              console.log(`\n \n \n RACHIIIIITT \n \n \n`);
                               console.log(`Error creating new environment: ${error}`);
                               closeFn();
                             });

src/components/molecules/sidebar/content/Environment.js

@@ -46,10 +46,7 @@ const Environment = ({ collectionId, collection }) => {
                     <div
                       className='relative inline-block p-2 text-left transition duration-200 ease-out rounded rounded-l-none hover:bg-slate-200'
                       onClick={() => {
-                        console.log(
-                          `Deleting environment: name = ${environment.name}, path = ${environment.pathname}, collectionId = ${collectionId}`,
-                        );
-                        deleteEnvironmentFile(environment.pathname, collectionId)
+                        deleteEnvironmentFile(environment.name, collectionId)
                           .then((result) => {
                             console.log(
                               `Deleted environment: name = ${environment.name}, path = ${environment.pathname}, collectionId = ${collectionId}, result: ${result}`,

src/components/molecules/sidebar/content/Environments.js

@@ -17,15 +17,10 @@ const Environments = ({ collections }) => {
         const clickFrom = clickFromElementDataSet?.clickFrom;
 
         if (clickFrom && clickFrom === 'env-options-menu') {
-          console.log(`\n Environments CLICK FROM : ${clickFrom} \n`);
           const itemType = clickFromElementDataSet?.itemType;
           const optionsMenuItem = clickFromElementDataSet?.optionsMenuItem;
           const pathName = clickFromElementDataSet?.pathName;
 
-          console.log(
-            `\n Environments: ${itemType} : ${optionsMenuItem} : ${JSON.stringify(clickFromElementDataSet)} \n`,
-          );
-
           setSelectedPathName(pathName);
           setSelectedCollectionId(collections[0].id);
           setSelectedMenuItem(optionsMenuItem);

src/components/organisms/SideBar.js

@@ -6,7 +6,6 @@ import Content from 'components/molecules/sidebar/content';
 
 const SideBar = () => {
   const collections = useCollectionStore((state) => state.collections);
-  console.log(JSON.stringify(collections));
   return (
     <div className='flex-auto'>
       <SideBarHeader />

src/service/collection.js

@@ -87,7 +87,7 @@ export const createEnvironmentFile = (name, collectionId) => {
   const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
 
   if (collection) {
-    const existingEnv = collection.enviroments.find((e) => e.name === name);
+    const existingEnv = collection.environments.find((e) => e.name === `${name}.env`);
     if (existingEnv) {
       return Promise.reject(new Error('An environment with the same name already exists'));
     } else {
@@ -134,7 +134,7 @@ export const deleteEnvironmentFile = (name, collectionId) => {
   const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
 
   if (collection) {
-    const existingEnv = collection.enviroments.find((e) => e.name === name);
+    const existingEnv = collection.environments.find((e) => e.name === name);
     if (existingEnv) {
       return new Promise((resolve, reject) => {
         ipcRenderer.invoke('renderer:delete-environment', collection.pathname, name).then(resolve).catch(reject);