Merge pull request #571 from openziti/tweaks_26

Experience Tweaks for v0.4.26

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v0.4.26
+
+CHANGE: The target for a `socks` share is automatically set to `socks` to improve web console display.
+
+CHANGE: Enhancements to the look and feel of the account actions tab in the web console. Textual improvements.
+
+FIX: The regenerate account token dialog incorrectly specified the path `${HOME}/.zrok/environments.yml`. This, was corrected to be `${HOME}/.zrok/environments.json`.
+
 ## v0.4.25
 
 FEATURE: New action in the web console that allows changing the password of the logged-in account (https://github.com/openziti/zrok/issues/148)

cmd/zrok/sharePrivate.go

@@ -99,6 +99,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
 		if len(args) != 0 {
 			tui.Error("the 'socks' backend mode does not expect <target>", nil)
 		}
+		target = "socks"
 
 	default:
 		tui.Error(fmt.Sprintf("invalid backend mode '%v'; expected {proxy, web, tcpTunnel, udpTunnel, caddy, drive}", cmd.backendMode), nil)

ui/src/console/detail/account/ActionsTab.js

@@ -16,7 +16,7 @@ const ActionsTab = (props) => {
         <div className={"actions-tab"}>
             <div id={"change-password"} style={{"padding-top": "10px"}}>
                 <h3>Change Password?</h3>
-                <p>Change your password here. Note that this will <strong>not</strong> log you out of any already logged in sessions.</p>
+                <p>Change the password used to log into the zrok web console.</p>
                 <Button variant={"danger"} onClick={openChangePasswordModal}>Change Password</Button>
                 <ChangePassword show={showChangePasswordModal} onHide={closeChangePasswordModal} user={props.user}/>
             </div>
@@ -24,20 +24,20 @@ const ActionsTab = (props) => {
             <hr/>
 
             <div id={"token-regeneration"}>
-                <h3>Regenerate your account token <strong>(DANGER!)</strong>?</h3>
+                <h3>DANGER: Regenerate your account token?</h3>
                 <p>
                     Regenerating your account token will stop all environments and shares from operating properly!
                 </p>
                 <p>
-                    You will need to <strong>manually</strong> edit your
+                    You will need to <em><strong>manually</strong></em> edit your
                     <code> &#36;&#123;HOME&#125;/.zrok/environment.json</code> files (in each environment) to use the new
-                    <code> zrok_token</code> . Updating these files will restore the functionality of your environments.
+                    <code> zrok_token</code>. Updating these files will restore the functionality of your environments.
                 </p>
                 <p>
                     Alternatively, you can just <code>zrok disable</code> any enabled environments and re-enable using the
-                    new account token. Running <code>zrok disable</code> will <strong>delete</strong> your environments and
+                    new account token. Running <code>zrok disable</code> will <em><strong>delete</strong></em> your environments and
                     any shares they contain (including reserved shares). So if you have environments and reserved shares you
-                    need to preserve, your best bet is to update the <code>zrok_token</code> in those environments as
+                    need to preserve, your best option is to update the <code>zrok_token</code> in those environments as
                     described above.
                 </p>
                 <Button variant={"danger"} onClick={openRegenerateTokenModal}>Regenerate Account Token</Button>

ui/src/console/detail/account/actions/RegenerateToken.js

@@ -49,7 +49,7 @@ const RegenerateToken = (props) => {
                         </p>
                         <p>
                             You will need to update each of
-                            your <code> &#36;&#123;HOME&#125;/.zrok/environments.yml</code> files
+                            your <code> &#36;&#123;HOME&#125;/.zrok/environments.json</code> files
                             with your new token to allow them to continue working!
                         </p>
                         <p>