Merge branch 'master' into fix/iframe-ipc-flakyness

src/common/user-store.ts

@@ -59,8 +59,6 @@ export class UserStore extends BaseStore<UserStoreModel> {
     colorTheme: UserStore.defaultTheme,
     downloadMirror: "default",
     downloadKubectlBinaries: true,  // Download kubectl binaries matching cluster version
-    downloadBinariesPath: this.getDefaultKubectlPath(),
-    kubectlBinariesPath: ""
   };
 
   get isNewVersion() {

src/main/kubectl.ts

@@ -36,7 +36,7 @@ const packageMirrors: Map<string, string> = new Map([
 let bundledPath: string
 const initScriptVersionString = "# lens-initscript v3\n"
 
-if (isDevelopment || isTestEnv) {
+if (isDevelopment || isTestEnv) {
   const platformName = isWindows ? "windows" : process.platform
   bundledPath = path.join(process.cwd(), "binaries", "client", platformName, process.arch, "kubectl")
 } else {
@@ -110,7 +110,11 @@ export class Kubectl {
   }
 
   protected getDownloadDir() {
-    return userStore.preferences?.downloadBinariesPath || Kubectl.kubectlDir
+    if (userStore.preferences?.downloadBinariesPath) {
+      return path.join(userStore.preferences.downloadBinariesPath, "kubectl")
+    }
+
+    return Kubectl.kubectlDir
   }
 
   public async getPath(bundled = false): Promise<string> {
@@ -214,7 +218,7 @@ export class Kubectl {
         });
         isValid = !await this.checkBinary(this.path, false)
       }
-      if(!isValid) {
+      if (!isValid) {
         logger.debug(`Releasing lock for ${this.kubectlVersion}`)
         release()
         return false

src/renderer/bootstrap.tsx

@@ -43,7 +43,10 @@ export async function bootstrap(App: AppComponent) {
       window.location.href = "about:blank"
     }
   })
-  render(<App/>, rootElem);
+  render(<>
+    {isMac && <div id="draggable-top" />}
+    <App />
+  </>, rootElem);
 }
 
 // run

src/renderer/components/+preferences/kubectl-binaries.tsx

@@ -18,44 +18,22 @@ export const KubectlBinaries = observer(({ preferences }: { preferences: UserPre
     { value: "china", label: "China (Azure)" },
   ]
 
-
   const save = () => {
     preferences.downloadBinariesPath = downloadPath;
     preferences.kubectlBinariesPath = binariesPath;
   }
 
-  const renderPath = () => {
-    if (preferences.downloadKubectlBinaries) {
-      return null;
-    }
-    return (
-      <>
-        <SubTitle title="Path to Kubectl binary"/>
-        <Input
-          theme="round-black"
-          value={binariesPath}
-          validators={isPath}
-          onChange={setBinariesPath}
-          onBlur={save}
-        />
-        <small className="hint">
-          <Trans>Default:</Trans>{" "}{Kubectl.bundledKubectlPath}
-        </small>
-      </>
-    );
-  }
-
   return (
     <>
       <h2><Trans>Kubectl Binary</Trans></h2>
-      <small className="hint">
-        <Trans>Download kubectl binaries matching to Kubernetes cluster verison.</Trans>
-      </small>
       <Checkbox
         label={<Trans>Download kubectl binaries</Trans>}
         value={preferences.downloadKubectlBinaries}
         onChange={downloadKubectlBinaries => preferences.downloadKubectlBinaries = downloadKubectlBinaries}
       />
+      <small className="hint">
+        <Trans>Download kubectl binaries matching to Kubernetes cluster version.</Trans>
+      </small>
       <SubTitle title="Download mirror" />
       <Select
         placeholder={<Trans>Download mirror for kubectl</Trans>}
@@ -64,20 +42,32 @@ export const KubectlBinaries = observer(({ preferences }: { preferences: UserPre
         onChange={({ value }: SelectOption) => preferences.downloadMirror = value}
         disabled={!preferences.downloadKubectlBinaries}
       />
-      <SubTitle title="Directory for binaries"/>
+      <SubTitle title="Directory for binaries" />
       <Input
         theme="round-black"
         value={downloadPath}
-        placeholder={`Directory to download binaries into`}
+        placeholder={userStore.getDefaultKubectlPath()}
         validators={isPath}
         onChange={setDownloadPath}
         onBlur={save}
         disabled={!preferences.downloadKubectlBinaries}
       />
-      <small>
+      <small className="hint">
-        Default: {userStore.getDefaultKubectlPath()}
+        The directory to download binaries into.
+      </small>
+      <SubTitle title="Path to Kubectl binary" />
+      <Input
+        theme="round-black"
+        placeholder={Kubectl.bundledKubectlPath}
+        value={binariesPath}
+        validators={isPath}
+        onChange={setBinariesPath}
+        onBlur={save}
+        disabled={preferences.downloadKubectlBinaries}
+      />
+      <small className="hint">
+        <Trans>The path to the kubectl binary on the system.</Trans>
       </small>
-      {renderPath()}
     </>
   );
 });

src/renderer/components/app.scss

@@ -13,6 +13,7 @@
 :root {
   --mainBackground: #1e2124;
   --main-layout-header: 40px;
+  --drag-region-height: 22px
 }
 
 ::selection {
@@ -47,7 +48,7 @@ html, body {
   left: 0;
   top: 0;
   width: 100%;
-  height: var(--main-layout-header);
+  height: var(--drag-region-height);
   z-index: 1000;
   pointer-events: none;
 }

src/renderer/components/cluster-manager/cluster-manager.tsx

@@ -14,6 +14,7 @@ import { ClusterSettings, clusterSettingsRoute } from "../+cluster-settings";
 import { clusterViewRoute, clusterViewURL, getMatchedCluster, getMatchedClusterId } from "./cluster-view.route";
 import { clusterStore } from "../../../common/cluster-store";
 import { hasLoadedView, initView, lensViews, refreshViews } from "./lens-views";
+import { isMac } from "../../../common/vars";
 
 @observer
 export class ClusterManager extends React.Component {
@@ -53,21 +54,20 @@ export class ClusterManager extends React.Component {
   render() {
     return (
       <div className="ClusterManager">
-        <div id="draggable-top"/>
         <main>
-          <div id="lens-views"/>
+          <div id="lens-views" />
           <Switch>
-            <Route component={LandingPage} {...landingRoute}/>
+            <Route component={LandingPage} {...landingRoute} />
-            <Route component={Preferences} {...preferencesRoute}/>
+            <Route component={Preferences} {...preferencesRoute} />
-            <Route component={Workspaces} {...workspacesRoute}/>
+            <Route component={Workspaces} {...workspacesRoute} />
-            <Route component={AddCluster} {...addClusterRoute}/>
+            <Route component={AddCluster} {...addClusterRoute} />
-            <Route component={ClusterView} {...clusterViewRoute}/>
+            <Route component={ClusterView} {...clusterViewRoute} />
-            <Route component={ClusterSettings} {...clusterSettingsRoute}/>
+            <Route component={ClusterSettings} {...clusterSettingsRoute} />
-            <Redirect exact to={this.startUrl}/>
+            <Redirect exact to={this.startUrl} />
           </Switch>
         </main>
-        <ClustersMenu/>
+        <ClustersMenu />
-        <BottomBar/>
+        <BottomBar />
       </div>
     )
   }