From 9603f59b96f68b973bb4c793a037a3b932e42955 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 10 Nov 2018 22:16:34 +0200
Subject: [PATCH] Fix bugs and improve minor UI things

---
 .../frontend/src/pages/dashboard/Client.js    |  2 +-
 .../frontend/src/pages/dashboard/Instance.js  |  4 +--
 .../frontend/src/pages/dashboard/Plugin.js    | 27 +++++++++----------
 .../frontend/src/pages/dashboard/index.js     |  2 +-
 .../src/style/lib/preferencetable.sass        |  4 +++
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/maubot/management/frontend/src/pages/dashboard/Client.js b/maubot/management/frontend/src/pages/dashboard/Client.js
index 04d195f..0424911 100644
--- a/maubot/management/frontend/src/pages/dashboard/Client.js
+++ b/maubot/management/frontend/src/pages/dashboard/Client.js
@@ -157,7 +157,7 @@ class Client extends BaseMainView {
     renderPreferences = () => (
         <PrefTable>
             <PrefInput rowName="User ID" type="text" disabled={!this.isNew} fullWidth={true}
-                       name={!this.isNew ? "id" : ""} value={this.state.id}
+                       name={!this.isNew ? "id" : ""} value={this.state.id} className="id"
                        placeholder="@fancybot:example.com" onChange={this.inputChange}/>
             <PrefInput rowName="Homeserver" type="text" name="homeserver"
                        value={this.state.homeserver} placeholder="https://example.com"
diff --git a/maubot/management/frontend/src/pages/dashboard/Instance.js b/maubot/management/frontend/src/pages/dashboard/Instance.js
index 7e73587..2c2f825 100644
--- a/maubot/management/frontend/src/pages/dashboard/Instance.js
+++ b/maubot/management/frontend/src/pages/dashboard/Instance.js
@@ -135,9 +135,9 @@ class Instance extends BaseMainView {
     render() {
         return <div className="instance">
             <PrefTable>
-                <PrefInput rowName="ID" type="text" name={"id"} value={this.state.id}
+                <PrefInput rowName="ID" type="text" name="id" value={this.state.id}
                            placeholder="fancybotinstance" onChange={this.inputChange}
-                           disabled={!this.isNew} fullWidth={true}/>
+                           disabled={!this.isNew} fullWidth={true} className="id"/>
                 <PrefSwitch rowName="Enabled" active={this.state.enabled}
                             onToggle={enabled => this.setState({ enabled })}/>
                 <PrefSwitch rowName="Running" active={this.state.started}
diff --git a/maubot/management/frontend/src/pages/dashboard/Plugin.js b/maubot/management/frontend/src/pages/dashboard/Plugin.js
index bb3ea4e..aac38cf 100644
--- a/maubot/management/frontend/src/pages/dashboard/Plugin.js
+++ b/maubot/management/frontend/src/pages/dashboard/Plugin.js
@@ -67,6 +67,12 @@ class Plugin extends BaseMainView {
 
     render() {
         return <div className="plugin">
+            {!this.isNew && <PrefTable>
+                <PrefInput rowName="ID" type="text" value={this.state.id} disabled={true}
+                           className="id"/>
+                <PrefInput rowName="Version" type="text" value={this.state.version}
+                           disabled={true}/>
+            </PrefTable>}
             <div className={`upload-box ${this.state.uploading ? "uploading" : ""}`}>
                 <UploadButton className="upload"/>
                 <input className="file-selector" type="file" accept="application/zip"
@@ -75,20 +81,13 @@ class Plugin extends BaseMainView {
                        onDragLeave={evt => evt.target.parentElement.classList.remove("drag")}/>
                 {this.state.uploading && <Spinner/>}
             </div>
-            {!this.isNew && <>
-                <PrefTable>
-                    <PrefInput rowName="ID" type="text" value={this.state.id} disabled={true}/>
-                    <PrefInput rowName="Version" type="text" value={this.state.version}
-                               disabled={true}/>
-                </PrefTable>
-                <div className="buttons">
-                    <button className={`delete ${this.hasInstances ? "disabled-bg" : ""}`}
-                            onClick={this.delete} disabled={this.loading || this.hasInstances}
-                            title={this.hasInstances ? "Can't delete plugin that is in use" : ""}>
-                        {this.state.deleting ? <Spinner/> : "Delete"}
-                    </button>
-                </div>
-            </>}
+            {!this.isNew && <div className="buttons">
+                <button className={`delete ${this.hasInstances ? "disabled-bg" : ""}`}
+                        onClick={this.delete} disabled={this.loading || this.hasInstances}
+                        title={this.hasInstances ? "Can't delete plugin that is in use" : ""}>
+                    {this.state.deleting ? <Spinner/> : "Delete"}
+                </button>
+            </div>}
             <div className="error">{this.state.error}</div>
             {!this.isNew && this.renderInstances()}
         </div>
diff --git a/maubot/management/frontend/src/pages/dashboard/index.js b/maubot/management/frontend/src/pages/dashboard/index.js
index f356db9..ed72dc7 100644
--- a/maubot/management/frontend/src/pages/dashboard/index.js
+++ b/maubot/management/frontend/src/pages/dashboard/index.js
@@ -137,7 +137,7 @@ class Dashboard extends Component {
                     <Route path="/client/:id" render={({ match }) =>
                         this.renderView("clients", Client, match.params.id)}/>
                     <Route path="/plugin/:id" render={({ match }) =>
-                        this.renderView("plugin", Plugin, match.params.id)}/>
+                        this.renderView("plugins", Plugin, match.params.id)}/>
                     <Route render={() => this.renderNotFound()}/>
                 </Switch>
             </main>
diff --git a/maubot/management/frontend/src/style/lib/preferencetable.sass b/maubot/management/frontend/src/style/lib/preferencetable.sass
index 66fcad7..64c2124 100644
--- a/maubot/management/frontend/src/style/lib/preferencetable.sass
+++ b/maubot/management/frontend/src/style/lib/preferencetable.sass
@@ -62,6 +62,10 @@
 
                 border-bottom: 1px solid $background
 
+                &.id:disabled
+                    font-family: "Fira Code", monospace
+                    font-weight: bold
+
                 &:not(:disabled)
                     border-bottom: 1px dotted $primary