Notify user always when removed, otherwise when indicated

Author: matleppa

apinf_packages/tenant/client/add/add.js

@@ -52,15 +52,12 @@ Template.tenantForm.events({
           };
           return usersRow;
         });
-        // gather list of notified users email addresses
+        // gather list of notified users' email addresses
         notifyUserList = tenantUsers.filter((userdata) => {
-      //    if (userdata.notification === 'checked') {
-            return {
-              username: userdata.name,
-              email: userdata.email,
-            }
-      //    }
-      //    return false;
+          if (userdata.notification === 'checked') {
+            return true;
+          }
+          return false;
         });
       }
 
@@ -155,12 +152,6 @@ Template.tenantForm.events({
         description: $('#add-tenant-description').val(),
       };
 
-      // Get possible users in changed tenant
-      if (Session.get('tenantUsers')) {
-        // Read list of users of the tenant at hand
-        modifiedTenant.users = Session.get('tenantUsers');
-      }
-
       // Any changes in name
       if (originalTenant.name !== modifiedTenant.name) {
         // Fill in tenant id
@@ -204,6 +195,12 @@ Template.tenantForm.events({
           -> all is done
        */
 
+      // Get possible users in changed tenant
+      if (Session.get('tenantUsers')) {
+        // Read list of users of the tenant at hand
+        modifiedTenant.users = Session.get('tenantUsers');
+      }
+
       const usersNeedChecking = [];
       const notifyChangedUsers = [];
       const notifyRemovedUsers = [];
@@ -233,10 +230,10 @@ Template.tenantForm.events({
             op: 'remove',
             path,
           };
-          // Add user to remove list
+          // Add remove operation for user to request list
           changeList.push(removedUser);
 
-          // Add user also to check list
+          // Add user info also to check list
           const checkPath = path.concat('/name');
           const checkUser = {
             op: 'test',
@@ -246,7 +243,8 @@ Template.tenantForm.events({
           // Add user to to-be-checked list
           usersNeedChecking.push(checkUser);
 
-          // Add user to list for notification about removal
+          console.log('orig usr to be removed=', origUser);
+          // Always add user to list for notification about removal
           notifyRemovedUsers.push(origUser);
 
           // If user data is modified, set user to be replaced
@@ -286,8 +284,11 @@ Template.tenantForm.events({
           // Add user to to-be-checked list
           usersNeedChecking.push(checkUser);
 
-          // Add user to notification about modification list
-          notifyChangedUsers.push(sameUserInModified[0]);
+          // If notification is indicated, add to notify list
+          if (sameUserInModified[0].notification) {
+            // Add user to notification about modification list
+            notifyChangedUsers.push(sameUserInModified[0]);
+          }
 
           // User data is changed, remove from modified list
           modifiedTenant.users.splice(modifiedUserIndex, 1);
@@ -307,8 +308,10 @@ Template.tenantForm.events({
 
       // If there are any modified users left, they are to be added into request
       const newUsers = modifiedTenant.users.map((user) => {
-        // Add user to notification about modification list
-        notifyChangedUsers.push(user);
+        if (user.notification === 'checked') {
+          // Add user to notification about modification list
+          notifyChangedUsers.push(user);
+        }
 
         // collect roles
         const tenantRoles = [];

apinf_packages/tenant/client/add/form/form.js

@@ -35,6 +35,7 @@ Template.tenantUserForm.events({
         provider: false,
         consumer: false,
         email: thisUser[0].email,
+        notification: "checked",
       };
 
       let tenantUsers = [];

apinf_packages/tenant/client/add/userlist/userlist.html

@@ -27,8 +27,9 @@
                   </label>
 
                   <input type="checkbox"
+                          checked={{ notification }}
                           id="notifyUser"
-                          name=notificationToUser
+                          name=notifyUser
                           value="notify-user"
                           class="notificationToUser">
                 </div>

apinf_packages/tenant/client/add/userlist/userlist.js

@@ -50,6 +50,7 @@ Template.tenantUsersList.events({
 
     // Save to localStorage to be used while listing users of tenant
     Session.set('tenantUsers', tenantUsers);
+    console.log('tenant users consumer change', tenantUsers);
   },
   'change .tenantUserRoleProvider': function (event) {
     let tenantUsers = [];
@@ -68,23 +69,25 @@ Template.tenantUsersList.events({
 
     // Save to localStorage to be used while listing users of tenant
     Session.set('tenantUsers', tenantUsers);
+    console.log('tenant users provider change', tenantUsers);
   },
   'change .notificationToUser': function (event) {
     let tenantUsers = [];
-    // Get possible previous users of tenant
+    // Get list of users of tenant
     if (Session.get('tenantUsers')) {
       tenantUsers = Session.get('tenantUsers');
     }
 
-    // update user's role, provider
+    // update user's notification grant
     tenantUsers = tenantUsers.map(user => {
       if (user.id === this.id) {
         user.notification = event.currentTarget.checked ? 'checked' : false;
       }
       return user;
     });
 
-    // Save to localStorage to be used while listing users of tenant
+    // Save to localStorage to be used while user roles change
     Session.set('tenantUsers', tenantUsers);
+    console.log('tenant users notif change', tenantUsers);
   },
 });

apinf_packages/tenant/client/remove_tenant/remove_tenant.js

@@ -39,16 +39,18 @@ Template.ensureTenantRemovalForm.events({
     Meteor.call('deleteTenant', tenantToRemove, (error, result) => {
       if (result) {
         if (result.status === 204) {
-          // Tenant successfully removed from manager side, empty local list
-          const notifyUserList = Session.get('tenantUsers');
+          // Always notify users when the tenant is removed
+          const tenantUsers = Session.get('tenantUsers');
+
           // Notification to users of tenant
-          console.log('Perhaps following users need to be notified about removal=', notifyUserList);
-          Meteor.call('informTenantUser', notifyUserList, 'userRemoval', tenantToRemove.name, (notifyError, notifyResult) => {
+          console.log('Perhaps following users need to be notified about removal=', tenantUsers);
+          Meteor.call('informTenantUser', tenantUsers, 'userRemoval', tenantToRemove.name, (notifyError, notifyResult) => {
             if (notifyError) {
               sAlert.error('Error in notifying users', { timeout: 'none' });
             }
           });
 
+          // Tenant successfully removed from manager side, empty local list
           tenantList = [];
           // Save to sessionStorage to be used while adding users to tenant
           Session.set('tenantList', tenantList);