4 files changed, 50 insertions, 32 deletions

diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index f23bc6cbf..0ff836cba 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -40,7 +40,8 @@ const messages = defineMessages({
   },
   keepLoadedInfo: {
     id: 'settings.workspace.form.keepLoadedInfo',
-    defaultMessage: '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
+    defaultMessage:
+      '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
   },
   servicesInWorkspaceHeadline: {
     id: 'settings.workspace.form.servicesInWorkspaceHeadline',
@@ -68,7 +69,8 @@ const styles = () => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles)
+@observer
 class EditWorkspaceForm extends Component {
   static contextTypes = {
     intl: intlShape,
@@ -86,6 +88,7 @@ class EditWorkspaceForm extends Component {
 
   form = this.prepareWorkspaceForm(this.props.workspace);
 
+  // eslint-disable-next-line react/no-deprecated
   componentWillReceiveProps(nextProps) {
     const { workspace } = this.props;
     if (workspace.id !== nextProps.workspace.id) {
@@ -164,16 +167,14 @@ class EditWorkspaceForm extends Component {
             </Link>
           </span>
           <span className="separator" />
-          <span className="settings__header-item">
-            {workspace.name}
-          </span>
+          <span className="settings__header-item">{workspace.name}</span>
         </div>
         <div className="settings__body">
           <div className={classes.nameInput}>
             <Input {...form.$('name').bind()} />
             <Toggle field={form.$('keepLoaded')} />
             <p className={`${classes.keepLoadedInfo} franz-form__label`}>
-              { intl.formatMessage(messages.keepLoadedInfo) }
+              {intl.formatMessage(messages.keepLoadedInfo)}
             </p>
           </div>
           <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
@@ -187,11 +188,13 @@ class EditWorkspaceForm extends Component {
                   </span>
                   {intl.formatMessage(messages.noServicesAdded)}
                 </p>
-                <Link to="/settings/recipes" className="button">{intl.formatMessage(messages.discoverServices)}</Link>
+                <Link to="/settings/recipes" className="button">
+                  {intl.formatMessage(messages.discoverServices)}
+                </Link>
               </div>
             ) : (
-              <Fragment>
-                {services.map(s => (
+              <>
+                {services.map((s) => (
                   <WorkspaceServiceListItem
                     key={s.id}
                     service={s}
@@ -199,7 +202,7 @@ class EditWorkspaceForm extends Component {
                     onToggle={() => this.toggleService(s)}
                   />
                 ))}
-              </Fragment>
+              </>
             )}
           </div>
         </div>
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index a90bb37e9..cfaacd56e 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -184,7 +184,7 @@ class WorkspacesDashboard extends Component {
               {getUserWorkspacesRequest.isExecuting ? (
                 <Loader />
               ) : (
-                <Fragment>
+                <>
                   {/* ===== Workspace could not be loaded error ===== */}
                   {getUserWorkspacesRequest.error ? (
                     <Infobox
@@ -197,7 +197,7 @@ class WorkspacesDashboard extends Component {
                       {intl.formatMessage(messages.workspacesRequestFailed)}
                     </Infobox>
                   ) : (
-                    <Fragment>
+                    <>
                       {workspaces.length === 0 ? (
                         <div className="align-middle settings__empty-state">
                           {/* ===== Workspaces empty state ===== */}
@@ -222,9 +222,9 @@ class WorkspacesDashboard extends Component {
                           </tbody>
                         </table>
                       )}
-                    </Fragment>
+                    </>
                   )}
-                </Fragment>
+                </>
               )}
             </>
           )}
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 5eca71259..ba7606031 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -32,9 +32,7 @@ class EditWorkspaceScreen extends Component {
     const { workspaceBeingEdited } = workspaceStore;
     const { actions } = this.props;
     const workspace = new Workspace(
-      Object.assign({
-        saving: true,
-      }, workspaceBeingEdited, values),
+      ({ saving: true, ...workspaceBeingEdited, ...values }),
     );
     actions.workspaces.update({ workspace });
   };
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index bddcb6eb4..632f3c299 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -1,8 +1,4 @@
-import {
-  computed,
-  observable,
-  action,
-} from 'mobx';
+import { computed, observable, action } from 'mobx';
 import localStorage from 'mobx-localstorage';
 import { matchRoute } from '../../helpers/routing-helpers';
 import { workspaceActions } from './actions';
@@ -105,7 +101,10 @@ export default class WorkspacesStore extends FeatureStore {
       [workspaceActions.update, this._update],
       [workspaceActions.activate, this._setActiveWorkspace],
       [workspaceActions.deactivate, this._deactivateActiveWorkspace],
-      [workspaceActions.toggleKeepAllWorkspacesLoadedSetting, this._toggleKeepAllWorkspacesLoadedSetting],
+      [
+        workspaceActions.toggleKeepAllWorkspacesLoadedSetting,
+        this._toggleKeepAllWorkspacesLoadedSetting,
+      ],
     ]);
     this._allActions = this._freeUserActions.concat(this._premiumUserActions);
     this._registerActions(this._allActions);
@@ -124,7 +123,9 @@ export default class WorkspacesStore extends FeatureStore {
       this._activateLastUsedWorkspaceReaction,
       this._setWorkspaceBeingEditedReaction,
     ]);
-    this._allReactions = this._freeUserReactions.concat(this._premiumUserReactions);
+    this._allReactions = this._freeUserReactions.concat(
+      this._premiumUserReactions,
+    );
 
     this._registerReactions(this._allReactions);
 
@@ -157,12 +158,12 @@ export default class WorkspacesStore extends FeatureStore {
 
   getWorkspaceServices(workspace) {
     const { services } = this.stores;
-    return workspace.services.map(id => services.one(id)).filter(s => !!s);
+    return workspace.services.map((id) => services.one(id)).filter((s) => !!s);
   }
 
   // ========== PRIVATE METHODS ========= //
 
-  _getWorkspaceById = id => this.workspaces.find(w => w.id === id);
+  _getWorkspaceById = (id) => this.workspaces.find((w) => w.id === id);
 
   _updateSettings = (changes) => {
     localStorage.setItem('workspaces', {
@@ -178,6 +179,7 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _create = async ({ name }) => {
+    // eslint-disable-next-line no-useless-catch
     try {
       const workspace = await createWorkspaceRequest.execute(name);
       await getUserWorkspacesRequest.result.push(workspace);
@@ -188,6 +190,7 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _delete = async ({ workspace }) => {
+    // eslint-disable-next-line no-useless-catch
     try {
       await deleteWorkspaceRequest.execute(workspace);
       await getUserWorkspacesRequest.result.remove(workspace);
@@ -198,6 +201,7 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _update = async ({ workspace }) => {
+    // eslint-disable-next-line no-useless-catch
     try {
       await updateWorkspaceRequest.execute(workspace);
       // Path local result optimistically
@@ -235,7 +239,9 @@ export default class WorkspacesStore extends FeatureStore {
       this.activeWorkspace = null;
     }, 100);
     // Indicate that we are done switching to the default workspace
-    setTimeout(() => { this.isSwitchingWorkspace = false; }, 1000);
+    setTimeout(() => {
+      this.isSwitchingWorkspace = false;
+    }, 1000);
   };
 
   @action _toggleWorkspaceDrawer = () => {
@@ -255,7 +261,9 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   _toggleKeepAllWorkspacesLoadedSetting = async () => {
-    this._updateSettings({ keepAllWorkspacesLoaded: !this.settings.keepAllWorkspacesLoaded });
+    this._updateSettings({
+      keepAllWorkspacesLoaded: !this.settings.keepAllWorkspacesLoaded,
+    });
   };
 
   // Reactions
@@ -309,7 +317,9 @@ export default class WorkspacesStore extends FeatureStore {
 
   _openDrawerWithSettingsReaction = () => {
     const { router } = this.stores;
-    const isWorkspaceSettingsRoute = router.location.pathname.includes(WORKSPACES_ROUTES.ROOT);
+    const isWorkspaceSettingsRoute = router.location.pathname.includes(
+      WORKSPACES_ROUTES.ROOT,
+    );
     const isSwitchingToSettingsRoute = !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
     const isLeavingSettingsRoute = !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
 
@@ -321,7 +331,10 @@ export default class WorkspacesStore extends FeatureStore {
       }
     } else if (isLeavingSettingsRoute) {
       this.isSettingsRouteActive = false;
-      if (!this._wasDrawerOpenBeforeSettingsRoute && this.isWorkspaceDrawerOpen) {
+      if (
+        !this._wasDrawerOpenBeforeSettingsRoute
+        && this.isWorkspaceDrawerOpen
+      ) {
         workspaceActions.toggleWorkspaceDrawer();
       }
     }
@@ -334,7 +347,11 @@ export default class WorkspacesStore extends FeatureStore {
     // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (servicesHaveBeenLoaded && !services.one(serviceId) && serviceId !== KEEP_WS_LOADED_USID) {
+        if (
+          servicesHaveBeenLoaded
+          && !services.one(serviceId)
+          && serviceId !== KEEP_WS_LOADED_USID
+        ) {
           workspace.services.remove(serviceId);
         }
       });
@@ -351,5 +368,5 @@ export default class WorkspacesStore extends FeatureStore {
       this._startActions(this._premiumUserActions);
       this._startReactions(this._premiumUserReactions);
     }
-  }
+  };
 }