From 906b04bb01314d474c07081cabc88ccda4dad4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Grabowski?= <michal.grabowski@ibexa.co>
Date: Thu, 21 Oct 2021 10:26:57 +0200
Subject: [PATCH 1/2] IBX-1267: It is possible to create content under
 non-container in UDW (#1966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Grabowski <michal.grabowski@ez.no>
---
 .../content-create-button/content.create.button.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
index 0f76d7d36a..22ed9fa796 100644
--- a/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
+++ b/src/bundle/ui-dev/src/modules/universal-discovery/components/content-create-button/content.create.button.js
@@ -10,6 +10,7 @@ import {
     ContentOnTheFlyConfigContext,
     SelectedLocationsContext,
     MultipleConfigContext,
+    ContentTypesMapContext,
 } from '../../universal.discovery.module';
 
 const ContentCreateButton = ({ isDisabled }) => {
@@ -19,6 +20,7 @@ const ContentCreateButton = ({ isDisabled }) => {
     const [selectedLocations, dispatchSelectedLocationsAction] = useContext(SelectedLocationsContext);
     const [multiple, multipleItemsLimit] = useContext(MultipleConfigContext);
     const { hidden, allowedLocations } = useContext(ContentOnTheFlyConfigContext);
+    const contentTypesMap = useContext(ContentTypesMapContext);
     const createLabel = Translator.trans(/*@Desc("Create")*/ 'create_content.create', {}, 'universal_discovery_widget');
     const toggleContentCreateVisibility = () => {
         window.eZ.helpers.tooltips.hideAll();
@@ -32,12 +34,14 @@ const ContentCreateButton = ({ isDisabled }) => {
         );
     }
 
+    const contentTypeInfo = contentTypesMap[selectedLocation?.location?.ContentInfo.Content.ContentType._href];
     const isAllowedLocation = selectedLocation && (!allowedLocations || allowedLocations.includes(selectedLocation.parentLocationId));
     const hasAccess =
         !selectedLocation ||
         !selectedLocation.permissions ||
         (selectedLocation.permissions && selectedLocation.permissions.create.hasAccess);
     const isLimitReached = multiple && multipleItemsLimit !== 0 && selectedLocations.length >= multipleItemsLimit;
+    const isContainer = contentTypeInfo?.isContainer ?? true;
 
     if (hidden) {
         return null;
@@ -47,7 +51,7 @@ const ContentCreateButton = ({ isDisabled }) => {
         <div className="c-content-create-button">
             <button
                 className="c-content-create-button__btn btn btn-link"
-                disabled={isDisabled || !hasAccess || !isAllowedLocation || isLimitReached}
+                disabled={isDisabled || !hasAccess || !isAllowedLocation || isLimitReached || !isContainer}
                 onClick={toggleContentCreateVisibility}
                 data-tooltip-container-selector=".c-top-menu"
                 title={createLabel}>

From 288229d68b60a7e3b0753ae6e0766a70d52cb61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Grabowski?= <michal.grabowski@ibexa.co>
Date: Thu, 21 Oct 2021 10:28:35 +0200
Subject: [PATCH 2/2] IBX-1264: Dropdowns are not clickable / do not expand in
 backoffice (#1974)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Grabowski <michal.grabowski@ez.no>
---
 src/bundle/Resources/public/js/scripts/core/dropdown.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/bundle/Resources/public/js/scripts/core/dropdown.js b/src/bundle/Resources/public/js/scripts/core/dropdown.js
index 431f804aa1..44c5b779ea 100644
--- a/src/bundle/Resources/public/js/scripts/core/dropdown.js
+++ b/src/bundle/Resources/public/js/scripts/core/dropdown.js
@@ -299,6 +299,14 @@
         }
 
         init() {
+            if (this.container.dataset.initialized) {
+                console.warn("Dropdown has already been initialized!");
+
+                return;
+            }
+
+            this.container.dataset.initialized = true;
+
             const selectedItems = this.getSelectedItems();
             const isEmpty = !selectedItems.length;