yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sets sortOrder on the converted tab based on the exiting tabs

Browse Source
This commit is contained in:
Mads Rasmussen
2021-09-07 14:45:44 +02:00
parent 05d0a29e03
commit f51e594929
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
View File

@@ -90,6 +90,9 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
},
convertGroupToTab: function (groups, group) {
const tabs = groups.filter(group => group.type === this.TYPE_TAB).sort((a, b) => a.sortOrder - b.sortOrder);
const nextSortOrder = tabs && tabs.length > 0 ? tabs[tabs.length - 1].sortOrder + 1 : 0;
group.convertingToTab = true;
group.type = this.TYPE_TAB;
@@ -100,7 +103,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
group.alias = this.isAliasUnique(otherGroups, newAlias) ? newAlias : this.createUniqueAlias(otherGroups, newAlias);
group.parentAlias = null;
group.sortOrder = nextSortOrder;
group.convertingToTab = false;
},

35
src/Umbraco.Web.UI.Client/test/unit/common/services/content-type-helper.spec.js
View File

@@ -173,13 +173,13 @@ describe('contentTypeHelper tests', function () {
describe('convertGroupToTab', function () {
const groups = [
{ type: 0, alias: 'hero', name: 'Hero' },
{ type: 0, alias: 'content' },
{ type: 0, alias: 'footer' }
];
it('should convert group to tab', function () {
const groups = [
{ type: 0, alias: 'hero', name: 'Hero' },
{ type: 0, alias: 'content' },
{ type: 0, alias: 'footer' }
];
const newTab = groups[0];
contentTypeHelper.convertGroupToTab(groups, newTab);
@@ -189,6 +189,29 @@ describe('contentTypeHelper tests', function () {
expect(newTab.parentAlias).toBeNull();
});
it('should set sort order to 0 if it is the first tab', function () {
const groups = [
{ type: 0, alias: 'hero', name: 'Hero' }
];
const newTab = groups[0];
contentTypeHelper.convertGroupToTab(groups, newTab);
expect(newTab.sortOrder).toBe(0);
});
it('should set sort order to 1 higher than the last tab', function () {
const groups = [
{ type: 0, alias: 'settings', name: 'Settings', sortOrder: 100 },
{ type: 1, alias: 'content', name: 'Content', sortOrder: 5 }
];
const newTab = groups[0];
contentTypeHelper.convertGroupToTab(groups, newTab);
expect(newTab.sortOrder).toBe(6);
});
});
});