Merge pull request #1430 from OpenBazaar/addModWithGuid

Add add mod with guid

Author: jjeffryes

js/languages/en-US.json

@@ -231,7 +231,9 @@
   "SearchForCategory": "Search for category",
   "Moderators": "Moderators",
   "CurrentModerators": "Current Moderators",
-  "AddModerators": "Add New Moderators",
+  "AddModerators": "Add Moderators",
+  "ManualAddModerator": "Add Moderators by GUID",
+  "ManualAddModeratorHelp": "Enter the GUIDs of one or more moderators, separated by commas, here. The GUID is on the right side of their About tab on their page. Adding the GUID of a user that is not a moderator will have no effect, that GUID will be ignored.",
   "DeselectToRemoveModerator": "Deselect the moderators you want to remove",
   "SelectToAddModerator": "Select the moderators you want to add",
   "Categories": "Categories",

js/templates/settings.html

@@ -729,7 +729,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="hideTopAndBottomBorder js-settingsCurrentMods">
                 </div>
-                <div class="padding10 width100 alignCenter fadeable js-loadingMsg">
+                <div class="padding10 width100 alignCenter fadeable js-loadingMsgOld">
                   <i class="ion-android-sync spinner textSize24px textOpacity50"></i>
                 </div>
               </div>
@@ -750,12 +750,32 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="hideTopAndBottomBorder js-settingsNewMods">
                 </div>
-                <div class="padding10 width100 alignCenter fadeable js-loadingMsg">
+                <div class="padding10 width100 alignCenter fadeable js-loadingMsgNew">
                   <i class="ion-android-sync spinner textSize24px textOpacity50"></i>
                 </div>
               </div>
             </div>
 
+            <div class="flexRow">
+              <div class="flexCol-3  borderRight custCol-border zIndex1"><!-- add z-index so help box overlaps next column-->
+                <div class="fieldItem">
+                  <label for="addManualMods" class="tooltip tooltip-box" data-tooltip="<%= polyglot.t('ManualAddModeratorHelp') %>">
+                    <%= polyglot.t('ManualAddModerator') %> <i class="ion-help-circled"></i>
+                  </label>
+
+                </div>
+              </div>
+
+              <div class="flexCol-9 borderRight0 custCol-border">
+                <div class="fieldItem padding0">
+                  <input name="manualMods"
+                         type="text"
+                         id="addManualMods"
+                         class="fieldItem">
+                </div>
+              </div>
+            </div>
+
             <div class="flexRow TODO">
               <div class="flexCol-3  borderRight custCol-border">
                 <div class="fieldItem">
@@ -768,6 +788,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="fieldItem padding0">
                   <!--TODO: keywords input here -->
+                  <input id="store-keywords">
                 </div>
               </div>
             </div>

js/views/settingsVw.js

@@ -503,9 +503,21 @@ module.exports = Backbone.View.extend({
         //don't add unless it comes from the model
         if(moderator.fromModel){
           this.$el.find('.js-settingsCurrentMods').append(modShort.el);
+          if(!this.$('.js-loadingMsgOld').hasClass('foldIn')){
+            //hide spinners after a while
+            setTimeout(()=> {
+              this.$('.js-loadingMsgOld').addClass('foldIn');
+            },2000);
+          }
         }
       }else{
         this.$el.find('.js-settingsNewMods').append(modShort.el);
+        if(!this.$('.js-loadingMsgNew').hasClass('foldIn')){
+          //hide spinners after a while
+          setTimeout(()=> {
+            this.$('.js-loadingMsgNew').addClass('foldIn');
+          },2000);
+        }
       }
       this.moderatorCount++;
       this.subViews.push(modShort);
@@ -557,10 +569,6 @@ module.exports = Backbone.View.extend({
             }
           });
         }
-        //hide spinners after a while
-        setTimeout(()=> {
-          this.$('.js-loadingMsg').addClass('foldIn');
-        },3000);
         this.firstLoadModerators = false;
       } else if (state === 'blocked') {
         // Since the Blocked Users View kicks off many server calls (one
@@ -811,9 +819,8 @@ module.exports = Backbone.View.extend({
         form = this.$el.find("#storeForm"),
         settingsData = {},
         moderatorsNew = this.$el.find('#storeForm .js-settingsNewMods .js-userShortView input:checked'),
-        moderatorList = this.userModel.get('moderators').map(function(moderatorObject){
-          return moderatorObject.guid;
-        }),
+        moderatorList = this.userModel.get('moderator_guids'),
+        manualModList,
         moderatorsUnChecked = this.$('#storeForm .js-settingsCurrentMods .js-userShortView input:not(:checked)'),
         onFail,
         $saveBtn = this.$('.js-saveStore');
@@ -830,6 +837,14 @@ module.exports = Backbone.View.extend({
       moderatorList.push($(this).data('guid'));
     });
 
+    //add any manually entered mods
+    manualModList = this.$('#addManualMods').val().split(',');
+    __.each(manualModList, function(mod){
+      if(mod.length === 40){
+        moderatorList.push(mod);
+      }
+    });
+
     settingsData.moderators = moderatorList.length > 0 ? moderatorList : "";
 
     onFail = (data) => {