Merge branch 'devel' into features

2021-08-23 10:41:19 +03:00
parent 9c0bdb4848 e73a920154
commit 292e974d29
19 changed files with 96 additions and 30 deletions
@@ -93,6 +93,11 @@ const messages = defineMessages({
    defaultMessage: 'Archive',
    description: 'Move topic from the list of active chats to archive'
  },
+  unarchive: {
+    id: 'menu_item_restore_topic',
+    defaultMessage: 'Restore',
+    description: 'Restore topic from archive'
+  },
  edit_permissions: {
    id: 'menu_item_edit_permissions',
    defaultMessage: 'Edit permissions',
@@ -253,6 +258,22 @@ class ContextMenu extends React.Component {
          });
        }
      },
+      'topic_restore': {
+        id: 'topic_restore',
+        title: formatMessage(messages.unarchive),
+        handler: (params, errorHandler) => {
+          const topic = this.props.tinode.getTopic(params.topicName);
+          if (!topic) {
+            console.log("Topic not found: ", params.topicName);
+            return;
+          }
+          return topic.archive(false).catch((err) => {
+            if (errorHandler) {
+              errorHandler(err.message, 'err');
+            }
+          });
+        }
+      },
      // menu_item_edit_permissions is defined elsewhere.
      'permissions': {
        id: 'permissions',