Merge pull request #1128 from sfroment/dev/sfroment/#1127

feat(core): add title/topics modification

client/react-native/common/components/Library/Avatar.js

@@ -19,6 +19,7 @@ const Avatar = ({ data, size = 40, margin = 4, uri = null, style = [] }) => {
 
   if (!data || !data.id) {
     console.error(['No id provided', data])
+    return null
   }
 
   const extractedPublicKey = extractPublicKeyFromId(data.id)

client/react-native/common/components/Screens/Chats/Detail.js

@@ -2,6 +2,7 @@ import {
   ActivityIndicator,
   Platform,
   TextInput as RNTextInput,
+  View,
 } from 'react-native'
 import { btoa } from 'b64-lite'
 import { withNamespaces } from 'react-i18next'
@@ -304,7 +305,29 @@ class Detail extends PureComponent {
     header: (
       <Header
         navigation={navigation}
-        title={utils.getTitle(navigation.state.params || {})}
+        title={(
+          <View style={{ flexDirection: 'column' }}>
+            <Text
+              large
+              color={colors.fakeBlack}
+              justify={navigation.getParam('backBtn') ? 'center' : 'start'}
+              middle
+              size={5}
+            >
+              {utils.getTitle(navigation.state.params) || {}}
+            </Text>
+            {navigation.state.params.topic
+              ? (
+                <Text
+                  justify={navigation.getParam('backBtn') ? 'center' : 'start'}
+                  middle
+                >
+                  {navigation.state.params.topic}
+                </Text>
+              ) : null
+            }
+          </View>
+        )}
         rightBtnIcon='settings'
         onPressRightBtn={() =>
           navigation.navigate('chats/settings', {

client/react-native/common/components/Screens/Chats/Settings/List.js

@@ -11,8 +11,17 @@ import withRelayContext from '../../../../helpers/withRelayContext'
 import { withGoBack } from '../../../Library/BackActionProvider'
 
 class ListBase extends PureComponent {
-  state = {
-    edit: false,
+  constructor (props) {
+    super(props)
+    const conversation = props.navigation.getParam('conversation')
+    const title = utils.getTitle(conversation)
+
+    this.state = {
+      edit: false,
+      topic: conversation.topic,
+      title,
+      conversation,
+    }
   }
 
   componentDidMount () {
@@ -29,6 +38,15 @@ class ListBase extends PureComponent {
   }
 
   onSave = () => {
+    const { title, topic, conversation } = this.state
+    const { context: { mutations } } = this.props
+
+    mutations.conversationUpdate({
+      ...conversation,
+      title,
+      topic,
+    })
+
     this.setState({ edit: false }, () =>
       this.props.navigation.setParams({ state: this.state })
     )
@@ -63,9 +81,8 @@ class ListBase extends PureComponent {
 
   render () {
     const { navigation, t, context } = this.props
-    const { edit } = this.state
-    const conversation = this.props.navigation.getParam('conversation')
-    const title = utils.getTitle(conversation)
+    const { edit, conversation, title, topic } = this.state
+
     this.context = context
     return (
       <Screen>
@@ -92,7 +109,18 @@ class ListBase extends PureComponent {
           />
           {edit && (
             <Menu.Section title={t('chats.name')}>
-              <Menu.Input value={title} />
+              <Menu.Input
+                value={title}
+                onChangeText={title => this.setState({ title })}
+              />
+            </Menu.Section>
+          )}
+          {edit && (
+            <Menu.Section title={t('chats.topic')}>
+              <Menu.Input
+                value={topic}
+                onChangeText={topic => this.setState({ topic })}
+              />
             </Menu.Section>
           )}
           {!edit && (

client/react-native/common/graphql/enums.gen.js

@@ -205,6 +205,7 @@ export const BertyEntityKindInputKind = {
   ConversationInvite: 301,
   ConversationNewMessage: 302,
   ConversationRead: 303,
+  ConversationUpdate: 304,
   DevtoolsMapset: 401,
   SenderAliasUpdate: 501,
   DeviceUpdatePushConfig: 601,
@@ -225,6 +226,7 @@ export const ValueBertyEntityKindInputKind = {
   301: 'ConversationInvite',
   302: 'ConversationNewMessage',
   303: 'ConversationRead',
+  304: 'ConversationUpdate',
   401: 'DevtoolsMapset',
   501: 'SenderAliasUpdate',
   601: 'DeviceUpdatePushConfig',

client/react-native/common/graphql/mutations/ConversationUpdate.js

@@ -0,0 +1,72 @@
+import { graphql } from 'react-relay'
+
+import { commit } from '../../relay'
+// import { updaters } from '..'
+
+const ConversationUpdateMutation = graphql`
+  mutation ConversationUpdateMutation(
+    $id: ID!
+    $createdAt: GoogleProtobufTimestampInput
+    $updatedAt: GoogleProtobufTimestampInput
+    $readAt: GoogleProtobufTimestampInput
+    $title: String!
+    $topic: String!
+    $infos: String!
+    $members: [BertyEntityConversationMemberInput]
+  ) {
+    ConversationUpdate(
+      id: $id
+      createdAt: $createdAt
+      updatedAt: $updatedAt
+      readAt: $readAt
+      title: $title
+      topic: $topic
+      infos: $infos
+      members: $members
+    ) {
+      ...Conversation
+      id
+      createdAt
+      updatedAt
+      title
+      topic
+      members {
+        id
+        createdAt
+        updatedAt
+        status
+        contact {
+          id
+          createdAt
+          updatedAt
+          sigchain
+          status
+          devices {
+            id
+            createdAt
+            updatedAt
+            name
+            status
+            apiVersion
+            contactId
+          }
+          displayName
+          displayStatus
+          overrideDisplayName
+          overrideDisplayStatus
+        }
+        conversationId
+        contactId
+      }
+    }
+  }
+`
+
+export default context => (input, configs) =>
+  commit(
+    context.environment,
+    ConversationUpdateMutation,
+    'ConversationUpdate',
+    input,
+    configs,
+  )

client/react-native/common/graphql/mutations/index.js

@@ -9,6 +9,7 @@ export conversationAddMessage from './ConversationAddMessage'
 export conversationInvite from './ConversationInvite'
 export conversationRead from './ConversationRead'
 export conversationRemove from './ConversationRemove'
+export conversationUpdate from './ConversationUpdate'
 export eventSeen from './EventSeen'
 export debugRequeueEvent from './DebugRequeueEvent'
 export debugRequeueAll from './DebugRequeueAll'

client/react-native/common/i18n/en/messages.json

@@ -110,6 +110,7 @@
   },
   "chats": {
     "title": "Chats",
+    "topic": "Topic",
     "no-new-messages": "No new messages",
     "new-conversation": "New conversation",
     "new-message": "New message",

client/react-native/common/i18n/fr/messages.json

@@ -110,6 +110,7 @@
   },
   "chats": {
     "title": "Conversations",
+    "topic": "Sujet",
     "no-new-messages": "Pas de nouveaux messages",
     "new-conversation": "Nouvelle conversation",
     "new-message": "Nouveau message",

client/react-native/desktop/Makefile

@@ -5,6 +5,7 @@ deps:
 	GO111MODULE=off go get -u github.com/asticode/go-astilectron-bundler/...
 
 build:
+	GOPROXY=https://goproxy.berty.io GO111MODULE=on go mod vendor
 	sed s%TMPL_MAKEFILE_PATH%$(MAKEFILE_DIR)%g bundler.json.tmpl > bundler.json
 	cp -rf ../web/build ../desktop/resources/app
 	GOCACHE=/tmp/gocache astilectron-bundler -v

core/api/node/graphql/enums.gen.js

@@ -205,6 +205,7 @@ export const BertyEntityKindInputKind = {
   ConversationInvite: 301,
   ConversationNewMessage: 302,
   ConversationRead: 303,
+  ConversationUpdate: 304,
   DevtoolsMapset: 401,
   SenderAliasUpdate: 501,
   DeviceUpdatePushConfig: 601,
@@ -225,6 +226,7 @@ export const ValueBertyEntityKindInputKind = {
   301: 'ConversationInvite',
   302: 'ConversationNewMessage',
   303: 'ConversationRead',
+  304: 'ConversationUpdate',
   401: 'DevtoolsMapset',
   501: 'SenderAliasUpdate',
   601: 'DeviceUpdatePushConfig',