Skip to content

Commit e8655ae

Browse files
committed
feat: display colorful space diff on synchronization
1 parent f9359f4 commit e8655ae

14 files changed

+907
-80
lines changed

src/actions/syncSpace.js

+15
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import {
33
GET_SYNC_REMOTE_SPACE_SUCCEEDED,
44
GET_SYNC_LOCAL_SPACE_SUCCEEDED,
55
CLEAR_SYNC_SPACES,
6+
SELECT_SYNC_PHASE,
7+
CLEAR_SYNC_PHASES,
68
} from '../types';
79

810
export const getRemoteSpaceForSync = payload =>
@@ -16,3 +18,16 @@ export const clearSpacesForSync = () => dispatch => {
1618
type: CLEAR_SYNC_SPACES,
1719
});
1820
};
21+
22+
export const clearPhasesForSync = () => dispatch => {
23+
return dispatch({
24+
type: CLEAR_SYNC_PHASES,
25+
});
26+
};
27+
28+
export const selectPhaseForSync = phase => dispatch => {
29+
dispatch({
30+
type: SELECT_SYNC_PHASE,
31+
payload: phase,
32+
});
33+
};

src/components/phase/PhaseItemDescription.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3+
import clsx from 'clsx';
34
import InfoIcon from '@material-ui/icons/Info';
45
import Text from '../common/Text';
56
import './PhaseItemDescription.css';
@@ -13,12 +14,15 @@ const style = {
1314
alignItems: 'center',
1415
};
1516

16-
const PhaseItemDescription = ({ description }) => {
17+
const PhaseItemDescription = ({ description, className }) => {
1718
if (description && description !== '') {
1819
return (
1920
<div style={style}>
2021
<InfoIcon color="primary" />
21-
<Text content={description} className="PhaseItemDescriptionText" />
22+
<Text
23+
content={description}
24+
className={clsx('PhaseItemDescriptionText', className)}
25+
/>
2226
</div>
2327
);
2428
}
@@ -27,10 +31,12 @@ const PhaseItemDescription = ({ description }) => {
2731

2832
PhaseItemDescription.propTypes = {
2933
description: PropTypes.string,
34+
className: PropTypes.string,
3035
};
3136

3237
PhaseItemDescription.defaultProps = {
3338
description: '',
39+
className: null,
3440
};
3541

3642
export default PhaseItemDescription;

src/components/space/SpaceDescription.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ import {
1111
SPACE_START_PREVIEW_BUTTON,
1212
BANNER_WARNING_PREVIEW_ID,
1313
SPACE_DESCRIPTION_ID,
14+
SPACE_DESCRIPTION_TEXT_CLASS,
1415
} from '../../config/selectors';
1516

16-
const style = {
17-
fontSize: 'large',
18-
};
19-
2017
const renderPreviewWarning = t => {
2118
return (
2219
<Banner
@@ -39,8 +36,7 @@ const SpaceDescription = ({ description, classes, start, saved }) => {
3936
<div className={classes.spaceDescription} id={SPACE_DESCRIPTION_ID}>
4037
<Text
4138
content={description}
42-
style={style}
43-
className="SpaceDescriptionText"
39+
className={SPACE_DESCRIPTION_TEXT_CLASS}
4440
/>
4541
</div>
4642
<Button

0 commit comments

Comments
 (0)