From 594f1d47edebcbd5fcfaf7494d0c44c38fec1cbb Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 26 Oct 2017 23:17:10 +0900 Subject: [PATCH] Use constants for AutoSaveIndicator savingState --- src/browser/components/AutoSaveIndicator.jsx | 21 +++++++++++++++----- src/browser/components/SettingsPage.jsx | 10 +++++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/browser/components/AutoSaveIndicator.jsx b/src/browser/components/AutoSaveIndicator.jsx index 754678c3..ad082e1b 100644 --- a/src/browser/components/AutoSaveIndicator.jsx +++ b/src/browser/components/AutoSaveIndicator.jsx @@ -5,15 +5,20 @@ const {Alert} = require('react-bootstrap'); const baseClassName = 'AutoSaveIndicator'; const leaveClassName = `${baseClassName}-Leave`; +const SAVING_STATE_SAVING = 'saving'; +const SAVING_STATE_SAVED = 'saved'; +const SAVING_STATE_ERROR = 'error'; +const SAVING_STATE_DONE = 'done'; + function getClassNameAndMessage(savingState, errorMessage) { switch (savingState) { - case 'saving': + case SAVING_STATE_SAVING: return {className: baseClassName, message: 'Saving...'}; - case 'saved': + case SAVING_STATE_SAVED: return {className: baseClassName, message: 'Saved'}; - case 'error': + case SAVING_STATE_ERROR: return {className: `${baseClassName}`, message: errorMessage}; - case 'done': + case SAVING_STATE_DONE: return {className: `${baseClassName} ${leaveClassName}`, message: 'Saved'}; default: return {className: `${baseClassName} ${leaveClassName}`, message: ''}; @@ -23,7 +28,6 @@ function getClassNameAndMessage(savingState, errorMessage) { function AutoSaveIndicator(props) { const {savingState, errorMessage, ...rest} = props; const {className, message} = getClassNameAndMessage(savingState, errorMessage); - return ( { const savingState = Object.assign({}, this.state.savingState); - savingState[configType] = 'done'; + savingState[configType] = AutoSaveIndicator.SAVING_STATE_DONE; this.setState({savingState}); }, 2000); }