From bbc952b265b1150ac3dbeb8af225fd0f6d8e6935 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 15 Jun 2021 10:53:53 +0200
Subject: [PATCH] Fix MUC and headlines heaidngs, so that they still work

as ElementViews, since I ran out of time converting them to lit
components as well.

This reverts commit 1121a90af02ea860c1439704a120160d0604f198.
---
 src/plugins/chatview/heading.js             | 63 +++++++--------------
 src/plugins/chatview/templates/chat-head.js | 43 ++++++++++++--
 src/plugins/headlines-view/heading.js       | 14 ++++-
 src/plugins/muc-views/heading.js            | 15 ++++-
 4 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/src/plugins/chatview/heading.js b/src/plugins/chatview/heading.js
index f2d32662c..10c5d51a3 100644
--- a/src/plugins/chatview/heading.js
+++ b/src/plugins/chatview/heading.js
@@ -1,36 +1,38 @@
 import UserDetailsModal from 'modals/user-details.js';
-import debounce from 'lodash-es/debounce';
 import tpl_chatbox_head from './templates/chat-head.js';
-import { ElementView } from '@converse/skeletor/src/element.js';
+import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
 import { _converse, api } from "@converse/headless/core";
-import { getHeadingDropdownItem, getHeadingStandaloneButton } from 'plugins/chatview/utils.js';
-import { render } from 'lit';
 
 import './styles//chat-head.scss';
 
 
-export default class ChatHeading extends ElementView {
-
-    async render () {
-        const tpl = await this.generateHeadingTemplate();
-        render(tpl, this);
-    }
+export default class ChatHeading extends CustomElement {
 
     connectedCallback () {
         super.connectedCallback();
+        this.initialize();
+    }
+
+    initialize () {
         this.model = _converse.chatboxes.get(this.getAttribute('jid'));
-        this.debouncedRender = debounce(this.render, 100);
-        this.listenTo(this.model, 'change:status', this.debouncedRender);
-        this.listenTo(this.model, 'vcard:change', this.debouncedRender);
+        this.listenTo(this.model, 'change:status', this.requestUpdate);
+        this.listenTo(this.model, 'vcard:change', this.requestUpdate);
         if (this.model.contact) {
-            this.listenTo(this.model.contact, 'destroy', this.debouncedRender);
+            this.listenTo(this.model.contact, 'destroy', this.requestUpdate);
         }
         this.model.rosterContactAdded?.then(() => {
-            this.listenTo(this.model.contact, 'change:nickname', this.debouncedRender);
-            this.debouncedRender();
+            this.listenTo(this.model.contact, 'change:nickname', this.requestUpdate);
+            this.requestUpdate();
         });
-        this.render();
+    }
+
+    render () {
+        return tpl_chatbox_head(Object.assign(this.model.toJSON(), {
+            'heading_buttons_promise': this.getHeadingButtons(),
+            'model': this.model,
+            'showUserDetailsModal': ev => this.showUserDetailsModal(ev),
+        }));
     }
 
     showUserDetailsModal (ev) {
@@ -94,33 +96,6 @@ export default class ChatHeading extends ElementView {
             return buttons; // Happens during tests
         }
     }
-
-    async generateHeadingTemplate () {
-        const vcard = this.model?.vcard;
-        const vcard_json = vcard ? vcard.toJSON() : {};
-        const i18n_profile = __("The User's Profile Image");
-        const avatar_data = Object.assign(
-            {
-                'alt_text': i18n_profile,
-                'extra_classes': '',
-                'height': 40,
-                'width': 40
-            },
-            vcard_json
-        );
-        const heading_btns = await this.getHeadingButtons();
-        const standalone_btns = heading_btns.filter(b => b.standalone);
-        const dropdown_btns = heading_btns.filter(b => !b.standalone);
-        return tpl_chatbox_head(
-            Object.assign(this.model.toJSON(), {
-                avatar_data,
-                'display_name': this.model.getDisplayName(),
-                'dropdown_btns': dropdown_btns.map(b => getHeadingDropdownItem(b)),
-                'showUserDetailsModal': ev => this.showUserDetailsModal(ev),
-                'standalone_btns': standalone_btns.map(b => getHeadingStandaloneButton(b))
-            })
-        );
-    }
 }
 
 api.elements.define('converse-chat-heading', ChatHeading);
diff --git a/src/plugins/chatview/templates/chat-head.js b/src/plugins/chatview/templates/chat-head.js
index ad8ea9cc8..bcd45319c 100644
--- a/src/plugins/chatview/templates/chat-head.js
+++ b/src/plugins/chatview/templates/chat-head.js
@@ -1,13 +1,44 @@
+import { __ } from 'i18n';
 import { _converse } from '@converse/headless/core';
+import { getHeadingDropdownItem, getHeadingStandaloneButton } from 'plugins/chatview/utils.js';
 import { html } from "lit";
 import { renderAvatar } from 'shared/directives/avatar.js';
 import { until } from 'lit/directives/until.js';
 
 
-export default (o) => {
-    const tpl_standalone_btns = (o) => o.standalone_btns.reverse().map(b => until(b, ''));
+async function getStandaloneButtons (promise) {
+    const heading_btns = await promise;
+    const standalone_btns = heading_btns.filter(b => b.standalone);
+    return standalone_btns.map(b => getHeadingStandaloneButton(b))
+}
 
-    const avatar = html`<span class="mr-2">${renderAvatar(o.avatar_data)}</span>`;
+async function getDropdownButtons (promise) {
+    const heading_btns = await promise;
+    const dropdown_btns = heading_btns.filter(b => !b.standalone);
+    return dropdown_btns.map(b => getHeadingDropdownItem(b));
+}
+
+export default (o) => {
+    const vcard = o.model?.vcard;
+    const vcard_json = vcard ? vcard.toJSON() : {};
+    const i18n_profile = __("The User's Profile Image");
+    const avatar_data = Object.assign(
+        {
+            'alt_text': i18n_profile,
+            'extra_classes': '',
+            'height': 40,
+            'width': 40
+        },
+        vcard_json
+    );
+    const avatar = html`<span class="mr-2">${renderAvatar(avatar_data)}</span>`;
+    const display_name = o.model.getDisplayName();
+
+    const tpl_dropdown_btns = () => getDropdownButtons(o.heading_buttons_promise)
+        .then(btns => btns.length ? html`<converse-dropdown .items=${btns}></converse-dropdown>` : '');
+
+    const tpl_standalone_btns = () => getStandaloneButtons(o.heading_buttons_promise)
+        .then(btns => btns.reverse().map(b => until(b, '')));
 
     return html`
         <div class="chatbox-title ${ o.status ? '' :  "chatbox-title--no-desc"}">
@@ -15,12 +46,12 @@ export default (o) => {
                 ${ (!_converse.api.settings.get("singleton")) ?  html`<converse-controlbox-navback jid="${o.jid}"></converse-controlbox-navback>` : '' }
                 ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="show-msg-author-modal" @click=${o.showUserDetailsModal}>${ avatar }</a>` : '' }
                 <div class="chatbox-title__text" title="${o.jid}">
-                    ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="user show-msg-author-modal" @click=${o.showUserDetailsModal}>${ o.display_name }</a>` : o.display_name }
+                    ${ (o.type !== _converse.HEADLINES_TYPE) ? html`<a class="user show-msg-author-modal" @click=${o.showUserDetailsModal}>${ display_name }</a>` : display_name }
                 </div>
             </div>
             <div class="chatbox-title__buttons row no-gutters">
-                ${ o.dropdown_btns.length ? html`<converse-dropdown .items=${o.dropdown_btns}></converse-dropdown>` : '' }
-                ${ o.standalone_btns.length ? tpl_standalone_btns(o) : '' }
+                ${ until(tpl_dropdown_btns(), '') }
+                ${ until(tpl_standalone_btns(), '') }
             </div>
         </div>
         ${ o.status ? html`<p class="chat-head__desc">${ o.status }</p>` : '' }
diff --git a/src/plugins/headlines-view/heading.js b/src/plugins/headlines-view/heading.js
index f5c5143ff..262f63d7e 100644
--- a/src/plugins/headlines-view/heading.js
+++ b/src/plugins/headlines-view/heading.js
@@ -1,11 +1,12 @@
-import ChatHeading from 'plugins/chatview/heading.js';
 import tpl_chat_head from './templates/chat-head.js';
+import { ElementView } from '@converse/skeletor/src/element.js';
 import { __ } from 'i18n';
 import { _converse, api } from "@converse/headless/core";
 import { getHeadingDropdownItem, getHeadingStandaloneButton } from 'plugins/chatview/utils.js';
+import { render } from 'lit';
 
 
-export default class HeadlinesHeading extends ChatHeading {
+export default class HeadlinesHeading extends ElementView {
 
     async connectedCallback () {
         super.connectedCallback();
@@ -14,6 +15,11 @@ export default class HeadlinesHeading extends ChatHeading {
         this.render();
     }
 
+    async render () {
+        const tpl = await this.generateHeadingTemplate();
+        render(tpl, this);
+    }
+
     async generateHeadingTemplate () {
         const heading_btns = await this.getHeadingButtons();
         const standalone_btns = heading_btns.filter(b => b.standalone);
@@ -49,6 +55,10 @@ export default class HeadlinesHeading extends ChatHeading {
         return _converse.api.hook('getHeadingButtons', this, buttons);
     }
 
+    close (ev) {
+        ev.preventDefault();
+        this.model.close();
+    }
 }
 
 api.elements.define('converse-headlines-heading', HeadlinesHeading);
diff --git a/src/plugins/muc-views/heading.js b/src/plugins/muc-views/heading.js
index e4235cf07..f66f80cd9 100644
--- a/src/plugins/muc-views/heading.js
+++ b/src/plugins/muc-views/heading.js
@@ -1,4 +1,4 @@
-import ChatHeading from 'plugins/chatview/heading.js';
+import { ElementView } from '@converse/skeletor/src/element.js';
 import MUCInviteModal from 'modals/muc-invite.js';
 import RoomDetailsModal from 'modals/muc-details.js';
 import debounce from 'lodash-es/debounce';
@@ -11,11 +11,12 @@ import {
     getHeadingDropdownItem,
     getHeadingStandaloneButton,
 } from 'plugins/chatview/utils.js';
+import { render } from 'lit';
 
 import './styles/muc-head.scss';
 
 
-export default class MUCHeading extends ChatHeading {
+export default class MUCHeading extends ElementView {
 
     async connectedCallback () {
         super.connectedCallback();
@@ -34,6 +35,11 @@ export default class MUCHeading extends ChatHeading {
         this.render();
     }
 
+    async render () {
+        const tpl = await this.generateHeadingTemplate();
+        render(tpl, this);
+    }
+
     onOccupantAdded (occupant) {
         if (occupant.get('jid') === _converse.bare_jid) {
             this.debouncedRender();
@@ -65,6 +71,11 @@ export default class MUCHeading extends ChatHeading {
         this.model.session.set('view', converse.MUC.VIEWS.CONFIG);
     }
 
+    close (ev) {
+        ev.preventDefault();
+        this.model.close();
+    }
+
     destroy (ev) {
         ev.preventDefault();
         destroyMUC(this.model);