Skip to content

Commit 6db9b00

Browse files
matleppamatleppa
committed
Corrections after review
1 parent 9982e76 commit 6db9b00

File tree

6 files changed

+31
-24
lines changed

6 files changed

+31
-24
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@
13931393
"settings_save": "Save",
13941394
"settings_sdkCode_generator": "SDK Code Generator",
13951395
"settings_successMessage": "Settings saved",
1396-
"settings_tenant": "Tenant",
1396+
"settings_tenant": "Tenant Manager",
13971397
"settings_title_supportsGraphql": "API Umbrella proxy supports GraphQL requests",
13981398
"settingsPage_title": "General",
13991399
"settingsPage_title_settings": "Settings",
@@ -1457,6 +1457,9 @@
14571457
"tenantCatalogTable_row_title_provider": "Provider",
14581458
"tenantCatalogTable_header_action": "Action",
14591459
"tenantForm_addTenant_Success_Message": "Tenant added successfully: ",
1460+
"tenantForm_addTenant_error_Message": "Tenant operation failed! ",
1461+
"tenantForm_addTenant_failure_Message": "Tenant manager error! Returns code ",
1462+
"tenantForm_addTenant_notify_error": "Error in notifying users",
14601463
"tenantForm_button_cancel": "No, cancel",
14611464
"tenantForm_button_cancel_title": "Cancel this operation",
14621465
"tenantForm_button_save_title": "Save new Tenant",
@@ -1466,6 +1469,8 @@
14661469
"tenantForm_update_check_error_Message": "Tenant user check failed! Refresh Tenant list and try again! ",
14671470
"tenantForm_modifyButton_text": "Yes, Modify Tenant",
14681471
"tenantForm_saveButton_text": "Yes, Add Tenant",
1472+
"tenantForm_tenant_noName_error": "Tenant must have a name!",
1473+
"tenantForm_tenant_noDescription_error": "Tenant must have a description!",
14691474
"tenantForm_title_add": "Add new Tenant",
14701475
"tenantForm_title_modify": "Modify Tenant",
14711476
"tenantForm_tenantDescription": "Tenant description",

‎apinf_packages/settings/client/settings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ <h2>{{_ "settingsPage_title" }}</h2>
130130
</div>
131131
{{# if afFieldValueIs name='tenantIdm.enabled' value=true }}
132132
<div class="panel-body">
133-
{{> afQuickField name='tenantIdm.basepath' id="tenantIdm-basepath" }}
133+
{{> afQuickField name='tenantIdm.url_and_basepath' id="tenantIdm-basepath" }}
134134
</div>
135135
{{/ if }}
136-
</div>
136+
</div>
137137

138138
<!-- Save settings -->
139139
<button

‎apinf_packages/settings/collection/schema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Settings.schema = new SimpleSchema({
178178
type: Boolean,
179179
optional: true,
180180
},
181-
'tenantIdm.basepath': {
181+
'tenantIdm.url_and_basepath': {
182182
type: String,
183183
regEx: SimpleSchema.RegEx.Url,
184184
optional: true,

‎apinf_packages/tenant/client/add/add.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ Template.tenantForm.onDestroyed(() => {
2323

2424
Template.tenantForm.events({
2525
'click #save-tenant': function () {
26+
2627
if ($('#add-tenant-name').val() === '') {
27-
sAlert.error('Tenant must have a name!', { timeout: 'none' });
28+
sAlert.error(TAPi18n.__('tenantForm_tenant_noName_error'), { timeout: 'none' });
2829
} else if ($('#add-tenant-description').val() === '') {
29-
sAlert.error('Tenant must have a description!', { timeout: 'none' });
30+
sAlert.error(TAPi18n.__('tenantForm_tenant_noDescription_error'), { timeout: 'none' });
3031
} else {
3132
// Save new Tenant operation began, inform spinner
3233
Session.set('tenantUpdateOngoing', true);
@@ -62,15 +63,12 @@ Template.tenantForm.events({
6263
});
6364
}
6465

65-
// Set local tenant list empty
66-
let tenantList = [];
67-
6866
// POST /tenant
6967
Meteor.call('addTenant', tenant, (error, result) => {
7068
if (result) {
7169
if (result.status === 201) {
7270
// Empty the tenant user list
73-
tenantUsers.splice(0, tenantUsers.length);
71+
tenantUsers = [];
7472
// Remove users from session
7573
Session.set('tenantUsers', tenantUsers);
7674

@@ -80,7 +78,7 @@ Template.tenantForm.events({
8078
$('#add-tenant-description').val('');
8179

8280
// New tenant successfully added on manager side, empty local list
83-
tenantList = [];
81+
const tenantList = [];
8482
// Save to sessionStorage to be used while adding users to tenant
8583
Session.set('tenantList', tenantList);
8684

@@ -94,7 +92,7 @@ Template.tenantForm.events({
9492
// eslint-disable-next-line max-len
9593
Meteor.call('informTenantUser', notifyUserList, 'tenantAddition', tenant.name, (nofityChangeError) => {
9694
if (nofityChangeError) {
97-
sAlert.error('Error in notifying users', { timeout: 'none' });
95+
sAlert.error(TAPi18n.__('tenantForm_addTenant_notify_error'), { timeout: 'none' });
9896
}
9997
});
10098

@@ -108,15 +106,17 @@ Template.tenantForm.events({
108106
// Operation finished, failure, inform spinner
109107
Session.set('tenantUpdateOngoing', false);
110108
// Tenant addition failure on manager side, save new tenant object to local array
111-
const errorMessage = `Tenant manager error! Returns code (${result.status}).`;
109+
let errorMessage = TAPi18n.__('tenantForm_addTenant_failure_Message');
110+
errorMessage = errorMessage.concat(` (${result.status}).`);
112111
sAlert.error(errorMessage, { timeout: 'none' });
113112
}
114113
}
115114
if (error) {
116115
// Operation finished, failure, inform spinner
117116
Session.set('tenantUpdateOngoing', false);
118117
// Tenant addition failure on manager side, save new tenant object to local array
119-
const errorMessage = `Tenant operation failed! (${error}).`;
118+
let errorMessage = TAPi18n.__('tenantForm_addTenant_error_Message');
119+
errorMessage = errorMessage.concat(` (${error}).`);
120120
sAlert.error(errorMessage, { timeout: 'none' });
121121
}
122122
});
@@ -129,9 +129,9 @@ Template.tenantForm.events({
129129

130130
// Name and description must be given in order to be able to send modify
131131
if ($('#add-tenant-name').val() === '') {
132-
sAlert.error('Tenant must have a name!', { timeout: 'none' });
132+
sAlert.error(TAPi18n.__('tenantForm_tenant_noName_error'), { timeout: 'none' });
133133
} else if ($('#add-tenant-description').val() === '') {
134-
sAlert.error('Tenant must have a description!', { timeout: 'none' });
134+
sAlert.error(TAPi18n.__('tenantForm_tenant_noDescription_error'), { timeout: 'none' });
135135
} else {
136136
// Update Tenant operation began, inform spinner
137137
Session.set('tenantUpdateOngoing', true);
@@ -154,12 +154,12 @@ Template.tenantForm.events({
154154
// Fill in tenant id
155155
modifyTenantPayload.id = originalTenant.id;
156156
// Fill in replace for name operation
157-
const changedDescription = {
157+
const changedName = {
158158
op: 'replace',
159159
value: $('#add-tenant-name').val(),
160160
path: '/name',
161161
};
162-
modifyTenantPayload.body.push(changedDescription);
162+
modifyTenantPayload.body.push(changedName);
163163
}
164164

165165
// Any changes in description
@@ -181,7 +181,7 @@ Template.tenantForm.events({
181181
-> fill "remove" op for user
182182
- if user is present in both, but no changes,
183183
-> remove user from NEW tenant user list
184-
- if user is present in both, and there are changes
184+
- if user is present in both, and there are changes in roles
185185
-> fill "replace" op for user
186186
-> remove user from NEW tenant user list
187187
@@ -231,7 +231,7 @@ Template.tenantForm.events({
231231
// Add remove operation for user to request list
232232
changeList.push(removedUser);
233233

234-
// Add user info also to check list
234+
// Add user info also to check list to be checked from tenant manager
235235
const checkPath = path.concat('/name');
236236
const checkUser = {
237237
op: 'test',
@@ -241,7 +241,7 @@ Template.tenantForm.events({
241241
// Add user to to-be-checked list
242242
usersNeedChecking.push(checkUser);
243243

244-
// Always add user to list for notification about removal
244+
// Always add user to list for notification about removal by email
245245
notifyRemovedUsers.push(origUser);
246246

247247
// If user data is modified, set user to be replaced

‎apinf_packages/tenant/client/catalog/catalog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Template.tenantCatalog.onRendered(function () {
5454
Session.set('tenantList', tenantList);
5555
}
5656
if (error) {
57-
sAlert.error(error, { timeout: 'none' });
57+
sAlert.error(error.error, { timeout: 'none', html: true });
5858
}
5959
});
6060

@@ -64,7 +64,7 @@ Template.tenantCatalog.onRendered(function () {
6464
Session.set('completeUserList', result.completeUserList);
6565
}
6666
if (error) {
67-
sAlert.error(error, { timeout: 'none' });
67+
sAlert.error(error.error, { timeout: 'none', html: true });
6868
}
6969
});
7070

‎apinf_packages/tenant/server/methods.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const getTenantInfo = function () {
3939
const settings = Settings.findOne();
4040

4141
// Get url from settings to be used in HTTP requests
42-
const tenantUrl = _.get(settings, 'tenantIdm.basepath');
42+
const tenantUrl = _.get(settings, 'tenantIdm.url_and_basepath');
4343

4444
// Return URL, if it is set
4545
if (tenantUrl) {
@@ -113,6 +113,7 @@ Meteor.methods({
113113
} catch (err) {
114114
// Failure: Return error object
115115
let errorMessage = TAPi18n.__('tenantRequest_missingTenantList');
116+
errorMessage = errorMessage.concat('<br />');
116117
errorMessage = errorMessage.concat(err);
117118
throw new Meteor.Error(errorMessage);
118119
}
@@ -172,6 +173,7 @@ Meteor.methods({
172173
} catch (err) {
173174
// Failure, Return error object
174175
let errorMessage = TAPi18n.__('tenantRequest_missingUserlist');
176+
errorMessage = errorMessage.concat('<br />');
175177
errorMessage = errorMessage.concat(err);
176178
throw new Meteor.Error(errorMessage);
177179
}

0 commit comments

Comments
 (0)