ConversationView - extract all header setup into new method

signalapp · Jun 11, 2019 · e190678 · e190678
1 parent ca1e6c3
commit e190678
Showing 1 changed file with 70 additions and 67 deletions.
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
@@ -188,73 +188,6 @@
         }
       });
 
-      const getHeaderProps = () => {
-        const expireTimer = this.model.get('expireTimer');
-        const expirationSettingName = expireTimer
-          ? Whisper.ExpirationTimerOptions.getName(expireTimer || 0)
-          : null;
-
-        return {
-          id: this.model.id,
-          name: this.model.getName(),
-          phoneNumber: this.model.getNumber(),
-          profileName: this.model.getProfileName(),
-          color: this.model.getColor(),
-          avatarPath: this.model.getAvatarPath(),
-
-          isVerified: this.model.isVerified(),
-          isMe: this.model.isMe(),
-          isGroup: !this.model.isPrivate(),
-          isArchived: this.model.get('isArchived'),
-
-          expirationSettingName,
-          showBackButton: Boolean(this.panels && this.panels.length),
-          timerOptions: Whisper.ExpirationTimerOptions.map(item => ({
-            name: item.getName(),
-            value: item.get('seconds'),
-          })),
-
-          onSetDisappearingMessages: seconds =>
-            this.setDisappearingMessages(seconds),
-          onDeleteMessages: () => this.destroyMessages(),
-          onResetSession: () => this.endSession(),
-
-          // These are view only and don't update the Conversation model, so they
-          //   need a manual update call.
-          onShowSafetyNumber: () => {
-            this.showSafetyNumber();
-          },
-          onShowAllMedia: async () => {
-            await this.showAllMedia();
-            this.updateHeader();
-          },
-          onShowGroupMembers: async () => {
-            await this.showMembers();
-            this.updateHeader();
-          },
-          onGoBack: () => {
-            this.resetPanel();
-            this.updateHeader();
-          },
-
-          onArchive: () => {
-            this.unload('archive');
-            this.model.setArchived(true);
-          },
-          onMoveToInbox: () => {
-            this.model.setArchived(false);
-          },
-        };
-      };
-      this.titleView = new Whisper.ReactWrapperView({
-        className: 'title-wrapper',
-        Component: window.Signal.Components.ConversationHeader,
-        props: getHeaderProps(this.model),
-      });
-      this.updateHeader = () => this.titleView.update(getHeaderProps());
-      this.listenTo(this.model, 'change', this.updateHeader);
-      this.$('.conversation-header').append(this.titleView.el);
-
       this.view = new Whisper.MessageListView({
         collection: this.model.messageCollection,
         window: this.window,
@@ -283,6 +216,7 @@
       this.$('.send-message').focus(this.focusBottomBar.bind(this));
       this.$('.send-message').blur(this.unfocusBottomBar.bind(this));
 
+      this.setupHeader();
       this.setupEmojiPickerButton();
       this.setupStickerPickerButton();
 
@@ -323,6 +257,75 @@
       paste: 'onPaste',
     },
 
+    setupHeader() {
+      const getHeaderProps = () => {
+        const expireTimer = this.model.get('expireTimer');
+        const expirationSettingName = expireTimer
+          ? Whisper.ExpirationTimerOptions.getName(expireTimer || 0)
+          : null;
+
+        return {
+          id: this.model.id,
+          name: this.model.getName(),
+          phoneNumber: this.model.getNumber(),
+          profileName: this.model.getProfileName(),
+          color: this.model.getColor(),
+          avatarPath: this.model.getAvatarPath(),
+
+          isVerified: this.model.isVerified(),
+          isMe: this.model.isMe(),
+          isGroup: !this.model.isPrivate(),
+          isArchived: this.model.get('isArchived'),
+
+          expirationSettingName,
+          showBackButton: Boolean(this.panels && this.panels.length),
+          timerOptions: Whisper.ExpirationTimerOptions.map(item => ({
+            name: item.getName(),
+            value: item.get('seconds'),
+          })),
+
+          onSetDisappearingMessages: seconds =>
+            this.setDisappearingMessages(seconds),
+          onDeleteMessages: () => this.destroyMessages(),
+          onResetSession: () => this.endSession(),
+
+          // These are view only and don't update the Conversation model, so they
+          //   need a manual update call.
+          onShowSafetyNumber: () => {
+            this.showSafetyNumber();
+          },
+          onShowAllMedia: async () => {
+            await this.showAllMedia();
+            this.updateHeader();
+          },
+          onShowGroupMembers: async () => {
+            await this.showMembers();
+            this.updateHeader();
+          },
+          onGoBack: () => {
+            this.resetPanel();
+            this.updateHeader();
+          },
+
+          onArchive: () => {
+            this.unload('archive');
+            this.model.setArchived(true);
+          },
+          onMoveToInbox: () => {
+            this.model.setArchived(false);
+          },
+        };
+      };
+      this.titleView = new Whisper.ReactWrapperView({
+        className: 'title-wrapper',
+        Component: window.Signal.Components.ConversationHeader,
+        props: getHeaderProps(this.model),
+      });
+      this.updateHeader = () => this.titleView.update(getHeaderProps());
+      this.listenTo(this.model, 'change', this.updateHeader);
+      this.$('.conversation-header').append(this.titleView.el);
+    },
+
     setupEmojiPickerButton() {
       const props = {
         onForceSend: () => {