fix(eclair): minor fixes fo eclair support

jamaljsr · Mar 17, 2020 · f76de99 · f76de99
1 parent f437918
commit f76de99
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 14 deletions.
diff --git a/src/__mocks__/electron.js b/src/__mocks__/electron.js
@@ -7,6 +7,9 @@ module.exports = {
     dialog: {
       showSaveDialog: jest.fn(),
     },
+    Menu: {
+      buildFromTemplate: jest.fn(),
+    },
     process: {
       env: {},
     },

diff --git a/src/components/designer/lightning/ConnectTab.tsx b/src/components/designer/lightning/ConnectTab.tsx
@@ -175,15 +175,17 @@ const ConnectTab: React.FC<Props> = ({ node }) => {
         size="small"
         onChange={e => setAuthType(e.target.value)}
       >
-        <Radio.Button key="paths" value="paths">
-          {l('filePaths')}
-        </Radio.Button>
-        <Radio.Button key="hex" value="hex">
-          {l('hexStrings')}
-        </Radio.Button>
-        <Radio.Button key="base64" value="base64">
-          {l('base64Strings')}
-        </Radio.Button>
+        {credentials.admin && [
+          <Radio.Button key="paths" value="paths">
+            {l('filePaths')}
+          </Radio.Button>,
+          <Radio.Button key="hex" value="hex">
+            {l('hexStrings')}
+          </Radio.Button>,
+          <Radio.Button key="base64" value="base64">
+            {l('base64Strings')}
+          </Radio.Button>,
+        ]}
         {node.implementation === 'LND' && (
           <Radio.Button value="lndc">{l('lndConnect')}</Radio.Button>
         )}

diff --git a/src/components/network/NetworkView.tsx b/src/components/network/NetworkView.tsx
@@ -197,7 +197,14 @@ const NetworkView: React.FC<RouteComponentProps<MatchParams>> = ({ match }) => {
   return (
     <Styled.NetworkView>
       {header}
-      {showNotice && <Alert type="info" message={l('missingImages')} showIcon />}
+      {showNotice && (
+        <Alert
+          type="info"
+          message={l('missingImages')}
+          description={missingImages.join(', ')}
+          showIcon
+        />
+      )}
       {toggleAsync.error && (
         <Alert
           type="error"

diff --git a/src/components/terminal/DockerTerminal.tsx b/src/components/terminal/DockerTerminal.tsx
@@ -2,6 +2,7 @@
 /* istanbul ignore file */
 import React, { useEffect, useRef } from 'react';
 import { useParams } from 'react-router';
+import { remote } from 'electron';
 import { debug, info } from 'electron-log';
 import styled from '@emotion/styled';
 import 'xterm/css/xterm.css';
@@ -143,6 +144,23 @@ const DockerTerminal: React.FC = () => {
   const { type, name } = useParams<RouteParams>();
   const termEl = useRef<HTMLDivElement>(null);
 
+  // add context menu
+  useEffect(() => {
+    window.addEventListener(
+      'contextmenu',
+      e => {
+        e.preventDefault();
+        const menu = remote.Menu.buildFromTemplate([
+          { role: 'cut' },
+          { role: 'copy' },
+          { role: 'paste' },
+        ]);
+        menu.popup({ window: remote.getCurrentWindow() });
+      },
+      false,
+    );
+  });
+
   useEffect(() => {
     info('Rendering DockerTerminal component');
     document.title = `Polar Terminal | ${name} (${type})`;

diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
@@ -20,7 +20,7 @@
   "cmps.common.AdvancedOptionsModal.error": "Failed to update options",
   "cmps.common.CopyIcon.message": "Copied {{label}} to clipboard",
   "cmps.common.NavMenu.createNetwork": "Create Network",
-  "cmps.common.NavMenu.manageNodes": "Manage Nodes",
+  "cmps.common.NavMenu.manageNodes": "Manage Images",
   "cmps.common.NavMenu.importNetwork": "Import Network",
   "cmps.common.NavMenu.exportNetwork": "Export Network",
   "cmps.common.RestartNode.title": "Restart Node",

diff --git a/src/lib/docker/dockerService.spec.ts b/src/lib/docker/dockerService.spec.ts
@@ -443,7 +443,7 @@ describe('DockerService', () => {
     it('should create volume dirs when the network is started', async () => {
       composeMock.upAll.mockResolvedValue(mockResult);
       await dockerService.start(network);
-      expect(fs.ensureDir).toBeCalledTimes(7);
+      expect(fsMock.ensureDir).toBeCalledTimes(7);
     });
 
     it('should call compose.down when a network is stopped', async () => {

diff --git a/src/lib/docker/dockerService.ts b/src/lib/docker/dockerService.ts
@@ -115,7 +115,7 @@ class DockerService implements DockerLibrary {
    */
   async start(network: Network) {
     const { bitcoin, lightning } = network.nodes;
-    this.ensureDirs(network, [...bitcoin, ...lightning]);
+    await this.ensureDirs(network, [...bitcoin, ...lightning]);
 
     info(`Starting docker containers for ${network.name}`);
     info(` - path: ${network.path}`);
@@ -140,7 +140,7 @@ class DockerService implements DockerLibrary {
    * @param node the node to start
    */
   async startNode(network: Network, node: CommonNode) {
-    this.ensureDirs(network, [node]);
+    await this.ensureDirs(network, [node]);
     // make sure the docker container is stopped. If it is already started in an error state
     // then starting it would have no effect
     await this.stopNode(network, node);