Merge pull request #483 from rvpanoz/develop

Develop
rvpanoz · Oct 4, 2020 · 5912484 · 5912484
2 parents 40c55b2 + 15d9da6
commit 5912484
Show file tree

Hide file tree

Showing 23 changed files with 205 additions and 139 deletions.
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/app/cli/manager.js b/app/cli/manager.js
@@ -1,4 +1,4 @@
-import cp from 'child_process';
+import cp, { exec } from 'child_process';
 import path from 'path';
 import chalk from 'chalk';
 import { Observable } from 'rxjs';
@@ -52,12 +52,10 @@ const execute = ({
     });
 
     try {
-      // on windows use npm.cmd
       const command = spawn(
         /^win/.test(process.platform) ? `${manager}.cmd` : manager,
         commandArgs,
         {
-          shell: true,
           env: process.env,
           cwd: isLocal
             ? operation === 'init'
@@ -107,10 +105,10 @@ const execute = ({
         observer.next({
           status: 'close',
           errors,
-          data: result.join(''),
+          initDirectory,
           cmd: commandArgs,
           packageJson: Boolean(packageJson),
-          initDirectory,
+          data: result.join(' '),
         });
 
         observer.complete();

diff --git a/app/cli/shell.js b/app/cli/shell.js
@@ -1,4 +1,6 @@
 import log from 'electron-log';
+import fs from 'fs';
+import path from 'path';
 import { concat } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import manager from './manager';
@@ -18,7 +20,7 @@ const runCommand = (options, callback) => {
       const runner = manager[command];
       const result$ = runner(rest, idx);
 
-      return result$.pipe(catchError((error) => log.error(error)));
+      return result$.pipe(catchError(log.error));
     });
 
   // subscribe to observables in order as previous completes

diff --git a/app/commons/hocs/withErrorBoundary.js b/app/commons/hocs/withErrorBoundary.js
@@ -1,12 +1,7 @@
-/* eslint-disable object-shorthand */
-/* eslint-disable react/state-in-constructor */
-
 import React from 'react';
-import { Component, createFactory } from 'react';
+import { Component } from 'react';
 
 const withErrorBoundary = (BaseComponent) => {
-  const factory = createFactory(BaseComponent);
-
   return class ErrorBoundary extends Component {
     constructor(props) {
       super(props);
@@ -37,9 +32,7 @@ const withErrorBoundary = (BaseComponent) => {
         );
       }
 
-      return factory({
-        ...props,
-      });
+      return <BaseComponent {...props} />;
     }
   };
 };

diff --git a/app/components/App.js b/app/components/App.js
@@ -44,20 +44,6 @@ const App = () => {
   useEffect(() => {
     ipcRenderer.once('finish-loaded', () => dispatch(initActions()));
 
-    ipcRenderer.on('npm-env-close', (event, error, env) => {
-      dispatch({ type: setEnv.type, payload: env });
-    });
-
-    ipcRenderer.on('npm-command-flow', (event, message) => {
-      dispatch(
-        setSnackbar({
-          open: true,
-          type: 'primary',
-          message,
-        })
-      );
-    });
-
     ipcRenderer.on('yarn-lock-detected', () => {
       dispatch(
         setSnackbar({
@@ -85,7 +71,7 @@ const App = () => {
   return (
     <MuiThemeProvider theme={theme}>
       <CssBaseline />
-      {!uiException ? <Layout app="Luna" /> : uiException}
+      {!uiException ? <Layout app="Luna" /> : <div>{uiException?.message}</div>}
     </MuiThemeProvider>
   );
 };

diff --git a/app/components/packages/Actions.js b/app/components/packages/Actions.js
@@ -115,7 +115,13 @@ export const InstallAction = ({ handler }) => {
     message: iMessage('confirmation', 'installSelected'),
     buttons: ['Cancel', 'Install'],
   };
-  const dialogHandler = () => handler('install');
+  const dialogHandler = ({ response }) => {
+    if (response === 0) {
+      return;
+    }
+
+    handler('install');
+  };
   const onClickHandler = () => showDialog(dialogHandler, dialogOptions);
 
   return (
@@ -145,7 +151,13 @@ export const LatestAction = ({ handler }) => {
     buttons: ['Cancel', 'Install'],
   };
 
-  const dialogHandler = () => handler('install', true, true);
+  const dialogHandler = ({ response }) => {
+    if (response === 0) {
+      return;
+    }
+
+    handler('install', true, true);
+  };
   const onClickHandler = () => showDialog(dialogHandler, dialogOptions);
 
   return (
@@ -175,7 +187,13 @@ export const UpdateAction = ({ handler }) => {
     buttons: ['Cancel', 'Update'],
   };
 
-  const dialogHandler = () => handler('update');
+  const dialogHandler = ({ response }) => {
+    if (response === 0) {
+      return;
+    }
+
+    handler('update');
+  };
   const onClickHandler = () => showDialog(dialogHandler, dialogOptions);
 
   return (
@@ -198,7 +216,7 @@ UpdateAction.propTypes = {
 };
 
 export const UninstallAction = ({ handler, options }) => {
-  const { selected } = options;
+  const { selected } = options || [];
   const hasNpmSelected = selected && selected.indexOf('npm') > -1;
 
   const dialogOptions = {
@@ -208,7 +226,13 @@ export const UninstallAction = ({ handler, options }) => {
     buttons: ['Cancel', 'Uninstall'],
   };
 
-  const dialogHandler = () => handler('uninstall');
+  const dialogHandler = ({ response }) => {
+    if (response === 0) {
+      return;
+    }
+
+    handler('uninstall');
+  };
   const onClickHandler = () => showDialog(dialogHandler, dialogOptions);
 
   // avoid npm uninstallation :)

diff --git a/app/components/packages/PackageDetails.js b/app/components/packages/PackageDetails.js
@@ -101,7 +101,7 @@ const PackageDetails = ({ classes, toggleOptions }) => {
       });
     }
 
-    return dispatch(
+    dispatch(
       installPackage({
         ipcEvent: 'npm-install',
         cmd: ['install'],
@@ -112,7 +112,7 @@ const PackageDetails = ({ classes, toggleOptions }) => {
     );
   };
 
-  const handleUpdate = () =>
+  const handleUpdate = () => {
     dispatch(
       updatePackages({
         ipcEvent: 'npm-update',
@@ -121,8 +121,9 @@ const PackageDetails = ({ classes, toggleOptions }) => {
         packages: [active.name],
       })
     );
+  };
 
-  const handleUninstall = () =>
+  const handleUninstall = () => {
     dispatch(
       uninstallPackages({
         ipcEvent: 'npm-uninstall',
@@ -131,6 +132,7 @@ const PackageDetails = ({ classes, toggleOptions }) => {
         packages: [active.name],
       })
     );
+  };
 
   const handleInstallVersion = (packageVersion) => {
     if (fromSearch && mode === 'local') {
@@ -158,7 +160,11 @@ const PackageDetails = ({ classes, toggleOptions }) => {
       optionalDependencies: () => ['save-optional'],
     })('')(group);
 
-    const dialogHandler = () =>
+    const dialogHandler = ({ response }) => {
+      if (response === 0) {
+        return;
+      }
+
       dispatch(
         installPackage({
           cmd: ['install'],
@@ -168,6 +174,7 @@ const PackageDetails = ({ classes, toggleOptions }) => {
           single: true,
         })
       );
+    };
 
     return showDialog(dialogHandler, dialogOptions);
   };

diff --git a/app/components/popups/Init.js b/app/components/popups/Init.js
@@ -26,6 +26,7 @@ const Init = ({ classes, enableInit }) => {
           ...initOptions,
           directory: filePath[0],
         });
+
         enableInit(filePath[0]);
       }
     };

diff --git a/app/components/sidebar/SidebarContainer.js b/app/components/sidebar/SidebarContainer.js
@@ -104,7 +104,11 @@ const AppSidebar = ({ classes, className }) => {
       buttons: ['Cancel', 'Install'],
     };
 
-    const dialogHandler = () =>
+    const dialogHandler = ({ response }) => {
+      if (response === 0) {
+        return;
+      }
+
       dispatch(
         installPackageJson({
           ipcEvent: 'install',
@@ -115,6 +119,7 @@ const AppSidebar = ({ classes, className }) => {
           directory: shrinkedDirectory,
         })
       );
+    };
 
     return showDialog(dialogHandler, dialogOptions);
   }, [mode, directory, dispatch]);
@@ -129,13 +134,18 @@ const AppSidebar = ({ classes, className }) => {
       buttons: ['Cancel', 'Run'],
     };
 
-    const dialogHandler = () =>
+    const dialogHandler = ({ response }) => {
+      if (response === 0) {
+        return;
+      }
+
       dispatch(
         runDedupe({
           ipcEvent: 'dedupe',
           cmd: ['dedupe'],
         })
       );
+    };
 
     return showDialog(dialogHandler, dialogOptions);
   }, [dispatch]);
@@ -150,7 +160,11 @@ const AppSidebar = ({ classes, className }) => {
       buttons: ['Cancel', 'Run'],
     };
 
-    const dialogHandler = () =>
+    const dialogHandler = ({ response }) => {
+      if (response === 0) {
+        return;
+      }
+
       dispatch(
         runCache({
           ipcEvent: 'cache',
@@ -160,6 +174,7 @@ const AppSidebar = ({ classes, className }) => {
           },
         })
       );
+    };
 
     return showDialog(dialogHandler, dialogOptions);
   }, [dispatch]);

diff --git a/app/components/topbar/TopBarContainer.js b/app/components/topbar/TopBarContainer.js
@@ -82,6 +82,10 @@ const AppTopBar = ({ classes, className }) => {
     };
 
     const dialogHandler = ({ filePaths }) => {
+      if (!filePaths.length) {
+        return;
+      }
+
       dispatch(
         setActivePage({
           page: 'packages',

diff --git a/app/index.js b/app/index.js
@@ -15,11 +15,11 @@ ReactDom.render(
 
 if (module.hot) {
   module.hot.accept('./components/App', () => {
-    const NextApp = require('./components/App').default;
+    const Root = require('./components/App').default;
 
     ReactDom.render(
       <StoreContext.Provider value={store}>
-        <NextApp />
+        <Root />
       </StoreContext.Provider>,
       document.getElementById('app')
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ const Init = ({ classes, enableInit }) => { @@
               ...initOptions,
               directory: filePath[0],
             });
             enableInit(filePath[0]);
           }
         };
@@ Expand Down @@