Merge branch 'develop' into messages-permissions

This commit is contained in:
Diego Mello 2017-11-22 17:34:54 -02:00 committed by GitHub
commit 41cb4ebd56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 411 additions and 144 deletions

26
.snyk Normal file
View File

@ -0,0 +1,26 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.7.1
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:debug:20170905':
- react-native > connect > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > express-session > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > finalhandler > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > morgan > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > serve-index > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > body-parser > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > compression > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > connect-timeout > debug:
patched: '2017-09-29T23:29:20.238Z'
- react-native > connect > serve-static > send > debug:
patched: '2017-09-29T23:29:20.238Z'
- realm > extract-zip > debug:
patched: '2017-09-29T23:29:20.238Z'

View File

@ -87,13 +87,16 @@ exports[`render channel 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
general general
@ -163,13 +166,16 @@ exports[`render no icon 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
name name
@ -239,13 +245,16 @@ exports[`render private group 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
private-group private-group
@ -351,13 +360,16 @@ exports[`render unread +999 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
name name
@ -386,13 +398,13 @@ exports[`render unread +999 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -483,13 +495,16 @@ exports[`render unread 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
name name
@ -518,13 +533,13 @@ exports[`render unread 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -615,13 +630,16 @@ exports[`renders correctly 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
name name

View File

@ -253,13 +253,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
rocket.cat rocket.cat
@ -381,13 +384,18 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
Object {
"fontWeight": "bold",
},
]
} }
> >
rocket.cat rocket.cat
@ -509,13 +517,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
rocket.cat rocket.cat
@ -544,13 +555,13 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -657,13 +668,18 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
Object {
"fontWeight": "bold",
},
]
} }
> >
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
@ -692,13 +708,13 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -805,13 +821,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
@ -840,13 +859,13 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -953,13 +972,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
@ -988,13 +1010,13 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -1101,13 +1123,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
@ -1136,13 +1161,13 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
style={ style={
Object { Object {
"backgroundColor": "#1d74f5", "backgroundColor": "#1d74f5",
"borderRadius": 5, "borderRadius": 3,
"color": "#fff", "color": "#fff",
"fontSize": 14, "fontSize": 14,
"minWidth": 20, "minWidth": 20,
"overflow": "hidden", "overflow": "hidden",
"paddingLeft": 5, "paddingHorizontal": 5,
"paddingRight": 5, "paddingVertical": 2,
"textAlign": "center", "textAlign": "center",
} }
} }
@ -1150,6 +1175,157 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
999+ 999+
</Text> </Text>
</View> </View>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
collapsable={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
Object {
"alignItems": "center",
"flexDirection": "row",
"height": 56,
"opacity": 1,
"paddingLeft": 16,
"paddingRight": 16,
}
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
Array [
Object {
"alignItems": "center",
"justifyContent": "center",
"overflow": "hidden",
},
Object {
"backgroundColor": "#795548",
"borderRadius": 4,
"height": 40,
"width": 40,
},
undefined,
]
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
"color": "#ffffff",
},
Object {
"fontSize": 20,
},
]
}
>
LC
</Text>
<CachedImage
source={
Object {
"uri": "https://demo.rocket.chat/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
}
}
style={
Array [
Object {
"position": "absolute",
},
Object {
"borderRadius": 4,
"height": 40,
"width": 40,
},
]
}
/>
</View>
<View
style={
Object {
"flex": 1,
"marginLeft": 16,
"marginRight": 4,
}
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
numberOfLines={1}
style={
Array [
Object {
"color": "#444",
"flex": 1,
"fontSize": 16,
"height": 16,
"paddingTop": 10,
},
undefined,
]
}
>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
numberOfLines={1}
style={
Object {
"color": "#888",
"flex": 1,
"fontSize": 10,
"height": 10,
}
}
>
11-10-2017 10:00:00
</Text>
</View>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"backgroundColor": "#1d74f5",
"borderRadius": 3,
"color": "#fff",
"fontSize": 14,
"minWidth": 20,
"overflow": "hidden",
"paddingHorizontal": 5,
"paddingVertical": 2,
"textAlign": "center",
}
}
>
@ 999+
</Text>
</View>
<View <View
accessibilityComponentType={undefined} accessibilityComponentType={undefined}
accessibilityLabel={undefined} accessibilityLabel={undefined}
@ -1230,13 +1406,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
W W
@ -1339,13 +1518,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >
WW WW
@ -1448,13 +1630,16 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
ellipsizeMode="tail" ellipsizeMode="tail"
numberOfLines={1} numberOfLines={1}
style={ style={
Array [
Object { Object {
"color": "#444", "color": "#444",
"flex": 1, "flex": 1,
"fontSize": 16, "fontSize": 16,
"height": 16, "height": 16,
"paddingTop": 10, "paddingTop": 10,
} },
undefined,
]
} }
> >

View File

@ -66,6 +66,7 @@ const subscriptionSchema = {
properties: { properties: {
_id: 'string', _id: 'string',
_server: 'servers', _server: 'servers',
f: { type: 'bool', optional: true },
t: 'string', t: 'string',
ts: { type: 'date', optional: true }, ts: { type: 'date', optional: true },
ls: { type: 'date', optional: true }, ls: { type: 'date', optional: true },
@ -76,6 +77,7 @@ const subscriptionSchema = {
alert: { type: 'bool', optional: true }, alert: { type: 'bool', optional: true },
roles: { type: 'list', objectType: 'subscriptionRolesSchema' }, roles: { type: 'list', objectType: 'subscriptionRolesSchema' },
unread: { type: 'int', optional: true }, unread: { type: 'int', optional: true },
userMentions: { type: 'int', optional: true },
// userMentions: 0, // userMentions: 0,
// groupMentions: 0, // groupMentions: 0,
_updatedAt: { type: 'date', optional: true } _updatedAt: { type: 'date', optional: true }
@ -159,7 +161,8 @@ const realm = new Realm({
messagesEditedBySchema, messagesEditedBySchema,
permissionsSchema, permissionsSchema,
permissionsRolesSchema permissionsRolesSchema
] ],
deleteRealmIfMigrationNeeded: true
}); });
export default realm; export default realm;

View File

@ -17,14 +17,14 @@ const styles = StyleSheet.create({
}, },
number: { number: {
minWidth: 20, minWidth: 20,
borderRadius: 5, borderRadius: 3,
backgroundColor: '#1d74f5', backgroundColor: '#1d74f5',
color: '#fff', color: '#fff',
textAlign: 'center', textAlign: 'center',
overflow: 'hidden', overflow: 'hidden',
fontSize: 14, fontSize: 14,
paddingLeft: 5, paddingHorizontal: 5,
paddingRight: 5 paddingVertical: 2
}, },
roomNameView: { roomNameView: {
flex: 1, flex: 1,
@ -38,6 +38,12 @@ const styles = StyleSheet.create({
height: 16, height: 16,
color: '#444' color: '#444'
}, },
alert: {
fontWeight: 'bold'
},
favorite: {
// backgroundColor: '#eee'
},
update: { update: {
flex: 1, flex: 1,
fontSize: 10, fontSize: 10,
@ -67,7 +73,10 @@ export default class RoomItem extends React.PureComponent {
type: PropTypes.string.isRequired, type: PropTypes.string.isRequired,
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
_updatedAt: PropTypes.instanceOf(Date), _updatedAt: PropTypes.instanceOf(Date),
favorite: PropTypes.bool,
alert: PropTypes.bool,
unread: PropTypes.number, unread: PropTypes.number,
userMentions: PropTypes.number,
baseUrl: PropTypes.string, baseUrl: PropTypes.string,
onPress: PropTypes.func, onPress: PropTypes.func,
dateFormat: PropTypes.string dateFormat: PropTypes.string
@ -101,7 +110,7 @@ export default class RoomItem extends React.PureComponent {
); );
} }
renderNumber = (unread) => { renderNumber = (unread, userMentions) => {
if (!unread || unread <= 0) { if (!unread || unread <= 0) {
return; return;
} }
@ -110,6 +119,10 @@ export default class RoomItem extends React.PureComponent {
unread = '999+'; unread = '999+';
} }
if (userMentions > 0) {
unread = `@ ${ unread }`;
}
return ( return (
<Text style={styles.number}> <Text style={styles.number}>
{ unread } { unread }
@ -118,16 +131,18 @@ export default class RoomItem extends React.PureComponent {
} }
render() { render() {
const { unread, name, _updatedAt } = this.props; const {
favorite, alert, unread, userMentions, name, _updatedAt
} = this.props;
return ( return (
<TouchableOpacity onPress={this.props.onPress} style={styles.container}> <TouchableOpacity onPress={this.props.onPress} style={[styles.container, favorite && styles.favorite]}>
{this.icon} {this.icon}
<View style={styles.roomNameView}> <View style={styles.roomNameView}>
<Text style={styles.roomName} ellipsizeMode='tail' numberOfLines={1}>{ name }</Text> <Text style={[styles.roomName, alert && styles.alert]} ellipsizeMode='tail' numberOfLines={1}>{ name }</Text>
{_updatedAt ? <Text style={styles.update} ellipsizeMode='tail' numberOfLines={1}>{ moment(_updatedAt).format(this.props.dateFormat) }</Text> : null} {_updatedAt ? <Text style={styles.update} ellipsizeMode='tail' numberOfLines={1}>{ moment(_updatedAt).format(this.props.dateFormat) }</Text> : null}
</View> </View>
{this.renderNumber(unread)} {this.renderNumber(unread, userMentions)}
</TouchableOpacity> </TouchableOpacity>
); );
} }

View File

@ -254,7 +254,10 @@ export default class RoomsListView extends React.Component {
renderItem = item => ( renderItem = item => (
<RoomItem <RoomItem
alert={item.alert}
unread={item.unread} unread={item.unread}
userMentions={item.userMentions}
favorite={item.f}
name={item.name} name={item.name}
_updatedAt={item._updatedAt} _updatedAt={item._updatedAt}
key={item._id} key={item._id}

View File

@ -11,7 +11,9 @@
"ios": "react-native run-ios", "ios": "react-native run-ios",
"log-android": "react-native log-android", "log-android": "react-native log-android",
"android": "react-native run-android", "android": "react-native run-android",
"storybook": "storybook start -p 7007" "storybook": "storybook start -p 7007",
"snyk-protect": "snyk protect",
"prepare": "npm run snyk-protect"
}, },
"dependencies": { "dependencies": {
"babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-decorators-legacy": "^1.3.4",
@ -49,7 +51,8 @@
"redux-saga": "^0.16.0", "redux-saga": "^0.16.0",
"regenerator-runtime": "^0.11.0", "regenerator-runtime": "^0.11.0",
"remote-redux-devtools": "^0.5.12", "remote-redux-devtools": "^0.5.12",
"strip-ansi": "^4.0.0" "strip-ansi": "^4.0.0",
"snyk": "^1.41.1"
}, },
"devDependencies": { "devDependencies": {
"@storybook/addon-storyshots": "^3.2.15", "@storybook/addon-storyshots": "^3.2.15",
@ -80,6 +83,7 @@
".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$": "identity-obj-proxy" ".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$": "identity-obj-proxy"
} }
}, },
"snyk": true,
"engines": { "engines": {
"node": ">=8.x", "node": ">=8.x",
"npm": ">=4.x", "npm": ">=4.x",

View File

@ -18,6 +18,7 @@ export default (
<RoomItem <RoomItem
type='d' type='d'
unread={0} unread={0}
alert
_updatedAt={date} _updatedAt={date}
dateFormat={dateFormat} dateFormat={dateFormat}
name='rocket.cat' name='rocket.cat'
@ -34,6 +35,7 @@ export default (
<RoomItem <RoomItem
type='d' type='d'
unread={9} unread={9}
alert
_updatedAt={date} _updatedAt={date}
dateFormat={dateFormat} dateFormat={dateFormat}
name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries" name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries"
@ -50,6 +52,7 @@ export default (
<RoomItem <RoomItem
type='d' type='d'
unread={100} unread={100}
userMentions={0}
_updatedAt={date} _updatedAt={date}
dateFormat={dateFormat} dateFormat={dateFormat}
name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries" name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries"
@ -58,6 +61,16 @@ export default (
<RoomItem <RoomItem
type='d' type='d'
unread={100000} unread={100000}
userMentions={0}
_updatedAt={date}
dateFormat={dateFormat}
name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries"
baseUrl='https://demo.rocket.chat'
/>
<RoomItem
type='d'
unread={100000}
userMentions={1}
_updatedAt={date} _updatedAt={date}
dateFormat={dateFormat} dateFormat={dateFormat}
name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries" name="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries"