more work on confirming topic subscriptions, update permissions without subscribing

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinode-webapp",
   "description": "Tinode messenger for the web",
-  "version": "0.15.13-rc2",
+  "version": "0.15.13-rc3",
   "devDependencies": {
     "@babel/core": "^7.2.2",
     "@babel/preset-env": "^7.3.1",

src/version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.15.13-rc2";
+export const PACKAGE_VERSION = "0.15.13-rc3";

src/views/messages-view.jsx

@@ -36,10 +36,18 @@ const messages = defineMessages({
   }
 });
 
+// Checks if the access permissions are granted but not yet accepted.
+function isUnconfirmed(acs) {
+  const ex = acs ? acs.getExcessive() || '' : '';
+  return (ex.includes('R') || ex.includes('W'));
+}
+
 class MessagesView extends React.Component {
   constructor(props) {
     super(props);
 
+    console.log(props.acs);
+
     this.state = {
       messages: [],
       onlineSubs: [],
@@ -49,6 +57,7 @@ class MessagesView extends React.Component {
       scrollPosition: 0,
       readOnly: props.acs ? !props.acs.isWriter() : true,
       writeOnly: props.acs ? !props.acs.isReader() : true,
+      unconfirmed: isUnconfirmed(props.acs),
       typingIndicator: false,
       imagePreview: null
     };
@@ -169,9 +178,11 @@ class MessagesView extends React.Component {
       this.props.readTimerHandler(null);
     }
 
+    console.log("propsChange", props.acs);
     this.setState({
       readOnly: props.acs ? !props.acs.isWriter() : true,
-      writeOnly: props.acs ? !props.acs.isReader() : true
+      writeOnly: props.acs ? !props.acs.isReader() : true,
+      unconfirmed: isUnconfirmed(props.acs)
     });
 
     if (!topic.isSubscribed() && tryToResubscribe) {
@@ -199,11 +210,14 @@ class MessagesView extends React.Component {
         .catch((err) => {
           props.onError(err.message, 'err');
           const {formatMessage} = props.intl;
+
+          console.log("subscribe failed", props.acs);
           this.setState({
             title: formatMessage(messages.not_found),
             avatar: null,
             readOnly: true,
             writeOnly: true,
+            unconfirmed: false,
             fetchingMessages: false,
             messages: [],
             onlineSubs: [],
@@ -276,10 +290,13 @@ class MessagesView extends React.Component {
         avatar: null
       });
     }
+
+    console.log("handleDescChange", desc.acs);
     if (desc.acs) {
       this.setState({
         readOnly: !desc.acs.isWriter(),
-        writeOnly: !desc.acs.isReader()
+        writeOnly: !desc.acs.isReader(),
+        unconfirmed: isUnconfirmed(desc.acs),
       });
     }
   }
@@ -551,13 +568,16 @@ class MessagesView extends React.Component {
             null
             }
           </div>
-          <SendMessage
+          {this.state.unconfirmed ?
-            tinode={this.props.tinode}
+            <Invitation onAction={this.handleNewChatAcceptance} />
-            topic={this.props.topic}
+            :
-            disabled={this.state.readOnly}
+            <SendMessage
-            sendMessage={this.props.sendMessage}
+              tinode={this.props.tinode}
-            onError={this.props.onError} />
+              topic={this.props.topic}
-          <Invitation onAction={this.handleNewChatAcceptance} />
+              disabled={this.state.readOnly}
+              sendMessage={this.props.sendMessage}
+              onError={this.props.onError} />
+          }
           {this.state.imagePreview ?
             <ImagePreview content={this.state.imagePreview}
               onClose={this.handleCloseImagePreview} /> : null}

src/views/tinode-web.jsx

@@ -1037,9 +1037,9 @@ class TinodeWeb extends React.Component {
       subscribed ? {title: formatMessage({id: 'menu_item_info'}), handler: this.handleShowInfoView} : null,
       subscribed ? 'messages_clear' : null,
       subscribed && deleter ? 'messages_clear_hard' : null,
-      subscribed ? (muted ? 'topic_unmute' : 'topic_mute') : null,
+      muted ? 'topic_unmute' : 'topic_mute',
-      subscribed ? (blocked ? 'topic_unblock' : 'topic_block') : null,
+      blocked ? 'topic_unblock' : 'topic_block',
-      subscribed && !archived ? 'topic_archive' : null,
+      !archived ? 'topic_archive' : null,
       'topic_delete'
     ];
   }

webpack.config.js

@@ -8,7 +8,7 @@ module.exports = {
   module: {
     rules: [
       {
-        test: /src\/.*\.jsx?$/,
+        test: /src\/.*\.(js|jsx)?$/,
         loaders: [
           'babel-loader',
         ],