From e775497c5ef07b5c2da8f364d2a699c9c54a65d7 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Apr 2021 16:09:52 +1000 Subject: [PATCH 01/92] Removes ReaderWriterLockSlim from PropertyGroupCollection and PropertyTypeCollection. No lock should exist here at all not even sure why it's there (Based on 9yr old code). I'm pretty sure it's there because these entities used to be cached (and not cloned) which meant it was the same instance used between threads. --- .../Models/PropertyGroupCollection.cs | 57 +++++++------------ .../Models/PropertyTypeCollection.cs | 51 +++++++---------- 2 files changed, 41 insertions(+), 67 deletions(-) diff --git a/src/Umbraco.Core/Models/PropertyGroupCollection.cs b/src/Umbraco.Core/Models/PropertyGroupCollection.cs index 973147b3fb..e2af5835f2 100644 --- a/src/Umbraco.Core/Models/PropertyGroupCollection.cs +++ b/src/Umbraco.Core/Models/PropertyGroupCollection.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Runtime.Serialization; -using System.Threading; namespace Umbraco.Core.Models { @@ -17,8 +16,6 @@ namespace Umbraco.Core.Models // TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details public class PropertyGroupCollection : KeyedCollection, INotifyCollectionChanged, IDeepCloneable { - private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim(); - internal PropertyGroupCollection() { } @@ -70,47 +67,37 @@ namespace Umbraco.Core.Models internal new void Add(PropertyGroup item) { - try + //Note this is done to ensure existing groups can be renamed + if (item.HasIdentity && item.Id > 0) { - _addLocker.EnterWriteLock(); - - //Note this is done to ensure existing groups can be renamed - if (item.HasIdentity && item.Id > 0) + var exists = Contains(item.Id); + if (exists) { - var exists = Contains(item.Id); + var keyExists = Contains(item.Name); + if (keyExists) + throw new Exception($"Naming conflict: Changing the name of PropertyGroup '{item.Name}' would result in duplicates"); + + //collection events will be raised in SetItem + SetItem(IndexOfKey(item.Id), item); + return; + } + } + else + { + var key = GetKeyForItem(item); + if (key != null) + { + var exists = Contains(key); if (exists) { - var keyExists = Contains(item.Name); - if (keyExists) - throw new Exception($"Naming conflict: Changing the name of PropertyGroup '{item.Name}' would result in duplicates"); - //collection events will be raised in SetItem - SetItem(IndexOfKey(item.Id), item); + SetItem(IndexOfKey(key), item); return; } } - else - { - var key = GetKeyForItem(item); - if (key != null) - { - var exists = Contains(key); - if (exists) - { - //collection events will be raised in SetItem - SetItem(IndexOfKey(key), item); - return; - } - } - } - //collection events will be raised in InsertItem - base.Add(item); - } - finally - { - if (_addLocker.IsWriteLockHeld) - _addLocker.ExitWriteLock(); } + //collection events will be raised in InsertItem + base.Add(item); } /// diff --git a/src/Umbraco.Core/Models/PropertyTypeCollection.cs b/src/Umbraco.Core/Models/PropertyTypeCollection.cs index cc9d00fa5d..b7a735e5dc 100644 --- a/src/Umbraco.Core/Models/PropertyTypeCollection.cs +++ b/src/Umbraco.Core/Models/PropertyTypeCollection.cs @@ -4,7 +4,6 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Runtime.Serialization; -using System.Threading; namespace Umbraco.Core.Models { @@ -16,10 +15,6 @@ namespace Umbraco.Core.Models // TODO: Change this to ObservableDictionary so we can reduce the INotifyCollectionChanged implementation details public class PropertyTypeCollection : KeyedCollection, INotifyCollectionChanged, IDeepCloneable { - [IgnoreDataMember] - private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim(); - - internal PropertyTypeCollection(bool supportsPublishing) { SupportsPublishing = supportsPublishing; @@ -87,36 +82,28 @@ namespace Umbraco.Core.Models item.SupportsPublishing = SupportsPublishing; // TODO: this is not pretty and should be refactored - try - { - _addLocker.EnterWriteLock(); - var key = GetKeyForItem(item); - if (key != null) - { - var exists = Contains(key); - if (exists) - { - //collection events will be raised in SetItem - SetItem(IndexOfKey(key), item); - return; - } - } - //check if the item's sort order is already in use - if (this.Any(x => x.SortOrder == item.SortOrder)) - { - //make it the next iteration - item.SortOrder = this.Max(x => x.SortOrder) + 1; - } - - //collection events will be raised in InsertItem - base.Add(item); - } - finally + var key = GetKeyForItem(item); + if (key != null) { - if (_addLocker.IsWriteLockHeld) - _addLocker.ExitWriteLock(); + var exists = Contains(key); + if (exists) + { + //collection events will be raised in SetItem + SetItem(IndexOfKey(key), item); + return; + } } + + //check if the item's sort order is already in use + if (this.Any(x => x.SortOrder == item.SortOrder)) + { + //make it the next iteration + item.SortOrder = this.Max(x => x.SortOrder) + 1; + } + + //collection events will be raised in InsertItem + base.Add(item); } /// From b75a7865519bd27f311ab7bba9746864d969dd32 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Apr 2021 16:41:11 +1000 Subject: [PATCH 02/92] Ensures the ReaderWriterLockSlim within our caches are disposed at the end of the app --- src/Umbraco.Core/Cache/AppCaches.cs | 25 ++++++++++++++++- .../Cache/AppPolicedCacheDictionary.cs | 27 +++++++++++++++++-- src/Umbraco.Core/Cache/DeepCloneAppCache.cs | 23 +++++++++++++++- src/Umbraco.Core/Cache/ObjectCacheAppCache.cs | 21 ++++++++++++++- src/Umbraco.Core/Cache/WebCachingAppCache.cs | 22 ++++++++++++++- 5 files changed, 112 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/Cache/AppCaches.cs b/src/Umbraco.Core/Cache/AppCaches.cs index fbfc4c8c82..05453663f5 100644 --- a/src/Umbraco.Core/Cache/AppCaches.cs +++ b/src/Umbraco.Core/Cache/AppCaches.cs @@ -6,8 +6,10 @@ namespace Umbraco.Core.Cache /// /// Represents the application caches. /// - public class AppCaches + public class AppCaches : IDisposable { + private bool _disposedValue; + /// /// Initializes a new instance of the for use in a web application. /// @@ -82,5 +84,26 @@ namespace Umbraco.Core.Cache /// search through all keys on a global scale. /// public IsolatedCaches IsolatedCaches { get; } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + RuntimeCache.DisposeIfDisposable(); + RequestCache.DisposeIfDisposable(); + IsolatedCaches.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } diff --git a/src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs b/src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs index 5c60dededa..4a6c032e4f 100644 --- a/src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs +++ b/src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Cache /// Provides a base class for implementing a dictionary of . /// /// The type of the dictionary key. - public abstract class AppPolicedCacheDictionary + public abstract class AppPolicedCacheDictionary : IDisposable { private readonly ConcurrentDictionary _caches = new ConcurrentDictionary(); @@ -24,6 +24,7 @@ namespace Umbraco.Core.Cache /// Gets the internal cache factory, for tests only! /// internal readonly Func CacheFactory; + private bool _disposedValue; /// /// Gets or creates a cache. @@ -70,5 +71,27 @@ namespace Umbraco.Core.Cache foreach (var cache in _caches.Values) cache.Clear(); } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + foreach(var value in _caches.Values) + { + value.DisposeIfDisposable(); + } + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs b/src/Umbraco.Core/Cache/DeepCloneAppCache.cs index eff06e2aad..10a83d7423 100644 --- a/src/Umbraco.Core/Cache/DeepCloneAppCache.cs +++ b/src/Umbraco.Core/Cache/DeepCloneAppCache.cs @@ -12,8 +12,10 @@ namespace Umbraco.Core.Cache /// instance, and ensuring that all inserts and returns are deep cloned copies of the cache item, /// when the item is deep-cloneable. /// - internal class DeepCloneAppCache : IAppPolicyCache + internal class DeepCloneAppCache : IAppPolicyCache, IDisposable { + private bool _disposedValue; + /// /// Initializes a new instance of the class. /// @@ -153,5 +155,24 @@ namespace Umbraco.Core.Cache return input; } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + InnerCache.DisposeIfDisposable(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } diff --git a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs index 5c4f76f51d..fd1e7f21f1 100644 --- a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs +++ b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs @@ -13,9 +13,10 @@ namespace Umbraco.Core.Cache /// /// Implements on top of a . /// - public class ObjectCacheAppCache : IAppPolicyCache + public class ObjectCacheAppCache : IAppPolicyCache, IDisposable { private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion); + private bool _disposedValue; /// /// Initializes a new instance of the . @@ -360,5 +361,23 @@ namespace Umbraco.Core.Cache } return policy; } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _locker.Dispose(); + } + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs index bec596b129..d7377a193a 100644 --- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs +++ b/src/Umbraco.Core/Cache/WebCachingAppCache.cs @@ -11,7 +11,7 @@ namespace Umbraco.Core.Cache /// Implements on top of a . /// /// The underlying cache is expected to be HttpRuntime.Cache. - internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache + internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache, IDisposable { // locker object that supports upgradeable read locking // does not need to support recursion if we implement the cache correctly and ensure @@ -19,6 +19,7 @@ namespace Umbraco.Core.Cache private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); private readonly System.Web.Caching.Cache _cache; + private bool _disposedValue; /// /// Initializes a new instance of the class. @@ -204,5 +205,24 @@ namespace Umbraco.Core.Cache _locker.ExitWriteLock(); } } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _locker.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } From 7e332b23c9852a827f8ba7691ed2fc3161d0d07c Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Apr 2021 17:14:34 +1000 Subject: [PATCH 03/92] Fixes ConcurrentHashSet to just use a ConcurrentDictionary as it's underlying source and remove the ReaderWriterLockSlim since we are never disposing this. Makes IdkMap disposable. --- .../Collections/ConcurrentHashSet.cs | 109 +++--------------- src/Umbraco.Core/Services/IdkMap.cs | 29 ++++- 2 files changed, 41 insertions(+), 97 deletions(-) diff --git a/src/Umbraco.Core/Collections/ConcurrentHashSet.cs b/src/Umbraco.Core/Collections/ConcurrentHashSet.cs index c4dba51acd..0424c4dae1 100644 --- a/src/Umbraco.Core/Collections/ConcurrentHashSet.cs +++ b/src/Umbraco.Core/Collections/ConcurrentHashSet.cs @@ -1,8 +1,8 @@ using System; using System.Collections; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; namespace Umbraco.Core.Collections { @@ -14,9 +14,10 @@ namespace Umbraco.Core.Collections [Serializable] public class ConcurrentHashSet : ICollection { - private readonly HashSet _innerSet = new HashSet(); - private readonly ReaderWriterLockSlim _instanceLocker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); - + // Internally we just use a ConcurrentDictionary with the same value for the Value (since we don't actually care about the value) + private static readonly byte _emptyValue = 0x0; + private readonly ConcurrentDictionary _innerSet = new ConcurrentDictionary(); + /// /// Returns an enumerator that iterates through the collection. /// @@ -26,7 +27,7 @@ namespace Umbraco.Core.Collections /// 1 public IEnumerator GetEnumerator() { - return GetThreadSafeClone().GetEnumerator(); + return _innerSet.Keys.GetEnumerator(); } /// @@ -50,16 +51,7 @@ namespace Umbraco.Core.Collections /// The object to remove from the .The is read-only. public bool Remove(T item) { - try - { - _instanceLocker.EnterWriteLock(); - return _innerSet.Remove(item); - } - finally - { - if (_instanceLocker.IsWriteLockHeld) - _instanceLocker.ExitWriteLock(); - } + return _innerSet.TryRemove(item, out _); } @@ -74,17 +66,7 @@ namespace Umbraco.Core.Collections { get { - try - { - _instanceLocker.EnterReadLock(); - return _innerSet.Count; - } - finally - { - if (_instanceLocker.IsReadLockHeld) - _instanceLocker.ExitReadLock(); - } - + return _innerSet.Count; } } @@ -99,19 +81,10 @@ namespace Umbraco.Core.Collections /// /// Adds an item to the . /// - /// The object to add to the .The is read-only. + /// The object to add to the . public void Add(T item) { - try - { - _instanceLocker.EnterWriteLock(); - _innerSet.Add(item); - } - finally - { - if (_instanceLocker.IsWriteLockHeld) - _instanceLocker.ExitWriteLock(); - } + _innerSet.TryAdd(item, _emptyValue); } /// @@ -121,21 +94,7 @@ namespace Umbraco.Core.Collections /// public bool TryAdd(T item) { - if (Contains(item)) return false; - try - { - _instanceLocker.EnterWriteLock(); - - //double check - if (_innerSet.Contains(item)) return false; - _innerSet.Add(item); - return true; - } - finally - { - if (_instanceLocker.IsWriteLockHeld) - _instanceLocker.ExitWriteLock(); - } + return _innerSet.TryAdd(item, _emptyValue); } /// @@ -144,16 +103,7 @@ namespace Umbraco.Core.Collections /// The is read-only. public void Clear() { - try - { - _instanceLocker.EnterWriteLock(); - _innerSet.Clear(); - } - finally - { - if (_instanceLocker.IsWriteLockHeld) - _instanceLocker.ExitWriteLock(); - } + _innerSet.Clear(); } /// @@ -165,16 +115,7 @@ namespace Umbraco.Core.Collections /// The object to locate in the . public bool Contains(T item) { - try - { - _instanceLocker.EnterReadLock(); - return _innerSet.Contains(item); - } - finally - { - if (_instanceLocker.IsReadLockHeld) - _instanceLocker.ExitReadLock(); - } + return _innerSet.ContainsKey(item); } /// @@ -183,24 +124,8 @@ namespace Umbraco.Core.Collections /// The one-dimensional that is the destination of the elements copied from the . The array must have zero-based indexing.The zero-based index in at which copying begins. is a null reference (Nothing in Visual Basic). is less than zero. is equal to or greater than the length of the -or- The number of elements in the source is greater than the available space from to the end of the destination . public void CopyTo(T[] array, int index) { - var clone = GetThreadSafeClone(); - clone.CopyTo(array, index); - } - - private HashSet GetThreadSafeClone() - { - HashSet clone = null; - try - { - _instanceLocker.EnterReadLock(); - clone = new HashSet(_innerSet, _innerSet.Comparer); - } - finally - { - if (_instanceLocker.IsReadLockHeld) - _instanceLocker.ExitReadLock(); - } - return clone; + var keys = _innerSet.Keys; + keys.CopyTo(array, index); } /// @@ -209,8 +134,8 @@ namespace Umbraco.Core.Collections /// The one-dimensional that is the destination of the elements copied from . The must have zero-based indexing. The zero-based index in at which copying begins. is null. is less than zero. is multidimensional.-or- The number of elements in the source is greater than the available space from to the end of the destination . The type of the source cannot be cast automatically to the type of the destination . 2 public void CopyTo(Array array, int index) { - var clone = GetThreadSafeClone(); - Array.Copy(clone.ToArray(), 0, array, index, clone.Count); + var keys = _innerSet.Keys; + Array.Copy(keys.ToArray(), 0, array, index, keys.Count); } } } diff --git a/src/Umbraco.Core/Services/IdkMap.cs b/src/Umbraco.Core/Services/IdkMap.cs index f352def49e..b1caa1ea59 100644 --- a/src/Umbraco.Core/Services/IdkMap.cs +++ b/src/Umbraco.Core/Services/IdkMap.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Scoping; namespace Umbraco.Core.Services { - public class IdkMap + public class IdkMap : IDisposable { private readonly IScopeProvider _scopeProvider; private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(); @@ -46,6 +46,7 @@ namespace Umbraco.Core.Services private readonly ConcurrentDictionary id2key, Func key2id)> _dictionary = new ConcurrentDictionary id2key, Func key2id)>(); + private bool _disposedValue; internal void SetMapper(UmbracoObjectTypes umbracoObjectType, Func id2key, Func key2id) { @@ -106,8 +107,8 @@ namespace Umbraco.Core.Services } finally { - if (_locker.IsReadLockHeld) - _locker.ExitReadLock(); + if (_locker.IsWriteLockHeld) + _locker.ExitWriteLock(); } } @@ -125,8 +126,8 @@ namespace Umbraco.Core.Services } finally { - if (_locker.IsReadLockHeld) - _locker.ExitReadLock(); + if (_locker.IsWriteLockHeld) + _locker.ExitWriteLock(); } } #endif @@ -369,5 +370,23 @@ namespace Umbraco.Core.Services public T Id { get; } } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _locker.Dispose(); + } + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } From bf7a3251d80b2855605c6cf9b7c1c1e73712349a Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Apr 2021 17:56:55 +1000 Subject: [PATCH 04/92] Ensure more ReaderWriterLockSlim are disposed or converted --- .../PureLiveModelFactory.cs | 27 ++++++++++++-- .../Logging/WebProfilerProvider.cs | 22 ++++-------- .../PublishedCache/NuCache/MemberCache.cs | 22 +++++++++++- .../NuCache/PublishedSnapshot.cs | 1 + .../PublishedContentTypeCache.cs | 23 +++++++++++- src/Umbraco.Web/Routing/SiteDomainHelper.cs | 36 ++++++++++++++----- 6 files changed, 101 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs index 8ef99383a4..5b5f54cdc8 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs @@ -21,7 +21,7 @@ using File = System.IO.File; namespace Umbraco.ModelsBuilder.Embedded { - internal class PureLiveModelFactory : ILivePublishedModelFactory2, IRegisteredObject + internal class PureLiveModelFactory : ILivePublishedModelFactory2, IRegisteredObject, IDisposable { private Assembly _modelsAssembly; private Infos _infos = new Infos { ModelInfos = null, ModelTypeMap = new Dictionary() }; @@ -33,6 +33,7 @@ namespace Umbraco.ModelsBuilder.Embedded private int _ver, _skipver; private readonly int _debugLevel; private BuildManager _theBuildManager; + private bool _disposedValue; private readonly Lazy _umbracoServices; // fixme: this is because of circular refs :( private UmbracoServices UmbracoServices => _umbracoServices.Value; @@ -677,11 +678,31 @@ namespace Umbraco.ModelsBuilder.Embedded public void Stop(bool immediate) { - _watcher.EnableRaisingEvents = false; - _watcher.Dispose(); + Dispose(); HostingEnvironment.UnregisterObject(this); } + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _watcher.EnableRaisingEvents = false; + _watcher.Dispose(); + _locker.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } + #endregion } } diff --git a/src/Umbraco.Web/Logging/WebProfilerProvider.cs b/src/Umbraco.Web/Logging/WebProfilerProvider.cs index f38a606745..8dad5f5b96 100755 --- a/src/Umbraco.Web/Logging/WebProfilerProvider.cs +++ b/src/Umbraco.Web/Logging/WebProfilerProvider.cs @@ -16,7 +16,7 @@ namespace Umbraco.Web.Logging /// internal class WebProfilerProvider : AspNetRequestProvider { - private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(); + private readonly object _locker = new object(); private MiniProfiler _startupProfiler; private int _first; private volatile BootPhase _bootPhase; @@ -39,8 +39,7 @@ namespace Umbraco.Web.Logging public void BeginBootRequest() { - _locker.EnterWriteLock(); - try + lock (_locker) { if (_bootPhase != BootPhase.Boot) throw new InvalidOperationException("Invalid boot phase."); @@ -48,28 +47,19 @@ namespace Umbraco.Web.Logging // assign the profiler to be the current MiniProfiler for the request // is's already active, starting and all - HttpContext.Current.Items[":mini-profiler:"] = _startupProfiler; - } - finally - { - _locker.ExitWriteLock(); + HttpContext.Current.Items[":mini-profiler:"] = _startupProfiler; } } public void EndBootRequest() { - _locker.EnterWriteLock(); - try + lock (_locker) { if (_bootPhase != BootPhase.BootRequest) - throw new InvalidOperationException("Invalid boot phase."); + throw new InvalidOperationException("Invalid boot phase."); _bootPhase = BootPhase.Booted; - _startupProfiler = null; - } - finally - { - _locker.ExitWriteLock(); + _startupProfiler = null; } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs index 2e196f629e..f311a7f302 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs @@ -13,7 +13,7 @@ using Umbraco.Web.PublishedCache.NuCache.Navigable; namespace Umbraco.Web.PublishedCache.NuCache { - internal class MemberCache : IPublishedMemberCache, INavigableData + internal class MemberCache : IPublishedMemberCache, INavigableData, IDisposable { private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor; @@ -23,6 +23,7 @@ namespace Umbraco.Web.PublishedCache.NuCache private readonly IMemberService _memberService; private readonly PublishedContentTypeCache _contentTypeCache; private readonly bool _previewDefault; + private bool _disposedValue; public MemberCache(bool previewDefault, IAppCache snapshotCache, IMemberService memberService, PublishedContentTypeCache contentTypeCache, IPublishedSnapshotAccessor publishedSnapshotAccessor, IVariationContextAccessor variationContextAccessor, IEntityXmlSerializer entitySerializer) @@ -158,6 +159,25 @@ namespace Umbraco.Web.PublishedCache.NuCache return _contentTypeCache.Get(PublishedItemType.Member, alias); } + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _contentTypeCache.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } + #endregion } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshot.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshot.cs index 3f5c1aa4d5..85bad38ac7 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshot.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshot.cs @@ -32,6 +32,7 @@ namespace Umbraco.Web.PublishedCache.NuCache { ContentCache.Dispose(); MediaCache.Dispose(); + MemberCache.Dispose(); } } diff --git a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs index 0f6e9af6bd..c9db02f091 100644 --- a/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs +++ b/src/Umbraco.Web/PublishedCache/PublishedContentTypeCache.cs @@ -13,7 +13,7 @@ namespace Umbraco.Web.PublishedCache /// Represents a content type cache. /// /// This cache is not snapshotted, so it refreshes any time things change. - public class PublishedContentTypeCache + public class PublishedContentTypeCache : IDisposable { // NOTE: These are not concurrent dictionaries because all access is done within a lock private readonly Dictionary _typesByAlias = new Dictionary(); @@ -320,6 +320,8 @@ namespace Umbraco.Web.PublishedCache // for unit tests - changing the callback must reset the cache obviously // TODO: Why does this even exist? For testing you'd pass in a mocked service to get by id private Func _getPublishedContentTypeById; + private bool _disposedValue; + internal Func GetPublishedContentTypeById { get => _getPublishedContentTypeById; @@ -367,5 +369,24 @@ namespace Umbraco.Web.PublishedCache { return GetAliasKey(contentType.ItemType, contentType.Alias); } + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + _lock.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } diff --git a/src/Umbraco.Web/Routing/SiteDomainHelper.cs b/src/Umbraco.Web/Routing/SiteDomainHelper.cs index 6173dfb43c..26937b2899 100644 --- a/src/Umbraco.Web/Routing/SiteDomainHelper.cs +++ b/src/Umbraco.Web/Routing/SiteDomainHelper.cs @@ -4,13 +4,14 @@ using System.Linq; using System.Threading; using System.Text.RegularExpressions; using Umbraco.Core; +using System.ComponentModel; namespace Umbraco.Web.Routing { /// /// Provides utilities to handle site domains. /// - public class SiteDomainHelper : ISiteDomainHelper + public class SiteDomainHelper : ISiteDomainHelper, IDisposable { #region Configure @@ -18,6 +19,7 @@ namespace Umbraco.Web.Routing private static Dictionary _sites; private static Dictionary> _bindings; private static Dictionary> _qualifiedSites; + private bool _disposedValue; // these are for unit tests *only* // ReSharper disable ConvertToAutoPropertyWithPrivateSetter @@ -30,16 +32,10 @@ namespace Umbraco.Web.Routing private const string DomainValidationSource = @"^(((?i:http[s]?://)?([-\w]+(\.[-\w]+)*)(:\d+)?(/)?))$"; private static readonly Regex DomainValidation = new Regex(DomainValidationSource, RegexOptions.IgnoreCase | RegexOptions.Compiled); - /// - /// Returns a disposable object that represents safe write access to config. - /// - /// Should be used in a using(SiteDomainHelper.ConfigWriteLock) { ... } mode. + [EditorBrowsable(EditorBrowsableState.Never)] protected static IDisposable ConfigWriteLock => new WriteLock(ConfigLock); - /// - /// Returns a disposable object that represents safe read access to config. - /// - /// Should be used in a using(SiteDomainHelper.ConfigWriteLock) { ... } mode. + [EditorBrowsable(EditorBrowsableState.Never)] protected static IDisposable ConfigReadLock => new ReadLock(ConfigLock); /// @@ -313,6 +309,28 @@ namespace Umbraco.Web.Routing return ret; } + #endregion + + protected virtual void Dispose(bool disposing) + { + if (!_disposedValue) + { + if (disposing) + { + // This is pretty nasty disposing a static on an instance but it's because this whole class + // is pretty fubar. I'm sure we've fixed this all up in netcore now? We need to remove all statics. + ConfigLock.Dispose(); + } + + _disposedValue = true; + } + } + + public void Dispose() + { + // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method + Dispose(disposing: true); + } } } From dc089970408355eb7a34d8e3901e036caa070fd5 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Apr 2021 18:02:23 +1000 Subject: [PATCH 05/92] Removes usages of UpgradeableReadLock --- src/Umbraco.Core/Cache/ObjectCacheAppCache.cs | 23 +++++++++++++--- src/Umbraco.Core/Cache/WebCachingAppCache.cs | 27 ++++++++++++++----- src/Umbraco.Core/ReadLock.cs | 13 +-------- src/Umbraco.Core/UpgradeableReadLock.cs | 10 +------ src/Umbraco.Core/WriteLock.cs | 13 +-------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs index fd1e7f21f1..e2f6017608 100644 --- a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs +++ b/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs @@ -110,19 +110,34 @@ namespace Umbraco.Core.Cache Lazy result; - using (var lck = new UpgradeableReadLock(_locker)) + try { + _locker.EnterUpgradeableReadLock(); + result = MemoryCache.Get(key) as Lazy; if (result == null || FastDictionaryAppCacheBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null { result = FastDictionaryAppCacheBase.GetSafeLazy(factory); var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles); - lck.UpgradeToWriteLock(); - //NOTE: This does an add or update - MemoryCache.Set(key, result, policy); + try + { + _locker.EnterWriteLock(); + //NOTE: This does an add or update + MemoryCache.Set(key, result, policy); + } + finally + { + if (_locker.IsWriteLockHeld) + _locker.ExitWriteLock(); + } } } + finally + { + if (_locker.IsUpgradeableReadLockHeld) + _locker.ExitUpgradeableReadLock(); + } //return result.Value; diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Core/Cache/WebCachingAppCache.cs index d7377a193a..671cd2d9c4 100644 --- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs +++ b/src/Umbraco.Core/Cache/WebCachingAppCache.cs @@ -139,8 +139,10 @@ namespace Umbraco.Core.Cache var value = result == null ? null : GetSafeLazyValue(result); if (value != null) return value; - using (var lck = new UpgradeableReadLock(_locker)) + try { + _locker.EnterUpgradeableReadLock(); + result = _cache.Get(key) as Lazy; // null if key not found // cannot create value within the lock, so if result.IsValueCreated is false, just @@ -153,15 +155,28 @@ namespace Umbraco.Core.Cache var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value)); var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration); - lck.UpgradeToWriteLock(); + try + { + _locker.EnterWriteLock(); - // create a cache dependency if one is needed. - var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null; + // create a cache dependency if one is needed. + var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null; - //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update! - _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback); + //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update! + _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback); + } + finally + { + if (_locker.IsWriteLockHeld) + _locker.ExitWriteLock(); + } } } + finally + { + if (_locker.IsUpgradeableReadLockHeld) + _locker.ExitUpgradeableReadLock(); + } // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache // exceptions (but try again and again) and silently eat them - however at diff --git a/src/Umbraco.Core/ReadLock.cs b/src/Umbraco.Core/ReadLock.cs index 9d3ef22168..f830d08bfa 100644 --- a/src/Umbraco.Core/ReadLock.cs +++ b/src/Umbraco.Core/ReadLock.cs @@ -1,20 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; namespace Umbraco.Core { - /// - /// Provides a convenience methodology for implementing locked access to resources. - /// - /// - /// Intended as an infrastructure class. - /// This is a very inefficient way to lock as it allocates one object each time we lock, - /// so it's OK to use this class for things that happen once, where it is convenient, but not - /// for performance-critical code! - /// + [Obsolete("Use ReaderWriterLockSlim directly. This will be removed in future versions.")] public class ReadLock : IDisposable { private readonly ReaderWriterLockSlim _rwLock; diff --git a/src/Umbraco.Core/UpgradeableReadLock.cs b/src/Umbraco.Core/UpgradeableReadLock.cs index e3717fdf9a..656470cd8a 100644 --- a/src/Umbraco.Core/UpgradeableReadLock.cs +++ b/src/Umbraco.Core/UpgradeableReadLock.cs @@ -1,17 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; namespace Umbraco.Core { - /// - /// Provides a convenience methodology for implementing locked access to resources. - /// - /// - /// Intended as an infrastructure class. - /// + [Obsolete("Use ReaderWriterLockSlim directly. This will be removed in future versions.")] public class UpgradeableReadLock : IDisposable { private readonly ReaderWriterLockSlim _rwLock; diff --git a/src/Umbraco.Core/WriteLock.cs b/src/Umbraco.Core/WriteLock.cs index dfa170218b..1b698dc59c 100644 --- a/src/Umbraco.Core/WriteLock.cs +++ b/src/Umbraco.Core/WriteLock.cs @@ -1,20 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; namespace Umbraco.Core { - /// - /// Provides a convenience methodology for implementing locked access to resources. - /// - /// - /// Intended as an infrastructure class. - /// This is a very inefficient way to lock as it allocates one object each time we lock, - /// so it's OK to use this class for things that happen once, where it is convenient, but not - /// for performance-critical code! - /// + [Obsolete("Use ReaderWriterLockSlim directly. This will be removed in future versions.")] public class WriteLock : IDisposable { private readonly ReaderWriterLockSlim _rwLock; From 5d8fb9670bd75b4a002017b0dcd849c1fa159497 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Tue, 29 Jun 2021 00:37:19 +0200 Subject: [PATCH 06/92] Textstring prevalue editor view: Set id attribute (#10453) * Add missing focus styling * Set id attribute Co-authored-by: BatJan Co-authored-by: Jan Skovgaard Olsen --- .../src/views/prevalueeditors/textstring.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html index 717b9a8ce2..5d613881b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From a19b79553d16dad705c62804df9adcad7312bac8 Mon Sep 17 00:00:00 2001 From: David Challener <694674+dchallener@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:12:45 +0100 Subject: [PATCH 07/92] Update contributing.md Visual Studio min version Having had an older version of visual studio running I've been unable to build the source without making changes to the solution. However, upgrading to at least VS 16.8 has meant those changes haven't been required. This is to do with how the language target "latest" was working. Propose upping the min version listed here to avoid build issues being raised. --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3432ac472a..bada94c30b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -136,7 +136,7 @@ You can get in touch with [the core contributors team](#the-core-contributors-te In order to build the Umbraco source code locally, first make sure you have the following installed. - * [Visual Studio 2019 v16.3+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/) + * [Visual Studio 2019 v16.8+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/) * [Node.js v10+](https://nodejs.org/en/download/) * npm v6.4.1+ (installed with Node.js) * [Git command line](https://git-scm.com/download/) From 33e44181c1d044f4c5a04a3a495290725df69d2a Mon Sep 17 00:00:00 2001 From: David Challener <694674+dchallener@users.noreply.github.com> Date: Tue, 29 Jun 2021 22:05:18 +0100 Subject: [PATCH 08/92] Disable cached partials if in preview mode We don't want unpublished items in cached views - possible leak to live site. Show previews using normal partial view instead. --- src/Umbraco.Web/CacheHelperExtensions.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/CacheHelperExtensions.cs b/src/Umbraco.Web/CacheHelperExtensions.cs index ae8df63415..e3b96106db 100644 --- a/src/Umbraco.Web/CacheHelperExtensions.cs +++ b/src/Umbraco.Web/CacheHelperExtensions.cs @@ -37,7 +37,8 @@ namespace Umbraco.Web ViewDataDictionary viewData = null) { //disable cached partials in debug mode: http://issues.umbraco.org/issue/U4-5940 - if (htmlHelper.ViewContext.HttpContext.IsDebuggingEnabled) + //disable cached partials in preview mode: https://github.com/umbraco/Umbraco-CMS/issues/10384 + if (htmlHelper.ViewContext.HttpContext.IsDebuggingEnabled || Umbraco.Web.Composing.Current.UmbracoContext.InPreviewMode) { // just return a normal partial view instead return htmlHelper.Partial(partialViewName, model, viewData); From 7afcd590374e18c7232f38d913c1ee9d51177992 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Thu, 1 Jul 2021 13:48:56 +0100 Subject: [PATCH 09/92] Fixed "user-dialog" dashboard markup The logic in the markup was previously incorrect. I changed the check from `tab.length` to `dashboard.length`. The custom dashboard's label isn't `.caption` and it's per dashboard, not per "property". Lastly, `.path` should be `.view`. Resolves #6417 --- .../src/views/common/overlays/user/user.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html index fdd2671200..2de04a0147 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html @@ -130,13 +130,11 @@ -
+
+
{{tab.label}}
-
-

{{property.caption}}

-
-
+
From d6a27d6646de5454e6480a1f7d1e22a63034a650 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Thu, 1 Jul 2021 23:58:59 +0200 Subject: [PATCH 10/92] Color picker: Fix label view (#10445) * Add missing focus styling * Change width to ensure label does not get too wide Co-authored-by: BatJan Co-authored-by: Jan Skovgaard Olsen --- .../src/less/components/umb-color-swatches.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less index 8cf64e183c..bdfc55f648 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less @@ -59,7 +59,7 @@ font-size: 14px; padding: 1px 5px; min-height: 45px; - max-width: 100%; + max-width: calc(100% - 8px); margin-top: auto; margin-bottom: -3px; margin-left: -1px; From e67d59a789995fc95cb0f0a30233c9bf0c0899e2 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 22 Mar 2021 18:15:39 +0100 Subject: [PATCH 11/92] Adjust showLabels to be parsed as boolean --- .../src/views/propertyeditors/boolean/boolean.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js index 018c2b72c1..c93b558a23 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js @@ -11,8 +11,8 @@ function booleanEditorController($scope) { showLabels: false }; - if ($scope.model.config && $scope.model.config.showLabels && Object.toBoolean($scope.model.config.showLabels)) { - config.showLabels = true; + if ($scope.model.config) { + $scope.model.config.showLabels = $scope.model.config.showLabels ? Object.toBoolean($scope.model.config.showLabels) : config.showLabels; } // Map the user config From 3e208904356f1fe1262a7edee052dbf9663a6ad3 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 2 Jul 2021 11:47:39 +0200 Subject: [PATCH 12/92] Fix dependencies to make 8.15 installable via NuGet --- build/NuSpecs/UmbracoCms.Web.nuspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec index e96a217f4e..7aebfae108 100644 --- a/build/NuSpecs/UmbracoCms.Web.nuspec +++ b/build/NuSpecs/UmbracoCms.Web.nuspec @@ -43,7 +43,8 @@ - + + From 1e54d0551438b7ec97072b5fb14551163d17a81f Mon Sep 17 00:00:00 2001 From: Henk Jan Pluim Date: Tue, 6 Jul 2021 16:46:07 +0200 Subject: [PATCH 13/92] #10577 bugfix - Umbraco backoffice allows you to assign the same 'login' on two different Members (#10591) --- src/Umbraco.Core/Services/Implement/MemberService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs index 877bb5c9ce..b26a6bef39 100644 --- a/src/Umbraco.Core/Services/Implement/MemberService.cs +++ b/src/Umbraco.Core/Services/Implement/MemberService.cs @@ -626,7 +626,7 @@ namespace Umbraco.Core.Services.Implement query.Where(member => member.Username.EndsWith(login)); break; case StringPropertyMatchType.Wildcard: - query.Where(member => member.Email.SqlWildcard(login, TextColumnType.NVarchar)); + query.Where(member => member.Username.SqlWildcard(login, TextColumnType.NVarchar)); break; default: throw new ArgumentOutOfRangeException(nameof(matchType)); From a1e0af6fff971af3270b6292b0be38a6988d3a70 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Tue, 6 Jul 2021 18:39:56 +0100 Subject: [PATCH 14/92] Accessibility improvements for Extensions in Razor Markup (#9576) * Support for language of parts * Changed casing of "FallBack" to "Fallback" to be consistent with the existing code. * Now tests the type to determine if span should be added. * Remove magic strings and return
for IHtmlString values This fixes the "string" vs "String" issue in the previous commit and prevents the function returning invalid markup * Fix for test providing string as "object" Co-authored-by: Joe Glombek --- .../Models/PublishedContent/Fallback.cs | 6 ++ .../PublishedContentLanguageVariantTests.cs | 8 ++- .../PublishedValueFallback.cs | 65 ++++++++++++++++--- 3 files changed, 70 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Core/Models/PublishedContent/Fallback.cs b/src/Umbraco.Core/Models/PublishedContent/Fallback.cs index 0434218555..805f14d21b 100644 --- a/src/Umbraco.Core/Models/PublishedContent/Fallback.cs +++ b/src/Umbraco.Core/Models/PublishedContent/Fallback.cs @@ -71,5 +71,11 @@ namespace Umbraco.Core.Models.PublishedContent { return GetEnumerator(); } + + public const int DisplayFallbackLanguage = 4; + /// + /// Gets the fallback to tree ancestors policy. + /// + public static Fallback ToDisplayFallbackLanguage => new Fallback(new[] { DisplayFallbackLanguage }); } } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index 636f8502ed..05cf8d01c1 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -235,7 +235,13 @@ namespace Umbraco.Tests.PublishedContent var value = content.Value("welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.Ancestors)); Assert.AreEqual("Welcome", value); } - + [Test] + public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_And_Language_Change() + { + var content = Current.UmbracoContext.Content.GetAtRoot().First(); + var value = content.Value("welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.DisplayFallbackLanguage)); + Assert.AreEqual("Welcome", value); + } [Test] public void Do_Not_GetContent_For_Unpopulated_Requested_Language_With_Fallback_Over_That_Loops() { diff --git a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs index 57c3094eaf..b5901fef69 100644 --- a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs +++ b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Web; +using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; @@ -35,6 +37,8 @@ namespace Umbraco.Web.Models.PublishedContent { _variationContextAccessor.ContextualizeVariation(property.PropertyType.Variations, ref culture, ref segment); + var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); + foreach (var f in fallback) { switch (f) @@ -45,9 +49,11 @@ namespace Umbraco.Web.Models.PublishedContent value = defaultValue; return true; case Fallback.Language: - if (TryGetValueWithLanguageFallback(property, culture, segment, out value)) + if (TryGetValueWithLanguageFallback(property, culture, segment, out value, includeFallbackLanguage)) return true; break; + case Fallback.DisplayFallbackLanguage: + continue; default: throw NotSupportedFallbackMethod(f, "property"); } @@ -67,6 +73,7 @@ namespace Umbraco.Web.Models.PublishedContent public bool TryGetValue(IPublishedElement content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value) { var propertyType = content.ContentType.GetPropertyType(alias); + var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); if (propertyType == null) { value = default; @@ -85,9 +92,11 @@ namespace Umbraco.Web.Models.PublishedContent value = defaultValue; return true; case Fallback.Language: - if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value)) + if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value, includeFallbackLanguage)) return true; break; + case Fallback.DisplayFallbackLanguage: + continue; default: throw NotSupportedFallbackMethod(f, "element"); } @@ -107,6 +116,7 @@ namespace Umbraco.Web.Models.PublishedContent public virtual bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value, out IPublishedProperty noValueProperty) { noValueProperty = default; + var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); var propertyType = content.ContentType.GetPropertyType(alias); if (propertyType != null) @@ -131,13 +141,15 @@ namespace Umbraco.Web.Models.PublishedContent case Fallback.Language: if (propertyType == null) continue; - if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value)) + if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value, includeFallbackLanguage)) return true; break; case Fallback.Ancestors: - if (TryGetValueWithAncestorsFallback(content, alias, culture, segment, out value, ref noValueProperty)) + if (TryGetValueWithAncestorsFallback(content, alias, culture, segment, out value, ref noValueProperty, includeFallbackLanguage)) return true; break; + case Fallback.DisplayFallbackLanguage: + continue; default: throw NotSupportedFallbackMethod(f, "content"); } @@ -155,9 +167,10 @@ namespace Umbraco.Web.Models.PublishedContent // tries to get a value, recursing the tree // because we recurse, content may not even have the a property with the specified alias (but only some ancestor) // in case no value was found, noValueProperty contains the first property that was found (which does not have a value) - private bool TryGetValueWithAncestorsFallback(IPublishedContent content, string alias, string culture, string segment, out T value, ref IPublishedProperty noValueProperty) + private bool TryGetValueWithAncestorsFallback(IPublishedContent content, string alias, string culture, string segment, out T value, ref IPublishedProperty noValueProperty, bool includeFallbackLanguage) { IPublishedProperty property; // if we are here, content's property has no value + var originalCulture = culture; do { content = content.Parent; @@ -183,6 +196,10 @@ namespace Umbraco.Web.Models.PublishedContent if (property != null && property.HasValue(culture, segment)) { value = property.Value(culture, segment); + if (includeFallbackLanguage && originalCulture != culture) + { + value = GetMarkUpForFallbackLanguage(culture, value); + } return true; } @@ -191,7 +208,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedProperty property, string culture, string segment, out T value) + private bool TryGetValueWithLanguageFallback(IPublishedProperty property, string culture, string segment, out T value, bool includeFallbackLanguage) { value = default; @@ -217,6 +234,10 @@ namespace Umbraco.Web.Models.PublishedContent if (property.HasValue(culture2, segment)) { value = property.Value(culture2, segment); + if (includeFallbackLanguage && culture2 != culture) + { + value = GetMarkUpForFallbackLanguage(culture2, value); + } return true; } @@ -225,7 +246,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedElement content, string alias, string culture, string segment, out T value) + private bool TryGetValueWithLanguageFallback(IPublishedElement content, string alias, string culture, string segment, out T value, bool includeFallbackLanguage) { value = default; @@ -251,6 +272,10 @@ namespace Umbraco.Web.Models.PublishedContent if (content.HasValue(alias, culture2, segment)) { value = content.Value(alias, culture2, segment); + if (includeFallbackLanguage && culture2 != culture) + { + value = GetMarkUpForFallbackLanguage(culture2, value); + } return true; } @@ -259,7 +284,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedContent content, string alias, string culture, string segment, out T value) + private bool TryGetValueWithLanguageFallback(IPublishedContent content, string alias, string culture, string segment, out T value, bool includeFallbackLanguage) { value = default; @@ -288,11 +313,35 @@ namespace Umbraco.Web.Models.PublishedContent if (content.HasValue(alias, culture2, segment)) { value = content.Value(alias, culture2, segment); + if (includeFallbackLanguage && culture2 != culture) + { + value = GetMarkUpForFallbackLanguage(culture2, value); + + } return true; } language = language2; } } + + private T GetMarkUpForFallbackLanguage(string culture2, T value) + { + var typeOfT = typeof(T); + if (value is string) + { + var newValue = "" + value + ""; + return (T)Convert.ChangeType(newValue, typeof(T)); + } + else if (typeOfT == typeof(IHtmlString)) + { + // we want to return a block element here since the IHtmlString could contain futher block elements + var newValue = "
" + value + "
"; + IHtmlString htmlString = new MvcHtmlString(newValue); + return (T)htmlString; + } + + return value; + } } } From 87a7e84cbabdf5f692e52f2d73c6b474092bfaab Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Tue, 13 Jul 2021 09:57:20 +0200 Subject: [PATCH 15/92] Bugfix: #10414 - Validation message doesn't disappear once the issue is fixed (#10581) * Add missing focus styling * Fix issue where validation message does not disappear when all chars are removed Co-authored-by: BatJan Co-authored-by: Jan Skovgaard Olsen --- .../src/views/propertyeditors/textbox/textbox.controller.js | 4 ++++ .../src/views/propertyeditors/textbox/textbox.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js index b7c740e749..3e4539c6ae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.controller.js @@ -31,6 +31,10 @@ function textboxController($scope, validationMessageService) { checkLengthVadility(); $scope.nearMaxLimit = $scope.validLength && $scope.charsCount > Math.max($scope.maxChars*.8, $scope.maxChars-25); } + else { + $scope.charsCount = 0; + checkLengthVadility(); + } } $scope.model.onValueChanged = $scope.change; $scope.change(); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html index 5e135ea7d9..1f1131c43f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html @@ -10,7 +10,7 @@ aria-required="{{model.validation.mandatory}}" aria-invalid="False" ng-trim="false" - ng-keyup="change()" /> + ng-change="change()" />

{{model.label}} {{textboxFieldForm.textbox.errorMsg}}

From c812dab96739c5cfc228c70796af0c2b5b001fec Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 23 Jul 2021 01:26:37 +0200 Subject: [PATCH 16/92] File upload checkered background (#10621) * Use umb-icon component * Cleanup unused css and use checkered background on both image cropper and file upload --- .../components/umb-property-file-upload.less | 2 +- .../src/less/property-editors.less | 349 +++++++++--------- .../upload/umb-property-file-upload.html | 2 +- 3 files changed, 170 insertions(+), 183 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less index 83774e2dae..75d171dd87 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-property-file-upload.less @@ -20,7 +20,7 @@ } } - i.icon { + .icon { font-size: 55px; line-height: 70px } diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index 11d11c7e3a..87603671dd 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -575,43 +575,31 @@ font-size: 22px; } -/* - .umb-cropper-gravity .viewport, .umb-cropper-gravity, .umb-cropper-imageholder { - display: inline-block; - max-width: 100%; +.umb-crop-thumbnail-container { + img { + max-width: unset; } +} - .umb-cropper-imageholder { - float: left; - } +.cropList { + display: inline-block; + position: relative; + vertical-align: top; + flex:0; +} - .umb-cropper-imageholder umb-image-gravity { - display:block; - } - */ +.umb-fileupload, +.umb-cropper-gravity { - .umb-crop-thumbnail-container { - img { - max-width: unset; - } - } - - .cropList { - display: inline-block; - position: relative; - vertical-align: top; - flex:0; - } - - .umb-cropper-gravity .gravity-container { + .gravity-container { border: 1px solid @inputBorder; - box-sizing: border-box; - line-height: 0; width: 100%; height: 100%; overflow: hidden; - .checkeredBackground(); + box-sizing: border-box; + line-height: 0; contain: content; + .checkeredBackground(); &:focus, &:focus-within { border-color: @inputBorderFocus; @@ -621,7 +609,6 @@ position: relative; width: 100%; height: 100%; - display: flex; justify-content: center; align-items: center; @@ -637,169 +624,169 @@ } } } - +} - .umb-cropper-gravity img { - position: relative; - max-width: 100%; - height: auto; - top: 0; - left: 0; - } +.umb-cropper-gravity img { + position: relative; + max-width: 100%; + height: auto; + top: 0; + left: 0; +} - .umb-cropper-gravity .overlayViewport { - position: absolute; - top:0; - bottom:0; - left:0; - right:0; - contain: strict; +.umb-cropper-gravity .overlayViewport { + position: absolute; + top:0; + bottom:0; + left:0; + right:0; + contain: strict; - display: flex; - justify-content: center; - align-items: center; - } - .umb-cropper-gravity .overlay { - position: relative; - display: block; - max-width: 100%; - max-height: 100%; - cursor: crosshair; - } - .umb-cropper-gravity .overlay .focalPoint { - position: absolute; - top: 0; - left: 0; - cursor: move; - z-index: @zindexCropperOverlay; + display: flex; + justify-content: center; + align-items: center; +} +.umb-cropper-gravity .overlay { + position: relative; + display: block; + max-width: 100%; + max-height: 100%; + cursor: crosshair; +} +.umb-cropper-gravity .overlay .focalPoint { + position: absolute; + top: 0; + left: 0; + cursor: move; + z-index: @zindexCropperOverlay; - width: 14px; - height: 14px; - // this element should have no width or height as its preventing the jQuery draggable-plugin to go all the way to the sides: - margin-left: -10px; - margin-top: -10px; - margin-right: -10px; - margin-bottom: -10px; + width: 14px; + height: 14px; + // this element should have no width or height as its preventing the jQuery draggable-plugin to go all the way to the sides: + margin-left: -10px; + margin-top: -10px; + margin-right: -10px; + margin-bottom: -10px; - text-align: center; - border-radius: 20px; - background: @pinkLight; - border: 3px solid @white; - opacity: 0.8; - } + text-align: center; + border-radius: 20px; + background: @pinkLight; + border: 3px solid @white; + opacity: 0.8; +} - .umb-cropper-gravity .overlay .focalPoint i { - font-size: 26px; - line-height: 26px; - opacity: 0.8 !important; - } +.umb-cropper-gravity .overlay .focalPoint i { + font-size: 26px; + line-height: 26px; + opacity: 0.8 !important; +} - .imagecropper { - display: flex; - align-items: flex-start; - flex-direction: row; +.imagecropper { + display: flex; + align-items: flex-start; + flex-direction: row; - @media (max-width: 768px) { - flex-direction: column; - } - - } - - .imagecropper .umb-cropper__container { - position: relative; - width: 100%; - } - - .imagecropper .umb-cropper__container .button-drawer { - display: flex; - justify-content: flex-end; - padding: 10px; - position: relative; - - button { - margin-left: 4px; - } - } - - .umb-close-cropper { - position: absolute; - top: 3px; - right: 3px; - cursor: pointer; - z-index: @zindexCropperOverlay + 1; - } - - .umb-close-cropper:hover { - opacity: .9; - background: @gray-10; - } - - .imagecropper .umb-sortable-thumbnails { - display: flex; - flex-direction: row; - flex-wrap: wrap; - } - - .imagecropper .umb-sortable-thumbnails li { - display: flex; + @media (max-width: 768px) { flex-direction: column; - justify-content: space-between; - padding: 8px; + } + +} + +.imagecropper .umb-cropper__container { + position: relative; + width: 100%; +} + +.imagecropper .umb-cropper__container .button-drawer { + display: flex; + justify-content: flex-end; + padding: 10px; + position: relative; + + button { + margin-left: 4px; + } +} + +.umb-close-cropper { + position: absolute; + top: 3px; + right: 3px; + cursor: pointer; + z-index: @zindexCropperOverlay + 1; +} + +.umb-close-cropper:hover { + opacity: .9; + background: @gray-10; +} + +.imagecropper .umb-sortable-thumbnails { + display: flex; + flex-direction: row; + flex-wrap: wrap; +} + +.imagecropper .umb-sortable-thumbnails li { + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 8px; + margin-top: 0; +} + +.imagecropper .umb-sortable-thumbnails li.current { + border-color: @gray-8; + background: @gray-10; + color: @black; + cursor: pointer; +} + +.imagecropper .umb-sortable-thumbnails li:hover, +.imagecropper .umb-sortable-thumbnails li.current:hover { + border-color: @gray-8; + background: @gray-10; + color: @black; + cursor: pointer; + opacity: .95; +} + +.imagecropper .umb-sortable-thumbnails li .crop-name, +.imagecropper .umb-sortable-thumbnails li .crop-size, +.imagecropper .umb-sortable-thumbnails li .crop-annotation { + display: block; + text-align: left; + font-size: 13px; + line-height: 1; +} + +.imagecropper .umb-sortable-thumbnails li .crop-name { + font-weight: bold; + margin: 10px 0 5px; +} + +.imagecropper .umb-sortable-thumbnails li .crop-size, +.imagecropper .umb-sortable-thumbnails li .crop-annotation { + font-size: 10px; + font-style: italic; + margin: 0 0 5px; +} + +.imagecropper .umb-sortable-thumbnails li .crop-annotation { + color: @gray-6; +} + +.btn-crop-delete { + display: block; + text-align: left; +} + +.imagecropper .cropList-container { + h5 { + margin-left: 10px; margin-top: 0; } - - .imagecropper .umb-sortable-thumbnails li.current { - border-color: @gray-8; - background: @gray-10; - color: @black; - cursor: pointer; - } - - .imagecropper .umb-sortable-thumbnails li:hover, - .imagecropper .umb-sortable-thumbnails li.current:hover { - border-color: @gray-8; - background: @gray-10; - color: @black; - cursor: pointer; - opacity: .95; - } - - .imagecropper .umb-sortable-thumbnails li .crop-name, - .imagecropper .umb-sortable-thumbnails li .crop-size, - .imagecropper .umb-sortable-thumbnails li .crop-annotation { - display: block; - text-align: left; - font-size: 13px; - line-height: 1; - } - - .imagecropper .umb-sortable-thumbnails li .crop-name { - font-weight: bold; - margin: 10px 0 5px; - } - - .imagecropper .umb-sortable-thumbnails li .crop-size, - .imagecropper .umb-sortable-thumbnails li .crop-annotation { - font-size: 10px; - font-style: italic; - margin: 0 0 5px; - } - - .imagecropper .umb-sortable-thumbnails li .crop-annotation { - color: @gray-6; - } - - .btn-crop-delete { - display: block; - text-align: left; - } - - .imagecropper .cropList-container { - h5 { - margin-left: 10px; - margin-top: 0; - } - } +} // // Folder browser diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html index fadc0ac3b1..1db179aa42 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-property-file-upload.html @@ -4,7 +4,7 @@
- +

Click to upload

From 6116ec814d930d59d1db7d5e1c87a70b0cef871e Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Tue, 20 Jul 2021 17:29:01 +0200 Subject: [PATCH 17/92] Update umbeditorview.directive.js --- .../directives/components/editor/umbeditorview.directive.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js index 34cb55a794..35981049af 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js @@ -59,6 +59,8 @@ Use this directive to construct the main editor window.
  • {@link umbraco.directives.directive:umbEditorContainer umbEditorContainer}
  • {@link umbraco.directives.directive:umbEditorFooter umbEditorFooter}
    • + +@param {boolean} footer Whether the directive should make place for a {@link umbraco.directives.directive:umbEditorFooter umbEditorFooter} at the bottom (`true` by default). **/ (function() { From c86d3b1dae6ea34cc60321c10b39e063daf305fe Mon Sep 17 00:00:00 2001 From: Patrick de Mooij Date: Fri, 16 Oct 2020 12:00:39 +0200 Subject: [PATCH 18/92] 9157: Use the sorting event instead of the saving --- src/Umbraco.Core/Services/Implement/ContentService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs index af14d7fa69..7e694946ef 100644 --- a/src/Umbraco.Core/Services/Implement/ContentService.cs +++ b/src/Umbraco.Core/Services/Implement/ContentService.cs @@ -2388,7 +2388,7 @@ namespace Umbraco.Core.Services.Implement if (raiseEvents) { //raise cancelable sorting event - if (scope.Events.DispatchCancelable(Saving, this, saveEventArgs, nameof(Sorting))) + if (scope.Events.DispatchCancelable(Sorting, this, saveEventArgs, nameof(Sorting))) return OperationResult.Cancel(evtMsgs); //raise saving event (this one cannot be canceled) From 2eb554f1b46d50ae8445dcdedc2d759fcb9178da Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 27 Jul 2021 14:52:01 +0200 Subject: [PATCH 19/92] Inject windowResizeListener in Image Crop directive (#10745) --- .../components/imaging/umbimagecrop.directive.js | 12 ++++++------ .../common/services/windowresizelistener.service.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js index 60ba71d7a5..1f5d506bdd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagecrop.directive.js @@ -6,7 +6,7 @@ **/ angular.module("umbraco.directives") .directive('umbImageCrop', - function ($timeout, $window, cropperHelper) { + function ($timeout, cropperHelper, windowResizeListener) { const MAX_SCALE = 4; @@ -26,7 +26,7 @@ angular.module("umbraco.directives") forceUpdate: '@?' }, - link: function (scope, element, attrs, windowResizeListener) { + link: function (scope, element, attrs) { var unsubscribe = []; let sliderRef = null; @@ -72,7 +72,7 @@ angular.module("umbraco.directives") }; function updateSlider() { - if(sliderRef) { + if (sliderRef) { // Update slider range min/max sliderRef.noUiSlider.updateOptions({ "range": { @@ -102,7 +102,7 @@ angular.module("umbraco.directives") // cross-browser wheel delta var delta = Math.max(-50, Math.min(50, (event.wheelDelta || -event.detail))); - if(sliderRef) { + if (sliderRef) { var currentScale =sliderRef.noUiSlider.get(); var newScale = Math.min(Math.max(currentScale + delta*.001*scope.dimensions.image.ratio, scope.dimensions.scale.min), scope.dimensions.scale.max); @@ -127,8 +127,8 @@ angular.module("umbraco.directives") 'left': (parseInt(scope.dimensions.margin.left, 10)) + 'px' } }; - updateStyles(); + updateStyles(); //elements var $viewport = element.find(".viewport"); @@ -138,11 +138,11 @@ angular.module("umbraco.directives") $overlay.bind("focus", function () { $overlay.bind("DOMMouseScroll mousewheel onmousewheel", onScroll); }); + $overlay.bind("blur", function () { $overlay.unbind("DOMMouseScroll mousewheel onmousewheel", onScroll); }); - //default constraints for drag n drop var constraints = { left: { max: 0, min: 0 }, top: { max: 0, min: 0 } }; scope.constraints = constraints; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js b/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js index 68691b8629..3c13228a9b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/windowresizelistener.service.js @@ -11,7 +11,7 @@ */ function windowResizeListener($rootScope) { - var WinReszier = (function () { + var WinResizer = (function () { var registered = []; var inited = false; var resize = _.debounce(function(ev) { @@ -51,7 +51,7 @@ function windowResizeListener($rootScope) { * @param {Function} cb */ register: function (cb) { - WinReszier.register(cb); + WinResizer.register(cb); }, /** @@ -59,9 +59,9 @@ function windowResizeListener($rootScope) { * @param {Function} cb */ unregister: function(cb) { - WinReszier.unregister(cb); + WinResizer.unregister(cb); } }; } -angular.module('umbraco.services').factory('windowResizeListener', windowResizeListener); \ No newline at end of file +angular.module('umbraco.services').factory('windowResizeListener', windowResizeListener); From 820952561127bb79910928652cf59ee15ea6fbde Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 27 Jul 2021 15:49:16 +0200 Subject: [PATCH 20/92] Modernize mini listview component to use svg icons and `umb-search-filter` component (#10740) --- .../src/less/components/umb-mini-search.less | 13 ++++----- .../views/components/umb-mini-list-view.html | 28 +++++++++---------- .../src/views/components/umb-mini-search.html | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less index ec598c17eb..e4eb8f8235 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less @@ -4,13 +4,12 @@ .icon { position: absolute; - width: 30px; - height: 30px; display: flex; justify-content: center; align-items: center; - margin: 1px; - padding: 0; + font-size: 20px; + margin: 5px; + padding: 1px; pointer-events: none; color: @ui-action-discreet-type; transition: color .1s linear; @@ -30,6 +29,7 @@ .icon { color: @ui-action-discreet-type-hover; } + input { color: @ui-action-discreet-border-hover; border-color: @ui-action-discreet-border-hover; @@ -42,10 +42,9 @@ border-color: @ui-action-discreet-border-hover; cursor: unset; } - + input:focus, &:focus-within input, &.--has-value input { width: 190px; - padding-left:30px; + padding-left: 30px; } - } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html index e2319f099d..dfd6f9002c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-list-view.html @@ -5,14 +5,14 @@ ng-repeat="miniListView in miniListViews">
    - +

    {{ miniListView.node.name }}

    @@ -32,19 +32,17 @@
    -
    -
    - - + +
    + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html index 3c95dbae5b..b69071d4e4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html @@ -1,5 +1,5 @@ - + Date: Wed, 28 Jul 2021 22:25:19 +0200 Subject: [PATCH 21/92] Don't squeeze avatar when help panel is open --- .../src/less/components/application/umb-app-header.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less index bd1b8ab07a..68a29df89e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-app-header.less @@ -48,6 +48,7 @@ opacity: 0.8; color: @white; font-size: 22px; + flex-shrink: 0; } .umb-app-header__button:hover .umb-app-header__action-icon, From cb06442de44d93b6437fcf4fa92bb4d12dc68f5e Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 29 Jul 2021 13:54:05 +0200 Subject: [PATCH 22/92] Fix: Issue when upgraded from 8.14 to 8.15 when inviting user into the backoffice. #10746 (#10767) * Remove unusable method * Fixes #10746 by removing the recursive call ending in an infinite loop Also: the culture is already known, don't take the `CurrentUICulture` --- .../LocalizedTextServiceExtensions.cs | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs index 2911441578..e062f11306 100644 --- a/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs +++ b/src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs @@ -71,30 +71,6 @@ namespace Umbraco.Core.Services #pragma warning restore CS0618 // Type or member is obsolete } - /// - /// Localize using the current thread culture - /// - /// - /// - /// - /// - /// - public static string Localize(this ILocalizedTextService manager, string area, string alias, IDictionary tokens = null) - { - if (manager is ILocalizedTextService2 manager2) - { - return manager2.Localize(area, alias, Thread.CurrentThread.CurrentUICulture, tokens); - } - var fullKey = alias; - if (area != null) - { - fullKey = string.Concat(area, "/", alias); - } -#pragma warning disable CS0618 // Type or member is obsolete - return manager.Localize(fullKey, Thread.CurrentThread.CurrentUICulture, tokens); -#pragma warning restore CS0618 // Type or member is obsolete - } - /// /// Localize a key without any variables /// @@ -108,7 +84,7 @@ namespace Umbraco.Core.Services { if (manager is ILocalizedTextService2 manager2) { - return manager2.Localize(area, alias, Thread.CurrentThread.CurrentUICulture, tokens); + return manager2.Localize(area, alias, culture, ConvertToDictionaryVars(tokens)); } var fullKey = alias; if (area != null) From 168abbf2f7597a8c5ccadded19ef619cb9f82e46 Mon Sep 17 00:00:00 2001 From: Robert Ghafoor Date: Fri, 30 Jul 2021 09:34:14 +0200 Subject: [PATCH 23/92] 10758 Caption will now be correctly set when passing in a target to the media picker. --- .../infiniteeditors/mediapicker/mediapicker.controller.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js index 0b9c59f2da..405556e2ae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js @@ -168,6 +168,7 @@ angular.module("umbraco") var originalTarget = $scope.target; var id = $scope.target.udi ? $scope.target.udi : $scope.target.id; var altText = $scope.target.altText; + var caption = $scope.target.caption; // ID of a UDI or legacy int ID still could be null/undefinied here // As user may dragged in an image that has not been saved to media section yet @@ -181,6 +182,7 @@ angular.module("umbraco") $scope.target.url = mediaHelper.resolveFileFromEntity(node); $scope.target.thumbnail = mediaHelper.resolveFileFromEntity(node, true); $scope.target.altText = altText; + $scope.target.caption = caption; $scope.target.focalPoint = originalTarget.focalPoint; $scope.target.coordinates = originalTarget.coordinates; openDetailsDialog(); From 56790f72b020eaed5f26fd981a4f1f3feb8a4927 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 2 Aug 2021 00:18:30 +0200 Subject: [PATCH 24/92] Replace angular.forEach with Utilities.forEach (#10759) * Replace angular.forEach with Utilities.forEach * Use localizeMany to localize translations in a single request * Replace angular.forEach * Replace angular.forEach in mocks --- .../components/buttons/umbbutton.directive.js | 30 ++++++------ .../content/umbcontentnodeinfo.directive.js | 14 +++--- .../editor/umbeditornavigation.directive.js | 20 ++++---- .../media/umbmedianodeinfo.directive.js | 21 ++++---- .../components/umbaceeditor.directive.js | 2 +- .../components/umbchildselector.directive.js | 32 ++++++------- .../components/umbgridselector.directive.js | 6 +-- .../components/umbgroupsbuilder.directive.js | 48 +++++++++---------- .../components/umbminilistview.directive.js | 10 ++-- .../components/umbnestedcontent.directive.js | 9 ++-- .../upload/umbfiledropzone.directive.js | 5 +- .../util/disabletabindex.directive.js | 2 +- .../util/umbkeyboardlist.directive.js | 2 +- .../src/common/services/retryqueue.service.js | 2 +- .../dashboard/dashboard.tabs.controller.js | 36 +++++++------- .../test/lib/angular/angular-mocks.js | 32 ++++++------- 16 files changed, 131 insertions(+), 140 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js index dd6fa5c5c8..d1be694fde 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js @@ -135,7 +135,7 @@ Use this directive to render an umbraco button. The directive can be used to gen if (vm.buttonStyle) { // make it possible to pass in multiple styles - if(vm.buttonStyle.startsWith("[") && vm.buttonStyle.endsWith("]")) { + if (vm.buttonStyle.startsWith("[") && vm.buttonStyle.endsWith("]")) { // when using an attr it will always be a string so we need to remove square brackets // and turn it into and array @@ -143,16 +143,16 @@ Use this directive to render an umbraco button. The directive can be used to gen // split array by , + make sure to catch whitespaces var array = withoutBrackets.split(/\s?,\s?/g); - angular.forEach(array, function(item){ + Utilities.forEach(array, item => { vm.style = vm.style + " " + "btn-" + item; - if(item === "block") { + if (item === "block") { vm.blockElement = true; } }); } else { vm.style = "btn-" + vm.buttonStyle; - if(vm.buttonStyle === "block") { + if (vm.buttonStyle === "block") { vm.blockElement = true; } } @@ -167,7 +167,7 @@ Use this directive to render an umbraco button. The directive can be used to gen // watch for state changes if (changes.state) { - if(changes.state.currentValue) { + if (changes.state.currentValue) { vm.innerState = changes.state.currentValue; } if (changes.state.currentValue === 'success' || changes.state.currentValue === 'error') { @@ -179,25 +179,25 @@ Use this directive to render an umbraco button. The directive can be used to gen } // watch for disabled changes - if(changes.disabled) { - if(changes.disabled.currentValue) { + if (changes.disabled) { + if (changes.disabled.currentValue) { vm.disabled = changes.disabled.currentValue; } } // watch for label changes - if(changes.label && changes.label.currentValue) { + if (changes.label && changes.label.currentValue) { vm.buttonLabel = changes.label.currentValue; setButtonLabel(); } // watch for label key changes - if(changes.labelKey && changes.labelKey.currentValue) { + if (changes.labelKey && changes.labelKey.currentValue) { setButtonLabel(); } // watch for type changes - if(changes.type) { + if (changes.type) { if (!vm.type) { vm.type = "button";// set the default } @@ -206,23 +206,23 @@ Use this directive to render an umbraco button. The directive can be used to gen } function clickButton(event) { - if(vm.action) { + if (vm.action) { vm.action({$event: event}); } } function setButtonLabel() { // if the button opens a dialog add "..." to the label - if(vm.addEllipsis === "true") { + if (vm.addEllipsis === "true") { vm.buttonLabel = vm.buttonLabel + "..."; } // look up localization key - if(vm.labelKey) { - localizationService.localize(vm.labelKey).then(function(value){ + if (vm.labelKey) { + localizationService.localize(vm.labelKey).then(value => { vm.buttonLabel = value; // if the button opens a dialog add "..." to the label - if(vm.addEllipsis === "true") { + if (vm.addEllipsis === "true") { vm.buttonLabel = vm.buttonLabel + "..."; } }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js index c20c2a368d..f087f6e084 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js @@ -206,11 +206,11 @@ scope.loadingAuditTrail = true; logResource.getPagedEntityLog(scope.auditTrailOptions) - .then(function (data) { + .then(data => { // get current backoffice user and format dates - userService.getCurrentUser().then(function (currentUser) { - angular.forEach(data.items, function (item) { + userService.getCurrentUser().then(currentUser => { + Utilities.forEach(data.items, item => { item.timestampFormatted = dateHelper.getLocalDate(item.timestamp, currentUser.locale, 'LLL'); }); }); @@ -232,12 +232,12 @@ function loadRedirectUrls() { scope.loadingRedirectUrls = true; //check if Redirect URL Management is enabled - redirectUrlsResource.getEnableState().then(function (response) { + redirectUrlsResource.getEnableState().then(response => { scope.urlTrackerDisabled = response.enabled !== true; if (scope.urlTrackerDisabled === false) { redirectUrlsResource.getRedirectsForContentItem(scope.node.udi) - .then(function (data) { + .then(data => { scope.redirectUrls = data.searchResults; scope.hasRedirects = (typeof data.searchResults !== 'undefined' && data.searchResults.length > 0); scope.loadingRedirectUrls = false; @@ -250,7 +250,7 @@ } function setAuditTrailLogTypeColor(auditTrail) { - angular.forEach(auditTrail, function (item) { + Utilities.forEach(auditTrail, item => { switch (item.logType) { case "Save": @@ -304,7 +304,7 @@ function formatDatesToLocal() { // get current backoffice user and format dates - userService.getCurrentUser().then(function (currentUser) { + userService.getCurrentUser().then(currentUser => { scope.currentVariant.createDateFormatted = dateHelper.getLocalDate(scope.currentVariant.createDate, currentUser.locale, 'LLL'); scope.currentVariant.releaseDateFormatted = dateHelper.getLocalDate(scope.currentVariant.releaseDate, currentUser.locale, 'LLL'); scope.currentVariant.expireDateFormatted = dateHelper.getLocalDate(scope.currentVariant.expireDate, currentUser.locale, 'LLL'); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js index eec8455969..a912eab609 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js @@ -17,19 +17,19 @@ name: "More" }; - scope.openNavigationItem = function(item) { + scope.openNavigationItem = item => { scope.showDropdown = false; runItemAction(item); setItemToActive(item); - if(scope.onSelect) { + if (scope.onSelect) { scope.onSelect({"item": item}); } eventsService.emit("app.tabChange", item); }; - scope.openAnchorItem = function(item, anchor) { - if(scope.onAnchorSelect) { + scope.openAnchorItem = (item, anchor) => { + if (scope.onAnchorSelect) { scope.onAnchorSelect({"item": item, "anchor": anchor}); } if (item.active !== true) { @@ -37,11 +37,11 @@ } }; - scope.toggleDropdown = function () { + scope.toggleDropdown = () => { scope.showDropdown = !scope.showDropdown; }; - scope.hideDropdown = function() { + scope.hideDropdown = () => { scope.showDropdown = false; }; @@ -60,7 +60,7 @@ function calculateVisibleItems(windowWidth) { // if we don't get a windowWidth stick with the default item limit - if(!windowWidth) { + if (!windowWidth) { return; } @@ -94,7 +94,7 @@ if (selectedItem.view) { // deselect all items - angular.forEach(scope.navigation, function(item, index){ + Utilities.forEach(scope.navigation, item => { item.active = false; }); @@ -112,8 +112,8 @@ } } - var resizeCallback = function(size) { - if(size && size.width) { + var resizeCallback = size => { + if (size && size.width) { calculateVisibleItems(size.width); } }; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js index 6f34cfc0a1..c07777ca60 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js @@ -25,13 +25,12 @@ scope.memberOptions.entityType = "MEMBER"; scope.hasMemberReferences = false; - function onInit() { - userService.getCurrentUser().then(function(user){ + userService.getCurrentUser().then(user => { // only allow change of media type if user has access to the settings sections - angular.forEach(user.sections, function(section){ - if(section.alias === "settings") { + Utilities.forEach(user.sections, section => { + if (section.alias === "settings") { scope.allowChangeMediaType = true; } }); @@ -52,7 +51,7 @@ function formatDatesToLocal() { // get current backoffice user and format dates - userService.getCurrentUser().then(function (currentUser) { + userService.getCurrentUser().then(currentUser => { scope.node.createDateFormatted = dateHelper.getLocalDate(scope.node.createDate, currentUser.locale, 'LLL'); scope.node.updateDateFormatted = dateHelper.getLocalDate(scope.node.updateDate, currentUser.locale, 'LLL'); }); @@ -73,20 +72,20 @@ scope.node.extension = mediaHelper.getFileExtension(scope.nodeUrl); } - scope.openMediaType = function (mediaType) { + scope.openMediaType = mediaType => { var editor = { id: mediaType.id, - submit: function(model) { + submit: model => { editorService.close(); }, - close: function() { + close: () => { editorService.close(); } }; editorService.mediaTypeEditor(editor); }; - scope.openSVG = function () { + scope.openSVG = () => { var popup = window.open('', '_blank'); var html = '' + ''; @@ -136,7 +135,7 @@ function loadMediaRelations() { return mediaResource.getPagedReferences(scope.node.id, scope.mediaOptions) - .then(function (data) { + .then(data => { scope.mediaReferences = data; scope.hasMediaReferences = data.items.length > 0; }); @@ -144,7 +143,7 @@ function loadMemberRelations() { return mediaResource.getPagedReferences(scope.node.id, scope.memberOptions) - .then(function (data) { + .then(data => { scope.memberReferences = data; scope.hasMemberReferences = data.items.length > 0; }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js index ef463e6d95..f36fbc7ea8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js @@ -115,7 +115,7 @@ } // onLoad callbacks - angular.forEach(opts.callbacks, function(cb) { + Utilities.forEach(opts.callbacks, cb => { if (Utilities.isFunction(cb)) { cb(acee); } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js index 9a841e3e4a..47441326d7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js @@ -126,14 +126,14 @@ Use this directive to render a ui component for selecting child items to a paren scope.dialogModel = {}; scope.showDialog = false; - scope.removeChild = function(selectedChild, $index) { - if(scope.onRemove) { + scope.removeChild = (selectedChild, $index) => { + if (scope.onRemove) { scope.onRemove(selectedChild, $index); } }; - scope.addChild = function($event) { - if(scope.onAdd) { + scope.addChild = $event => { + if (scope.onAdd) { scope.onAdd($event); } }; @@ -141,16 +141,16 @@ Use this directive to render a ui component for selecting child items to a paren function syncParentName() { // update name on available item - angular.forEach(scope.availableChildren, function(availableChild){ - if(availableChild.id === scope.parentId) { - availableChild.name = scope.parentName; + Utilities.forEach(scope.availableChildren, availableChild => { + if (availableChild.id === scope.parentId) { + availableChild.name = scope.parentName; } }); // update name on selected child - angular.forEach(scope.selectedChildren, function(selectedChild){ - if(selectedChild.id === scope.parentId) { - selectedChild.name = scope.parentName; + Utilities.forEach(scope.selectedChildren, selectedChild => { + if (selectedChild.id === scope.parentId) { + selectedChild.name = scope.parentName; } }); @@ -159,16 +159,16 @@ Use this directive to render a ui component for selecting child items to a paren function syncParentIcon() { // update icon on available item - angular.forEach(scope.availableChildren, function(availableChild){ - if(availableChild.id === scope.parentId) { - availableChild.icon = scope.parentIcon; + Utilities.forEach(scope.availableChildren, availableChild => { + if (availableChild.id === scope.parentId) { + availableChild.icon = scope.parentIcon; } }); // update icon on selected child - angular.forEach(scope.selectedChildren, function(selectedChild){ - if(selectedChild.id === scope.parentId) { - selectedChild.icon = scope.parentIcon; + Utilities.forEach(scope.selectedChildren, selectedChild => { + if (selectedChild.id === scope.parentId) { + selectedChild.icon = scope.parentIcon; } }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js index fcc02f53a2..bf03749faa 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js @@ -91,7 +91,7 @@ } // update selected items - angular.forEach(scope.selectedItems, function (selectedItem) { + Utilities.forEach(scope.selectedItems, selectedItem => { if (selectedItem.placeholder) { selectedItem.name = scope.name; @@ -99,12 +99,11 @@ if (scope.alias !== null && scope.alias !== undefined) { selectedItem.alias = scope.alias; } - } }); // update availableItems - angular.forEach(scope.availableItems, function (availableItem) { + Utilities.forEach(scope.availableItems, availableItem => { if (availableItem.placeholder) { availableItem.name = scope.name; @@ -112,7 +111,6 @@ if (scope.alias !== null && scope.alias !== undefined) { availableItem.alias = scope.alias; } - } }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 06e1c61f1e..f09d815ae0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -25,7 +25,7 @@ // set placeholder property on each group if (scope.model.groups.length !== 0) { - angular.forEach(scope.model.groups, function (group) { + Utilities.forEach(scope.model.groups, group => { addInitProperty(group); }); } @@ -34,14 +34,16 @@ addInitGroup(scope.model.groups); activateFirstGroup(scope.model.groups); + + var labelKeys = [ + "validation_validation", + "contentTypeEditor_tabHasNoSortOrder" + ]; // localize texts - localizationService.localize("validation_validation").then(function (value) { - validationTranslated = value; - }); - - localizationService.localize("contentTypeEditor_tabHasNoSortOrder").then(function (value) { - tabNoSortOrderTranslated = value; + localizationService.localizeMany(labelKeys).then(data => { + validationTranslated = data[0]; + tabNoSortOrderTranslated = data[1]; }); } @@ -129,7 +131,6 @@ // store this tabs sort order as reference for the next prevSortOrder = group.sortOrder; - } }); @@ -179,12 +180,11 @@ function updatePropertiesSortOrder() { - angular.forEach(scope.model.groups, function (group) { + Utilities.forEach(scope.model.groups, group => { if (group.tabState !== "init") { group.properties = contentTypeHelper.updatePropertiesSortOrder(group.properties); } }); - } function setupAvailableContentTypesModel(result) { @@ -242,7 +242,6 @@ scope.sortingMode = true; scope.sortingButtonKey = "general_reorderDone"; - } }; @@ -254,20 +253,19 @@ compositeContentTypes: scope.model.compositeContentTypes, view: "views/common/infiniteeditors/compositions/compositions.html", size: "small", - submit: function () { + submit: () => { // make sure that all tabs has an init property if (scope.model.groups.length !== 0) { - angular.forEach(scope.model.groups, function (group) { + Utilities.forEach(scope.model.groups, group => { addInitProperty(group); }); } // remove overlay editorService.close(); - }, - close: function (oldModel) { + close: oldModel => { // reset composition changes scope.model.groups = oldModel.contentType.groups; @@ -277,7 +275,7 @@ editorService.close(); }, - selectCompositeContentType: function (selectedContentType) { + selectCompositeContentType: selectedContentType => { var deferred = $q.defer(); @@ -291,7 +289,7 @@ //use a different resource lookup depending on the content type type var resourceLookup = scope.contentType === "documentType" ? contentTypeResource.getById : mediaTypeResource.getById; - resourceLookup(selectedContentType.id).then(function (composition) { + resourceLookup(selectedContentType.id).then(composition => { //based on the above filtering we shouldn't be able to select an invalid one, but let's be safe and // double check here. var overlappingAliases = contentTypeHelper.validateAddingComposition(scope.model, composition); @@ -414,7 +412,7 @@ scope.activateGroup = function (selectedGroup) { // set all other groups that are inactive to active - angular.forEach(scope.model.groups, function (group) { + Utilities.forEach(scope.model.groups, group => { // skip init tab if (group.tabState !== "init") { group.tabState = "inActive"; @@ -452,7 +450,7 @@ // check i init tab already exists var addGroup = true; - angular.forEach(groups, function (group) { + Utilities.forEach(groups, group => { if (group.tabState === "init") { addGroup = false; } @@ -653,7 +651,7 @@ }; // check if there already is an init property - angular.forEach(group.properties, function (property) { + Utilities.forEach(group.properties, property => { if (property.propertyState === "init") { addInitPropertyBool = false; } @@ -669,8 +667,8 @@ function updateSameDataTypes(newProperty) { // find each property - angular.forEach(scope.model.groups, function (group) { - angular.forEach(group.properties, function (property) { + Utilities.forEach(scope.model.groups, group => { + Utilities.forEach(group.properties, property => { if (property.dataTypeId === newProperty.dataTypeId) { @@ -681,9 +679,7 @@ property.dataTypeId = newProperty.dataTypeId; property.dataTypeIcon = newProperty.dataTypeIcon; property.dataTypeName = newProperty.dataTypeName; - } - }); }); } @@ -691,8 +687,8 @@ function hasPropertyOfDataTypeId(dataTypeId) { // look at each property - var result = _.filter(scope.model.groups, function (group) { - return _.filter(group.properties, function (property) { + var result = _.filter(scope.model.groups, group => { + return _.filter(group.properties, property => { return (property.dataTypeId === dataTypeId); }); }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js index f7b634a710..b6ba1aaedb 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminilistview.directive.js @@ -135,11 +135,11 @@ var found = false; scope.listViewAnimation = "out"; - angular.forEach(miniListViewsHistory, function(historyItem, index){ + Utilities.forEach(miniListViewsHistory, (historyItem, index) => { // We need to make sure we can compare the two id's. // Some id's are integers and others are strings. // Members have string ids like "all-members". - if(historyItem.node.id.toString() === ancestor.id.toString()) { + if (historyItem.node.id.toString() === ancestor.id.toString()) { // load the list view from history scope.miniListViews = []; scope.miniListViews.push(historyItem); @@ -149,7 +149,7 @@ } }); - if(!found) { + if (!found) { // if we can't find the view in the history - close the list view scope.exitMiniListView(); } @@ -161,7 +161,7 @@ scope.showBackButton = function() { // don't show the back button if the start node is a list view - if(scope.node.metaData && scope.node.metaData.IsContainer || scope.node.isContainer) { + if (scope.node.metaData && scope.node.metaData.IsContainer || scope.node.isContainer) { return false; } else { return true; @@ -178,7 +178,7 @@ function makeBreadcrumb() { scope.breadcrumb = []; - angular.forEach(miniListViewsHistory, function(historyItem){ + Utilities.forEach(miniListViewsHistory, historyItem => { scope.breadcrumb.push(historyItem.node); }); } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js index f9b26c81a5..5c8ef162fa 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnestedcontent.directive.js @@ -15,7 +15,7 @@ var selectedTab = $scope.model.variants[0].tabs[0]; if ($scope.tabAlias) { - angular.forEach($scope.model.variants[0].tabs, function (tab) { + Utilities.forEach($scope.model.variants[0].tabs, tab => { if (tab.alias.toLowerCase() === $scope.tabAlias.toLowerCase()) { selectedTab = tab; return; @@ -33,20 +33,19 @@ $scope.$broadcast("formSubmitting", { scope: $scope }); // Sync the values back - angular.forEach($scope.ngModel.variants[0].tabs, function (tab) { + Utilities.forEach($scope.ngModel.variants[0].tabs, tab => { if (tab.alias.toLowerCase() === selectedTab.alias.toLowerCase()) { - var localPropsMap = selectedTab.properties.reduce(function (map, obj) { + var localPropsMap = selectedTab.properties.reduce((map, obj) => { map[obj.alias] = obj; return map; }, {}); - angular.forEach(tab.properties, function (prop) { + Utilities.forEach(tab.properties, prop => { if (localPropsMap.hasOwnProperty(prop.alias)) { prop.value = localPropsMap[prop.alias].value; } }); - } }); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js index 79dfee059e..d80b884dab 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js @@ -64,8 +64,7 @@ angular.module("umbraco.directives") function _filesQueued(files, event) { //Push into the queue - angular.forEach(files, - function(file) { + Utilities.forEach(files, file => { if (_filterFile(file) === true) { @@ -81,7 +80,7 @@ angular.module("umbraco.directives") if (!scope.working) { // Upload not allowed if (!scope.acceptedMediatypes || !scope.acceptedMediatypes.length) { - files.map(function(file) { + files.map(file => { file.uploadStatus = "error"; file.serverErrorMessage = "File type is not allowed here"; scope.rejected.push(file); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js index d43282715e..9381940c74 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/disabletabindex.directive.js @@ -29,7 +29,7 @@ angular.module("umbraco.directives") var childInputs = tabbableService.tabbable(mutation.target); //For each item in childInputs - override or set HTML attribute tabindex="-1" - angular.forEach(childInputs, function (element) { + Utilities.forEach(childInputs, element => { $(element).attr('tabindex', '-1'); }); } diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js index 0b743d0f10..3d8653386f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js @@ -62,7 +62,7 @@ angular.module('umbraco.directives') var found = false; // check if any element has focus - angular.forEach(listItems, function (item, index) { + Utilities.forEach(listItems, (item, index) => { if ($(item).is(":focus")) { // if an element already has focus set the // currentIndex so we navigate from that element diff --git a/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js b/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js index 16ced17075..c6aceeb9e0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/retryqueue.service.js @@ -21,7 +21,7 @@ push: function (retryItem) { retryQueue.push(retryItem); // Call all the onItemAdded callbacks - angular.forEach(service.onItemAddedCallbacks, function (cb) { + Utilities.forEach(service.onItemAddedCallbacks, cb => { try { cb(retryItem); } catch (e) { diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 534b60c120..e497b1ff7f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -88,9 +88,9 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource evts.push(eventsService.on("appState.tour.complete", function (name, completedTour) { $timeout(function(){ - angular.forEach(vm.tours, function (tourGroup) { - angular.forEach(tourGroup, function (tour) { - if(tour.alias === completedTour.alias) { + Utilities.forEach(vm.tours, tourGroup => { + Utilities.forEach(tourGroup, tour => { + if (tour.alias === completedTour.alias) { tour.completed = true; } }); @@ -100,24 +100,24 @@ function startUpDynamicContentController($q, $timeout, $scope, dashboardResource //proxy remote css through the local server assetsService.loadCss(dashboardResource.getRemoteDashboardCssUrl("content"), $scope); - dashboardResource.getRemoteDashboardContent("content").then( - function (data) { - vm.loading = false; + dashboardResource.getRemoteDashboardContent("content").then(data => { - //test if we have received valid data - //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code - if (data && data.sections) { - vm.dashboard = data; - } else { - vm.showDefault = true; - } - }, - function (exception) { - console.error(exception); - vm.loading = false; + vm.loading = false; + + //test if we have received valid data + //we capture it like this, so we avoid UI errors - which automatically triggers ui based on http response code + if (data && data.sections) { + vm.dashboard = data; + } else { vm.showDefault = true; - }); + } + }, + function (exception) { + console.error(exception); + vm.loading = false; + vm.showDefault = true; + }); onInit(); diff --git a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js index c9dde30c4f..0c9f8f3154 100644 --- a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js +++ b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js @@ -81,7 +81,7 @@ angular.mock.$Browser = function () { self.defer.cancel = function (deferId) { var fnIndex; - angular.forEach(self.deferredFns, function (fn, index) { + Utilities.forEach(self.deferredFns, function (fn, index) { if (fn.id === deferId) fnIndex = index; }); @@ -141,7 +141,7 @@ angular.mock.$Browser.prototype = { * run all fns in pollFns */ poll: function poll() { - angular.forEach(this.pollFns, function (pollFn) { + Utilities.forEach(this.pollFns, function (pollFn) { pollFn(); }); }, @@ -388,9 +388,9 @@ angular.mock.$LogProvider = function () { */ $log.assertEmpty = function () { var errors = []; - angular.forEach(['error', 'warn', 'info', 'log'], function (logLevel) { - angular.forEach($log[logLevel].logs, function (log) { - angular.forEach(log, function (logItem) { + Utilities.forEach(['error', 'warn', 'info', 'log'], function (logLevel) { + Utilities.forEach($log[logLevel].logs, function (log) { + Utilities.forEach(log, function (logItem) { errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' + (logItem.stack || '')); }); }); @@ -598,7 +598,7 @@ angular.mock.$LogProvider = function () { 'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString', 'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf']; - angular.forEach(unimplementedMethods, function (methodName) { + Utilities.forEach(unimplementedMethods, function (methodName) { self[methodName] = function () { throw Error("Method '" + methodName + "' is not implemented in the TzDate mock"); }; @@ -688,13 +688,13 @@ angular.mock.dump = function (object) { if (angular.isElement(object)) { object = $(object); out = $('
    '); - angular.forEach(object, function (element) { + Utilities.forEach(object, function (element) { out.append($(element).clone()); }); out = out.html(); } else if (Utilities.isArray(object)) { out = []; - angular.forEach(object, function (o) { + Utilities.forEach(object, function (o) { out.push(serialize(o)); }); out = '[ ' + out.join(', ') + ' ]'; @@ -1343,13 +1343,13 @@ function createHttpBackendMock($rootScope, $delegate, $browser) { function createShortMethods(prefix) { - angular.forEach(['GET', 'DELETE', 'JSONP'], function (method) { + Utilities.forEach(['GET', 'DELETE', 'JSONP'], function (method) { $httpBackend[prefix + method] = function (url, headers) { return $httpBackend[prefix](method, url, undefined, headers) } }); - angular.forEach(['PUT', 'POST', 'PATCH'], function (method) { + Utilities.forEach(['PUT', 'POST', 'PATCH'], function (method) { $httpBackend[prefix + method] = function (url, data, headers) { return $httpBackend[prefix](method, url, data, headers) } @@ -1425,7 +1425,7 @@ function MockXhr() { if (header) return header; header = undefined; - angular.forEach(this.$$respHeaders, function (headerVal, headerName) { + Utilities.forEach(this.$$respHeaders, function (headerVal, headerName) { if (!header && headerName.toLowerCase() == name) header = headerVal; }); return header; @@ -1434,7 +1434,7 @@ function MockXhr() { this.getAllResponseHeaders = function () { var lines = []; - angular.forEach(this.$$respHeaders, function (value, key) { + Utilities.forEach(this.$$respHeaders, function (value, key) { lines.push(key + ': ' + value); }); return lines.join('\n'); @@ -1723,7 +1723,7 @@ window.jstestdriver && (function (window) { */ window.dump = function () { var args = []; - angular.forEach(arguments, function (arg) { + Utilities.forEach(arguments, function (arg) { args.push(angular.mock.dump(arg)); }); jstestdriver.console.log.apply(jstestdriver.console, args); @@ -1757,13 +1757,13 @@ window.jstestdriver && (function (window) { angular.mock.clearDataCache(); // clean up jquery's fragment cache - angular.forEach(angular.element.fragments, function (val, key) { + Utilities.forEach(angular.element.fragments, function (val, key) { delete angular.element.fragments[key]; }); MockXhr.$$lastInstance = null; - angular.forEach(angular.callbacks, function (val, key) { + Utilities.forEach(angular.callbacks, function (val, key) { delete angular.callbacks[key]; }); angular.callbacks.counter = 0; @@ -1798,7 +1798,7 @@ window.jstestdriver && (function (window) { throw Error('Injector already created, can not register a module!'); } else { var modules = currentSpec.$modules || (currentSpec.$modules = []); - angular.forEach(moduleFns, function (module) { + Utilities.forEach(moduleFns, function (module) { modules.push(module); }); } From d9555ea57cfd6e4b8605ca50cd6480a01615d8f8 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 2 Aug 2021 00:31:41 +0200 Subject: [PATCH 25/92] Update noUiSlider to v15.2.0 (#10319) * Upgrade to noUiSlider v15.1.1 * Configurate on drag event * Update nouislider dependencies * Update description * Upgrade to latest noUISlider v15.2.0 --- src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js | 6 +++--- src/Umbraco.Web.UI.Client/package.json | 2 +- .../directives/components/umbrangeslider.directive.js | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js index b5339b60c9..7c4abcf50c 100644 --- a/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js +++ b/src/Umbraco.Web.UI.Client/gulp/tasks/dependencies.js @@ -207,10 +207,10 @@ function dependencies() { { "name": "nouislider", "src": [ - "./node_modules/nouislider/distribute/nouislider.min.js", - "./node_modules/nouislider/distribute/nouislider.min.css" + "./node_modules/nouislider/dist/nouislider.min.js", + "./node_modules/nouislider/dist/nouislider.min.css" ], - "base": "./node_modules/nouislider/distribute" + "base": "./node_modules/nouislider/dist" }, { "name": "signalr", diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 45411fad26..1221728a26 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -41,7 +41,7 @@ "lazyload-js": "1.0.0", "moment": "2.22.2", "ng-file-upload": "12.2.13", - "nouislider": "14.6.4", + "nouislider": "15.2.0", "npm": "^6.14.7", "signalr": "2.4.0", "spectrum-colorpicker2": "2.0.8", diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js index ed74f94f26..d5c791281c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbrangeslider.directive.js @@ -52,6 +52,7 @@ For extra details about options and events take a look here: https://refreshless @param {callback} onSlide (callback): onSlide gets triggered when the handle is being dragged. @param {callback} onSet (callback): onSet will trigger every time a slider stops changing. @param {callback} onChange (callback): onChange fires when a user stops sliding, or when a slider value is changed by 'tap'. +@param {callback} onDrag (callback): onDrag fires when a connect element between handles is being dragged, while ignoring other updates to the slider values. @param {callback} onStart (callback): onStart fires when a handle is clicked (mousedown, or the equivalent touch events). @param {callback} onEnd (callback): onEnd fires when a handle is released (mouseup etc), or when a slide is canceled due to other reasons. **/ @@ -71,6 +72,7 @@ For extra details about options and events take a look here: https://refreshless onSlide: '&?', onSet: '&?', onChange: '&?', + onDrag: '&?', onStart: '&?', onEnd: '&?' } @@ -181,6 +183,15 @@ For extra details about options and events take a look here: https://refreshless }); } + // bind hook for drag + if (ctrl.onDrag) { + sliderInstance.noUiSlider.on('drag', function (values, handle, unencoded, tap, positions) { + $timeout(function () { + ctrl.onDrag({ values: values, handle: handle, unencoded: unencoded, tap: tap, positions: positions }); + }); + }); + } + // bind hook for start if (ctrl.onStart) { sliderInstance.noUiSlider.on('start', function (values, handle, unencoded, tap, positions) { From 050cdd2bb040ed54e8fcb396fa2ba9fd3944baf9 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 2 Aug 2021 00:32:54 +0200 Subject: [PATCH 26/92] Update icon in member group picker (#10094) * Use member group icon as default icon * Make pickers consistent using member group entity icon * Remove unused functions * Use vm * Use original getSelected() function * Include clear function again * Fix merge conflict * Remove comment - remove function is requested from in view * Remove comment - wasn't used, but intend to use in PR 10096 to use property actions to clear member group picker --- .../membergrouppicker.controller.js | 32 +++++++------------ .../membergrouppicker/membergrouppicker.html | 17 +++++----- .../membergroups/membergroups.controller.js | 10 ++++-- .../membergroups/membergroups.html | 8 ++--- .../Models/Mapping/MemberMapDefinition.cs | 1 + 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js index 5362cb1f10..e64633ea31 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.controller.js @@ -2,6 +2,12 @@ //with a specified callback, this callback will receive an object with a selection on it function memberGroupPicker($scope, editorService, memberGroupResource){ + var vm = this; + + vm.openMemberGroupPicker = openMemberGroupPicker; + vm.remove = remove; + vm.clear = clear; + function trim(str, chr) { var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g'); return str.replace(rgxtrim, ''); @@ -24,7 +30,7 @@ function memberGroupPicker($scope, editorService, memberGroupResource){ } } - $scope.openMemberGroupPicker = function() { + function openMemberGroupPicker() { var memberGroupPicker = { multiPicker: true, submit: function (model) { @@ -52,31 +58,17 @@ function memberGroupPicker($scope, editorService, memberGroupResource){ } }; editorService.memberGroupPicker(memberGroupPicker); - }; + } - // TODO: I don't believe this is used - $scope.remove = function(index){ + function remove(index) { $scope.renderModel.splice(index, 1); setDirty(); - }; + } - // TODO: I don't believe this is used - $scope.add = function (item) { - var currIds = _.map($scope.renderModel, function (i) { - return i.id; - }); - - if (currIds.indexOf(item) < 0) { - $scope.renderModel.push({ name: item, id: item, icon: 'icon-users' }); - setDirty(); - } - }; - - // TODO: I don't believe this is used - $scope.clear = function() { + function clear() { $scope.renderModel = []; setDirty(); - }; + } function renderModelIds() { return _.map($scope.renderModel, function (i) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html index 5a0788149e..e644fac29d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergrouppicker/membergrouppicker.html @@ -1,17 +1,18 @@ -
    +
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js index 2213841ece..af22f6c800 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.controller.js @@ -1,4 +1,10 @@ function memberGroupController($scope, editorService, memberGroupResource) { + + var vm = this; + + vm.pickGroup = pickGroup; + vm.removeGroup = removeGroup; + //set the selected to the keys of the dictionary who's value is true $scope.getSelected = function () { var selected = []; @@ -16,7 +22,7 @@ } } - $scope.pickGroup = function() { + function pickGroup() { editorService.memberGroupPicker({ multiPicker: true, submit: function (model) { @@ -39,7 +45,7 @@ }); } - $scope.removeGroup = function (group) { + function removeGroup(group) { $scope.model.value[group] = false; setDirty(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html index abfa628e90..81b9f9d30b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/membergroups/membergroups.html @@ -1,15 +1,15 @@ -
    +
    + on-remove="vm.removeGroup(group)"> diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs index f86e7eb1fc..dcbe6b7534 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs @@ -143,6 +143,7 @@ namespace Umbraco.Web.Models.Mapping // Umbraco.Code.MapAll -Icon -Trashed -ParentId -Alias private void Map(IMemberGroup source, MemberGroupDisplay target, MapperContext context) { + target.Icon = Constants.Icons.MemberGroup; target.Id = source.Id; target.Key = source.Key; target.Name = source.Name; From d537545fa9f4c9899afe681778c2080bb6852864 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 27 Jul 2021 20:05:47 +0200 Subject: [PATCH 27/92] Use umb-icon component in user history --- .../src/views/common/overlays/user/user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html index 2de04a0147..e284a10556 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html @@ -86,13 +86,13 @@
    -
    From d40e503c824939d69842580e24021438f4d85132 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Mon, 2 Aug 2021 01:26:30 +0200 Subject: [PATCH 28/92] V8: Fix JS error when using the hide search function in treepicker (#6931) * Fix JS error when using the hide search function in treepicker * updates with same defensive change from original pr - only explores child.children after confirming the child indeed has children Co-authored-by: Nathan Woulfe --- .../common/infiniteeditors/treepicker/treepicker.controller.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js index 0c5fe9af1b..ed5c4096bc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js @@ -574,6 +574,8 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController", var listViewResults = vm.searchInfo.selectedSearchResults.filter(i => i.parentId === child.id); listViewResults.forEach(item => { + if (!child.children) return; + var childExists = child.children.find(c => c.id === item.id); if (!childExists) { From d11b79421d4bbc55e135952e91aed1053b7abaa6 Mon Sep 17 00:00:00 2001 From: Zeegaan <70372949+Zeegaan@users.noreply.github.com> Date: Wed, 4 Aug 2021 09:46:01 +0200 Subject: [PATCH 29/92] fixed a bug where validation didnt update properly adressed in https://github.com/umbraco/Umbraco-CMS/pull/10688 --- .../Controllers/MemberController.cs | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs index 6cada09db3..d8ee3126a4 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs @@ -368,7 +368,45 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (created.Succeeded == false) { - return ValidationProblem(created.Errors.ToErrorMessage()); + MemberDisplay forDisplay = _umbracoMapper.Map(contentItem.PersistedContent); + foreach (IdentityError error in created.Errors) + { + switch (error.Code) + { + case nameof(IdentityErrorDescriber.InvalidUserName): + ModelState.AddPropertyError( + new ValidationResult(error.Description, new[] { "value" }), + string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case nameof(IdentityErrorDescriber.PasswordMismatch): + case nameof(IdentityErrorDescriber.PasswordRequiresDigit): + case nameof(IdentityErrorDescriber.PasswordRequiresLower): + case nameof(IdentityErrorDescriber.PasswordRequiresNonAlphanumeric): + case nameof(IdentityErrorDescriber.PasswordRequiresUniqueChars): + case nameof(IdentityErrorDescriber.PasswordRequiresUpper): + case nameof(IdentityErrorDescriber.PasswordTooShort): + ModelState.AddPropertyError( + new ValidationResult(error.Description, new[] { "value" }), + string.Format("{0}password", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case nameof(IdentityErrorDescriber.InvalidEmail): + ModelState.AddPropertyError( + new ValidationResult(error.Description, new[] { "value" }), + string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case nameof(IdentityErrorDescriber.DuplicateUserName): + ModelState.AddPropertyError( + new ValidationResult(error.Description, new[] { "value" }), + string.Format("{0}login", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + case nameof(IdentityErrorDescriber.DuplicateEmail): + ModelState.AddPropertyError( + new ValidationResult(error.Description, new[] { "value" }), + string.Format("{0}email", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + break; + } + } + return ValidationProblem(forDisplay, ModelState); } // now re-look up the member, which will now exist From 96d593593381c48f57b0201a686957c1a37bddbb Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 4 Aug 2021 14:19:34 +0200 Subject: [PATCH 30/92] Revert "Accessibility improvements for Extensions in Razor Markup (#9576)" This reverts commit a1e0af6fff971af3270b6292b0be38a6988d3a70. --- .../Models/PublishedContent/Fallback.cs | 6 -- .../PublishedContentLanguageVariantTests.cs | 8 +-- .../PublishedValueFallback.cs | 65 +++---------------- 3 files changed, 9 insertions(+), 70 deletions(-) diff --git a/src/Umbraco.Core/Models/PublishedContent/Fallback.cs b/src/Umbraco.Core/Models/PublishedContent/Fallback.cs index 805f14d21b..0434218555 100644 --- a/src/Umbraco.Core/Models/PublishedContent/Fallback.cs +++ b/src/Umbraco.Core/Models/PublishedContent/Fallback.cs @@ -71,11 +71,5 @@ namespace Umbraco.Core.Models.PublishedContent { return GetEnumerator(); } - - public const int DisplayFallbackLanguage = 4; - /// - /// Gets the fallback to tree ancestors policy. - /// - public static Fallback ToDisplayFallbackLanguage => new Fallback(new[] { DisplayFallbackLanguage }); } } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs index 05cf8d01c1..636f8502ed 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentLanguageVariantTests.cs @@ -235,13 +235,7 @@ namespace Umbraco.Tests.PublishedContent var value = content.Value("welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.Ancestors)); Assert.AreEqual("Welcome", value); } - [Test] - public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_And_Language_Change() - { - var content = Current.UmbracoContext.Content.GetAtRoot().First(); - var value = content.Value("welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.DisplayFallbackLanguage)); - Assert.AreEqual("Welcome", value); - } + [Test] public void Do_Not_GetContent_For_Unpopulated_Requested_Language_With_Fallback_Over_That_Loops() { diff --git a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs index b5901fef69..57c3094eaf 100644 --- a/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs +++ b/src/Umbraco.Web/Models/PublishedContent/PublishedValueFallback.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; -using System.Web.Mvc; using Umbraco.Core; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; @@ -37,8 +35,6 @@ namespace Umbraco.Web.Models.PublishedContent { _variationContextAccessor.ContextualizeVariation(property.PropertyType.Variations, ref culture, ref segment); - var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); - foreach (var f in fallback) { switch (f) @@ -49,11 +45,9 @@ namespace Umbraco.Web.Models.PublishedContent value = defaultValue; return true; case Fallback.Language: - if (TryGetValueWithLanguageFallback(property, culture, segment, out value, includeFallbackLanguage)) + if (TryGetValueWithLanguageFallback(property, culture, segment, out value)) return true; break; - case Fallback.DisplayFallbackLanguage: - continue; default: throw NotSupportedFallbackMethod(f, "property"); } @@ -73,7 +67,6 @@ namespace Umbraco.Web.Models.PublishedContent public bool TryGetValue(IPublishedElement content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value) { var propertyType = content.ContentType.GetPropertyType(alias); - var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); if (propertyType == null) { value = default; @@ -92,11 +85,9 @@ namespace Umbraco.Web.Models.PublishedContent value = defaultValue; return true; case Fallback.Language: - if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value, includeFallbackLanguage)) + if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value)) return true; break; - case Fallback.DisplayFallbackLanguage: - continue; default: throw NotSupportedFallbackMethod(f, "element"); } @@ -116,7 +107,6 @@ namespace Umbraco.Web.Models.PublishedContent public virtual bool TryGetValue(IPublishedContent content, string alias, string culture, string segment, Fallback fallback, T defaultValue, out T value, out IPublishedProperty noValueProperty) { noValueProperty = default; - var includeFallbackLanguage = fallback.Contains(Fallback.DisplayFallbackLanguage); var propertyType = content.ContentType.GetPropertyType(alias); if (propertyType != null) @@ -141,15 +131,13 @@ namespace Umbraco.Web.Models.PublishedContent case Fallback.Language: if (propertyType == null) continue; - if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value, includeFallbackLanguage)) + if (TryGetValueWithLanguageFallback(content, alias, culture, segment, out value)) return true; break; case Fallback.Ancestors: - if (TryGetValueWithAncestorsFallback(content, alias, culture, segment, out value, ref noValueProperty, includeFallbackLanguage)) + if (TryGetValueWithAncestorsFallback(content, alias, culture, segment, out value, ref noValueProperty)) return true; break; - case Fallback.DisplayFallbackLanguage: - continue; default: throw NotSupportedFallbackMethod(f, "content"); } @@ -167,10 +155,9 @@ namespace Umbraco.Web.Models.PublishedContent // tries to get a value, recursing the tree // because we recurse, content may not even have the a property with the specified alias (but only some ancestor) // in case no value was found, noValueProperty contains the first property that was found (which does not have a value) - private bool TryGetValueWithAncestorsFallback(IPublishedContent content, string alias, string culture, string segment, out T value, ref IPublishedProperty noValueProperty, bool includeFallbackLanguage) + private bool TryGetValueWithAncestorsFallback(IPublishedContent content, string alias, string culture, string segment, out T value, ref IPublishedProperty noValueProperty) { IPublishedProperty property; // if we are here, content's property has no value - var originalCulture = culture; do { content = content.Parent; @@ -196,10 +183,6 @@ namespace Umbraco.Web.Models.PublishedContent if (property != null && property.HasValue(culture, segment)) { value = property.Value(culture, segment); - if (includeFallbackLanguage && originalCulture != culture) - { - value = GetMarkUpForFallbackLanguage(culture, value); - } return true; } @@ -208,7 +191,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedProperty property, string culture, string segment, out T value, bool includeFallbackLanguage) + private bool TryGetValueWithLanguageFallback(IPublishedProperty property, string culture, string segment, out T value) { value = default; @@ -234,10 +217,6 @@ namespace Umbraco.Web.Models.PublishedContent if (property.HasValue(culture2, segment)) { value = property.Value(culture2, segment); - if (includeFallbackLanguage && culture2 != culture) - { - value = GetMarkUpForFallbackLanguage(culture2, value); - } return true; } @@ -246,7 +225,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedElement content, string alias, string culture, string segment, out T value, bool includeFallbackLanguage) + private bool TryGetValueWithLanguageFallback(IPublishedElement content, string alias, string culture, string segment, out T value) { value = default; @@ -272,10 +251,6 @@ namespace Umbraco.Web.Models.PublishedContent if (content.HasValue(alias, culture2, segment)) { value = content.Value(alias, culture2, segment); - if (includeFallbackLanguage && culture2 != culture) - { - value = GetMarkUpForFallbackLanguage(culture2, value); - } return true; } @@ -284,7 +259,7 @@ namespace Umbraco.Web.Models.PublishedContent } // tries to get a value, falling back onto other languages - private bool TryGetValueWithLanguageFallback(IPublishedContent content, string alias, string culture, string segment, out T value, bool includeFallbackLanguage) + private bool TryGetValueWithLanguageFallback(IPublishedContent content, string alias, string culture, string segment, out T value) { value = default; @@ -313,35 +288,11 @@ namespace Umbraco.Web.Models.PublishedContent if (content.HasValue(alias, culture2, segment)) { value = content.Value(alias, culture2, segment); - if (includeFallbackLanguage && culture2 != culture) - { - value = GetMarkUpForFallbackLanguage(culture2, value); - - } return true; } language = language2; } } - - private T GetMarkUpForFallbackLanguage(string culture2, T value) - { - var typeOfT = typeof(T); - if (value is string) - { - var newValue = "" + value + ""; - return (T)Convert.ChangeType(newValue, typeof(T)); - } - else if (typeOfT == typeof(IHtmlString)) - { - // we want to return a block element here since the IHtmlString could contain futher block elements - var newValue = "
    " + value + "
    "; - IHtmlString htmlString = new MvcHtmlString(newValue); - return (T)htmlString; - } - - return value; - } } } From 14fc72ff2bd85538cc36bab7f013d3738a97d06f Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 5 Aug 2021 09:50:58 +0200 Subject: [PATCH 31/92] Reverting ConcurrentHashSet for now so that Umbraco can install again, see #10751 --- .../Collections/ConcurrentHashSet.cs | 109 +++++++++++++++--- src/umbraco.sln.DotSettings | 1 + 2 files changed, 93 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Core/Collections/ConcurrentHashSet.cs b/src/Umbraco.Core/Collections/ConcurrentHashSet.cs index 0424c4dae1..c4dba51acd 100644 --- a/src/Umbraco.Core/Collections/ConcurrentHashSet.cs +++ b/src/Umbraco.Core/Collections/ConcurrentHashSet.cs @@ -1,8 +1,8 @@ using System; using System.Collections; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; +using System.Threading; namespace Umbraco.Core.Collections { @@ -14,10 +14,9 @@ namespace Umbraco.Core.Collections [Serializable] public class ConcurrentHashSet : ICollection { - // Internally we just use a ConcurrentDictionary with the same value for the Value (since we don't actually care about the value) - private static readonly byte _emptyValue = 0x0; - private readonly ConcurrentDictionary _innerSet = new ConcurrentDictionary(); - + private readonly HashSet _innerSet = new HashSet(); + private readonly ReaderWriterLockSlim _instanceLocker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion); + /// /// Returns an enumerator that iterates through the collection. /// @@ -27,7 +26,7 @@ namespace Umbraco.Core.Collections /// 1 public IEnumerator GetEnumerator() { - return _innerSet.Keys.GetEnumerator(); + return GetThreadSafeClone().GetEnumerator(); } /// @@ -51,7 +50,16 @@ namespace Umbraco.Core.Collections /// The object to remove from the .The is read-only. public bool Remove(T item) { - return _innerSet.TryRemove(item, out _); + try + { + _instanceLocker.EnterWriteLock(); + return _innerSet.Remove(item); + } + finally + { + if (_instanceLocker.IsWriteLockHeld) + _instanceLocker.ExitWriteLock(); + } } @@ -66,7 +74,17 @@ namespace Umbraco.Core.Collections { get { - return _innerSet.Count; + try + { + _instanceLocker.EnterReadLock(); + return _innerSet.Count; + } + finally + { + if (_instanceLocker.IsReadLockHeld) + _instanceLocker.ExitReadLock(); + } + } } @@ -81,10 +99,19 @@ namespace Umbraco.Core.Collections /// /// Adds an item to the . /// - /// The object to add to the . + /// The object to add to the .The is read-only. public void Add(T item) { - _innerSet.TryAdd(item, _emptyValue); + try + { + _instanceLocker.EnterWriteLock(); + _innerSet.Add(item); + } + finally + { + if (_instanceLocker.IsWriteLockHeld) + _instanceLocker.ExitWriteLock(); + } } /// @@ -94,7 +121,21 @@ namespace Umbraco.Core.Collections /// public bool TryAdd(T item) { - return _innerSet.TryAdd(item, _emptyValue); + if (Contains(item)) return false; + try + { + _instanceLocker.EnterWriteLock(); + + //double check + if (_innerSet.Contains(item)) return false; + _innerSet.Add(item); + return true; + } + finally + { + if (_instanceLocker.IsWriteLockHeld) + _instanceLocker.ExitWriteLock(); + } } /// @@ -103,7 +144,16 @@ namespace Umbraco.Core.Collections /// The is read-only. public void Clear() { - _innerSet.Clear(); + try + { + _instanceLocker.EnterWriteLock(); + _innerSet.Clear(); + } + finally + { + if (_instanceLocker.IsWriteLockHeld) + _instanceLocker.ExitWriteLock(); + } } /// @@ -115,7 +165,16 @@ namespace Umbraco.Core.Collections /// The object to locate in the . public bool Contains(T item) { - return _innerSet.ContainsKey(item); + try + { + _instanceLocker.EnterReadLock(); + return _innerSet.Contains(item); + } + finally + { + if (_instanceLocker.IsReadLockHeld) + _instanceLocker.ExitReadLock(); + } } /// @@ -124,8 +183,24 @@ namespace Umbraco.Core.Collections /// The one-dimensional that is the destination of the elements copied from the . The array must have zero-based indexing.The zero-based index in at which copying begins. is a null reference (Nothing in Visual Basic). is less than zero. is equal to or greater than the length of the -or- The number of elements in the source is greater than the available space from to the end of the destination . public void CopyTo(T[] array, int index) { - var keys = _innerSet.Keys; - keys.CopyTo(array, index); + var clone = GetThreadSafeClone(); + clone.CopyTo(array, index); + } + + private HashSet GetThreadSafeClone() + { + HashSet clone = null; + try + { + _instanceLocker.EnterReadLock(); + clone = new HashSet(_innerSet, _innerSet.Comparer); + } + finally + { + if (_instanceLocker.IsReadLockHeld) + _instanceLocker.ExitReadLock(); + } + return clone; } /// @@ -134,8 +209,8 @@ namespace Umbraco.Core.Collections /// The one-dimensional that is the destination of the elements copied from . The must have zero-based indexing. The zero-based index in at which copying begins. is null. is less than zero. is multidimensional.-or- The number of elements in the source is greater than the available space from to the end of the destination . The type of the source cannot be cast automatically to the type of the destination . 2 public void CopyTo(Array array, int index) { - var keys = _innerSet.Keys; - Array.Copy(keys.ToArray(), 0, array, index, keys.Count); + var clone = GetThreadSafeClone(); + Array.Copy(clone.ToArray(), 0, array, index, clone.Count); } } } diff --git a/src/umbraco.sln.DotSettings b/src/umbraco.sln.DotSettings index 3d42d188af..bd8ca8b974 100644 --- a/src/umbraco.sln.DotSettings +++ b/src/umbraco.sln.DotSettings @@ -1,4 +1,5 @@  + True <data><IncludeFilters /><ExcludeFilters /></data> <data /> Disposable construction From 6a12f4af9033d3ab58e9aa1102449045ba511c7f Mon Sep 17 00:00:00 2001 From: Rowan Bottema Date: Thu, 5 Aug 2021 11:10:58 +0200 Subject: [PATCH 32/92] Update Serilog dependencies This should at least fix #10793 because of a memory leak fix in Serilog.Sinks.Map 1.0.2. Also updated the rest for good measure. Note that Serilog.Sinks.File is not upgraded to the latest version because it is a new major (4.1.0 -> 5.0.0). Also note that Serilog.Filters.Expressions is deprecated and should be replaced by Serilog.Expressions. I considered both out of scope for this fix. --- build/NuSpecs/UmbracoCms.Core.nuspec | 16 ++++++++-------- src/Umbraco.Core/Umbraco.Core.csproj | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index fce15eb487..c94def143b 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -32,16 +32,16 @@ - + - - - - + + + + - - - + + + diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 5dfcd14469..146197c4f8 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -67,10 +67,10 @@ all - 1.3.0 + 1.5.0 - 1.0.0 + 1.0.2 1.0.5 @@ -94,28 +94,28 @@ - 2.8.0 + 2.10.0 2.0.1 - 3.0.0 + 3.1.0 - 2.0.0 + 2.1.0 - 1.0.0 + 1.1.0 - 1.0.3 + 1.0.5 2.2.2 - 4.0.0 + 4.1.0 From 7800fe83a8978440be9debc6800d1403f8fdfc0b Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 5 Aug 2021 11:57:03 +0200 Subject: [PATCH 33/92] Install MessagePack's dependencies explicitly (#10772) --- build/NuSpecs/UmbracoCms.Web.nuspec | 4 ++++ build/NuSpecs/tools/Web.config.install.xdt | 17 ++++++++++++++++- src/Umbraco.Tests/App.config | 14 +++++++++++++- src/Umbraco.Web.UI/web.Template.config | 15 +++++++++++++-- src/Umbraco.Web/Umbraco.Web.csproj | 12 ++++++++++++ 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec index 7aebfae108..04b9905f9d 100644 --- a/build/NuSpecs/UmbracoCms.Web.nuspec +++ b/build/NuSpecs/UmbracoCms.Web.nuspec @@ -41,7 +41,11 @@ + + + + diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt index e215bdbf29..fe5b7db704 100644 --- a/build/NuSpecs/tools/Web.config.install.xdt +++ b/build/NuSpecs/tools/Web.config.install.xdt @@ -131,6 +131,9 @@ + + + @@ -153,7 +156,7 @@ - + @@ -171,6 +174,18 @@ + + + + + + + + + + + + diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 4af04827e3..c8e8fdac11 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -76,7 +76,7 @@ - + @@ -98,6 +98,18 @@ + + + + + + + + + + + + diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index c6b1eb686c..e61c6585ad 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -236,7 +236,7 @@ - + @@ -258,7 +258,18 @@ - + + + + + + + + + + + + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index e830722cc7..316f5def8e 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -101,6 +101,18 @@ all + + 4.5.1 + + + 4.5.4 + + + 4.5.0 + + + 1.7.1 + 1.0.5 From a7c0edec288c62ce996fd85226831a39e88df33d Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 5 Aug 2021 15:05:03 +0200 Subject: [PATCH 34/92] Support custom SVG icons in user groups list (#10739) --- .../infiniteeditors/usergrouppicker/usergrouppicker.html | 4 ++-- .../views/components/users/umb-user-group-preview.html | 8 ++++---- .../src/views/users/views/groups/groups.html | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html index 252c1b7cd5..dbddb141dd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/usergrouppicker/usergrouppicker.html @@ -18,7 +18,7 @@
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html index 20718cf804..db0c6c86c3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html @@ -1,7 +1,7 @@
    - - - + + +
    {{ name }}
    @@ -20,7 +20,7 @@ {{ contentStartNode.name }}
    - +
    Media start node: diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html index 46923dd27d..106a8c8454 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html @@ -81,8 +81,8 @@ ng-class="{'-selected': group.selected, '-selectable': group.hasAccess && !group.isSystemUserGroup}">
    - - + +
    Date: Thu, 5 Aug 2021 15:22:23 +0200 Subject: [PATCH 35/92] Tour backdrop missing (#10762) --- .../components/tree/umbtree.directive.js | 16 ++-------------- .../src/common/services/backdrop.service.js | 14 +++++++------- .../src/common/services/navigation.service.js | 18 ++++++++++++------ .../src/common/services/overlay.service.js | 7 ++++++- .../components/application/umb-backdrop.html | 2 +- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js index 7868f79809..4512494202 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js @@ -3,7 +3,7 @@ * @name umbraco.directives.directive:umbTree * @restrict E **/ -function umbTreeDirective($q, $rootScope, treeService, notificationsService, userService, backdropService) { +function umbTreeDirective($q, treeService, navigationService, notificationsService) { return { restrict: 'E', @@ -318,18 +318,6 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use } } - // Close any potential backdrop and remove the #leftcolumn modifier class - function closeBackdrop() { - var aboveClass = 'above-backdrop'; - var leftColumn = $('#leftcolumn'); - var isLeftColumnOnTop = leftColumn.hasClass(aboveClass); - - if(isLeftColumnOnTop){ - backdropService.close(); - leftColumn.removeClass(aboveClass); - } - } - /** Returns the css classses assigned to the node (div element) */ $scope.getNodeCssClass = function (node) { if (!node) { @@ -370,7 +358,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use */ $scope.select = function (n, ev) { - closeBackdrop() + navigationService.closeBackdrop(); if (n.metaData && n.metaData.noAccess === true) { ev.preventDefault(); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js b/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js index 4f977cb1b2..e628e48306 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/backdrop.service.js @@ -35,11 +35,11 @@ */ function open(options) { - if(options && options.element) { + if (options && options.element) { args.element = options.element; } - if(options && options.disableEventsOnClick) { + if (options && options.disableEventsOnClick) { args.disableEventsOnClick = options.disableEventsOnClick; } @@ -58,11 +58,11 @@ * */ function close() { - args.opacity = null, - args.element = null, - args.elementPreventClick = false, - args.disableEventsOnClick = false, - args.show = false + args.opacity = null; + args.element = null; + args.elementPreventClick = false; + args.disableEventsOnClick = false; + args.show = false; eventsService.emit("appState.backdrop", args); } diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index c628e3a5b1..bba44a94a0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -118,19 +118,25 @@ function navigationService($routeParams, $location, $q, $injector, eventsService } function closeBackdrop() { - var aboveClass = 'above-backdrop'; - var leftColumn = $('#leftcolumn'); - var isLeftColumnOnTop = leftColumn.hasClass(aboveClass); - if(isLeftColumnOnTop){ + var tourIsOpen = document.body.classList.contains("umb-tour-is-visible"); + if (tourIsOpen) { + return; + } + + var aboveClass = "above-backdrop"; + var leftColumn = document.getElementById("leftcolumn"); + var isLeftColumnOnTop = leftColumn.classList.contains(aboveClass); + + if (isLeftColumnOnTop) { backdropService.close(); - leftColumn.removeClass(aboveClass); + leftColumn.classList.remove(aboveClass); } } function showBackdrop() { var backDropOptions = { - 'element': $('#leftcolumn')[0] + 'element': document.getElementById('leftcolumn') }; backdropService.open(backDropOptions); } diff --git a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js index ea05dad4e7..8a965f2c78 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/overlay.service.js @@ -51,7 +51,12 @@ function close() { focusLockService.removeInertAttribute(); - backdropService.close(); + + var tourIsOpen = document.body.classList.contains("umb-tour-is-visible"); + if (!tourIsOpen) { + backdropService.close(); + } + currentOverlay = null; eventsService.emit("appState.overlay", null); } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html index da1f61ee4a..1ff3960ae9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/application/umb-backdrop.html @@ -10,7 +10,7 @@
    -
    +
    From 4513a85d14d7fda505f8c792d4082ff764314af9 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 27 Jul 2021 20:31:31 +0200 Subject: [PATCH 36/92] Only set umb-button-ellipsis opacity to 1 when above backdrop --- .../less/components/buttons/umb-button-ellipsis.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less index 7104e6478f..b6acb2f6cf 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-button-ellipsis.less @@ -1,4 +1,4 @@ -.umb-button-ellipsis{ +.umb-button-ellipsis { padding: 0 5px; text-align: center; margin: 0 auto; @@ -28,13 +28,13 @@ } .umb-button-ellipsis--tab, - .umb-tour-is-visible .umb-tree &, + .umb-tour-is-visible .umb-tree .umb-tree-item.above-backdrop &, &:hover, - &:focus{ + &:focus { opacity: 1; } - &--hidden{ + &--hidden { opacity: 0; &:hover, @@ -55,7 +55,7 @@ .umb-button-ellipsis--tab & { margin: 0 0 7px; - } + } .umb-button-ellipsis--small & { font-size: 8px; From 120bc2af115f904dc07b74fa00fd61ca46218832 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 5 Aug 2021 15:57:14 +0200 Subject: [PATCH 37/92] Examine dashboard search adjustments (#10735) --- .../forms/umbsearchfilter.directive.js | 21 +++++++ .../components/application/umb-search.less | 2 +- .../src/less/utilities/_spacing.less | 8 +++ .../blockpicker/blockpicker.html | 2 +- .../components/forms/umb-search-filter.html | 2 + .../settings/examinemanagement.controller.js | 2 +- .../dashboard/settings/examinemanagement.html | 55 ++++++++++++------- 7 files changed, 68 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js index 2e9f15913c..5eb22dcecd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbsearchfilter.directive.js @@ -40,6 +40,8 @@ vm.$onInit = onInit; vm.change = change; + vm.keyDown = keyDown; + vm.blur = blur; function onInit() { vm.inputId = vm.inputId || "umb-search-filter_" + String.CreateGuid(); @@ -63,6 +65,23 @@ }, 0); } } + + function blur() { + if (vm.onBlur) { + vm.onBlur(); + } + } + + function keyDown(evt) { + //13: enter + switch (evt.keyCode) { + case 13: + if (vm.onSearch) { + vm.onSearch(); + } + break; + } + } } var component = { @@ -76,6 +95,8 @@ text: "@", labelKey: "@?", onChange: "&?", + onSearch: "&?", + onBlur: "&?", autoFocus: "
    - + +
    @@ -59,7 +61,7 @@
    - +
    @@ -116,15 +118,19 @@
    -
    -
    - +
    +
    - +
    + + +
    - + +
    @@ -256,14 +264,19 @@
    -
    -
    - - +
    +
    + +
    + + +
    Date: Thu, 5 Aug 2021 16:09:14 +0200 Subject: [PATCH 38/92] Amending fix for #10739 --- .../src/views/components/users/umb-user-group-preview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html index db0c6c86c3..003ea7ff76 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html @@ -1,6 +1,6 @@
    - +
    {{ name }}
    From ea42063424df734f2a0a7c3f7af86f1357845301 Mon Sep 17 00:00:00 2001 From: jattwood Date: Tue, 3 Aug 2021 12:10:38 -0400 Subject: [PATCH 39/92] Fix for #10678. --- src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs | 2 +- src/Umbraco.Web/Security/BackOfficeUserManager.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs index d2899caccc..6ceb2e1c96 100644 --- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs +++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs @@ -259,7 +259,7 @@ namespace Umbraco.Core.Models.Identity { get { - var isLocked = LockoutEndDateUtc.HasValue && LockoutEndDateUtc.Value.ToLocalTime() >= DateTime.Now; + var isLocked = LockoutEndDateUtc.HasValue && LockoutEndDateUtc.Value.ToLocalTime() > DateTime.Now; return isLocked; } } diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs index f91c128cde..4980e04bd1 100644 --- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs +++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs @@ -500,7 +500,7 @@ namespace Umbraco.Web.Security var result = await base.SetLockoutEndDateAsync(userId, lockoutEnd); // The way we unlock is by setting the lockoutEnd date to the current datetime - if (result.Succeeded && lockoutEnd >= DateTimeOffset.UtcNow) + if (result.Succeeded && lockoutEnd > DateTimeOffset.UtcNow) { RaiseAccountLockedEvent(userId); } From d55b740b16faf8b8faaffa533ee5130371ae6169 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 5 Aug 2021 17:05:37 +0200 Subject: [PATCH 40/92] Fix possible null result in #10762 --- .../src/common/services/navigation.service.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index bba44a94a0..b2f66b176b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -30,7 +30,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService var element = $(args.element); element.addClass('above-backdrop'); }); - + //A list of query strings defined that when changed will not cause a reload of the route var nonRoutingQueryStrings = ["mculture", "cculture", "csegment", "lq", "sr"]; @@ -126,11 +126,14 @@ function navigationService($routeParams, $location, $q, $injector, eventsService var aboveClass = "above-backdrop"; var leftColumn = document.getElementById("leftcolumn"); - var isLeftColumnOnTop = leftColumn.classList.contains(aboveClass); - if (isLeftColumnOnTop) { - backdropService.close(); - leftColumn.classList.remove(aboveClass); + if(leftColumn !== null) { + var isLeftColumnOnTop = leftColumn.classList.contains(aboveClass); + + if (isLeftColumnOnTop) { + backdropService.close(); + leftColumn.classList.remove(aboveClass); + } } } @@ -334,7 +337,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService appState.setGlobalState("showTray", false); }, - /** + /** * @ngdoc method * @name umbraco.services.navigationService#syncTree * @methodOf umbraco.services.navigationService @@ -367,14 +370,14 @@ function navigationService($routeParams, $location, $q, $injector, eventsService }); }, - /** + /** * @ngdoc method * @name umbraco.services.navigationService#hasTree * @methodOf umbraco.services.navigationService * * @description * Checks if a tree with the given alias exists. - * + * * @param {String} treeAlias the tree alias to check */ hasTree: function (treeAlias) { From 137be33a6cbf9a912ff2a17b059a124ec79394e1 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 6 Aug 2021 09:09:50 +0200 Subject: [PATCH 41/92] Fixes various issues with javascript services (#10800) --- .../common/directives/components/tree/umbtree.directive.js | 2 +- .../common/directives/util/umbkeyboardlist.directive.js | 7 +++---- .../src/common/services/navigation.service.js | 2 +- .../src/less/components/application/umb-search.less | 4 ++-- src/Umbraco.Web.UI.Client/src/utilities.js | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js index 4512494202..358223901e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js @@ -358,7 +358,7 @@ function umbTreeDirective($q, treeService, navigationService, notificationsServi */ $scope.select = function (n, ev) { - navigationService.closeBackdrop(); + navigationService.hideMenu(); if (n.metaData && n.metaData.noAccess === true) { ev.preventDefault(); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js index 3d8653386f..7658b4e043 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/util/umbkeyboardlist.directive.js @@ -32,20 +32,20 @@ angular.module('umbraco.directives') return { restrict: 'A', - link: function (scope, element, attr) { + link: function (scope, element) { var listItems = []; var currentIndex = 0; var focusSet = false; - $timeout(function(){ + $timeout(function() { // get list of all links in the list listItems = element.find("li :tabbable"); }); // Handle keydown events function keydown(event) { - $timeout(function(){ + $timeout(function() { checkFocus(); // arrow down if (event.keyCode === 40) { @@ -109,7 +109,6 @@ angular.module('umbraco.directives') // Stop listening when scope is destroyed. scope.$on('$destroy', stopListening); - } }; }]); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index b2f66b176b..0685baabe8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -127,7 +127,7 @@ function navigationService($routeParams, $location, $q, $injector, eventsService var aboveClass = "above-backdrop"; var leftColumn = document.getElementById("leftcolumn"); - if(leftColumn !== null) { + if(leftColumn) { var isLeftColumnOnTop = leftColumn.classList.contains(aboveClass); if (isLeftColumnOnTop) { diff --git a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less index 30c50b71b3..f0423e5d2e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/application/umb-search.less @@ -16,7 +16,7 @@ box-shadow: 0 10px 20px rgba(0,0,0,.12),0 6px 6px rgba(0,0,0,.14); } -.umb-search__label{ +.umb-search__label { margin: 0; } @@ -33,7 +33,7 @@ height: 70px; } -.umb-search-input { +input.umb-search-input { width: 100%; height: 70px; border: none; diff --git a/src/Umbraco.Web.UI.Client/src/utilities.js b/src/Umbraco.Web.UI.Client/src/utilities.js index abbc287e0f..14e37ecb87 100644 --- a/src/Umbraco.Web.UI.Client/src/utilities.js +++ b/src/Umbraco.Web.UI.Client/src/utilities.js @@ -110,7 +110,7 @@ * Not equivalent to angular.forEach. But like the angularJS method this does not fail on null or undefined. */ const forEach = (obj, iterator) => { - if (obj) { + if (obj && isArray(obj)) { return obj.forEach(iterator); } return obj; From 9f3eddf95f93f6a0d7cabf212110676f719f4e1d Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 6 Aug 2021 11:32:16 +0200 Subject: [PATCH 42/92] Refactor NPoco queries to use constants and dtos (#10654) --- src/Umbraco.Core/Persistence/Dtos/DictionaryDto.cs | 1 + .../Repositories/Implement/ContentTypeRepository.cs | 4 ++-- .../Repositories/Implement/DictionaryRepository.cs | 6 +++--- .../Repositories/Implement/DomainRepository.cs | 6 +++--- .../Implement/ExternalLoginRepository.cs | 2 +- .../Repositories/Implement/LanguageRepository.cs | 12 ++++++------ .../Repositories/Implement/MacroRepository.cs | 4 ++-- .../Repositories/Implement/MediaTypeRepository.cs | 2 +- .../Repositories/Implement/MemberGroupRepository.cs | 7 ++++--- .../Repositories/Implement/MemberRepository.cs | 4 +++- .../Repositories/Implement/MemberTypeRepository.cs | 2 +- .../Repositories/Implement/PublicAccessRepository.cs | 4 ++-- .../Repositories/Implement/RelationRepository.cs | 2 +- .../Repositories/Implement/RelationTypeRepository.cs | 2 +- .../Repositories/Implement/TemplateRepository.cs | 2 +- .../Repositories/Implement/UserGroupRepository.cs | 2 +- .../Repositories/Implement/UserRepository.cs | 2 +- 17 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Dtos/DictionaryDto.cs b/src/Umbraco.Core/Persistence/Dtos/DictionaryDto.cs index d357e9adbc..36d0d76c09 100644 --- a/src/Umbraco.Core/Persistence/Dtos/DictionaryDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/DictionaryDto.cs @@ -11,6 +11,7 @@ namespace Umbraco.Core.Persistence.Dtos internal class DictionaryDto { public const string TableName = Constants.DatabaseSchema.Tables.DictionaryEntry; + [Column("pk")] [PrimaryKeyColumn] public int PrimaryKey { get; set; } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs index 6571a847a9..0dcbc72fca 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs @@ -134,7 +134,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement if (objectTypes.Any()) { - sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", new { objectTypes = objectTypes }); + sql = sql.WhereIn(dto => dto.NodeObjectType, objectTypes); } return Database.Fetch(sql); @@ -173,7 +173,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoNode.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Node}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs index 0e3521f8bc..ac1f7c3f2a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs @@ -58,10 +58,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override IEnumerable PerformGetAll(params int[] ids) { - var sql = GetBaseQuery(false).Where("cmsDictionary.pk > 0"); + var sql = GetBaseQuery(false).Where(x => x.PrimaryKey > 0); if (ids.Any()) { - sql.Where("cmsDictionary.pk in (@ids)", new { /*ids =*/ ids }); + sql.WhereIn(x => x.PrimaryKey, ids); } return Database @@ -105,7 +105,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "cmsDictionary.pk = @id"; + return $"{Constants.DatabaseSchema.Tables.DictionaryEntry}.pk = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs index 9aa28fb18a..b49f3bf204 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs @@ -34,10 +34,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override IEnumerable PerformGetAll(params int[] ids) { - var sql = GetBaseQuery(false).Where("umbracoDomain.id > 0"); + var sql = GetBaseQuery(false).Where(x => x.Id > 0); if (ids.Any()) { - sql.Where("umbracoDomain.id in (@ids)", new { ids = ids }); + sql.WhereIn(x => x.Id, ids); } return Database.Fetch(sql).Select(ConvertFromDto); @@ -68,7 +68,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoDomain.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Domain}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs index ad53a2d522..55be1d7ba8 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs @@ -160,7 +160,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoExternalLogin.id = @id"; + return $"{Constants.DatabaseSchema.Tables.ExternalLogin}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs index a905294417..bd953b8d15 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs @@ -41,15 +41,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override IEnumerable PerformGetAll(params int[] ids) { - var sql = GetBaseQuery(false).Where("umbracoLanguage.id > 0"); + var sql = GetBaseQuery(false).Where(x => x.Id > 0); if (ids.Any()) { - sql.Where("umbracoLanguage.id in (@ids)", new { ids = ids }); + sql.WhereIn(x => x.Id, ids); } //this needs to be sorted since that is the way legacy worked - default language is the first one!! //even though legacy didn't sort, it should be by id - sql.OrderBy(dto => dto.Id); + sql.OrderBy(x => x.Id); // get languages var languages = Database.Fetch(sql).Select(ConvertFromDto).OrderBy(x => x.Id).ToList(); @@ -90,14 +90,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement ? sql.SelectCount() : sql.Select(); - sql - .From(); + sql.From(); + return sql; } protected override string GetBaseWhereClause() { - return "umbracoLanguage.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Language}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs index 1f0b45614b..154801769c 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs @@ -28,7 +28,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement public IMacro Get(Guid id) { - var sql = GetBaseQuery().Where("uniqueId=@Id", new { Id = id }); + var sql = GetBaseQuery().Where(x => x.UniqueId == id); return GetBySql(sql); } @@ -115,7 +115,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "cmsMacro.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Macro}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs index 512011b52c..1351141c13 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs @@ -89,7 +89,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoNode.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Node}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs index edd6dc0ebb..05186f5841 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs @@ -38,7 +38,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement .Where(dto => dto.NodeObjectType == NodeObjectTypeId); if (ids.Any()) - sql.Where("umbracoNode.id in (@ids)", new { /*ids =*/ ids }); + sql.WhereIn(x => x.NodeId, ids); return Database.Fetch(sql).Select(x => MemberGroupFactory.BuildEntity(x)); } @@ -118,7 +118,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement public IMemberGroup Get(Guid uniqueId) { var sql = GetBaseQuery(false); - sql.Where("umbracoNode.uniqueId = @uniqueId", new { uniqueId }); + sql.Where(x => x.UniqueId == uniqueId); var dto = Database.Fetch(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault(); @@ -257,7 +257,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement .InnerJoin() .On(dto => dto.NodeId, dto => dto.MemberGroup) .Where(x => x.NodeObjectType == NodeObjectTypeId) - .Where("cmsMember2MemberGroup.Member in (@ids)", new { ids = memberIds }); + .WhereIn(x => x.Member, memberIds); var currentlyAssigned = Database.Fetch(assignedSql).ToArray(); @@ -271,6 +271,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement var found = currentlyAssigned.Where(x => x.MemberId == mId).ToArray(); var assignedRoles = found.Where(x => roleNames.Contains(x.RoleName, StringComparer.CurrentCultureIgnoreCase)).Select(x => x.RoleName); var nonAssignedRoles = roleNames.Except(assignedRoles, StringComparer.CurrentCultureIgnoreCase); + foreach (var toAssign in nonAssignedRoles) { var groupId = rolesForNames.First(x => x.Text.InvariantEquals(toAssign)).NodeId; diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs index 15c707c624..62f41aa727 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs @@ -437,9 +437,11 @@ namespace Umbraco.Core.Persistence.Repositories.Implement foreach (var batch in inGroups) { var memberIdBatch = batch.Select(x => x.Id); + var sql = Sql().SelectAll().From() .Where(dto => dto.MemberGroup == memberGroup.Id) - .Where("Member IN (@memberIds)", new { memberIds = memberIdBatch }); + .WhereIn(dto => dto.Member, memberIdBatch); + var memberIdsInGroup = Database.Fetch(sql) .Select(x => x.Member).ToArray(); diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs index c3b95dbd8f..6475732cc1 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs @@ -115,7 +115,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoNode.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Node}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs index 1dc7aa478d..4d3267f242 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs @@ -36,7 +36,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement if (ids.Any()) { - sql.Where("umbracoAccess.id IN (@ids)", new { ids }); + sql.WhereIn(x => x.Id, ids); } sql.OrderBy(x => x.NodeId); @@ -66,7 +66,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoAccess.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Access}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs index 592e112be1..d02478ac68 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs @@ -111,7 +111,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoRelation.id = @id"; + return $"{Constants.DatabaseSchema.Tables.Relation}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs index 623b55b6f8..66a148d03a 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs @@ -109,7 +109,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoRelationType.id = @id"; + return $"{Constants.DatabaseSchema.Tables.RelationType}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs index 2175780916..f26b7fa6ab 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs @@ -116,7 +116,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return Constants.DatabaseSchema.Tables.Node + ".id = @id"; + return $"{Constants.DatabaseSchema.Tables.Node}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs index 0a66e29147..b2391c572d 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs @@ -271,7 +271,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement protected override string GetBaseWhereClause() { - return "umbracoUserGroup.id = @id"; + return $"{Constants.DatabaseSchema.Tables.UserGroup}.id = @id"; } protected override IEnumerable GetDeleteClauses() diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs index 9bc0bbeb47..50eb2e6d0e 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs @@ -420,7 +420,7 @@ ORDER BY colName"; protected override string GetBaseWhereClause() { - return "umbracoUser.id = @id"; + return $"{Constants.DatabaseSchema.Tables.User}.id = @id"; } protected override IEnumerable GetDeleteClauses() From 9e12190b6fea738c5e8a8635c6960259f99543d4 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 6 Jul 2021 00:13:33 +0200 Subject: [PATCH 43/92] Fix localization of title attribute --- .../umb-property-info-button.html | 8 ++++++-- .../umbpropertyinfobutton.component.js | 11 ++++++++++- .../blocklist.blockconfiguration.overlay.html | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html index aca2858070..cb15a7ba93 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umb-property-info-button.html @@ -1,5 +1,9 @@ -
    + ng-click="vm.onMouseClick($event)" + ng-bind="vm.symbol"> + +
    + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js index e160071ea2..d4bd3729bd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-property-info-button/umbpropertyinfobutton.component.js @@ -10,24 +10,33 @@ transclude: true, bindings: { buttonTitle: "@?", + buttonTitleKey: "@?", symbol: "@?" } }); - function UmbPropertyInfoButtonController() { + function UmbPropertyInfoButtonController(localizationService) { var vm = this; + vm.show = false; vm.onMouseClick = function ($event) { vm.show = !vm.show; }; + vm.onMouseClickOutside = function ($event) { vm.show = false; }; vm.$onInit = function() { vm.symbol = vm.symbol || "i"; + + if (vm.buttonTitleKey) { + localizationService.localize(vm.buttonTitleKey).then(value => { + vm.buttonTitle = value; + }); + } }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html index 94d7d9810b..a15a2fda25 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html @@ -37,7 +37,9 @@
    - Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation. + + Overwrite how this block appears in the BackOffice UI. Pick a .html file containing your presentation. +
    From 8b40753f2c3de411fd5cf1b67ac3515662b70ea7 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 6 Aug 2021 11:59:41 +0200 Subject: [PATCH 44/92] Fix issue with show selected member types on init using treepicker (#10204) --- .../prevalueeditors/treepicker.controller.js | 4 +-- .../src/views/prevalueeditors/treepicker.html | 4 +-- src/Umbraco.Web/Editors/EntityController.cs | 25 ++++++++++--------- .../Models/Mapping/EntityMapDefinition.cs | 9 +++++-- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js index 1b490d86d3..7495d58780 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js @@ -26,7 +26,7 @@ angular.module('umbraco') if ($scope.model.value) { - if (Array.isArray($scope.model.value)) { + if (!Array.isArray($scope.model.value)) { $scope.ids = $scope.model.value.split(","); } else { $scope.ids.push($scope.model.value); @@ -49,7 +49,7 @@ angular.module('umbraco') }); } - $scope.openContentPicker = function () { + $scope.openTreePicker = function () { var treePicker = config; treePicker.section = config.type; diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html index 2fb2aab352..a543c6ad3a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html @@ -11,14 +11,14 @@ allow-remove="allowRemove" allow-edit="allowEdit" on-remove="remove($index)" - on-edit="openContentPicker()"> + on-edit="openTreePicker()">
    diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index 9399deb1e5..b6bef3fd96 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -29,8 +29,8 @@ using Umbraco.Web.Services; using Umbraco.Web.Trees; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; - using Constants = Umbraco.Core.Constants; + namespace Umbraco.Web.Editors { ///     @@ -456,7 +456,7 @@ namespace Umbraco.Web.Editors } //all udi types will need to be the same in this list so we'll determine by the first - //currently we only support GuidIdi for this method + //currently we only support GuidUdi for this method var guidUdi = ids[0] as GuidUdi; if (guidUdi != null) @@ -1132,16 +1132,17 @@ namespace Umbraco.Web.Editors } private static readonly string[] _postFilterSplitStrings = new[] - { - "=", - "==", - "!=", - "<>", - ">", - "<", - ">=", - "<=" - }; + { + "=", + "==", + "!=", + "<>", + ">", + "<", + ">=", + "<=" + }; + private static QueryCondition BuildQueryCondition(string postFilter) { var postFilterParts = postFilter.Split(_postFilterSplitStrings, 2, StringSplitOptions.RemoveEmptyEntries); diff --git a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs index 621487ae04..9b717c8380 100644 --- a/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs +++ b/src/Umbraco.Web/Models/Mapping/EntityMapDefinition.cs @@ -42,7 +42,6 @@ namespace Umbraco.Web.Models.Mapping target.Trashed = source.Trashed; target.Udi = Udi.Create(ObjectTypes.GetUdiType(source.NodeObjectType), source.Key); - if (source is IContentEntitySlim contentSlim) { source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias; @@ -152,6 +151,10 @@ namespace Umbraco.Web.Models.Mapping if (target.Icon.IsNullOrWhiteSpace()) { + if (source.NodeObjectType == Constants.ObjectTypes.Document) + target.Icon = Constants.Icons.Content; + if (source.NodeObjectType == Constants.ObjectTypes.Media) + target.Icon = Constants.Icons.Content; if (source.NodeObjectType == Constants.ObjectTypes.Member) target.Icon = Constants.Icons.Member; else if (source.NodeObjectType == Constants.ObjectTypes.DataType) @@ -160,6 +163,8 @@ namespace Umbraco.Web.Models.Mapping target.Icon = Constants.Icons.ContentType; else if (source.NodeObjectType == Constants.ObjectTypes.MediaType) target.Icon = Constants.Icons.MediaType; + else if (source.NodeObjectType == Constants.ObjectTypes.MemberType) + target.Icon = Constants.Icons.MemberType; else if (source.NodeObjectType == Constants.ObjectTypes.TemplateType) target.Icon = Constants.Icons.Template; } @@ -241,7 +246,7 @@ namespace Umbraco.Web.Models.Mapping switch (entity) { case IMemberEntitySlim memberEntity: - return memberEntity.ContentTypeIcon.IfNullOrWhiteSpace(Constants.Icons.Member); + return memberEntity.ContentTypeIcon; case IContentEntitySlim contentEntity: // NOTE: this case covers both content and media entities return contentEntity.ContentTypeIcon; From f4f635087920f1d7cd5eddbb5f0048a62974537c Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Fri, 6 Aug 2021 12:01:25 +0200 Subject: [PATCH 45/92] Use colorpicker plugin when plugins includes table plugin (#10523) --- .../src/common/services/tinymce.service.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 20e7ad665d..d44b10bb80 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -352,18 +352,22 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s return plugin.name; }); - //plugins that must always be active + // Plugins that must always be active plugins.push("autoresize"); plugins.push("noneditable"); + // Table plugin use color picker plugin in table properties + if (plugins.includes("table")) { + plugins.push("colorpicker"); + } + var modeTheme = ''; var modeInline = false; - - //Based on mode set - //classic = Theme: modern, inline: false - //inline = Theme: modern, inline: true, - //distraction-free = Theme: inlite, inline: true + // Based on mode set + // classic = Theme: modern, inline: false + // inline = Theme: modern, inline: true, + // distraction-free = Theme: inlite, inline: true switch (args.mode) { case "classic": modeTheme = "modern"; From 40d8e11ba74b9ad0bac6a508bcf36c36b596a159 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Fri, 6 Aug 2021 12:22:03 +0200 Subject: [PATCH 46/92] Match neutral cultures as Examine culture fields (#9305) --- src/Umbraco.Examine/ExamineExtensions.cs | 6 +++--- src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Examine/ExamineExtensions.cs b/src/Umbraco.Examine/ExamineExtensions.cs index d231a86f69..fb4ad59898 100644 --- a/src/Umbraco.Examine/ExamineExtensions.cs +++ b/src/Umbraco.Examine/ExamineExtensions.cs @@ -27,7 +27,7 @@ namespace Umbraco.Examine /// /// myFieldName_en-us will match the "en-us" /// - internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^([_\\w]+)_([a-z]{2}-[a-z0-9]{2,4})$", RegexOptions.Compiled); + internal static readonly Regex CultureIsoCodeFieldNameMatchExpression = new Regex("^(?[_\\w]+)_(?[a-z]{2,3}(-[a-z0-9]{2,4})?)$", RegexOptions.Compiled | RegexOptions.ExplicitCapture); private static bool _isConfigured = false; private static object _configuredInit = null; @@ -67,7 +67,7 @@ namespace Umbraco.Examine foreach (var field in allFields) { var match = CultureIsoCodeFieldNameMatchExpression.Match(field); - if (match.Success && match.Groups.Count == 3 && culture.InvariantEquals(match.Groups[2].Value)) + if (match.Success && culture.InvariantEquals(match.Groups["CultureName"].Value)) yield return field; } } @@ -85,7 +85,7 @@ namespace Umbraco.Examine foreach (var field in allFields) { var match = CultureIsoCodeFieldNameMatchExpression.Match(field); - if (match.Success && match.Groups.Count == 3 && culture.InvariantEquals(match.Groups[2].Value)) + if (match.Success && culture.InvariantEquals(match.Groups["CultureName"].Value)) { yield return field; //matches this culture field } diff --git a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs index 1e7b51aa14..4d8409754a 100644 --- a/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs +++ b/src/Umbraco.Examine/UmbracoFieldDefinitionCollection.cs @@ -73,13 +73,13 @@ namespace Umbraco.Examine return true; //before we use regex to match do some faster simple matching since this is going to execute quite a lot - if (!fieldName.Contains("_") || !fieldName.Contains("-")) + if (!fieldName.Contains("_")) return false; var match = ExamineExtensions.CultureIsoCodeFieldNameMatchExpression.Match(fieldName); - if (match.Success && match.Groups.Count == 3) + if (match.Success) { - var nonCultureFieldName = match.Groups[1].Value; + var nonCultureFieldName = match.Groups["FieldName"].Value; //check if there's a definition for this and if so return the field definition for the culture field based on the non-culture field if (base.TryGetValue(nonCultureFieldName, out var existingFieldDefinition)) { From 7030d5b170bf2c3e8701bde5a35a912d29ca41d7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 6 Aug 2021 12:44:10 +0200 Subject: [PATCH 47/92] Removes the `changeDocType` translations as this is no longer a feature in v8 (triggered by #10499) --- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/de.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 20 ------------------ .../Umbraco/config/lang/en_us.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/es.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml | 21 ------------------- src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml | 20 ------------------ src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml | 20 ------------------ .../Umbraco/config/lang/zh_tw.xml | 20 ------------------ 17 files changed, 341 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index a4710d1317..21e0ccb8e7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -185,26 +185,6 @@ Seřadit Historie (všechny jazyky) - - Abyste změnili typ dokumentu pro zvolený obsah, nejprve jej vyberte ze seznamu typů platných pro tohle umístění. - Pak potvrďte a/nebo pozměňte mapování vlastností z aktuálního typu na nový a dejte Uložit. - Obsah byl znovu publikován. - Aktuální vlastnost - Aktuální typ - Typ dokumentu nemůže být změněn, neboť neexistují alternativy platné pro toto umístění. - Typ dokumentu byl změněn - Mapování vlastností - Mapování na vlastnost - Nová šablona - Nový typ - nic - Obsah - Vybrat nový typ dokumentu - Typ dokumentu pro zvolený obsah byl úspěšně změněný na [new type] a následující vlastnosti byly namapovány: - na - Nelze dokončit mapování vlastností, neboť nejméně jedna z vlastností má definováno více než jedno mapování. - Jsou zobrazeny pouze alternativní typy platné pro aktuální umístění. - Nepodařilo se vytvořit složku pod rodičem s ID %0% Nepodařilo se vytvořit složku pod rodičem s názvem %0% diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml index 6f52c24034..802a3c3de6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml @@ -197,26 +197,6 @@ Arferu Hanes (pob amrywiad) - - Er mwyn newid y math o ddogfen ar gyfer y cynnwys dewiswyd, yn gyntaf dewiswch o'r rhestr o fathau dilys ar gyfer y lleoliad yma. - Wedyn cadarnhewch a/neu newid y mapiau priodweddau o'r math bresennol at yr un newydd, yna cliciwch Achub. - Mae'r cynnwys wedi'i ail-gyhoeddi. - Priodwedd Bresennol - Math bresennol - Ni ellir newid y fath o ddogfen gan nad oes dewisiadau amgen ar gyfer y lleoliad yma. Bydd dewis amgen yn ddilys os caniateir i'r dewis fod o dan rhiant yr eitem gynnwys sydd wedi'i ddewis ac fod caniatâd i bob eitem gynnwys blentyn sy'n bodoli eisoes i gael eu creu oddi'i tan. - Math o Ddogfen Wedi'i Newid - Mapio Priodweddau - Mapio i Briodwedd - Templed Newydd - Math Newydd - dim - Cynnwys - Dewis Math o Ddogfen Newydd - Mae'r math o ddogfen ar gyfer y cynnwys dewiswyd wedi cael ei newid yn llwyddiannus i [new type] ac mae'r priodweddau canlynol wedi'u mapio: - i - Ni ellir cwblhau mapio'r priodweddau gan fod gan un neu fwy o'r priodweddau fwy nag un map wedi'i ddiffinio. - Dim ond mathau amgen sy'n ddilys ar gyfer y lleoliad bresennol sydd yn ymddangos. - Methwyd creu ffolder o dan id rhiant %0% Methwyd creu ffolder o dan rhiant efo enw %0% diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index b23d674072..d3a5be2ebf 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -195,26 +195,6 @@ Brugerdefineret Historik (alle sprog) - - For at skifte det valgte indholds dokumenttype, skal du først vælge en ny dokumenttype, som er gyldig på denne placering. - Kontroller derefter, at alle egenskaber bliver overført rigtigt til den nye dokumenttype, og klik derefter på Gem. - Indholdet er blevet genudgivet. - Nuværende egenskab - Nuværende type - Du kan ikke skifte dokumenttype, da der ikke er andre gyldige dokumenttyper på denne placering. - Dokumenttype skiftet - Overfør egenskaber - Overfør til egenskab - Ny skabelon - Ny type - ingen - Indhold - Vælg ny dokumenttype - Dokumenttypen på detvalgte indhold blev skiftet til [new type], og følgende egenskaber blev overført: - til - Overførsel af egenskaber kunne ikke fuldføres, da en eller flere egenskaber er indstillet til at blive overført mere end én gang. - Kun andre dokumenttyper, der er gyldige på denne placering, vises. - Oprettelse af mappen under parent med ID %0% fejlede Oprettelse af mappen under parent med navnet %0% fejlede diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml index c4ff0812bd..cc74b19a15 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml @@ -181,26 +181,6 @@ Sortieren Verlauf (alle Variationen) - - Um den Typ des ausgewählten Dokuments zu ändern, wählen Sie bitte zunächst aus der Liste der an dieser Stelle erlaubten Dokumenttypen. - Im Anschluss bestätigen oder korrigieren Sie die Zuordnung der Eigenschaften und klicken Sie auf 'Speichern'. - Der Inhalt wurde neu veröffentlicht. - Derzeitige Eigenschaft - Derzeitiger Datentyp - Der Typ dieses Dokuments kann nicht geändert werden, da an dieser Stelle keine Alternativen zugelassen sind. Ein alternativer Dokumenttyp kann nur dann verwendet werden, wenn er unterhalb des diesem Dokument übergeordneten Elements angelegt werden darf. - Dokumenttyp geändert - Eigenschaften zuordnen - Dieser Eigenschaft zuordnen - Neue Vorlage - Neuer Typ - keiner - Inhalt - Neuen Dokumenttyp auswählen - Der Typ des ausgewählten Dokuments wurde erfolgreich zu [new type] geändert und die Eigenschaften wie folgend zugeordnet: - nach - Die Zuordnung der Eigenschaften kann nicht abgeschlossen werden, da mindestens eine Eigenschaft mehrfach zugeordnet werden soll. - Nur an dieser Stelle erlaubte Dokumenttypen werden angezeigt. - Es konnte kein Verzeichnis unter dem Knoten mit der ID %0% angelegt werden. Es konnte kein Verzeichnis unter dem Knoten mit dem Namen %0% angelegt werden. diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 0b1cd188ef..e05f786f13 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -189,26 +189,6 @@ Custom History (all variants) - - To change the Document Type for the selected content, first select from the list of valid types for this location. - Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. - The content has been re-published. - Current Property - Current type - The Document Type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. - Document Type Changed - Map Properties - Map to Property - New Template - New Type - none - Content - Select New Document Type - The Document Type of the selected content has been successfully changed to [new type] and the following properties mapped: - to - Could not complete property mapping as one or more properties have more than one mapping defined. - Only alternate types valid for the current location are displayed. - Failed to create a folder under parent with ID %0% Failed to create a folder under parent with name %0% diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 87ed1e5148..c74f7ef0de 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -192,26 +192,6 @@ Custom History (all variants) - - To change the Document Type for the selected content, first select from the list of valid types for this location. - Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. - The content has been re-published. - Current Property - Current type - The Document Type cannot be changed, as there are no alternatives valid for this location. An alternative will be valid if it is allowed under the parent of the selected content item and that all existing child content items are allowed to be created under it. - Document Type Changed - Map Properties - Map to Property - New Template - New Type - none - Content - Select New Document Type - The Document Type of the selected content has been successfully changed to [new type] and the following properties mapped: - to - Could not complete property mapping as one or more properties have more than one mapping defined. - Only alternate types valid for the current location are displayed. - Failed to create a folder under parent with ID %0% Failed to create a folder under parent with name %0% diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml index c2b7468523..2eb8cb10cb 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml @@ -133,26 +133,6 @@ Deshacer Rehacer - - Para cambiar el tipo de documento al contenido seleccionado, primero selecciona uno de la lista de tipos válidos. - Entonces confirma el mapeo de propiedades del tipo actual al nuevo y haz clic en Guardar. - El contenido se ha vuelto a publicar. - Propiedad actual - Tipo actual - El tipo de contenido no se puede cambiar, porque no hay alternativas válidas para este contenido. - Tipo de documento cambiado - Mapeo de propiedades - Mapea a la propiedad - Nueva plantilla - Nuevo tipo - ninguno - Contenido - Selecciona un nuevo Tipo de Documento - El tipo de documento del contenido seleccionado ha sido cambiado correctamente a [new type] y las siguientes propiedades mapeadas: - a - No se ha podido completar el mapeo de propiedades porque uno o más propiedades tienen más de un mapeo definido. - Solo se muestran otros tipos válidos para el contenido actual. - Está publicado Acerca de diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml index d40e3b35d7..d12631d716 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml @@ -183,26 +183,6 @@ Ordonner Historique (toutes variantes) - - Pour changer le type de document du contenu séléctionné, faites d'abord un choix dans la liste des types valides à cet endroit. - Puis confirmez et/ou modifiez la correspondance des propriétés du type actuel vers le nouveau, et cliquez sur Sauver. - Le contenu a été republié. - Propriété actuelle - Type actuel - Le type de document ne peut être changé car il n'y a pas d'alternative valide à cet endroit. Une alternative sera valide si elle est autorisée sous le parent du contenu sélectionné et si tous les éléments de contenu enfants existants peuvent être créés avec celle-ci. - Type de document modifié - Faire correspondre les propriétés - Faire correspondre à la propriété - Nouveau modèle - Nouveau type - aucun - Contenu - Choisir le nouveau Type de Document - Le type de document du contenu séléctionné a bien été changé en [new type] et les correspondances de propriétés suivantes effectuées : - en - Impossible de terminer la correspondance des propriétés car une ou plusieurs propriétés ont plus d'une correspondance définie. - Seuls les types de documents valides à cet endroit sont affichés. - Echec de la création d'un dossier sous le parent avec l'ID %0% Echec de la création d'un dossier sous le parent avec le nom %0% diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml index ac56649083..17c00f1966 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml @@ -91,26 +91,6 @@ スタイルの表示 表の挿入 - - ドキュメントタイプを変更するには、まず有効なドキュメントタイプのリストから選択します - 確認および現在のドキュメントタイプからのマッピングを割り当て、保存します。 - コンテントは再公開されています - 現在のプロパティ - 現在のドキュメントタイプ - 有効な代替タイプが存在しないため変更することができません。選択されたコンテントの親の下に許可されたドキュメントタイプへのみ変更ができます - ドキュメントタイプを変更しました - プロパティを割り当てる - 割り当てるプロパティ - 新しいテンプレート - 新しいドキュメントタイプ - なし - コンテント - ドキュメントタイプを変更する - 選択コンテンツのドキュメント タイプは、[新しいタイプ] に変更され、以下のプロパティがマップされました。 - から - 1つ以上のプロパティを割り当てられませんでした。プロパティが定義が重複しています - 有効なドキュメントタイプのみが表示されます - 公開されました このページについて diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index bd70a6d0f4..638e7aef2d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -89,26 +89,6 @@ Vis stiler Sett inn tabell - - For å endre det valge innholdets dokumenttype, velger du først en ny dokumenttype som er gyldig på gjeldende plassering. - Kontroller deretter at alle egenskaper blir overført riktig til den nye dokumenttypen og klikk på Lagre. - Innholdet har blitt republisert. - Nåværende egenskap - Nåværende type - Du kan ikke endre dokumenttype, ettersom det ikke er andre gyldige dokumenttyper på denne plasseringen. - Dokumenttype endret - Overfør egenskaper - Overfør til egenskap - Ny mal - Ny type - ingen - Innhold - Velg ny dokumenttype - Dokumenttypen på det valgte innhold ble endret til [new type], og følgende egenskaper ble overført: - til - Overføringen av egenskaper kunne ikke fullføres da en eller flere egenskaper er satt til å bli overført mer enn en gang. - Kun andre dokumenttyper som er gyldige for denne plasseringen vises. - Publisert Om siden diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml index 961dcaeb16..120b806b5f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml @@ -193,26 +193,6 @@ Indienen Indienen en sluiten - - Om het documenttype voor de geselecteerde inhoud te wijzigen, selecteert u eerst uit de lijst van geldige types voor deze locatie. - Bevestig en/of wijzig vervolgens de toewijzing van eigenschappen van het huidige naar het nieuwe type en klik op Opslaan. - De inhoud is opnieuw gepubliceerd. - Huidige eigenschap - Huidig type - Het documenttype kan niet worden gewijzigd, omdat er geen alternatieven geldig zijn voor deze locatie. - Documenttype gewijzigd - Eigenschappen toewijzen - Toewijzen aan eigenschap - Nieuw sjabloon - Nieuw type - geen - Inhoud - Selecteer nieuw documenttype - Het documenttype van de geselecteerde inhoud is succesvol gewijzigd naar [new type] en de volgende eigenschappen zijn toegekend: - aan - Toewijzen van eigenschappen kan niet worden afgerond, omdat één of meer eigenschappen meer dan één toewijzing hebben. - Alleen alternatieve types geldig voor de huidige locatie worden weergegeven. - Het maken van een map onder de bovenliggende map met ID %0% is mislukt Het maken van een map onder de bovenliggende map met de naam %0% is mislukt diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml index 4ac1a9ca04..2f691e3060 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml @@ -130,26 +130,6 @@ Cofnij Powtórz - - Aby zmienić typ dokumentu dla wybranej treści, najpierw wybierz typ z listy typów obowiązujących dla tej lokalizacji. - Następnie potwierdź i/lub zmień mapowanie właściwości z bieżącego typu do nowego i kliknij "Zapisz". - Treść została opublikowana ponownie. - Bieżąca właściwość - Bieżący typ - Typ dokumentu nie może być zmieniony, ponieważ nie istnieją obowiązujące alternatywy dla tej lokalizacji. Alternatywa będzie dostępna, jeśli będzie dozwolona pod rodzicem wybranego elementu zawartości i jeśli wszystkie istniejące dzieci elementu zawartości będą mieć pozwolenie na bycie tworzonym pod rodzicem. - Typ dokumentu został zmieniony - Mapuj Właściwości - Mapuj do Właściwości - Nowy Szablon - Nowy typ - Nic - Zawartość - Wybierz Nowy Typ Dokumentu - Typ dokumentu wybranej zawartości został zmieniony z powodzeniem do [new type] i następujące właściwości zostały zmapowane: - do - Nie można dokończyć mapowania właściwości, ponieważ jedna lub więcej właściwości mają zdefiniowane więcej niż jedno mapowanie. - Wyświetlane są tylko alternatywne typy obowiązujące dla obecnej lokalizacji. - Jest Opublikowany O tej stronie diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml index ffc088522d..0762290e7c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml @@ -163,27 +163,6 @@ Вставить таблицу Отменить - - Чтобы сменить тип документа для выбранного узла, сначала выберите тип из списка разрешенных для данного расположения. - Затем подтвердите и/или исправьте сопоставление свойств текущего типа документа свойствам нового и нажмите "Сохранить". - Документ переопубликован. - Текущее свойство - Текущий тип - Тип документа не может быть изменен, так как для данного расположения нет разрешенных альтернатив. - Альтернативный тип станет доступным, если его разрешить как тип, пригодный для создания дочерних узлов внутри родительского узла данного документа. - Тип документа изменен - Сопоставление свойств - Сопоставлено свойству - Новый шаблон - Новый тип - нет - Узел - Выберите новый тип документа - Тип документа выбранного узла успешно изменен на [new type] и следующие свойства были перенесены: - в - Невозможно закончить перенос свойств, так как одно или более свойства имеют больше чем одно сопоставление. - Показаны только допустимые для данного расположения альтернативные типы. - Вы не указали ни одного допустимого цвета diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml index d9fc485007..dccce31ec7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml @@ -141,26 +141,6 @@ Visa stil Infoga tabell - - För att ändra vald dokumenttyp, välj först i listan av giltiga typer för denna platsen. - Konfirmera sedan och/eller ändra mappningen av egenskaper från aktuell dokumenttyp till den nya, och klicka sedan på spara. - Innehållet har blivit publicerat på nytt - Aktuell egenskap - Aktuell typ - Dokumenttypen kan inte ändras, eftersom det inte finns några giltiga val för denna plats. - Dokumenttypen är ändrad - Mappningsegenskaper - Mappning till egenskap - Ny sidmall - Ny egenskap - ingen - Innehåll - Välj ny dokumenttyp - Dokumenttypen på valt innehåll har ändrats till [new type] utan problem och följande egenskaper är mappade: - till - Kunde inte slutföra egenskapsmappningen då en eller flera egenskaper har en eller flera mappningar definierade. - Enbart giltiga alternativa egenskaper visas för platsen - Du har inte konfigurerat några giltiga färger diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml index d59cf248fc..08f9c21001 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml @@ -190,26 +190,6 @@ Özel Geçmiş (tüm varyantlar) - - Seçilen içeriğin belge türünü değiştirmek için, önce bu konum için geçerli türler listesinden seçin. - Ardından, mevcut türden özellik eşlemesini onaylayın ve / veya yenisiyle değiştirin ve Kaydet'i tıklayın. - İçerik yeniden yayınlandı. - Mevcut Mülk - Mevcut tür - Bu konum için geçerli bir alternatif olmadığından belge türü değiştirilemez. Seçilen içerik öğesinin üst öğesi altında izin verilirse ve mevcut tüm alt içerik öğelerinin onun altında oluşturulmasına izin verilirse bir alternatif geçerli olacaktır. - Doküman Türü Değiştirildi - Harita Özellikleri - Mülke Eşle - Yeni Şablon - Yeni Tür - Hiçbiri - İçerik - Yeni Belge Türünü Seçin - Seçilen içeriğin belge türü başarıyla [yeni tür] olarak değiştirildi ve aşağıdaki özellikler eşlendi: - için - Bir veya daha fazla özelliğin tanımlanmış birden fazla eşlemesi olduğundan özellik eşlemesi tamamlanamadı. - Yalnızca mevcut konum için geçerli olan alternatif türler görüntülenir. - %0% kimliğine sahip ebeveyn altında klasör oluşturulamadı %0% adıyla ebeveyn altında klasör oluşturulamadı diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml index 57b90db4b3..ff0517e99a 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml @@ -96,26 +96,6 @@ 显示样式 插入表格 - - 要更改所选节点的文档类型，先在列表中选择合适的文档类型。 - 然后设置当前文档类型到新文档类型的各字段间的对应映射关系并保存。 - 内容已被重新发布 - 当前属性 - 当前类型 - 不能改变文档类型，因为没有可替代的类型。 - 文档类型已更改 - 要映射的字段 - 映射字段 - 新模板 - 新类型 - 无 - 内容 - 选择新的文档类型 - 选中文档的类型已被成功更改为[new type]，以下字段被映射： - 至 - 不能完成字段映射，因为存在一个字段映射至多字段的问题。 - 仅显示可作为替代的文档类型。 - 已发布 关于本页 diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index 16177f7ca3..cb496ca778 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -93,26 +93,6 @@ 顯示樣式 插入表格 - - 要更改所選節點的文檔類型，先在列表中選擇合適的文檔類型。 - 然後設置當前文檔類型到新文檔類型的各欄位間的對應映射關係並保存。 - 內容已被重新發佈 - 當前屬性 - 當前類型 - 不能改變文檔類型，因為沒有可替代的類型。 - 文檔類型已更改 - 要映射的欄位 - 映射欄位 - 新範本 - 新類型 - 無 - 內容 - 選擇新的文檔類型 - 選中文檔的類型已被成功更改為[new type]，以下欄位被映射： - 至 - 不能完成欄位映射，因為存在一個欄位映射至多欄位的問題。 - 僅顯示可作為替代的文檔類型。 - 已發表 關於本頁 From 0ebf8742c3f71a087cae72d3d50c88e7d884d6ac Mon Sep 17 00:00:00 2001 From: inetzo Date: Fri, 6 Aug 2021 12:53:35 +0200 Subject: [PATCH 48/92] UserService.SavedUserGroup event returns wrong list of AddedUsers (#10681) --- src/Umbraco.Core/Services/Implement/UserService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs index ca42d5878a..5dcd143498 100644 --- a/src/Umbraco.Core/Services/Implement/UserService.cs +++ b/src/Umbraco.Core/Services/Implement/UserService.cs @@ -857,8 +857,9 @@ namespace Umbraco.Core.Services.Implement var groupUsers = userGroup.HasIdentity ? _userRepository.GetAllInGroup(userGroup.Id).ToArray() : empty; var xGroupUsers = groupUsers.ToDictionary(x => x.Id, x => x); var groupIds = groupUsers.Select(x => x.Id).ToArray(); + var addedUserIds = userIds.Except(groupIds); - addedUsers = _userRepository.GetMany(userIds.Except(groupIds).ToArray()).Where(x => x.Id != 0).ToArray(); + addedUsers = addedUserIds.Count() > 0 ? _userRepository.GetMany(addedUserIds.ToArray()).Where(x => x.Id != 0).ToArray() : new IUser[] { }; removedUsers = groupIds.Except(userIds).Select(x => xGroupUsers[x]).Where(x => x.Id != 0).ToArray(); } From 51e6ff5cbffaf3ccda31da43047a146a08e827f3 Mon Sep 17 00:00:00 2001 From: Patrick de Mooij Date: Tue, 13 Jul 2021 21:17:28 +0200 Subject: [PATCH 49/92] Fix examine overview not working as expected --- .../dashboard/settings/examinemanagement.controller.js | 10 +++++----- .../views/dashboard/settings/examinemanagement.html | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js index 91c349d546..94e81afb8f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.controller.js @@ -166,17 +166,17 @@ function ExamineManagementController($http, $q, $timeout, umbRequestHelper, loca vm.searchResults.totalPages = Math.ceil(vm.searchResults.totalRecords / 20); // add URLs to edit well known entities _.each(vm.searchResults.results, function (result) { - var section = result.values["__IndexType"]; + var section = result.values["__IndexType"][0]; switch (section) { case "content": case "media": - result.editUrl = "/" + section + "/" + section + "/edit/" + result.values["__NodeId"]; - result.editId = result.values["__NodeId"]; + result.editUrl = "/" + section + "/" + section + "/edit/" + result.values["__NodeId"][0]; + result.editId = result.values["__NodeId"][0]; result.editSection = section; break; case "member": - result.editUrl = "/member/member/edit/" + result.values["__Key"]; - result.editId = result.values["__Key"]; + result.editUrl = "/member/member/edit/" + result.values["__Key"][0]; + result.editId = result.values["__Key"][0]; result.editSection = section; break; } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html index f74edc3524..d1162b61eb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/examinemanagement.html @@ -159,8 +159,8 @@ {{result.score}} {{result.id}} - {{result.values['nodeName']}} - {{result.values['nodeName']}} + {{result.values['nodeName'] | umbCmsJoinArray:', '}} + {{result.values['nodeName'] | umbCmsJoinArray:', '}} @@ -305,8 +305,8 @@ {{result.score}} {{result.id}} - {{result.values['nodeName']}} - {{result.values['nodeName']}} + {{result.values['nodeName'] | umbCmsJoinArray:', '}} + {{result.values['nodeName'] | umbCmsJoinArray:', '}} From 54b4d6f8d184714c2f0ed827d6eaea0433bce5bf Mon Sep 17 00:00:00 2001 From: nzdev <834725+nzdev@users.noreply.github.com> Date: Tue, 13 Jul 2021 19:46:27 +1200 Subject: [PATCH 50/92] Compress true/false from int to bool --- .../UnPublishedContentPropertyCacheCompressionOptions.cs | 5 +++++ .../NuCache/DataSource/MsgPackContentNestedDataSerializer.cs | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/Umbraco.Core/PropertyEditors/UnPublishedContentPropertyCacheCompressionOptions.cs b/src/Umbraco.Core/PropertyEditors/UnPublishedContentPropertyCacheCompressionOptions.cs index ece25479cc..954390ca1e 100644 --- a/src/Umbraco.Core/PropertyEditors/UnPublishedContentPropertyCacheCompressionOptions.cs +++ b/src/Umbraco.Core/PropertyEditors/UnPublishedContentPropertyCacheCompressionOptions.cs @@ -14,6 +14,11 @@ namespace Umbraco.Core.PropertyEditors //Only compress non published content that supports publishing and the property is text return true; } + if (propertyType.ValueStorageType == ValueStorageType.Integer && Umbraco.Core.Constants.PropertyEditors.Aliases.Boolean.Equals(dataEditor.Alias)) + { + //Compress boolean values from int to bool + return true; + } return false; } } diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs index f1400382e6..bfbe1d8818 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/MsgPackContentNestedDataSerializer.cs @@ -101,6 +101,10 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource { property.Value = LZ4Pickler.Pickle(Encoding.UTF8.GetBytes((string)property.Value), LZ4Level.L00_FAST); } + foreach (var property in propertyAliasToData.Value.Where(x => x.Value != null && x.Value is int intVal)) + { + property.Value = Convert.ToBoolean((int)property.Value); + } } } } From 6f8749bc528b112ccfd1af73f3cfb29d6969032e Mon Sep 17 00:00:00 2001 From: nzdev <834725+nzdev@users.noreply.github.com> Date: Tue, 13 Jul 2021 19:55:45 +1200 Subject: [PATCH 51/92] Automatically intern contentType Alias and propertyType Alias when querying the database to save on memory and speed up comparisons. --- src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs | 3 ++- src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs index 68036dab4b..58ecd0cd39 100644 --- a/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/ContentTypeDto.cs @@ -9,6 +9,7 @@ namespace Umbraco.Core.Persistence.Dtos internal class ContentTypeDto { public const string TableName = Constants.DatabaseSchema.Tables.ContentType; + private string _alias; [Column("pk")] [PrimaryKeyColumn(IdentitySeed = 700)] @@ -21,7 +22,7 @@ namespace Umbraco.Core.Persistence.Dtos [Column("alias")] [NullSetting(NullSetting = NullSettings.Null)] - public string Alias { get; set; } + public string Alias { get => _alias; set => _alias = value == null ? null : string.Intern(value); } [Column("icon")] [Index(IndexTypes.NonClustered)] diff --git a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs index f22e4453f4..d5ce28d3b5 100644 --- a/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs +++ b/src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs @@ -10,6 +10,8 @@ namespace Umbraco.Core.Persistence.Dtos [ExplicitColumns] internal class PropertyTypeDto { + private string _alias; + [Column("id")] [PrimaryKeyColumn(IdentitySeed = 100)] public int Id { get; set; } @@ -29,7 +31,7 @@ namespace Umbraco.Core.Persistence.Dtos [Index(IndexTypes.NonClustered, Name = "IX_cmsPropertyTypeAlias")] [Column("Alias")] - public string Alias { get; set; } + public string Alias { get => _alias; set => _alias = value == null ? null : string.Intern(value); } [Column("Name")] [NullSetting(NullSetting = NullSettings.Null)] From 67e812d93cf1d13e7aa0dec85f3adf4e2e869cd6 Mon Sep 17 00:00:00 2001 From: Chad Currie Date: Sun, 11 Jul 2021 19:41:39 +1200 Subject: [PATCH 52/92] Don't create new empty arrays --- .../DataSource/BTree.DictionaryOfPropertyDataSerializer.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs index 304fc6def0..f9a44adab1 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs @@ -11,6 +11,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource /// internal class DictionaryOfPropertyDataSerializer : SerializerBase, ISerializer>, IDictionaryOfPropertyDataSerializer { + private static readonly PropertyData[] Empty = Array.Empty(); public IDictionary ReadFrom(Stream stream) { // read properties count @@ -25,6 +26,11 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource // read values count var vcount = PrimitiveSerializer.Int32.ReadFrom(stream); + if(vcount == 0) + { + dict[key] = Empty; + continue; + } // create pdata and add to the dictionary var pdatas = new PropertyData[vcount]; From 9a16adcb18ef0065f5df1b1bcefb6ebb8b0e1f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 6 Aug 2021 12:54:46 +0200 Subject: [PATCH 53/92] append a input with ng-model which matches the field coming from model state --- .../mediapicker3/umb-media-picker3-property-editor.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html index cb6d9e5e26..d523bc6f2d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html @@ -52,6 +52,7 @@
    + From c1956882fef9022217c583cec168100fa1cd5f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 6 Aug 2021 12:54:46 +0200 Subject: [PATCH 54/92] append a input with ng-model which matches the field coming from model state (cherry picked from commit 9a16adcb18ef0065f5df1b1bcefb6ebb8b0e1f54) --- .../mediapicker3/umb-media-picker3-property-editor.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html index cb6d9e5e26..d523bc6f2d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html @@ -52,6 +52,7 @@
    + From cf64430116f6339f8954048d618967f575e540af Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 30 Jun 2021 15:41:07 +0200 Subject: [PATCH 55/92] #10520 Correct mandatory markers in nested content (#10563) (cherry picked from commit c1a4e07e87df428d71314174854c954749842144) --- .../src/less/components/umb-nested-content.less | 11 ----------- .../src/views/components/property/umb-property.html | 2 +- .../nestedcontent/nestedcontent.editor.html | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less index 9dd40a4386..f6c252cc4d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less @@ -15,17 +15,6 @@ pointer-events: none; } -.umb-nested-content--mandatory { - /* - yeah so this is a pain, but we must be super specific in targeting the mandatory property labels, - otherwise all properties within a reqired, nested, nested content property will all appear mandatory - */ - .umb-property > ng-form > .control-group > .umb-el-wrap > .control-header label:after { - content: '*'; - color: @red; - } -} - .umb-nested-content-overlay { position: absolute; top: 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html index 5b8e6d8f04..51a6f65c9c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html @@ -16,7 +16,7 @@ {{vm.property.label}} - + * diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html index 125e920fe6..e14bd03291 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html @@ -4,7 +4,7 @@ From 9ccabd51b9783bd68d2a3dcf68827976bf167e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 6 Aug 2021 12:54:46 +0200 Subject: [PATCH 56/92] append a input with ng-model which matches the field coming from model state (cherry picked from commit 9a16adcb18ef0065f5df1b1bcefb6ebb8b0e1f54) --- .../mediapicker3/umb-media-picker3-property-editor.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html index aa9f50b7df..295d3843fd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker3/umb-media-picker3-property-editor.html @@ -52,6 +52,7 @@
    + From 319e3ed7b99575966f7ef3db3db749c9a26e1059 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:37:17 +0200 Subject: [PATCH 57/92] Add label in mini search component (#10583) --- .../components/umbminisearch.component.js | 30 +++++++++++++++---- .../src/less/components/umb-mini-search.less | 21 +++++++------ .../src/views/components/umb-mini-search.html | 4 +++ 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js index 6c65cb6e23..c22a56f0d0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbminisearch.component.js @@ -11,17 +11,20 @@ model: "=", onStartTyping: "&?", onSearch: "&?", - onBlur: "&?" + onBlur: "&?", + labelKey: "@?", + inputId: "@?" } }); - function UmbMiniSearchController($scope) { - + function UmbMiniSearchController($scope, localizationService) { + var vm = this; vm.onKeyDown = onKeyDown; vm.onChange = onChange; - + vm.$onInit = onInit; + var searchDelay = _.debounce(function () { $scope.$apply(function () { if (vm.onSearch) { @@ -29,7 +32,7 @@ } }); }, 500); - + function onKeyDown(evt) { //13: enter switch (evt.keyCode) { @@ -40,7 +43,7 @@ break; } } - + function onChange() { if (vm.onStartTyping) { vm.onStartTyping(); @@ -48,6 +51,21 @@ searchDelay(); } + function onInit() { + vm.inputId = vm.inputId || "search_" + String.CreateGuid(); + setText(); + } + + function setText() { + var keyToLocalize = vm.labelKey || 'general_search'; + + localizationService.localize(keyToLocalize).then(function (data) { + // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [ + if(data.indexOf('[') === -1){ + vm.text = data; + } + }); + } } })(); diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less index e4eb8f8235..bdcc0055dd 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-mini-search.less @@ -1,24 +1,23 @@ .umb-mini-search { position: relative; - display: block; + display: flex; + justify-content: center; + align-items: center; .icon { position: absolute; - display: flex; - justify-content: center; - align-items: center; - font-size: 20px; - margin: 5px; - padding: 1px; + left: 9px; + width: 1em; + height: 1em; pointer-events: none; color: @ui-action-discreet-type; transition: color .1s linear; } input { - width: 0px; + width: 0; padding-left: 24px; - margin-bottom: 0px; + margin-bottom: 0; background-color: transparent; border-color: @ui-action-discreet-border; transition: background-color .1s linear, border-color .1s linear, color .1s linear, width .1s ease-in-out, padding-left .1s ease-in-out; @@ -42,9 +41,9 @@ border-color: @ui-action-discreet-border-hover; cursor: unset; } - + input:focus, &:focus-within input, &.--has-value input { width: 190px; - padding-left: 30px; + padding-left:30px; } } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html index b69071d4e4..57048d8b5c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-mini-search.html @@ -1,6 +1,10 @@ + Date: Fri, 6 Aug 2021 15:05:21 +0200 Subject: [PATCH 58/92] Update ImageProcessor dependencies --- build/NuSpecs/UmbracoCms.Web.nuspec | 2 +- build/NuSpecs/UmbracoCms.nuspec | 4 ++-- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- src/Umbraco.Web/Umbraco.Web.csproj | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec index 04b9905f9d..fa7c9b5c17 100644 --- a/build/NuSpecs/UmbracoCms.Web.nuspec +++ b/build/NuSpecs/UmbracoCms.Web.nuspec @@ -30,7 +30,7 @@ - + diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index a6b06d9964..a223704617 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -26,8 +26,8 @@ not want this to happen as the alpha of the next major is, really, the next major already. --> - - + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ea238d42d1..011b7e019f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -89,8 +89,8 @@ - - + + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 316f5def8e..68bcade20c 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -66,7 +66,7 @@ - 2.7.0.100 + 2.9.1 1.1.11 From 47df53db954605c90339d9936b54feadcfdbf646 Mon Sep 17 00:00:00 2001 From: Callum Whyte Date: Sat, 3 Jul 2021 14:36:00 +0100 Subject: [PATCH 59/92] Adding extension for MapDefinitions collection builder --- src/Umbraco.Core/CompositionExtensions.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs index 2fcf446d6b..afa45ce380 100644 --- a/src/Umbraco.Core/CompositionExtensions.cs +++ b/src/Umbraco.Core/CompositionExtensions.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Dictionary; using Umbraco.Core.IO; using Umbraco.Core.Logging.Viewer; using Umbraco.Core.Manifest; +using Umbraco.Core.Mapping; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.PackageActions; using Umbraco.Core.Persistence.Mappers; @@ -28,6 +29,13 @@ namespace Umbraco.Core public static CacheRefresherCollectionBuilder CacheRefreshers(this Composition composition) => composition.WithCollectionBuilder(); + /// + /// Gets the map definitions collection builder. + /// + /// The composition. + public static MapDefinitionCollectionBuilder MapDefinitions(this Composition composition) + => composition.WithCollectionBuilder(); + /// /// Gets the mappers collection builder. /// From 25888a5da1f30d697fbbfbdc13ed4501283da35f Mon Sep 17 00:00:00 2001 From: Michel Collard Date: Wed, 23 Jun 2021 10:52:41 +0200 Subject: [PATCH 60/92] Changed umb-notifications z-index --- .../src/less/components/notifications/umb-notifications.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less index 67038380ca..050f907acc 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/notifications/umb-notifications.less @@ -1,5 +1,5 @@ .umb-notifications { - z-index: 1100; + z-index: 999999; position: absolute; bottom: @editorFooterHeight; left: 0; From 9b57ec5fa611706cc066c429203eb03e8bbebf06 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Fri, 6 Aug 2021 14:27:18 +0100 Subject: [PATCH 61/92] Accessibility Amends for the Content Info Tab (#10541) --- .../content/umb-content-node-info.html | 5 ++-- .../views/components/umb-node-preview.html | 24 +++++-------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index 5f8967c419..57d621a7a9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -157,17 +157,18 @@ - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html index 34fb4d7dfd..f1b4b1aac2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html @@ -19,59 +19,47 @@ - Edit - {{name}} + Edit {{name}} - Open - {{name}} + Open {{name}} - Remove - {{name}} + Remove {{name}}
    From 4e4412ed34da8205e18ef92639c8e5cacdd09ad6 Mon Sep 17 00:00:00 2001 From: inetzo Date: Wed, 16 Jun 2021 20:02:06 +0200 Subject: [PATCH 62/92] RelationType parent/child are stored in the wrong order When creating a new relationtype, the parent and child type are stored in reverse order (parent- and childtype are switched). --- src/Umbraco.Web/Editors/RelationTypeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs index e56d856933..1ac6c556d9 100644 --- a/src/Umbraco.Web/Editors/RelationTypeController.cs +++ b/src/Umbraco.Web/Editors/RelationTypeController.cs @@ -145,7 +145,7 @@ namespace Umbraco.Web.Editors /// A containing the persisted relation type's ID. public HttpResponseMessage PostCreate(RelationTypeSave relationType) { - var relationTypePersisted = new RelationType(relationType.Name, relationType.Name.ToSafeAlias(true), relationType.IsBidirectional, relationType.ChildObjectType, relationType.ParentObjectType); + var relationTypePersisted = new RelationType(relationType.Name, relationType.Name.ToSafeAlias(true), relationType.IsBidirectional, relationType.ParentObjectType, relationType.ChildObjectType); try { From dafa5d2ef6d2681bba623097ca2725c439737428 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Fri, 6 Aug 2021 15:33:52 +0200 Subject: [PATCH 63/92] Numberrange view: Various minor improvements (#10452) --- .../views/prevalueeditors/numberrange.html | 53 ++++++++++++------- .../views/prevalueeditors/numberrange.less | 9 +--- src/Umbraco.Web.UI/Umbraco/config/lang/da.xml | 1 + src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 1 + .../Umbraco/config/lang/en_us.xml | 1 + 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html index 6e67c94793..2d223ed40a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.html @@ -1,25 +1,38 @@
    - - + +
    + + + + Not a number + + +
    – - +
    + + - - Not a number - - - Not a number - + + + Not a number + + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less index e7ca2dd1cd..cc95b7cb8e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/numberrange.less @@ -1,14 +1,7 @@ .umb-prevalues-numberrange { - - .__min-input { - } - .__enDash { display: inline-block; vertical-align: middle; - margin-top: 5px; - } - - .__max-input { + margin: 5px 2px 0; } } diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index d3a5be2ebf..7d64ce855f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -1912,6 +1912,7 @@ Mange hilsner fra Umbraco robotten Udfør handling %0% på %1% noden Tilføj billede overskrift Søg i indholdstræet + Maximum antal Referencer diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index e05f786f13..93c1e9a39d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2310,6 +2310,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Perform action %0% on the %1% node Add image caption Search content tree + Maximum amount References diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index c74f7ef0de..bcf91812c7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2329,6 +2329,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Perform action %0% on the %1% node Add image caption Search content tree + Maximum amount References From f7dee7ec74198918693fb6ba50caed9e1af53a80 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 6 Aug 2021 15:55:50 +0200 Subject: [PATCH 64/92] Fix self-closing element --- .../src/views/components/content/umb-content-node-info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index 57d621a7a9..e4fdb7fc33 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -168,7 +168,7 @@
    From 19a6184502caad8381894db7419bded4f2da089f Mon Sep 17 00:00:00 2001 From: Philippe Guilmette Date: Thu, 20 May 2021 09:21:11 -0400 Subject: [PATCH 65/92] Delete entries from umbracoUserLogin before deleting the user (fix for 10269) --- .../Persistence/Repositories/Implement/UserRepository.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs index 50eb2e6d0e..846a547d81 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs @@ -427,6 +427,7 @@ ORDER BY colName"; { var list = new List { + "DELETE FROM umbracoUserLogin WHERE userId = @id", "DELETE FROM umbracoUser2UserGroup WHERE userId = @id", "DELETE FROM umbracoUser2NodeNotify WHERE userId = @id", "DELETE FROM umbracoUserStartNode WHERE userId = @id", From 33e980841f326e022fbf93ceea6ad6fccababc01 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 6 Aug 2021 16:26:52 +0200 Subject: [PATCH 66/92] Update to latest flatpickr --- src/Umbraco.Web.UI.Client/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 1221728a26..6d01e50b5a 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -33,7 +33,7 @@ "chart.js": "^2.9.3", "clipboard": "2.0.4", "diff": "3.5.0", - "flatpickr": "4.5.2", + "flatpickr": "4.6.9", "font-awesome": "4.7.0", "jquery": "^3.5.1", "jquery-ui-dist": "1.12.1", @@ -52,8 +52,8 @@ }, "devDependencies": { "@babel/core": "7.6.4", - "@babel/preset-env": "7.6.3", "@babel/plugin-proposal-object-rest-spread": "7.13.8", + "@babel/preset-env": "7.6.3", "autoprefixer": "9.6.5", "caniuse-lite": "^1.0.30001237", "cssnano": "4.1.10", From 0bc9f3e32265be5c5ac4cd8a414f9a45c5504f8c Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Sun, 2 May 2021 09:16:29 +1000 Subject: [PATCH 67/92] Fix textboxes inside flatpickr popup to not cause the scheduled publishing overlay to submit when enter is pressed. --- .../views/content/overlays/schedule.controller.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js index 2de526b503..a69de224dd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.controller.js @@ -121,11 +121,25 @@ * @param {any} type publish or unpublish */ function datePickerShow(variant, type) { + var activeDatePickerInstance; if (type === 'publish') { variant.releaseDatePickerOpen = true; + activeDatePickerInstance = variant.releaseDatePickerInstance; } else if (type === 'unpublish') { variant.expireDatePickerOpen = true; + activeDatePickerInstance = variant.expireDatePickerInstance; } + + // Prevent enter key in time fields from submitting the overlay before the associated input gets the updated time + if (activeDatePickerInstance && !activeDatePickerInstance.hourElement.hasAttribute("overlay-submit-on-enter")) + { + activeDatePickerInstance.hourElement.setAttribute("overlay-submit-on-enter", "false"); + } + if (activeDatePickerInstance && !activeDatePickerInstance.minuteElement.hasAttribute("overlay-submit-on-enter")) + { + activeDatePickerInstance.minuteElement.setAttribute("overlay-submit-on-enter", "false"); + } + checkForBackdropClick(); $scope.model.disableSubmitButton = !canSchedule(); } From 1dd75b90517ed314c7c4f61a5fc04b6cb76a1d9e Mon Sep 17 00:00:00 2001 From: Kevin Meilander Date: Fri, 28 May 2021 10:39:59 -0500 Subject: [PATCH 68/92] #10354 - added domain content id as node context for the content finder for the 404 error page so $site works --- .../Routing/ContentFinderByConfigured404.cs | 7 ++++++- src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs index 5255da6521..8f8473a7e4 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs @@ -33,11 +33,14 @@ namespace Umbraco.Web.Routing { _logger.Debug("Looking for a page to handle 404."); + int? domainConentId = null; + // try to find a culture as best as we can var errorCulture = CultureInfo.CurrentUICulture; if (frequest.HasDomain) { errorCulture = frequest.Domain.Culture; + domainConentId = frequest.Domain.ContentId; } else { @@ -63,7 +66,9 @@ namespace Umbraco.Web.Routing _contentConfigSection.Error404Collection.ToArray(), _entityService, new PublishedContentQuery(frequest.UmbracoContext.PublishedSnapshot, frequest.UmbracoContext.VariationContextAccessor), - errorCulture); + errorCulture, + domainConentId + ); IPublishedContent content = null; diff --git a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs index f2494696cf..7871a81cc8 100644 --- a/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs +++ b/src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs @@ -41,7 +41,8 @@ namespace Umbraco.Web.Routing IContentErrorPage[] error404Collection, IEntityService entityService, IPublishedContentQuery publishedContentQuery, - CultureInfo errorCulture) + CultureInfo errorCulture, + int? domainContentId) { if (error404Collection.Length > 1) { @@ -50,11 +51,11 @@ namespace Umbraco.Web.Routing ?? error404Collection.FirstOrDefault(x => x.Culture == "default"); // there should be a default one! if (cultureErr != null) - return GetContentIdFromErrorPageConfig(cultureErr, entityService, publishedContentQuery); + return GetContentIdFromErrorPageConfig(cultureErr, entityService, publishedContentQuery, domainContentId); } else { - return GetContentIdFromErrorPageConfig(error404Collection.First(), entityService, publishedContentQuery); + return GetContentIdFromErrorPageConfig(error404Collection.First(), entityService, publishedContentQuery, domainContentId); } return null; @@ -67,7 +68,7 @@ namespace Umbraco.Web.Routing /// /// /// - internal static int? GetContentIdFromErrorPageConfig(IContentErrorPage errorPage, IEntityService entityService, IPublishedContentQuery publishedContentQuery) + internal static int? GetContentIdFromErrorPageConfig(IContentErrorPage errorPage, IEntityService entityService, IPublishedContentQuery publishedContentQuery, int? domainContentId) { if (errorPage.HasContentId) return errorPage.ContentId; @@ -92,7 +93,7 @@ namespace Umbraco.Web.Routing //we have an xpath statement to execute var xpathResult = UmbracoXPathPathSyntaxParser.ParseXPathQuery( xpathExpression: errorPage.ContentXPath, - nodeContextId: null, + nodeContextId: domainContentId, getPath: nodeid => { var ent = entityService.Get(nodeid); From 9b93a8f1abd0fb13e9f670dc7dc2fcb6b3cdc922 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 9 Aug 2021 08:26:22 +0200 Subject: [PATCH 69/92] Bump version to 8.16.0-rc --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 2dac2d8791..56e0376196 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -18,5 +18,5 @@ using System.Resources; [assembly: AssemblyVersion("8.0.0")] // these are FYI and changed automatically -[assembly: AssemblyFileVersion("8.15.1")] -[assembly: AssemblyInformationalVersion("8.15.1")] +[assembly: AssemblyFileVersion("8.16.0")] +[assembly: AssemblyInformationalVersion("8.16.0-rc")] diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 011b7e019f..024ce07c5f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -348,9 +348,9 @@ False True - 8151 + 8160 / - http://localhost:8151 + http://localhost:8160 False False From 442310d0eace964397999a90d4fc2119ff13613c Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 11 Aug 2021 13:59:28 +0200 Subject: [PATCH 70/92] Fixed issue with CachedPartial that cached an unmaterialized value, that could not be used on cache hits. --- .../Extensions/CacheHelperExtensions.cs | 12 +++++++----- .../Extensions/HtmlContentExtensions.cs | 0 .../Extensions/HtmlHelperRenderExtensions.cs | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) rename src/{Umbraco.Web.Website => Umbraco.Web.Common}/Extensions/HtmlContentExtensions.cs (100%) diff --git a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs index d52d140640..56bfcefd9a 100644 --- a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs @@ -20,7 +20,7 @@ namespace Umbraco.Extensions /// /// /// - /// + /// /// used to cache the partial view, this key could change if it is cached by page or by member /// /// @@ -30,7 +30,7 @@ namespace Umbraco.Extensions IHtmlHelper htmlHelper, string partialViewName, object model, - int cachedSeconds, + TimeSpan cacheTimeout, string cacheKey, ViewDataDictionary viewData = null) { @@ -41,10 +41,12 @@ namespace Umbraco.Extensions return htmlHelper.Partial(partialViewName, model, viewData); } - return appCaches.RuntimeCache.GetCacheItem( + var result = appCaches.RuntimeCache.GetCacheItem( CoreCacheHelperExtensions.PartialViewCacheKey + cacheKey, - () => htmlHelper.Partial(partialViewName, model, viewData), - timeout: new TimeSpan(0, 0, 0, cachedSeconds)); + () => new HtmlString(htmlHelper.Partial(partialViewName, model, viewData).ToHtmlString()), + timeout: cacheTimeout); + + return result; } } diff --git a/src/Umbraco.Web.Website/Extensions/HtmlContentExtensions.cs b/src/Umbraco.Web.Common/Extensions/HtmlContentExtensions.cs similarity index 100% rename from src/Umbraco.Web.Website/Extensions/HtmlContentExtensions.cs rename to src/Umbraco.Web.Common/Extensions/HtmlContentExtensions.cs diff --git a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs index e728c432e1..967ef2b87d 100644 --- a/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs +++ b/src/Umbraco.Web.Website/Extensions/HtmlHelperRenderExtensions.cs @@ -88,7 +88,7 @@ namespace Umbraco.Extensions this IHtmlHelper htmlHelper, string partialViewName, object model, - int cachedSeconds, + TimeSpan cacheTimeout, bool cacheByPage = false, bool cacheByMember = false, ViewDataDictionary viewData = null, @@ -129,7 +129,7 @@ namespace Umbraco.Extensions var appCaches = GetRequiredService(htmlHelper); var hostingEnvironment = GetRequiredService(htmlHelper); - return appCaches.CachedPartialView(hostingEnvironment, htmlHelper, partialViewName, model, cachedSeconds, cacheKey.ToString(), viewData); + return appCaches.CachedPartialView(hostingEnvironment, htmlHelper, partialViewName, model, cacheTimeout, cacheKey.ToString(), viewData); } // public static IHtmlContent EditorFor(this IHtmlHelper htmlHelper, string templateName = "", string htmlFieldName = "", object additionalViewData = null) From 91129632244cb7efb44434fb99be0db1571cdd68 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 13:25:13 +0100 Subject: [PATCH 71/92] Remove System.Configuration.ConfigurationManager --- src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 2f709d5d27..88a43fd1c1 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -46,7 +46,6 @@ - From ec15f20fdf8a8d4be79c23b8f3e737869c3d11b6 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 13:26:28 +0100 Subject: [PATCH 72/92] Replace excetion type from System.Configuration --- src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs index c813e428d2..2d276fbaf4 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs @@ -1,7 +1,7 @@ -using System.Configuration; using CSharpTest.Net.Collections; using CSharpTest.Net.Serialization; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Core.Exceptions; namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource { @@ -54,9 +54,9 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.DataSource for (var i = blockSize; i != 1; i >>= 1) bit++; if (1 << bit != blockSize) - throw new ConfigurationErrorsException($"Invalid block size value \"{blockSize}\": must be a power of two."); + throw new ConfigurationException($"Invalid block size value \"{blockSize}\": must be a power of two."); if (blockSize < 512 || blockSize > 65536) - throw new ConfigurationErrorsException($"Invalid block size value \"{blockSize}\": must be >= 512 and <= 65536."); + throw new ConfigurationException($"Invalid block size value \"{blockSize}\": must be >= 512 and <= 65536."); return blockSize; } From 485730b77636f946e384a797232f8b439527137f Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 13:27:03 +0100 Subject: [PATCH 73/92] Use TestData Options/Settings as opposed to ConfigManager --- src/Umbraco.TestData/SegmentTestController.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.TestData/SegmentTestController.cs b/src/Umbraco.TestData/SegmentTestController.cs index 8eabd65288..92c01bcf7f 100644 --- a/src/Umbraco.TestData/SegmentTestController.cs +++ b/src/Umbraco.TestData/SegmentTestController.cs @@ -1,7 +1,7 @@ using System; -using System.Configuration; using System.Linq; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Logging; using Umbraco.Cms.Core.Models; @@ -11,25 +11,30 @@ using Umbraco.Cms.Core.Web; using Umbraco.Cms.Infrastructure.Persistence; using Umbraco.Cms.Web.Website.Controllers; using Umbraco.Extensions; +using Umbraco.TestData.Configuration; namespace Umbraco.TestData { public class SegmentTestController : SurfaceController { + private IOptions _testDataSettings; + public SegmentTestController( IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, - IPublishedUrlProvider publishedUrlProvider) + IPublishedUrlProvider publishedUrlProvider, + IOptions testDataSettings) : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider) { + _testDataSettings = testDataSettings; } public IActionResult EnableDocTypeSegments(string alias, string propertyTypeAlias) { - if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true") + if(_testDataSettings.Value.Enabled != true) { return HttpNotFound(); } @@ -62,7 +67,7 @@ namespace Umbraco.TestData public IActionResult DisableDocTypeSegments(string alias) { - if (ConfigurationManager.AppSettings["Umbraco.TestData.Enabled"] != "true") + if (_testDataSettings.Value.Enabled != true) { return HttpNotFound(); } From f09ec194fe2446d9d7c1379847bc07f9bd1ecffa Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 13:27:28 +0100 Subject: [PATCH 74/92] Remove System.Configuration from tests --- .../Umbraco.Core/Composing/TypeFinderTests.cs | 1 - .../Umbraco.Core/Composing/TypeLoaderTests.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs index c55b577845..cbdb2ac5b8 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs @@ -33,7 +33,6 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing typeof(System.Guid).Assembly, typeof(NUnit.Framework.Assert).Assembly, typeof(System.Xml.NameTable).Assembly, - typeof(System.Configuration.GenericEnumConverter).Assembly, typeof(TypeFinder).Assembly, }; diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs index cea18c5176..c71d89856e 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs @@ -40,7 +40,6 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing typeof(Guid).Assembly, typeof(Assert).Assembly, typeof(System.Xml.NameTable).Assembly, - typeof(System.Configuration.GenericEnumConverter).Assembly, ////typeof(TabPage).Assembly, typeof(TypeFinder).Assembly, typeof(UmbracoContext).Assembly, From 5ae0b64b365797f5ff9c6052edef71bfa40413c2 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 11 Aug 2021 14:29:06 +0200 Subject: [PATCH 75/92] Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8 --- .../Controllers/ContentController.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 6cb0addb71..54adef04fa 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -913,13 +913,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers v.Notifications.AddRange(n.Notifications); } - HandleInvalidModelState(display, cultureForInvariantErrors); - //lastly, if it is not valid, add the model state to the outgoing object and throw a 400 - if (!ModelState.IsValid) - { - return ValidationProblem(display, ModelState); - } + HandleInvalidModelState(display, cultureForInvariantErrors); if (wasCancelled) { From f351cc15d5e0d7f2f6f1b38f47c2dde04ebd1e51 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 13:33:53 +0100 Subject: [PATCH 76/92] Fix up TestData to not use ConfigManager but to get Version from injected IUmbracoVersion in the view --- src/Umbraco.TestData/LoadTestController.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.TestData/LoadTestController.cs b/src/Umbraco.TestData/LoadTestController.cs index 3033d2febb..6b8bec49e9 100644 --- a/src/Umbraco.TestData/LoadTestController.cs +++ b/src/Umbraco.TestData/LoadTestController.cs @@ -44,7 +44,7 @@ namespace Umbraco.TestData

    LoadTest

    -
    " + System.Configuration.ConfigurationManager.AppSettings["umbracoConfigurationStatus"] + @"
    +
    @_umbracoVersion.SemanticVersion
    "; @@ -53,13 +53,14 @@ namespace Umbraco.TestData private static readonly string s_containerTemplateText = @" @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@inject Umbraco.Cms.Core.Configuration.IUmbracoVersion _umbracoVersion @{ Layout = null; var container = Umbraco.ContentAtRoot().OfTypes(""" + ContainerAlias + @""").FirstOrDefault(); var contents = container.Children().ToArray(); var groups = contents.GroupBy(x => x.Value(""origin"")); var id = contents.Length > 0 ? contents[0].Id : -1; - var wurl = Request.QueryString[""u""] == ""1""; + var wurl = Context.Request.Query[""u""] == ""1""; var missing = contents.Length > 0 && contents[contents.Length - 1].Id - contents[0].Id >= contents.Length; } " + s_headHtml + @" @@ -81,7 +82,7 @@ namespace Umbraco.TestData } if (wurl) { -
    @content.Id :: @content.Name :: @content.Url
    +
    @content.Id :: @content.Name :: @content.Url()
    } else { @@ -178,7 +179,7 @@ namespace Umbraco.TestData } } - private IActionResult ContentHtml(string s) => Content(s_headHtml + s + FootHtml); + private IActionResult ContentHtml(string s) => Content(s_headHtml + s + FootHtml, "text/html"); public IActionResult Install() { From c5752b5db5d4bad82726ca104b6bbf033b01f275 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 11 Aug 2021 14:50:39 +0200 Subject: [PATCH 77/92] Revert "Fixed issue with saving content when having an empty variant. Aligned codebase with how it is in v8" This reverts commit 5ae0b64b365797f5ff9c6052edef71bfa40413c2. --- .../Controllers/ContentController.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 54adef04fa..6cb0addb71 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -913,9 +913,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers v.Notifications.AddRange(n.Notifications); } - //lastly, if it is not valid, add the model state to the outgoing object and throw a 400 HandleInvalidModelState(display, cultureForInvariantErrors); + //lastly, if it is not valid, add the model state to the outgoing object and throw a 400 + if (!ModelState.IsValid) + { + return ValidationProblem(display, ModelState); + } + if (wasCancelled) { AddCancelMessage(display); From f794f638842d8fdf4ee2b1b2792075a1da45f012 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 11 Aug 2021 14:20:58 +0100 Subject: [PATCH 78/92] Use ToSemanticStringWithoutBuild() extension method --- src/Umbraco.TestData/LoadTestController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.TestData/LoadTestController.cs b/src/Umbraco.TestData/LoadTestController.cs index 6b8bec49e9..c245aae816 100644 --- a/src/Umbraco.TestData/LoadTestController.cs +++ b/src/Umbraco.TestData/LoadTestController.cs @@ -44,7 +44,7 @@ namespace Umbraco.TestData

    LoadTest

    -
    @_umbracoVersion.SemanticVersion
    +
    @_umbracoVersion.SemanticVersion.ToSemanticStringWithoutBuild()
    "; From c5e882680b977dfa3a85f094780ce1b8dd049977 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 11 Aug 2021 15:43:41 +0200 Subject: [PATCH 79/92] Fixed issue with model state marked as invalid on the entire model, where we handle it for each item separately --- src/Umbraco.Web.BackOffice/Controllers/ContentController.cs | 2 +- .../Filters/ContentSaveValidationAttribute.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 6cb0addb71..183284d5b8 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -913,9 +913,9 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers v.Notifications.AddRange(n.Notifications); } + //lastly, if it is not valid, add the model state to the outgoing object and throw a 400 HandleInvalidModelState(display, cultureForInvariantErrors); - //lastly, if it is not valid, add the model state to the outgoing object and throw a 400 if (!ModelState.IsValid) { return ValidationProblem(display, ModelState); diff --git a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs index d4aafe83ff..4b8fb6acb3 100644 --- a/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs @@ -68,6 +68,12 @@ namespace Umbraco.Cms.Web.BackOffice.Filters var model = (ContentItemSave) context.ActionArguments["contentItem"]; var contentItemValidator = new ContentSaveModelValidator(_loggerFactory.CreateLogger(), _propertyValidationService); + if (context.ModelState.ContainsKey("contentItem")) + { + // if the entire model is marked as error, remove it, we handle everything separately + context.ModelState.Remove("contentItem"); + } + if (!ValidateAtLeastOneVariantIsBeingSaved(model, context)) return; if (!contentItemValidator.ValidateExistingContent(model, context)) return; if (!await ValidateUserAccessAsync(model, context)) return; From d775de5dddf323b05de43e544f3b775db025dc31 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 11 Aug 2021 19:38:23 +0200 Subject: [PATCH 80/92] Fixed issue after merge --- .../Persistence/Repositories/Implement/UserRepository.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs index de589688a3..d83be68732 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs @@ -432,8 +432,7 @@ ORDER BY colName"; { var list = new List { - $"DELETE FROM umbracoUserLogin WHERE userId = @id", - "DELETE FROM {Constants.DatabaseSchema.Tables.UserLogin} WHERE userId = @id", + $"DELETE FROM {Constants.DatabaseSchema.Tables.UserLogin} WHERE userId = @id", $"DELETE FROM {Constants.DatabaseSchema.Tables.User2UserGroup} WHERE userId = @id", $"DELETE FROM {Constants.DatabaseSchema.Tables.User2NodeNotify} WHERE userId = @id", $"DELETE FROM {Constants.DatabaseSchema.Tables.UserStartNode} WHERE userId = @id", From 6097faa90634b83204041aa73279fa3056bf4efe Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Thu, 12 Aug 2021 09:43:29 +0300 Subject: [PATCH 81/92] Remove connection string from appsettings.json --- src/Umbraco.Web.UI.NetCore/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json index 757ac381ed..cef926fad2 100644 --- a/src/Umbraco.Web.UI.NetCore/appsettings.json +++ b/src/Umbraco.Web.UI.NetCore/appsettings.json @@ -1,7 +1,7 @@ { "$schema": "./umbraco/config/appsettings-schema.json", "ConnectionStrings": { - "umbracoDbDSN": "Data Source=|DataDirectory|\\Umbraco.sdf;Flush Interval=1;" + "umbracoDbDSN": "" }, "Serilog": { "MinimumLevel": { @@ -73,4 +73,4 @@ } } } -} \ No newline at end of file +} From 42255a8dc344603527e483731afbb85e230fde41 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 12 Aug 2021 11:03:14 +0200 Subject: [PATCH 82/92] Removed connection string --- src/Umbraco.Web.UI.NetCore/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json index 757ac381ed..cef926fad2 100644 --- a/src/Umbraco.Web.UI.NetCore/appsettings.json +++ b/src/Umbraco.Web.UI.NetCore/appsettings.json @@ -1,7 +1,7 @@ { "$schema": "./umbraco/config/appsettings-schema.json", "ConnectionStrings": { - "umbracoDbDSN": "Data Source=|DataDirectory|\\Umbraco.sdf;Flush Interval=1;" + "umbracoDbDSN": "" }, "Serilog": { "MinimumLevel": { @@ -73,4 +73,4 @@ } } } -} \ No newline at end of file +} From 185cebb49016f854ae8ecf67a66f5d4ca0d97429 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska Date: Thu, 12 Aug 2021 12:08:39 +0300 Subject: [PATCH 83/92] Adding a check for when the UrlProviderMode is set to Absolute --- .../AspNetCore/AspNetCoreHostingEnvironment.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs index 4ab50ecdc1..0b9801f871 100644 --- a/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs +++ b/src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Collections; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Extensions; using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment; @@ -22,6 +23,7 @@ namespace Umbraco.Cms.Web.Common.AspNetCore private readonly IWebHostEnvironment _webHostEnvironment; private string _applicationId; private string _localTempPath; + private UrlMode _urlProviderMode; public AspNetCoreHostingEnvironment( IServiceProvider serviceProvider, @@ -33,6 +35,7 @@ namespace Umbraco.Cms.Web.Common.AspNetCore _hostingSettings = hostingSettings ?? throw new ArgumentNullException(nameof(hostingSettings)); _webRoutingSettings = webRoutingSettings ?? throw new ArgumentNullException(nameof(webRoutingSettings)); _webHostEnvironment = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment)); + _urlProviderMode = _webRoutingSettings.CurrentValue.UrlProviderMode; SiteName = webHostEnvironment.ApplicationName; ApplicationPhysicalPath = webHostEnvironment.ContentRootPath; @@ -144,7 +147,7 @@ namespace Umbraco.Cms.Web.Common.AspNetCore /// public string ToAbsolute(string virtualPath) { - if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/")) + if (!virtualPath.StartsWith("~/") && !virtualPath.StartsWith("/") && _urlProviderMode != UrlMode.Absolute) { throw new InvalidOperationException($"The value {virtualPath} for parameter {nameof(virtualPath)} must start with ~/ or /"); } From 7710409be8570dd4cc2854139af771c70f0234a4 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Thu, 12 Aug 2021 12:09:21 +0200 Subject: [PATCH 84/92] Set isMainPage to true on TemplateRenderer.ExecuteTemplateRendering (#10684) * Set isMainPage to true on TemplateRenderer.ExecuteTemplateRendering (#10683) * Added comment * Tweak comment for clarity Co-authored-by: Paul Johnson --- src/Umbraco.Web.Common/Templates/TemplateRenderer.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs b/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs index df72f44f10..d604d4dd31 100644 --- a/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web.Common/Templates/TemplateRenderer.cs @@ -152,7 +152,8 @@ namespace Umbraco.Cms.Web.Common.Templates { var httpContext = _httpContextAccessor.GetRequiredHttpContext(); - var viewResult = _viewEngine.GetView(null, $"~/Views/{request.GetTemplateAlias()}.cshtml", false); + // isMainPage is set to true here to ensure ViewStart(s) found in the view hierarchy are rendered + var viewResult = _viewEngine.GetView(null, $"~/Views/{request.GetTemplateAlias()}.cshtml", isMainPage: true); if (viewResult.Success == false) { From e4a2fc2736ff59265dcbd1eca43990a71f47d395 Mon Sep 17 00:00:00 2001 From: Kenny Nielsen <3674690+Nikkelmann@users.noreply.github.com> Date: Thu, 12 Aug 2021 15:59:55 +0200 Subject: [PATCH 85/92] Only encode text once Html.ReplaceLineBreaks calls WebUtility.HtmlEncode internally, so the text gets encoded by this method. As far as I know, WebUtility.HtmlEncode and HttpUtility.HtmlEncode produces the same result (unlike WebUtility.UrlEncode and HttpUtility.UrlEncode which produces different results; see https://edi.wang/post/2018/11/25/netcore-webutility-urlencode-httputility-urlencode), so it should be safe to omit HttpUtility.HtmlEncode here. --- .../Views/Partials/grid/editors/textstring.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml index 77d92d6825..42972f64d8 100644 --- a/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml +++ b/src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/textstring.cshtml @@ -4,7 +4,7 @@ @if (Model.editor.config.markup != null) { string markup = Model.editor.config.markup.ToString(); - markup = markup.Replace("#value#", Html.ReplaceLineBreaks(HttpUtility.HtmlEncode((string)Model.value.ToString())).ToString()); + markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString()); if (Model.editor.config.style != null) { From c92e1beaa071ef58dd892e17bcc558205120a750 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 12 Aug 2021 15:50:47 -0600 Subject: [PATCH 86/92] Better debugging when working with external login providers --- src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs b/src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs index 80729412a3..4817956ef8 100644 --- a/src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs +++ b/src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs @@ -58,11 +58,17 @@ namespace Umbraco.Cms.Web.Common.Security var auth = await Context.AuthenticateAsync(ExternalAuthenticationType); var items = auth?.Properties?.Items; - if (auth?.Principal == null || items == null || !items.ContainsKey(UmbracoSignInMgrLoginProviderKey)) + if (auth?.Principal == null || items == null) { + Logger.LogDebug("The external login authentication failed. No user Principal or authentication items was resolved."); return null; } + if (!items.ContainsKey(UmbracoSignInMgrLoginProviderKey)) + { + throw new InvalidOperationException($"The external login authenticated successfully but the key {UmbracoSignInMgrLoginProviderKey} was not found in the authentication properties. Ensure you call SignInManager.ConfigureExternalAuthenticationProperties before issuing a ChallengeResult."); + } + if (expectedXsrf != null) { if (!items.ContainsKey(UmbracoSignInMgrXsrfKey)) From 5aad18b99aab893a8335ae284cfeea3d1a72fdb1 Mon Sep 17 00:00:00 2001 From: Paul Johnson Date: Fri, 13 Aug 2021 09:16:50 +0100 Subject: [PATCH 87/92] Build sln before running tests. Should prevent more OS related broken builds e.g. project files with case sensitivity issues. --- build/azure-pipelines.yml | 48 +++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index f82d90c1b2..f4ee42deeb 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -48,42 +48,60 @@ stages: vmImage: ubuntu-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x + - task: DotNetCoreCLI@2 + displayName: dotnet build + inputs: + command: build + projects: '**/umbraco-netcore-only.sln' - task: DotNetCoreCLI@2 displayName: dotnet test inputs: command: test projects: '**/*.Tests.UnitTests.csproj' + arguments: '--no-build' - job: MacOS_Unit_Tests displayName: Mac OS pool: vmImage: macOS-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x + - task: DotNetCoreCLI@2 + displayName: dotnet build + inputs: + command: build + projects: '**/umbraco-netcore-only.sln' - task: DotNetCoreCLI@2 displayName: dotnet test inputs: command: test projects: '**/*.Tests.UnitTests.csproj' + arguments: '--no-build' - job: Windows_Unit_Tests displayName: Windows pool: vmImage: windows-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x + - task: DotNetCoreCLI@2 + displayName: dotnet build + inputs: + command: build + projects: '**/umbraco.sln' - task: DotNetCoreCLI@2 displayName: dotnet test inputs: command: test projects: '**/*.Tests.UnitTests.csproj' + arguments: '--no-build' - stage: Integration_Tests displayName: Integration Tests dependsOn: [] @@ -97,14 +115,20 @@ stages: vmImage: ubuntu-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x + - task: DotNetCoreCLI@2 + displayName: dotnet build + inputs: + command: build + projects: '**/umbraco-netcore-only.sln' - task: DotNetCoreCLI@2 displayName: dotnet test inputs: command: test projects: '**/Umbraco.Tests.Integration.csproj' + arguments: '--no-build' env: UmbracoIntegrationTestConnectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);' - job: Windows_Integration_Tests @@ -114,16 +138,22 @@ stages: vmImage: windows-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x - powershell: sqllocaldb start mssqllocaldb displayName: Start MSSQL LocalDb + - task: DotNetCoreCLI@2 + displayName: dotnet build + inputs: + command: build + projects: '**/umbraco.sln' - task: DotNetCoreCLI@2 displayName: dotnet test inputs: command: test projects: '**\Umbraco.Tests.Integration*.csproj' + arguments: '--no-build' - stage: Acceptance_Tests displayName: Acceptance Tests dependsOn: [] @@ -150,7 +180,7 @@ stages: vmImage: windows-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x @@ -245,7 +275,7 @@ stages: vmImage: ubuntu-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x - task: Bash@3 @@ -335,7 +365,7 @@ stages: vmImage: windows-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x - task: NuGetToolInstaller@1 @@ -487,7 +517,7 @@ stages: vmImage: windows-latest steps: - task: UseDotNet@2 - displayName: Use .Net Core sdk 5.x + displayName: Use .Net 5.x inputs: version: 5.x - task: PowerShell@2 From 683170b04e08618dcb4c5b5887652c5c350c2d2a Mon Sep 17 00:00:00 2001 From: Zeegaan <70372949+Zeegaan@users.noreply.github.com> Date: Fri, 13 Aug 2021 10:51:50 +0200 Subject: [PATCH 88/92] Removed Unneccesary if check --- src/Umbraco.Web.Common/Security/PublicAccessChecker.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Umbraco.Web.Common/Security/PublicAccessChecker.cs b/src/Umbraco.Web.Common/Security/PublicAccessChecker.cs index 8e6174e5f1..ad9b39a7bb 100644 --- a/src/Umbraco.Web.Common/Security/PublicAccessChecker.cs +++ b/src/Umbraco.Web.Common/Security/PublicAccessChecker.cs @@ -39,11 +39,6 @@ namespace Umbraco.Cms.Web.Common.Security var username = currentMember.UserName; IList userRoles = await memberManager.GetRolesAsync(currentMember); - if (userRoles.Count == 0) - { - return PublicAccessStatus.AccessDenied; - } - if (!currentMember.IsApproved) { return PublicAccessStatus.NotApproved; From 18d670bc20814f6eb008f0142818e64afe193848 Mon Sep 17 00:00:00 2001 From: Zeegaan <70372949+Zeegaan@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:17:20 +0200 Subject: [PATCH 89/92] Removed UnitTest --- .../Security/PublicAccessCheckerTests.cs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs index 52c68b551f..f728314f81 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs @@ -115,23 +115,6 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result); } - [AutoMoqData] - [Test] - public async Task GivenMemberLoggedIn_WhenMemberHasNoRoles_ThenAccessDeniedResult( - IMemberManager memberManager, - IPublicAccessService publicAccessService, - IContentService contentService) - { - PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext); - - httpContext.User = GetLoggedInUser(); - MockGetUserAsync(memberManager, new MemberIdentityUser()); - MockGetRolesAsync(memberManager, Enumerable.Empty()); - - var result = await sut.HasMemberAccessToContentAsync(123); - Assert.AreEqual(PublicAccessStatus.AccessDenied, result); - } - [AutoMoqData] [Test] public async Task GivenMemberLoggedIn_WhenMemberIsLockedOut_ThenLockedOutResult( From 774e174b874e24b16b1f22b23ddc5fc0096f076e Mon Sep 17 00:00:00 2001 From: Paul Johnson Date: Fri, 13 Aug 2021 14:34:52 +0100 Subject: [PATCH 90/92] Remove duplicate project references in Umbraco.Examine.Lucene.csproj --- src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index 7473ce1bab..5de38bb5f2 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -3,7 +3,7 @@ netstandard2.0 Umbraco.Cms.Infrastructure.Examine Umbraco CMS - Umbraco.Examine.Lucene + Umbraco.Examine.Lucene Umbraco.Cms.Examine.Lucene @@ -20,10 +20,6 @@ - - - - @@ -38,4 +34,4 @@ - \ No newline at end of file + From 8e2044ad4ee3a123f51f5fa7479bc7388ac858ce Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 13 Aug 2021 18:30:09 +0200 Subject: [PATCH 91/92] Revert "Removed UnitTest" This reverts commit 18d670bc20814f6eb008f0142818e64afe193848. --- .../Security/PublicAccessCheckerTests.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs index f728314f81..52c68b551f 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs @@ -115,6 +115,23 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result); } + [AutoMoqData] + [Test] + public async Task GivenMemberLoggedIn_WhenMemberHasNoRoles_ThenAccessDeniedResult( + IMemberManager memberManager, + IPublicAccessService publicAccessService, + IContentService contentService) + { + PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext); + + httpContext.User = GetLoggedInUser(); + MockGetUserAsync(memberManager, new MemberIdentityUser()); + MockGetRolesAsync(memberManager, Enumerable.Empty()); + + var result = await sut.HasMemberAccessToContentAsync(123); + Assert.AreEqual(PublicAccessStatus.AccessDenied, result); + } + [AutoMoqData] [Test] public async Task GivenMemberLoggedIn_WhenMemberIsLockedOut_ThenLockedOutResult( From 8c42d563bd2ddaf3a03d8ee319698c4ab9363afe Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 13 Aug 2021 18:51:06 +0200 Subject: [PATCH 92/92] Updated unittest to match real usecase --- .../Security/PublicAccessCheckerTests.cs | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs index 52c68b551f..c2760e92f3 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs @@ -5,6 +5,7 @@ using System.Security.Claims; using System.Security.Principal; using System.Text; using System.Threading.Tasks; +using AutoFixture.NUnit3; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Moq; @@ -117,15 +118,28 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security [AutoMoqData] [Test] - public async Task GivenMemberLoggedIn_WhenMemberHasNoRoles_ThenAccessDeniedResult( + public async Task GivenMemberLoggedIn_WhenMemberHasNoRolesAndWrongUsername_ThenAccessDeniedResult( IMemberManager memberManager, IPublicAccessService publicAccessService, - IContentService contentService) + IContentService contentService, + IContent protectedNode, + IContent loginNode, + IContent noAccessNode, + string username) { PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext); + Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(It.IsAny())) + .Returns(new PublicAccessEntry(protectedNode, loginNode, noAccessNode, new [] + { + new PublicAccessRule(Guid.Empty, Guid.Empty) + { + RuleType = Constants.Conventions.PublicAccess.MemberUsernameRuleType, + RuleValue = "AnotherUsername" + } + })); httpContext.User = GetLoggedInUser(); - MockGetUserAsync(memberManager, new MemberIdentityUser()); + MockGetUserAsync(memberManager, new MemberIdentityUser(){IsApproved = true, UserName = username}); MockGetRolesAsync(memberManager, Enumerable.Empty()); var result = await sut.HasMemberAccessToContentAsync(123);