implementing chat archiving (does not work yet)

css/base.css

@@ -775,6 +775,13 @@ i.search {
   justify-content: space-around;
 }
 
+.contact-box .action-text {
+  text-align: center;
+  font-size: 1.05rem;
+  margin: 0.5rem auto 0.5rem auto;
+  cursor: pointer;
+}
+
 /* Online-offline indicator positioned inside avatar-box */
 .avatar-box .online, .offline {
   display: inline-block;

service-worker.js

@@ -69,7 +69,6 @@ self.addEventListener('notificationclick', function(event) {
 
 // This is needed for 'Add to Home Screen'.
 self.addEventListener('fetch', function(event) {
-  console.log("Fetch event", event.request);
   // Workaround for https://bugs.chromium.org/p/chromium/issues/detail?id=823392
   if (event.request.cache == 'only-if-cached' && event.request.mode != 'same-origin') {
     return;

src/i18n/en.json

@@ -1,5 +1,5 @@
 {
-  "contacts_not_found": "You have no chats<br />¯∖_(ツ)_/¯",
+  "archived_contacts": "Archived contacts ({count})",
   "full_name_prompt": "Full name, e.g. John Doe",
   "email_prompt": "Email, e.g. jdoe@example.com",
   "button_sign_up": "Sign up",
@@ -63,6 +63,7 @@
   "sidepanel_title_newtpk": "Start New Chat",
   "sidepanel_title_cred": "Confirm Credentials",
   "sidepanel_title_reset": "Reset Password",
+  "sidepanel_title_archive": "Archived",
   "update_available": "Update available. <a href=\"\">Reload</a>.",
   "reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…",
   "reconnect_now": "Try now",

src/i18n/ru.json

@@ -1,5 +1,5 @@
 {
-  "contacts_not_found": "Чатов нет<br />¯∖_(ツ)_/¯",
+  "contacts_not_found": ":!![OBSOLETE]!!:Чатов нет<br />¯∖_(ツ)_/¯",
   "full_name_prompt": "Полное имя, напр. Иван Петров",
   "email_prompt": "Email, напр. ivan@example.com",
   "button_sign_up": "Создать счет",
@@ -123,5 +123,7 @@
   "reconnect_countdown": "Нет связи. Подключение через {seconds}с…",
   "reconnect_now": "Подключить сейчас.",
   "save_attachment": "сохранить",
-  "menu_item_archive_topic": "В архив"
+  "menu_item_archive_topic": "В архив",
+  "archived_contacts": "Чаты в архиве ({count})",
+  "sidepanel_title_archive": "Архив"
 }

src/messages.json

@@ -1,6 +1,6 @@
 {
   "en": {
-    "contacts_not_found": "You have no chats<br />¯∖_(ツ)_/¯",
+    "archived_contacts": "Archived contacts ({count})",
     "full_name_prompt": "Full name, e.g. John Doe",
     "email_prompt": "Email, e.g. jdoe@example.com",
     "button_sign_up": "Sign up",
@@ -64,6 +64,7 @@
     "sidepanel_title_newtpk": "Start New Chat",
     "sidepanel_title_cred": "Confirm Credentials",
     "sidepanel_title_reset": "Reset Password",
+    "sidepanel_title_archive": "Archived",
     "update_available": "Update available. <a href=\"\">Reload</a>.",
     "reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…",
     "reconnect_now": "Try now",
@@ -127,7 +128,6 @@
     "title_manage_tags": "Manage tags"
   },
   "ru": {
-    "contacts_not_found": "Чатов нет<br />¯∖_(ツ)_/¯",
     "full_name_prompt": "Полное имя, напр. Иван Петров",
     "email_prompt": "Email, напр. ivan@example.com",
     "button_sign_up": "Создать счет",
@@ -251,6 +251,8 @@
     "reconnect_countdown": "Нет связи. Подключение через {seconds}с…",
     "reconnect_now": "Подключить сейчас.",
     "save_attachment": "сохранить",
-    "menu_item_archive_topic": "В архив"
+    "menu_item_archive_topic": "В архив",
+    "archived_contacts": "Чаты в архиве ({count})",
+    "sidepanel_title_archive": "Архив"
   }
 }

src/views/contacts-view.jsx

@@ -14,9 +14,15 @@ export default class ContactsView extends React.Component {
   }
 
   static getDerivedStateFromProps(nextProps, prevState) {
+    console.log(nextProps.archive ? "show archive" : "show active");
     let contacts = [];
     let unreadThreads = 0;
+    let archivedCount = 0;
     nextProps.chatList.map((c) => {
+      if (c.private && c.private.arch) {
+        console.log("Archived topic", c);
+        archivedCount ++;
+      }
       unreadThreads += c.unread > 0 ? 1 : 0;
       contacts.push(c);
     });
@@ -26,25 +32,31 @@ export default class ContactsView extends React.Component {
 
     updateFavicon(unreadThreads);
 
-    return {contactList: contacts};
+    return {contactList: contacts, archivedCount: archivedCount};
   }
 
   render() {
+    const archivedCount = this.state.archivedCount;
     return (
-      <FormattedHTMLMessage id="contacts_not_found"
-        defaultMesage="You have no chats<br />¯∖_(ツ)_/¯"
-        description="HTML message shown in ContactList when no contacts are found">{
-        (no_contacts) => <ContactList
-          connected={this.props.connected}
-          contacts={this.state.contactList}
-          emptyListMessage={no_contacts}
-          topicSelected={this.props.topicSelected}
-          myUserId={this.props.myUserId}
-          showOnline={true}
-          showUnread={true}
-          onTopicSelected={this.props.onTopicSelected}
-          showContextMenu={this.props.showContextMenu} />
-      }</FormattedHTMLMessage>
+      <React.Fragment>
+        <FormattedHTMLMessage id="contacts_not_found"
+          defaultMesage="You have no chats<br />¯∖_(ツ)_/¯"
+          description="HTML message shown in ContactList when no contacts are found">{
+          (no_contacts) => <ContactList
+            connected={this.props.connected}
+            contacts={this.state.contactList}
+            emptyListMessage={no_contacts}
+            topicSelected={this.props.topicSelected}
+            myUserId={this.props.myUserId}
+            showOnline={true}
+            showUnread={true}
+            onTopicSelected={this.props.onTopicSelected}
+            showContextMenu={this.props.showContextMenu} />
+        }</FormattedHTMLMessage>
+        {archivedCount > 0 ? <FormattedMessage id="archived_contacts"
+          defaultMessage="Archived contacts ({count})"
+          description="Label for archived chats" values={{count: archivedCount}}/> : null}
+      </React.Fragment>
     );
   }
 };

src/views/sidepanel-view.jsx

@@ -49,6 +49,11 @@ const messages = defineMessages({
     id: 'sidepanel_title_reset',
     description: 'Sidepanel title for PasswordResetView.',
     defaultMessage: 'Reset Password'
+  },
+  'archive': {
+    id: 'sidepanel_title_archive',
+    description: 'Sidepanel title for ContactsView-Archive.',
+    defaultMessage: 'Archived'
   }
 });
 
@@ -134,12 +139,13 @@ class SidepanelView extends React.Component {
             onCancel={this.props.onCancel}
             onError={this.props.onError} /> :
 
-          view === 'contacts' ?
+          (view === 'contacts' || view == 'archive') ?
           <ContactsView
             tinode={this.props.tinode}
             myUserId={this.props.myUserId}
             connected={this.props.connected}
             topicSelected={this.props.topicSelected}
+            archive={view == 'archive'}
             chatList={this.props.chatList}
             showContextMenu={this.props.showContextMenu}
             onTopicSelected={this.props.onTopicSelected} /> :

src/views/tinode-web.jsx

@@ -274,7 +274,7 @@ class TinodeWeb extends React.Component {
     var hash = HashNavigation.parseUrlHash(window.location.hash);
     if (hash.path && hash.path.length > 0) {
       // Left-side panel selector.
-      if (['register','settings','edit','cred','reset','newtpk','contacts',''].includes(hash.path[0])) {
+      if (['register','settings','edit','cred','reset','newtpk','archive','contacts',''].includes(hash.path[0])) {
         this.setState({sidePanelSelected: hash.path[0]});
       } else {
         console.log("Unknown sidepanel view", hash.path[0]);

src/widgets/contact-list.jsx

@@ -4,6 +4,7 @@ import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import Contact from './contact.jsx';
+import ContactAction from './contact-action.jsx';
 
 import { makeImageUrl } from '../lib/blob-helpers.js';
 
@@ -25,69 +26,83 @@ class ContactList extends React.Component {
     const {formatMessage} = this.props.intl;
     const showCheckmark = Array.isArray(this.props.topicSelected);
     const contactNodes = [];
+    let contactsCount = 0;
     if (this.props.contacts && this.props.contacts.length > 0) {
       this.props.contacts.map((c) => {
-        let key = c.topic ? c.topic : c.user;
-        // If filter function is provided, filter out the items
-        // which don't satisfy the condition.
-        if (this.props.filterFunc && this.props.filter) {
-          let content = [key];
-          if (c.private && c.private.comment) {
-            content.push(('' + c.private.comment).toLowerCase());
+        if (c.action) {
+          // Action item
+          contactNodes.push(<ContactAction title={c.title} action={c.action} />);
+        } else {
+          // Normal contact
+          const key = c.topic ? c.topic : c.user;
+          // If filter function is provided, filter out the items
+          // which don't satisfy the condition.
+          if (this.props.filterFunc && this.props.filter) {
+            let content = [key];
+            if (c.private && c.private.comment) {
+              content.push(('' + c.private.comment).toLowerCase());
+            }
+            if (c.public && c.public.fn) {
+              content.push(('' + c.public.fn).toLowerCase());
+            }
+            if (!this.props.filterFunc(this.props.filter, content)) {
+              return;
+            }
           }
-          if (c.public && c.public.fn) {
-            content.push(('' + c.public.fn).toLowerCase());
-          }
-          if (!this.props.filterFunc(this.props.filter, content)) {
-            return;
-          }
-        }
 
-        let selected = showCheckmark ?
-          (this.props.topicSelected.indexOf(key) > -1) :
-          (this.props.topicSelected === key);
-        let badges = [];
-        if (this.props.showMode) {
-          if (key === this.props.myUserId) {
-            badges.push({name: formatMessage(messages.badge_you), color: 'green'});
+          const selected = showCheckmark ?
+            (this.props.topicSelected.indexOf(key) > -1) :
+            (this.props.topicSelected === key);
+          const badges = [];
+          if (this.props.showMode) {
+            if (key === this.props.myUserId) {
+              badges.push({name: formatMessage(messages.badge_you), color: 'green'});
+            }
+            if (c.acs && c.acs.isOwner()) {
+              badges.push({name: formatMessage(messages.badge_owner), color: 'blue'});
+            }
           }
-          if (c.acs && c.acs.isOwner()) {
-            badges.push({name: formatMessage(messages.badge_owner), color: 'blue'});
-          }
-        }
-        let comment = Array.isArray(c.private) ?
-          c.private.join(',') : (c.private ? c.private.comment : null);
+          const comment = Array.isArray(c.private) ?
+            c.private.join(',') : (c.private ? c.private.comment : null);
 
-        contactNodes.push(
-          <Contact
-            title={c.public ? c.public.fn : null}
-            avatar={makeImageUrl(c.public ? c.public.photo : null)}
-            comment={comment}
-            unread={this.props.showUnread ? c.unread : 0}
-            now={c.online && this.props.connected}
-            acs={c.acs}
-            showMode={this.props.showMode}
-            badges={badges}
-            showCheckmark={showCheckmark}
-            selected={selected}
-            showOnline={this.props.showOnline}
-            onSelected={this.props.onTopicSelected}
-            showContextMenu={this.props.showContextMenu}
-            item={key}
-            index={contactNodes.length}
-            key={key} />
-        );
+          contactNodes.push(
+            <Contact
+              title={c.public ? c.public.fn : null}
+              avatar={makeImageUrl(c.public ? c.public.photo : null)}
+              comment={comment}
+              unread={this.props.showUnread ? c.unread : 0}
+              now={c.online && this.props.connected}
+              acs={c.acs}
+              showMode={this.props.showMode}
+              badges={badges}
+              showCheckmark={showCheckmark}
+              selected={selected}
+              showOnline={this.props.showOnline}
+              onSelected={this.props.onTopicSelected}
+              showContextMenu={this.props.showContextMenu}
+              item={key}
+              index={contactNodes.length}
+              key={key} />
+          );
+          contactsCount ++;
+        }
       }, this);
     }
 
     return (
       <div className={this.props.noScroll ? null : "scrollable-panel"}>
+        {contactsCount == 0 ?
+          <div className="center-medium-text"
+            dangerouslySetInnerHTML={{__html: this.props.emptyListMessage}} />
+          :
+          null
+        }
         {contactNodes.length > 0 ?
           <ul className="contact-box">
             {contactNodes}
           </ul>
           :
-          <div className="center-medium-text" dangerouslySetInnerHTML={{__html: this.props.emptyListMessage}} />
+          null
         }
       </div>
     );

src/widgets/contact.jsx

@@ -69,7 +69,7 @@ export default class Contact extends React.Component {
               <i className="material-icons">expand_more</i>
             </a>
           </span> : null}
-        </li>
+      </li>
     );
   }
 };