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

Start work on controllers

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-04-01 11:09:51 +02:00
parent 0fc310cc4e
commit 1a6f0e4d7b
71 changed files with 665 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs
View File

@@ -76,10 +76,10 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
foreach (var dictionaryItem in foundDictionaryDescendants)
{
_localizationService.Delete(dictionaryItem, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
_localizationService.Delete(dictionaryItem, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
}
_localizationService.Delete(foundDictionary, _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id);
_localizationService.Delete(foundDictionary, _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
return Ok();
}
@@ -106,8 +106,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
{
var message = _localizedTextService.Localize(
"dictionaryItem","changeKeyError",
_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.GetUserCulture(_localizedTextService, _globalSettings),
new Dictionary<string, string> { { "0", key } });
_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetUserCulture(_localizedTextService, _globalSettings),
new Dictionary<string, string?> { { "0", key } });
return ValidationProblem(message);
}
@@ -116,7 +116,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
Guid? parentGuid = null;
if (parentId > 0)
parentGuid = _localizationService.GetDictionaryItemById(parentId).Key;
parentGuid = _localizationService.GetDictionaryItemById(parentId)?.Key;
var item = _localizationService.CreateDictionaryItemWithIdentity(
key,
@@ -142,7 +142,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
/// <returns>
/// The <see cref="DictionaryDisplay"/>. Returns a not found response when dictionary item does not exist
/// </returns>
public ActionResult<DictionaryDisplay> GetById(int id)
public ActionResult<DictionaryDisplay?> GetById(int id)
{
var dictionary = _localizationService.GetDictionaryItemById(id);
if (dictionary == null)
@@ -160,7 +160,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
/// <returns>
/// The <see cref="DictionaryDisplay"/>. Returns a not found response when dictionary item does not exist
/// </returns>
public ActionResult<DictionaryDisplay> GetById(Guid id)
public ActionResult<DictionaryDisplay?> GetById(Guid id)
{
var dictionary = _localizationService.GetDictionaryItemById(id);
if (dictionary == null)
@@ -178,7 +178,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
/// <returns>
/// The <see cref="DictionaryDisplay"/>. Returns a not found response when dictionary item does not exist
/// </returns>
public ActionResult<DictionaryDisplay> GetById(Udi id)
public ActionResult<DictionaryDisplay?> GetById(Udi id)
{
var guidUdi = id as GuidUdi;
if (guidUdi == null)
@@ -200,20 +200,20 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
/// <returns>
/// The <see cref="DictionaryDisplay"/>.
/// </returns>
public ActionResult<DictionaryDisplay> PostSave(DictionarySave dictionary)
public ActionResult<DictionaryDisplay?> PostSave(DictionarySave dictionary)
{
var dictionaryItem =
_localizationService.GetDictionaryItemById(int.Parse(dictionary.Id.ToString(), CultureInfo.InvariantCulture));
var dictionaryItem = dictionary.Id is null ? null :
_localizationService.GetDictionaryItemById(int.Parse(dictionary.Id.ToString()!, CultureInfo.InvariantCulture));
if (dictionaryItem == null)
return ValidationProblem("Dictionary item does not exist");
var userCulture = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.GetUserCulture(_localizedTextService, _globalSettings);
var userCulture = _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetUserCulture(_localizedTextService, _globalSettings);
if (dictionary.NameIsDirty)
{
// if the name (key) has changed, we need to check if the new key does not exist
var dictionaryByKey = _localizationService.GetDictionaryItemByKey(dictionary.Name);
var dictionaryByKey = _localizationService.GetDictionaryItemByKey(dictionary.Name!);
if (dictionaryByKey != null && dictionaryItem.Id != dictionaryByKey.Id)
{
@@ -221,12 +221,12 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var message = _localizedTextService.Localize(
"dictionaryItem","changeKeyError",
userCulture,
new Dictionary<string, string> { { "0", dictionary.Name } });
new Dictionary<string, string?> { { "0", dictionary.Name } });
ModelState.AddModelError("Name", message);
return ValidationProblem(ModelState);
}
dictionaryItem.ItemKey = dictionary.Name;
dictionaryItem.ItemKey = dictionary.Name!;
}
foreach (var translation in dictionary.Translations)
@@ -241,7 +241,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var model = _umbracoMapper.Map<IDictionaryItem, DictionaryDisplay>(dictionaryItem);
model.Notifications.Add(new BackOfficeNotification(
model?.Notifications.Add(new BackOfficeNotification(
_localizedTextService.Localize("speechBubbles","dictionaryItemSaved", userCulture), string.Empty,
NotificationStyle.Success));
@@ -277,8 +277,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
foreach(var child in children.OrderBy(ItemSort()))
{
var display = _umbracoMapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(child);
display.Level = level;
list.Add(display);
if (display is not null)
{
display.Level = level;
list.Add(display);
}
BuildTree(level + 1, child.Key);
}
@@ -303,11 +306,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
/// </param>
private void GetChildItemsForList(IDictionaryItem dictionaryItem, int level, ICollection<DictionaryOverviewDisplay> list)
{
foreach (var childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key).OrderBy(ItemSort()))
foreach (var childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key)?.OrderBy(ItemSort()) ?? Enumerable.Empty<IDictionaryItem>())
{
var item = _umbracoMapper.Map<IDictionaryItem, DictionaryOverviewDisplay>(childItem);
item.Level = level;
list.Add(item);
if (item is not null)
{
item.Level = level;
list.Add(item);
}
GetChildItemsForList(childItem, level + 1, list);
}