From 18494f66a7e0f4020cbc77374d4679421fcf469a Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Sat, 18 Dec 2021 04:24:10 +0100
Subject: Refactor autoUpdater usage

---
 src/components/layout/AppLayout.js                 |  2 -
 .../settings/settings/EditSettingsForm.js          | 14 ----
 src/components/ui/ToggleRaw.js                     | 76 ----------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 src/components/ui/ToggleRaw.js

(limited to 'src/components')

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 084d93ecd..b47a6040d 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -10,7 +10,6 @@ import { mdiFlash, mdiPowerPlug } from '@mdi/js';
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
 import { Component as QuickSwitch } from '../../features/quickSwitch';
-import { Component as NightlyBuilds } from '../../features/nightlyBuilds';
 import { Component as PublishDebugInfo } from '../../features/publishDebugInfo';
 import ErrorBoundary from '../util/ErrorBoundary';
 
@@ -193,7 +192,6 @@ class AppLayout extends Component {
               )}
               <BasicAuth />
               <QuickSwitch />
-              <NightlyBuilds />
               <PublishDebugInfo />
               {services}
               {children}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index eab65f5e5..d17c804f0 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,7 +9,6 @@ import { mdiGithub, mdiOpenInNew } from '@mdi/js';
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
-import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 import Infobox from '../../ui/Infobox';
@@ -203,7 +202,6 @@ class EditSettingsForm extends Component {
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isSplitModeEnabled: PropTypes.bool.isRequired,
-    isNightlyEnabled: PropTypes.bool.isRequired,
     hasAddedTodosAsService: PropTypes.bool.isRequired,
     isOnline: PropTypes.bool.isRequired,
   };
@@ -252,7 +250,6 @@ class EditSettingsForm extends Component {
       isDarkmodeEnabled,
       isSplitModeEnabled,
       isTodosActivated,
-      isNightlyEnabled,
       hasAddedTodosAsService,
       isOnline,
     } = this.props;
@@ -770,17 +767,6 @@ class EditSettingsForm extends Component {
                 {automaticUpdates && (
                   <div>
                     <Toggle field={form.$('beta')} />
-                    <ToggleRaw
-                      field={{
-                        value: isNightlyEnabled,
-                        id: 'nightly',
-                        label: 'Include nightly versions',
-                        name: 'Nightly builds',
-                      }}
-                      onChange={
-                        window['ferdi'].features.nightlyBuilds.toggleFeature
-                      }
-                    />
                     {updateIsReadyToInstall ? (
                       <Button
                         label={intl.formatMessage(messages.buttonInstallUpdate)}
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js
deleted file mode 100644
index e482b97b4..000000000
--- a/src/components/ui/ToggleRaw.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * "Raw" Toggle - for usage without a MobX Form element
- */
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
-import classnames from 'classnames';
-
-class ToggleRaw extends Component {
-  static propTypes = {
-    onChange: PropTypes.func.isRequired,
-    field: PropTypes.shape({
-      value: PropTypes.bool.isRequired,
-      id: PropTypes.string,
-      name: PropTypes.string,
-      label: PropTypes.string,
-      error: PropTypes.string,
-    }).isRequired,
-    className: PropTypes.string,
-    showLabel: PropTypes.bool,
-    disabled: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    className: '',
-    showLabel: true,
-    disabled: false,
-  };
-
-  onChange(e) {
-    const { onChange } = this.props;
-
-    onChange(e);
-  }
-
-  render() {
-    const { field, className, showLabel, disabled } = this.props;
-
-    return (
-      <div
-        className={classnames([
-          'franz-form__field',
-          'franz-form__toggle-wrapper',
-          'franz-form__toggle-disabled',
-          className,
-        ])}
-      >
-        <label
-          htmlFor={field.id}
-          className={classnames({
-            'franz-form__toggle': true,
-            'is-active': field.value,
-          })}
-        >
-          <div className="franz-form__toggle-button" />
-          <input
-            type="checkbox"
-            id={field.id}
-            name={field.name}
-            value={field.name}
-            checked={field.value}
-            onChange={e => (!disabled ? this.onChange(e) : null)}
-          />
-        </label>
-        {field.error && <div className={field.error}>{field.error}</div>}
-        {field.label && showLabel && (
-          <label className="franz-form__label" htmlFor={field.id}>
-            {field.label}
-          </label>
-        )}
-      </div>
-    );
-  }
-}
-
-export default observer(ToggleRaw);
-- 
cgit v1.2.3-70-g09d2