Always show version but hide update button when program is launched w…

…ith "--no-check-update" flag
eoghan2t9 · May 27, 2020 · aebfaf6 · aebfaf6
1 parent 1d4ee05
commit aebfaf6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/client/src/components/App/index.js b/client/src/components/App/index.js
@@ -126,6 +126,7 @@ class App extends Component {
                         dnsPort={dashboard.dnsPort}
                         processingVersion={dashboard.processingVersion}
                         getVersion={getVersion}
+                        checkUpdateFlag={dashboard.checkUpdateFlag}
                     />
                     <Toasts />
                     <Icons />

diff --git a/client/src/components/ui/Footer.js b/client/src/components/ui/Footer.js
@@ -57,7 +57,7 @@ class Footer extends Component {
 
     render() {
         const {
-            dnsVersion, processingVersion, getVersion,
+            dnsVersion, processingVersion, getVersion, checkUpdateFlag,
         } = this.props;
 
         return (
@@ -94,6 +94,7 @@ class Footer extends Component {
                                     dnsVersion={dnsVersion}
                                     processingVersion={processingVersion}
                                     getVersion={getVersion}
+                                    checkUpdateFlag={checkUpdateFlag}
                                 />
                             </div>
                         </div>
@@ -108,6 +109,7 @@ Footer.propTypes = {
     dnsVersion: PropTypes.string,
     processingVersion: PropTypes.bool,
     getVersion: PropTypes.func,
+    checkUpdateFlag: PropTypes.bool,
 };
 
 export default withTranslation()(Footer);
diff --git a/client/src/components/ui/Version.js b/client/src/components/ui/Version.js
@@ -6,27 +6,25 @@ import './Version.css';
 
 const Version = (props) => {
     const {
-        dnsVersion, processingVersion, t,
+        dnsVersion = 'undefined', processingVersion, t, checkUpdateFlag,
     } = props;
 
     return (
         <div className="version">
             <div className="version__text">
-                {dnsVersion && <>
-                    <Trans>version</Trans>:&nbsp;
-                    <span className="version__value" title={dnsVersion}>{dnsVersion}</span>
-                    <button
-                        type="button"
-                        className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
-                        onClick={() => props.getVersion(true)}
-                        disabled={processingVersion}
-                        title={t('check_updates_now')}
-                    >
-                        <svg className="icons">
-                            <use xlinkHref="#refresh" />
-                        </svg>
-                    </button>
-                </>}
+                <Trans>version</Trans>:&nbsp;
+                <span className="version__value" title={dnsVersion}>{dnsVersion}</span>
+                {checkUpdateFlag && <button
+                    type="button"
+                    className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
+                    onClick={() => props.getVersion(true)}
+                    disabled={processingVersion}
+                    title={t('check_updates_now')}
+                >
+                    <svg className="icons">
+                        <use xlinkHref="#refresh" />
+                    </svg>
+                </button>}
             </div>
         </div>
     );
@@ -36,6 +34,7 @@ Version.propTypes = {
     dnsVersion: PropTypes.string.isRequired,
     getVersion: PropTypes.func.isRequired,
     processingVersion: PropTypes.bool.isRequired,
+    checkUpdateFlag: PropTypes.bool.isRequired,
     t: PropTypes.func.isRequired,
 };
 

diff --git a/client/src/reducers/index.js b/client/src/reducers/index.js
@@ -96,6 +96,7 @@ const dashboard = handleActions(
                     canAutoUpdate,
                     isUpdateAvailable: true,
                     processingVersion: false,
+                    checkUpdateFlag: !!payload,
                 };
                 return newState;
             }
@@ -165,6 +166,7 @@ const dashboard = handleActions(
         autoClients: [],
         supportedTags: [],
         name: '',
+        checkUpdateFlag: false,
     },
 );