Localized notification message

Author: matleppa

apinf_packages/core/lib/i18n/en.i18n.json

@@ -541,6 +541,14 @@
   "importOpenApiSpecification_optionText_url": "URL",
   "importOpenApiSpecification_optionText_firstOption": "Select lifecycle status",
   "importOpenApiSpecificationUploadButton_buttonText_file": "Choose file",
+  "informTenantUser_emailSubject_tenantAddition": "New tenant added: __tenant__",
+  "informTenantUser_emailSubject_tenantRemoval": "Tenant __tenant__ removed",
+  "informTenantUser_emailSubject_userRemoval": "User removed from tenant __tenant__",
+  "informTenantUser_emailSubject_userRoleChange": "Changes in user roles in tenant __tenant__",
+  "informTenantUser_emailText_roleInfo": "Current roles: ",
+  "informTenantUser_emailText_tenantRemoval": "Tenant __tenant__ is removed. One of the users was: ",
+  "informTenantUser_emailText_userRemoval": "Changes in tenant __tenant__. Removed following user: ",
+  "informTenantUser_emailText_userRoleChange": "In the tenant __tenant__, there are changes in roles of following user: ",
   "invalidApiBasePathMessage": "Must begin and end with /. Allowed alphanumeric characters and -.?$*+'()/:#@!&,;=",
   "invalidApiMonitoringEndpointMessage": "Must begin with /. Allowed alphanumeric characters and -.?$*+'()/:#@!&,;=",
   "invalidApiRequiredMessage": "Invalid input not allowed",

apinf_packages/tenant/client/add/add.js

@@ -93,7 +93,7 @@ Template.tenantForm.events({
 
             // Notification to users of tenant
             // eslint-disable-next-line max-len
-            Meteor.call('informTenantUser', notifyUserList, 'userRoleChange', tenant.name, (nofityChangeError) => {
+            Meteor.call('informTenantUser', notifyUserList, 'tenantAddition', tenant.name, (nofityChangeError) => {
               if (nofityChangeError) {
                 sAlert.error('Error in notifying users', { timeout: 'none' });
               }
@@ -105,7 +105,6 @@ Template.tenantForm.events({
 
             // Inform user about success
             sAlert.success(message);
-
           } else {
             // Operation finished, inform spinner
             Session.set('tenantUpdateOngoing', false);

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

@@ -24,7 +24,7 @@ Template.tenantUserForm.events({
         if (userdata.id === userId) {
           return {
             userdata,
-          }
+          };
         }
         return false;
       });
@@ -35,7 +35,7 @@ Template.tenantUserForm.events({
         provider: false,
         consumer: false,
         email: thisUser[0].email,
-        notification: "checked",
+        notification: 'checked',
       };
 
       let tenantUsers = [];

apinf_packages/tenant/client/remove_tenant/remove_tenant.js

@@ -43,7 +43,8 @@ Template.ensureTenantRemovalForm.events({
           const tenantUsers = Session.get('tenantUsers');
 
           // Notification to users of tenant
-          Meteor.call('informTenantUser', tenantUsers, 'tenantRemoval', tenantToRemove.name, (notifyError, notifyResult) => {
+            // eslint-disable-next-line max-len
+          Meteor.call('informTenantUser', tenantUsers, 'tenantRemoval', tenantToRemove.name, (notifyError) => {
             if (notifyError) {
               sAlert.error('Error in notifying users', { timeout: 'none' });
             }

apinf_packages/tenant/server/methods.js

@@ -113,7 +113,6 @@ Meteor.methods({
 
         response.status = result.statusCode;
       } catch (err) {
-
         // Return error object
         let errorMessage = TAPi18n.__('tenantRequest_missingTenantList');
         errorMessage = errorMessage.concat(err);
@@ -420,52 +419,64 @@ Meteor.methods({
     return response;
   },
   informTenantUser (userlist, notificationType, tenantName) {
-    // Check the type of notification
+    check(userlist, Array);
+    check(notificationType, String);
+    check(tenantName, String);
+
     let emailText;
     let emailSubject;
+    // To convey variables to text strings
+    const params = { tenant: tenantName };
+
+    // Check the type of notification
     if (notificationType === 'userRoleChange') {
-      emailSubject = `Changes in user roles in tenant ${tenantName}`;
-      emailText = `In the tenant ${tenantName} there are changes in roles of following user: `;
+      emailSubject = TAPi18n.__('informTenantUser_emailSubject_userRoleChange', params);
+      emailText = TAPi18n.__('informTenantUser_emailText_userRoleChange', params);
     } else if (notificationType === 'userRemoval') {
-      emailSubject = `User removed from tenant ${tenantName}`;
-      emailText = `Changes in tenant ${tenantName}. Removed following user: `;
+      emailSubject = TAPi18n.__('informTenantUser_emailSubject_userRemoval', params);
+      emailText = TAPi18n.__('informTenantUser_emailText_userRemoval', params);
     } else if (notificationType === 'tenantRemoval') {
-      emailSubject = `Tenant ${tenantName} removed`;
-      emailText = `Tenant ${tenantName} is removed. One of the users was: `;
+      emailSubject = TAPi18n.__('informTenantUser_emailSubject_tenantRemoval', params);
+      emailText = TAPi18n.__('informTenantUser_emailText_tenantRemoval', params);
+    } else if (notificationType === 'tenantAddition') {
+      emailSubject = TAPi18n.__('informTenantUser_emailSubject_tenantAddition', params);
+      // Note! Same text as in user role change
+      emailText = TAPi18n.__('informTenantUser_emailText_userRoleChange', params);
     }
 
     // Send notification for each user in list
     if (emailText) {
       // Get settings
       const settings = Settings.findOne();
 
-      // Check if email settings are configured
+      // Email can be sent only when email settings are configured
       if (settings.mail && settings.mail.enabled) {
+        // Send email for each changed user
         userlist.forEach(user => {
           // Get the email address for user in question
           const toUser = completeUserList.find(userData => userData.id === user.id);
 
-          // fill notification
+          // Add user name to notification
           let emailTextToSend = emailText.concat(user.name);
-          console.log('user=', user);
 
-          // In case roles were changed, anticipate new roles
-          if (notificationType === 'userRoleChange') {
-            emailTextToSend = emailTextToSend.concat('. Current roles: data-consumer');
+          // In case roles were changed, anticipate new roles. Consumer as default, provider, if indicated.
+          if (notificationType === 'userRoleChange' || notificationType === 'tenantAddition') {
+            emailTextToSend = emailTextToSend.concat('. ');
+            emailTextToSend = emailTextToSend.concat(TAPi18n.__('informTenantUser_emailText_roleInfo'));
+            emailTextToSend = emailTextToSend.concat(' data-consumer');
             if (user.provider) {
               emailTextToSend = emailTextToSend.concat(', data-provider.');
             }
           }
 
+          // Fill data to be sent
           const emailContent = {
             to: toUser.email,
             from: settings.mail.fromEmail,
             subject: emailSubject,
             text: emailTextToSend,
           };
 
-          console.log('emali lähtee näinikkäästi=', emailContent);
-
           // Send the e-mail
           Email.send(emailContent);
         });