Release v2.6.11
This commit is contained in:
@@ -19,6 +19,11 @@
|
||||
|
||||
const LIST_PAGE_SIZE = 25;
|
||||
|
||||
function toSortIndex(value) {
|
||||
const number = Number(value);
|
||||
return Number.isFinite(number) ? number : 999;
|
||||
}
|
||||
|
||||
function slugifyRoleKey(name) {
|
||||
const value = String(name || '').trim().toLowerCase();
|
||||
const slug = value.replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, ROLE_KEY_MAX_LENGTH);
|
||||
@@ -73,8 +78,11 @@
|
||||
resourceKey: definition ? definition.resourceKey : String(permission.section_name || '').trim().toLowerCase().replace(/[^a-z0-9]+/g, '-'),
|
||||
resourceName: definition ? definition.resourceName : permission.section_name,
|
||||
categoryName: definition ? definition.sectionName : permission.section_name,
|
||||
sectionIndex: definition ? toSortIndex(definition.sectionIndex) : 999,
|
||||
sectionOrder: definition ? definition.sectionOrder : 999,
|
||||
resourceIndex: definition ? toSortIndex(definition.resourceIndex) : 999,
|
||||
resourceOrder: definition ? Number(definition.resourceOrder) || 999 : 999,
|
||||
permissionIndex: definition ? toSortIndex(definition.permissionIndex) : 999,
|
||||
permissionOrder: definition ? Number(definition.permissionOrder) || 999 : 999,
|
||||
actionKey: definition ? definition.actionKey : 'read',
|
||||
actionLabel: definition ? definition.actionName : getActionLabel(permission.actionKey),
|
||||
@@ -103,7 +111,9 @@
|
||||
id: sectionKey || 'permissions',
|
||||
title: String(permission.resourceName || permission.categoryName || 'Permissions').trim(),
|
||||
categoryName: String(permission.categoryName || '').trim(),
|
||||
sectionIndex: toSortIndex(permission.sectionIndex),
|
||||
sectionOrder: Number(permission.sectionOrder) || 999,
|
||||
resourceIndex: toSortIndex(permission.resourceIndex),
|
||||
permissions: []
|
||||
};
|
||||
groupIndex.set(sectionKey, group);
|
||||
@@ -114,8 +124,13 @@
|
||||
|
||||
groups.forEach(function (group) {
|
||||
group.permissions.sort(function (left, right) {
|
||||
const leftOrder = Number(left.permissionOrder) || 999;
|
||||
const rightOrder = Number(right.permissionOrder) || 999;
|
||||
const leftIndex = toSortIndex(left.permissionIndex);
|
||||
const rightIndex = toSortIndex(right.permissionIndex);
|
||||
if (leftIndex !== rightIndex) {
|
||||
return leftIndex - rightIndex;
|
||||
}
|
||||
const leftOrder = toSortIndex(left.permissionOrder);
|
||||
const rightOrder = toSortIndex(right.permissionOrder);
|
||||
if (leftOrder !== rightOrder) {
|
||||
return leftOrder - rightOrder;
|
||||
}
|
||||
@@ -124,8 +139,13 @@
|
||||
});
|
||||
|
||||
groups.sort(function (left, right) {
|
||||
const leftOrder = Number(left.sectionOrder) || 999;
|
||||
const rightOrder = Number(right.sectionOrder) || 999;
|
||||
const leftIndex = toSortIndex(left.sectionIndex);
|
||||
const rightIndex = toSortIndex(right.sectionIndex);
|
||||
if (leftIndex !== rightIndex) {
|
||||
return leftIndex - rightIndex;
|
||||
}
|
||||
const leftOrder = toSortIndex(left.sectionOrder);
|
||||
const rightOrder = toSortIndex(right.sectionOrder);
|
||||
if (leftOrder !== rightOrder) {
|
||||
return leftOrder - rightOrder;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user