From 8765b8f4947f064350d046151dcda4434b55567a Mon Sep 17 00:00:00 2001 From: haraldox Date: Tue, 16 Jan 2018 14:24:40 +0100 Subject: Fix #32 service tooltips not initialized properly tooltips have to be rebuilt when services are added (ReactTooltip seems to cache them at first render) --- src/components/layout/Sidebar.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 915ebeace..6fec80090 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -50,6 +50,10 @@ export default class Sidebar extends Component { this.setState({ tooltipEnabled: false }); } + componentDidUpdate() { + ReactTooltip.rebuild(); + } + render() { const { openSettings, toggleMuteApp, isAppMuted } = this.props; const { intl } = this.context; -- cgit v1.2.3-70-g09d2 From 10fda09d0331baa9856657769bf7dd80b0f3e80d Mon Sep 17 00:00:00 2001 From: haraldox Date: Wed, 17 Jan 2018 12:08:33 +0100 Subject: Merge branch 'develop' into fix-service-tooltips-initialization --- src/components/settings/account/AccountDashboard.js | 2 +- src/components/ui/Subscription.js | 2 -- src/containers/settings/AccountScreen.js | 2 +- src/containers/ui/SubscriptionFormScreen.js | 1 - src/stores/AppStore.js | 7 +------ 5 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 5d947954f..43272fe96 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; -import { defineMessages, intlShape, FormattedMessage } from 'react-intl'; +import { defineMessages, intlShape } from 'react-intl'; import ReactTooltip from 'react-tooltip'; import moment from 'moment'; diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js index e402588b6..41f8ba5d7 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/ui/Subscription.js @@ -84,7 +84,6 @@ export default class SubscriptionForm extends Component { skipAction: PropTypes.func, skipButtonLabel: PropTypes.string, hideInfo: PropTypes.bool.isRequired, - openExternalUrl: PropTypes.func.isRequired, }; static defaultProps ={ @@ -146,7 +145,6 @@ export default class SubscriptionForm extends Component { skipAction, skipButtonLabel, hideInfo, - openExternalUrl, } = this.props; const { intl } = this.context; diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 21d0fe20a..c5c2982b0 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js @@ -59,7 +59,7 @@ export default class AccountScreen extends Component { } render() { - const { user, payment, app } = this.props.stores; + const { user, payment } = this.props.stores; const { openExternalUrl } = this.props.actions.app; const { user: userActions } = this.props.actions; diff --git a/src/containers/ui/SubscriptionFormScreen.js b/src/containers/ui/SubscriptionFormScreen.js index 3d9e413e1..ac4593670 100644 --- a/src/containers/ui/SubscriptionFormScreen.js +++ b/src/containers/ui/SubscriptionFormScreen.js @@ -34,7 +34,6 @@ export default class SubscriptionFormScreen extends Component { actions, stores, onCloseWindow, - skipAction, } = this.props; const interval = plan; diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js index a05bfc055..06c43f83f 100644 --- a/src/stores/AppStore.js +++ b/src/stores/AppStore.js @@ -124,15 +124,10 @@ export default class AppStore extends Store { this.stores.router.push(data.url); }); - const TIMEOUT = 5000; - // Check system idle time every minute - setInterval(() => { - this.idleTime = idleTimer.getIdleTime(); - }, TIMEOUT); - // Reload all services after a healthy nap // Alternative solution for powerMonitor as the resume event is not fired // More information: https://github.com/electron/electron/issues/1615 + const TIMEOUT = 5000; let lastTime = (new Date()).getTime(); setInterval(() => { const currentTime = (new Date()).getTime(); -- cgit v1.2.3-70-g09d2 From c1e9104970619e191122eb6924003b35091ffb19 Mon Sep 17 00:00:00 2001 From: haraldox Date: Wed, 17 Jan 2018 12:09:34 +0100 Subject: fix linting issue react component lifecycle method order --- src/components/layout/Sidebar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 6fec80090..fa269f216 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -42,6 +42,10 @@ export default class Sidebar extends Component { tooltipEnabled: true, }; + componentDidUpdate() { + ReactTooltip.rebuild(); + } + enableToolTip() { this.setState({ tooltipEnabled: true }); } @@ -50,10 +54,6 @@ export default class Sidebar extends Component { this.setState({ tooltipEnabled: false }); } - componentDidUpdate() { - ReactTooltip.rebuild(); - } - render() { const { openSettings, toggleMuteApp, isAppMuted } = this.props; const { intl } = this.context; -- cgit v1.2.3-70-g09d2 From 34949a6a005df240fa79f679675a0de1f3839776 Mon Sep 17 00:00:00 2001 From: haraldox Date: Fri, 19 Jan 2018 10:03:05 +0100 Subject: fix property change due to mobx-react-form update validate -> validators --- src/components/auth/Invite.js | 2 +- src/components/auth/Login.js | 4 ++-- src/components/auth/Password.js | 2 +- src/components/auth/Signup.js | 10 +++++----- src/components/ui/Subscription.js | 2 +- src/containers/settings/EditServiceScreen.js | 4 ++-- src/containers/settings/EditUserScreen.js | 12 ++++++------ 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index c1d815dcd..a420f98a2 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -53,7 +53,7 @@ export default class Invite extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), // value: '', - validate: [email], + validators: [email], placeholder: this.context.intl.formatMessage(messages.emailLabel), }, })], diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 67e92849d..4a3cd6776 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -76,12 +76,12 @@ export default class Login extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validate: [required, email], + validators: [required, email], }, password: { label: this.context.intl.formatMessage(messages.passwordLabel), value: '', - validate: [required], + validators: [required], type: 'password', }, }, diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index d2b196853..5bcc80b6e 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -60,7 +60,7 @@ export default class Password extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validate: [required, email], + validators: [required, email], }, }, }, this.context.intl); diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index a990a112e..219948274 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -82,7 +82,7 @@ export default class Signup extends Component { fields: { accountType: { value: 'individual', - validate: [required], + validators: [required], options: [{ value: 'individual', label: 'Individual', @@ -97,17 +97,17 @@ export default class Signup extends Component { firstname: { label: this.context.intl.formatMessage(messages.firstnameLabel), value: '', - validate: [required], + validators: [required], }, lastname: { label: this.context.intl.formatMessage(messages.lastnameLabel), value: '', - validate: [required], + validators: [required], }, email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validate: [required, email], + validators: [required, email], }, organization: { label: this.context.intl.formatMessage(messages.companyLabel), @@ -116,7 +116,7 @@ export default class Signup extends Component { password: { label: this.context.intl.formatMessage(messages.passwordLabel), value: '', - validate: [required, minLength(6)], + validators: [required, minLength(6)], type: 'password', }, }, diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js index 41f8ba5d7..dd350479d 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/ui/Subscription.js @@ -108,7 +108,7 @@ export default class SubscriptionForm extends Component { fields: { paymentTier: { value: 'year', - validate: [required], + validators: [required], options: [{ value: 'month', label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month') diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index c26195a1e..00e888cc4 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js @@ -121,7 +121,7 @@ export default class EditServiceScreen extends Component { label: intl.formatMessage(messages.team), placeholder: intl.formatMessage(messages.team), value: service.team, - validate: [required], + validators: [required], }, }); } @@ -132,7 +132,7 @@ export default class EditServiceScreen extends Component { label: intl.formatMessage(messages.customUrl), placeholder: 'https://', value: service.customUrl, - validate: [required, url], + validators: [required, url], }, }); } diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index fb5c5db89..dda8ce513 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js @@ -81,23 +81,23 @@ export default class EditUserScreen extends Component { label: intl.formatMessage(messages.firstname), placeholder: intl.formatMessage(messages.firstname), value: user.firstname, - validate: [required], + validators: [required], }, lastname: { label: intl.formatMessage(messages.lastname), placeholder: intl.formatMessage(messages.lastname), value: user.lastname, - validate: [required], + validators: [required], }, email: { label: intl.formatMessage(messages.email), placeholder: intl.formatMessage(messages.email), value: user.email, - validate: [required, email], + validators: [required, email], }, accountType: { value: user.accountType, - validate: [required], + validators: [required], label: intl.formatMessage(messages.accountType.label), options: [{ value: 'individual', @@ -118,12 +118,12 @@ export default class EditUserScreen extends Component { oldPassword: { label: intl.formatMessage(messages.currentPassword), type: 'password', - validate: [minLength(6)], + validators: [minLength(6)], }, newPassword: { label: intl.formatMessage(messages.newPassword), type: 'password', - validate: [minLength(6)], + validators: [minLength(6)], }, }, }; -- cgit v1.2.3-70-g09d2