Release v2.4.2

src/web/routes/settings/users/add.js

@@ -1,15 +1,8 @@
 // User add page renderer.
 
 const { renderView } = require('../../../view');
+const { buildUsersAddViewModel } = require('./form-view-model');
 
 module.exports = function renderUsersAddPage(message, currentUser, roles, formValues, messageVariant) {
-  return renderView('settings/users/add', {
-    title: 'Add user',
-    active: 'users',
-    message: message,
-    messageVariant: messageVariant || 'primary',
-    currentUser: currentUser || null,
-    roles: roles || [],
-    formValues: formValues || {}
-  });
+  return renderView('settings/users/form', buildUsersAddViewModel(message, currentUser, roles, formValues, messageVariant));
 };

src/web/routes/settings/users/edit.js

@@ -1,15 +1,8 @@
 // User edit page renderer.
 
 const { renderView } = require('../../../view');
+const { buildUsersEditViewModel } = require('./form-view-model');
 
 module.exports = function renderUsersEditPage(user, message, currentUser, roles) {
-  return renderView('settings/users/edit', {
-    title: 'Edit user',
-    active: 'users',
-    message: message,
-    currentUser: currentUser || null,
-    user: user,
-    inUse: Boolean(user && user.inUse),
-    roles: roles || []
-  });
+  return renderView('settings/users/form', buildUsersEditViewModel(user, message, currentUser, roles));
 };

src/web/routes/settings/users/form-view-model.js

@@ -0,0 +1,69 @@
+// Shared user form view-model helpers.
+
+function normalizeSelectedRoleIds(selectedRoleIds) {
+  return new Set((Array.isArray(selectedRoleIds) ? selectedRoleIds : []).map(function (roleId) {
+    return Number(roleId);
+  }).filter(function (roleId) {
+    return Number.isInteger(roleId) && roleId > 0;
+  }));
+}
+
+function mapRolesForForm(roles, selectedRoleIds) {
+  const selectedIds = normalizeSelectedRoleIds(selectedRoleIds);
+
+  return (Array.isArray(roles) ? roles : []).map(function (role) {
+    return Object.assign({}, role, {
+      isSelected: selectedIds.has(Number(role.id))
+    });
+  });
+}
+
+function buildUsersAddViewModel(message, currentUser, roles, formValues, messageVariant) {
+  return {
+    title: 'Add user',
+    active: 'users',
+    isEdit: false,
+    formId: 'user-form',
+    formAction: '/users',
+    footerSaveUrl: '/users',
+    footerCancelUrl: '/users',
+    footerDeleteUrl: '',
+    footerDeleteDisabled: true,
+    footerDeleteTitle: 'Delete is available after the user has been created.',
+    footerShowDelete: true,
+    message: message,
+    messageVariant: messageVariant || 'primary',
+    currentUser: currentUser || null,
+    roles: mapRolesForForm(roles, []),
+    formValues: formValues || {},
+    formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-redirect="response-url" data-async-save-new-url="/users/new"'
+  };
+}
+
+function buildUsersEditViewModel(user, message, currentUser, roles) {
+  return {
+    title: 'Edit user',
+    active: 'users',
+    isEdit: true,
+    formId: 'user-profile-form',
+    formAction: '/users/' + user.id + '/username',
+    formAttrs: 'data-async-save data-async-save-close-url="/users"',
+    footerSaveUrl: '/users/' + user.id + '/username',
+    footerCancelUrl: '/users',
+    footerDeleteUrl: '/users/' + user.id + '/delete',
+    footerDeleteDisabled: Boolean(user && user.inUse),
+    footerDeleteTitle: user && user.inUse ? 'Delete is disabled while this user is the only account left.' : '',
+    footerShowDelete: true,
+    message: message,
+    currentUser: currentUser || null,
+    user: user,
+    inUse: Boolean(user && user.inUse),
+    roles: mapRolesForForm(roles, user && user.roleIds)
+  };
+}
+
+module.exports = {
+  mapRolesForForm: mapRolesForForm,
+  buildUsersAddViewModel: buildUsersAddViewModel,
+  buildUsersEditViewModel: buildUsersEditViewModel
+};