ClusterWorkspaceSettings refactoring/fixing

Signed-off-by: alexfront <alex.andreev.email@gmail.com>

src/renderer/components/+cluster-settings/components/cluster-workspace-setting.tsx

@@ -1,12 +1,11 @@
 import React from "react";
-import { Cluster } from "../../../../main/cluster";
-import { clusterStore } from "../../../../common/cluster-store"
-import { workspaceStore } from "../../../../common/workspace-store"
-import { Select, SelectOption } from "../../../components/select";
-import { GeneralInputStatus } from "./statuses"
-import { observable } from "mobx";
-import { autobind } from "../../../utils";
 import { observer } from "mobx-react";
+import { Link } from "react-router-dom";
+import { workspacesURL } from "../../+workspaces";
+import { workspaceStore } from "../../../../common/workspace-store";
+import { Cluster } from "../../../../main/cluster";
+import { Select } from "../../../components/select";
+import { SubTitle } from "../../layout/sub-title";
 
 interface Props {
   cluster: Cluster;
@@ -14,23 +13,24 @@ interface Props {
 
 @observer
 export class ClusterWorkspaceSetting extends React.Component<Props> {
-  @observable workspace = this.props.cluster.workspace;
-
   render() {
-    return <>
+    return (
-      <h4>Cluster Workspace</h4>
+      <>
-      <p>Change cluster workspace:</p>
+        <SubTitle title="Cluster Workspace"/>
+        <p>
+          Define cluster{" "}
+          <Link to={workspacesURL()}>
+            workspace
+          </Link>.
+        </p>
         <Select
-        value={workspaceStore.currentWorkspaceId}
+          value={this.props.cluster.workspace}
-        options={workspaceStore.workspacesList.map(w => ({value: w.id, label: <span>{w.name}</span>}))}
+          onChange={({value}) => this.props.cluster.workspace = value}
-        onChange={this.changeWorkspace}
+          options={workspaceStore.workspacesList.map(w =>
+            ({value: w.id, label: w.name})
+          )}
         />
-    </>;
+      </>
-  }
+    );
-
-  @autobind()
-  changeWorkspace({ value: workspace }: SelectOption<string>) {
-    this.workspace = workspace;
-    this.props.cluster.workspace = workspace;
   }
 }

src/renderer/components/+cluster-settings/general.tsx

@@ -15,8 +15,6 @@ export class General extends React.Component<Props> {
   render() {
     return <div>
       <h2>General</h2>
-      <hr/>
-      
       <ClusterNameSetting cluster={this.props.cluster} />
       <ClusterWorkspaceSetting cluster={this.props.cluster} />
       <ClusterIconSetting cluster={this.props.cluster} />