From 3a7e388547e3df29bee9bb2649c543c19a1e775a Mon Sep 17 00:00:00 2001 From: Nikolaj Brask-Nielsen Date: Wed, 16 Aug 2023 16:44:05 +0200 Subject: [PATCH] Adds hide toggle to hide unavailable compositions (#12776) * feat: Added hide toggle to hide unavailable compositions * fix: Fixed - being . * chore: Move toggle to top --- src/Umbraco.Core/EmbeddedResources/Lang/da.xml | 1 + src/Umbraco.Core/EmbeddedResources/Lang/en.xml | 1 + src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml | 1 + .../src/less/components/umb-checkbox-list.less | 4 ++++ .../compositions/compositions.controller.js | 1 + .../common/infiniteeditors/compositions/compositions.html | 8 +++++++- 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml index aa002e9c0f..1c41c1f9a2 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/da.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/da.xml @@ -56,6 +56,7 @@ Opret indholdsskabelon Gensend invitation Standardværdi + Skjul utilgængelige kompositioner Indhold diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml index ced064559b..30b8a6b6a7 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en.xml @@ -55,6 +55,7 @@ Unlock Create Content Template Resend Invitation + Hide unavailable options Content diff --git a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml index df065a9d48..51890ed834 100644 --- a/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml +++ b/src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml @@ -57,6 +57,7 @@ Unlock Create Content Template Resend Invitation + Hide unavailable options Content diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less index 44fa84ebb8..10dbafc74f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkbox-list.less @@ -31,6 +31,10 @@ font-weight: bold; } +.umb-checkbox-list__item.-hidden { + display: none; +} + .umb-checkbox-list__item-checkbox { display: flex; justify-content: center; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js index b5155b8cc6..f695b66fc1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.controller.js @@ -8,6 +8,7 @@ vm.showConfirmSubmit = false; vm.loadingAlias = null; + vm.hideUnavailable = false; vm.isSelected = isSelected; vm.openContentType = openContentType; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html index 99e18c067d..926305e2de 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/compositions/compositions.html @@ -35,6 +35,12 @@ auto-focus="true"> + + + + @@ -72,7 +78,7 @@
  • + ng-class="{'-hidden': ((compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited) && vm.hideUnavailable, '-disabled': (compositeContentType.allowed === false && !compositeContentType.selected) || compositeContentType.inherited, '-selected': compositeContentType.selected}">