Release v2.4.2

src/web/routes/settings/background-tasks-page.js

@@ -1,9 +1,9 @@
 // Background tasks settings page renderer.
 
-const { renderView } = require('../../view');
-const { hasAnyPermission } = require('../../../rbac');
-const { buildPagination, buildQueryString } = require('../../lib/pagination');
-const { parsePageNumber, normalizeSortDirection, sortRows, createSearchMatcher } = require('../../lib/list-query');
+const { renderView } = require('#src/web/view');
+const { hasAnyPermission } = require('#src/rbac');
+const { buildPagination, buildQueryString } = require('#src/web/lib/pagination');
+const { parsePageNumber, normalizeSortDirection, sortRows, createSearchMatcher } = require('#src/web/lib/list-query');
 
 const TASKS_PER_PAGE = 25;
 const QUEUE_PAGE_URL = '/settings/tasks-background';

src/web/routes/settings/background-tasks.js

@@ -1,6 +1,6 @@
 // Settings route registration for the background tasks page.
 
-const { hasAnyPermission } = require('../../../rbac');
+const { hasAnyPermission, PERMISSION_DENIED_MESSAGE } = require('#src/rbac');
 
 function redirectToLogin(res, setAuthMessageCookie) {
   if (typeof setAuthMessageCookie === 'function') {
@@ -21,7 +21,7 @@ function requireSettingsAccess(setAuthMessageCookie) {
       return next();
     }
 
-    const error = new Error('You do not have permission to access this area.');
+    const error = new Error(PERMISSION_DENIED_MESSAGE);
     error.statusCode = 403;
     error.expose = true;
     next(error);
@@ -38,7 +38,7 @@ function requireScheduledSettingsAccess(setAuthMessageCookie) {
       return next();
     }
 
-    const error = new Error('You do not have permission to access this area.');
+    const error = new Error(PERMISSION_DENIED_MESSAGE);
     error.statusCode = 403;
     error.expose = true;
     next(error);
@@ -86,7 +86,7 @@ module.exports = function registerSettingsRoutes(app, deps) {
         return next();
       }
 
-      const error = new Error('You do not have permission to access this area.');
+      const error = new Error(PERMISSION_DENIED_MESSAGE);
       error.statusCode = 403;
       error.expose = true;
       next(error);
@@ -99,7 +99,7 @@ module.exports = function registerSettingsRoutes(app, deps) {
     }
 
     if (!hasAnyPermission(req.currentUser, ['scheduled-tasks.allow'])) {
-      const error = new Error('You do not have permission to access this area.');
+      const error = new Error(PERMISSION_DENIED_MESSAGE);
       error.statusCode = 403;
       error.expose = true;
       return next(error);

src/web/routes/settings/fonts.js

@@ -1,8 +1,8 @@
 // Settings route registration for managed fonts.
 
 const fs = require('fs');
-const { hasAnyPermission } = require('../../../rbac');
-const fontLibrary = require('../../lib/media/font-library');
+const { hasAnyPermission, PERMISSION_DENIED_MESSAGE } = require('#src/rbac');
+const fontLibrary = require('#src/web/lib/media/font-library');
 
 function normalizeFontFamilyName(value) {
   return String(value || '').replace(/\s+/g, ' ').trim().toLowerCase();
@@ -62,7 +62,7 @@ function requireFontsAccess(setAuthMessageCookie) {
       return next();
     }
 
-    const error = new Error('You do not have permission to access this area.');
+    const error = new Error(PERMISSION_DENIED_MESSAGE);
     error.statusCode = 403;
     error.expose = true;
     next(error);

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

@@ -1,16 +1,8 @@
 // RBAC role add page renderer.
 
 const { renderView } = require('../../../view');
+const { buildRbacAddViewModel } = require('./form-view-model');
 
-module.exports = function renderRbacAddPage(message, currentUser, formValues, permissionGroups, messageVariant) {
-  return renderView('settings/rbac/add', {
-    title: 'Create role',
-    active: 'rbac',
-    message: message,
-    messageVariant: messageVariant || 'primary',
-    currentUser: currentUser || null,
-    formValues: formValues || {},
-    permissionGroups: permissionGroups || [],
-    scripts: ['js/rbac-permissions.js']
-  });
+module.exports = function renderRbacAddPage(message, currentUser, formValues, permissionGroups, users, pagination, messageVariant) {
+  return renderView('settings/rbac/form', buildRbacAddViewModel(message, currentUser, formValues, permissionGroups, users, pagination, messageVariant));
 };

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

@@ -1,19 +1,8 @@
 // RBAC role edit page renderer.
 
 const { renderView } = require('../../../view');
+const { buildRbacEditViewModel } = require('./form-view-model');
 
 module.exports = function renderRbacEditPage(role, message, currentUser, permissionGroups, users, pagination) {
-  return renderView('settings/rbac/edit', {
-    title: 'Edit role',
-    active: 'rbac',
-    message: message,
-    currentUser: currentUser || null,
-    role: role,
-    inUse: Boolean(role && role.inUse),
-    permissionGroups: permissionGroups || [],
-    users: users || [],
-    pagination: pagination || null,
-    roleEditBasePath: '/rbac/' + Number(role && role.id) + '/edit',
-    scripts: ['js/rbac-permissions.js']
-  });
+  return renderView('settings/rbac/form', buildRbacEditViewModel(role, message, currentUser, permissionGroups, users, pagination));
 };

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

@@ -0,0 +1,59 @@
+// Shared RBAC form view-model helpers.
+
+function buildRbacAddViewModel(message, currentUser, formValues, permissionGroups, users, pagination, messageVariant) {
+  return {
+    title: 'Create role',
+    active: 'rbac',
+    isEdit: false,
+    usersPresent: true,
+    formId: 'role-create-form',
+    formAction: '/rbac',
+    footerSaveUrl: '/rbac',
+    footerCancelUrl: '/rbac',
+    footerDeleteUrl: '',
+    footerDeleteDisabled: true,
+    footerDeleteTitle: 'Delete is available after the role has been created.',
+    footerShowDelete: true,
+    message: message,
+    messageVariant: messageVariant || 'primary',
+    currentUser: currentUser || null,
+    formValues: formValues || {},
+    permissionGroups: permissionGroups || [],
+    users: users || [],
+    pagination: pagination || null,
+    roleEditBasePath: '/rbac/new',
+    scripts: ['js/rbac-permissions.js'],
+    formAttrs: 'data-async-save data-async-save-close-url="/rbac" data-async-save-new-redirect="response-url"'
+  };
+}
+
+function buildRbacEditViewModel(role, message, currentUser, permissionGroups, users, pagination) {
+  return {
+    title: 'Edit role',
+    active: 'rbac',
+    isEdit: true,
+    usersPresent: true,
+    formId: 'role-edit-form',
+    formAction: '/rbac/' + Number(role && role.id),
+    footerSaveUrl: '/rbac/' + Number(role && role.id),
+    footerCancelUrl: '/rbac',
+    footerDeleteUrl: '/rbac/' + Number(role && role.id) + '/delete',
+    footerDeleteDisabled: Boolean(role && role.inUse),
+    footerDeleteTitle: role && role.inUse ? 'Delete is disabled while this role is assigned to users.' : '',
+    footerShowDelete: true,
+    message: message,
+    currentUser: currentUser || null,
+    role: role,
+    inUse: Boolean(role && role.inUse),
+    permissionGroups: permissionGroups || [],
+    users: users || [],
+    pagination: pagination || null,
+    roleEditBasePath: '/rbac/' + Number(role && role.id) + '/edit',
+    scripts: ['js/rbac-permissions.js']
+  };
+}
+
+module.exports = {
+  buildRbacAddViewModel: buildRbacAddViewModel,
+  buildRbacEditViewModel: buildRbacEditViewModel
+};

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
+};