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

Fix handling of alias in tabs/groups

Browse Source
This commit is contained in:
Ronald Barendse
2021-07-15 14:15:39 +02:00
parent 68c26e90a7
commit 40bce56efd
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
View File

@@ -24,9 +24,9 @@
scope.openTabAlias = null;
scope.hasGenericTab = false;
scope.genericTab = {
key: String.CreateGuid(),
type: TYPE_TAB,
name: "Generic",
key: String.CreateGuid(),
alias: null,
parentAlias: null,
sortOrder: 0,
@@ -40,7 +40,7 @@
eventBindings.push(scope.$watchCollection('model.groups', (newValue) => {
scope.tabs = $filter("filter")(newValue, (group) => {
return group.type === TYPE_TAB;
return group.type === TYPE_TAB && group.parentAlias == null;
});
// Update index and parentAlias properties of tabs
@@ -107,11 +107,18 @@
handle: ".umb-group-builder__group-handle",
items: ".umb-group-builder__group-sortable",
stop: function (event, ui) {
const groupAlias = ui.item[0].dataset.groupAlias ? ui.item[0].dataset.groupAlias : "";
const group = groupAlias ? scope.model.groups.find(group => group.alias === groupAlias) : {};
group.parentAlias = scope.openTabAlias;
group.alias = (group.parentAlias !== "" ? group.parentAlias + "/" : "") + group.alias.substring(group.alias.lastIndexOf('/')+1);
const groupsInTab = scope.model.groups.filter(group => group.parentAlias === scope.openTabAlias);
const groupKey = ui.item[0].dataset.groupKey ? ui.item[0].dataset.groupKey : false;
const group = groupKey ? scope.model.groups.find(group => group.key === groupKey) : {};
// Update aliases
const parentAlias = scope.openTabAlias,
oldAlias = group.alias,
newAlias = contentEditingHelper.updateParentAlias(oldAlias, parentAlias);
group.alias = newAlias;
group.parentAlias = parentAlias;
updateDescendingAliases(oldAlias, newAlias);
const groupsInTab = scope.model.groups.filter(group => group.parentAlias === parentAlias);
updateSortOrder(groupsInTab);
}
};
@@ -418,13 +425,12 @@
const lastTab = scope.tabs[newTabIndex - 1];
const sortOrder = lastTab && lastTab.sortOrder !== undefined ? lastTab.sortOrder + 1 : 0;
const tabKey = String.CreateGuid();
const key = String.CreateGuid();
const tab = {
key: key,
type: TYPE_TAB,
name: "",
key: tabKey,
alias: tabKey,
name: '',
alias: key, // Temporarily set alias to key, because the name is empty
parentAlias: null,
sortOrder,
properties: []
@@ -502,19 +508,19 @@
updateDescendingAliases(oldAlias, newAlias);
group.alias = newAlias;
group.parentAlias = contentEditingHelper.getParentAlias(newAlias);
}
function updateDescendingAliases(oldParentAlias, newParentAlias) {
scope.model.groups.forEach(group => {
const parentAlias = contentEditingHelper.getParentAlias(group.alias);
if (parentAlias == oldParentAlias) {
const oldAlias = group.alias,
newAlias = contentEditingHelper.updateParentAlias(oldAlias, newParentAlias);
updateDescendingAliases(oldAlias, newAlias);
group.alias = newAlias;
group.parentAlias = newParentAlias;
}
});
}
@@ -591,13 +597,12 @@
const groupsInTab = scope.model.groups.filter(group => group.parentAlias === tabAlias);
const lastGroupSortOrder = groupsInTab.length > 0 ? groupsInTab[groupsInTab.length - 1].sortOrder + 1 : 0;
const groupKey = String.CreateGuid();
const key = String.CreateGuid();
const group = {
key: key,
type: TYPE_GROUP,
name: "",
key: groupKey,
alias: groupKey,
name: '',
alias: contentEditingHelper.updateParentAlias(key, tabAlias), // Temporarily set alias to key, because the name is empty
parentAlias: tabAlias || null,
sortOrder: lastGroupSortOrder,
properties: [],

2
src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
View File

@@ -181,7 +181,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, editorSt
},
generateAlias: function(name) {
return name.toUmbracoAlias();
return name ? name.toUmbracoAlias() : String.CreateGuid();
},
getCurrentAlias: function (alias) {

3
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
View File

@@ -17,7 +17,7 @@
allow-change-name="false">
</umb-content-type-tab>
</li>
<li ng-repeat="(tabIndex, tab) in tabs track by tab.key" ng-class="{'umb-group-builder__tab-sortable': sortingMode}" umb-droppable="droppableOptionsTab" data-tab-alias="{{tab.alias}}">
<li ng-repeat="(tabIndex, tab) in tabs track by tab.key" ng-class="{'umb-group-builder__tab-sortable': sortingMode}" umb-droppable="droppableOptionsTab" data-tab-key="{{tab.key}}" data-tab-alias="{{tab.alias}}">
<umb-content-type-tab
tab="tab"
is-open="tab.alias === openTabAlias"
@@ -120,6 +120,7 @@
ng-repeat="(groupIndex, group) in model.groups track by group.key"
ng-show="group.type === 0 && group.parentAlias === openTabAlias"
ng-class="{'umb-group-builder__group-sortable': sortingMode && !group.inherited}"
data-group-key="{{group.key}}"
data-group-alias="{{group.alias}}"
data-group-parent-alias="{{group.parentAlias}}">