From 3beca7fe15a09df7e39be9390fdcd4cfb2e77a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Membr=C3=A9?= <vincent.membre@rudder.io>
Date: Tue, 7 Nov 2023 11:15:30 +0100
Subject: [PATCH 1/2] Prepare nightly branch

---
 main-build.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main-build.conf b/main-build.conf
index 5a0ee5b33..9ec6dc687 100644
--- a/main-build.conf
+++ b/main-build.conf
@@ -13,7 +13,7 @@
 # Only rudder branch is defined here.
 # Version of Rudder used to build the plugin.
 # It defined the API/ABI used and it is important for binary compatibility
-branch-type=next
+branch-type=nightly
 rudder-version=7.3.9
 common-version=2.1.1
 private-version=2.1.0

From 623d9ef9f2f81bf7c5ef12d351a4376f742c73b9 Mon Sep 17 00:00:00 2001
From: Clark Andrianasolo <clark.andrianasolo@rudder.io>
Date: Thu, 9 Nov 2023 16:53:50 +0100
Subject: [PATCH 2/2] Fixes #21724: Categories can't be folded in ACL API with
 authorization plugin

---
 .../src/main/elm/sources/ApiAuthorizations.elm              | 4 +++-
 .../src/main/resources/toserve/apiauthorizations/media.css  | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api-authorizations/src/main/elm/sources/ApiAuthorizations.elm b/api-authorizations/src/main/elm/sources/ApiAuthorizations.elm
index f16a08e50..b2911d623 100644
--- a/api-authorizations/src/main/elm/sources/ApiAuthorizations.elm
+++ b/api-authorizations/src/main/elm/sources/ApiAuthorizations.elm
@@ -159,7 +159,9 @@ displayCategory acl cat =
       div [class "acl-category"]
       [ input[type_ "checkbox", id toggleId, class "toggle-checkbox"][]
       , div[class "category-header"]
-        [ i [class "fa fa-caret-down"][]
+        [ label [for toggleId, class "category-toggle-caret"]
+          [ i [class "fa fa-caret-down"][]
+          ]
         , label [for toggleId]
           [ text cat.category
           , span [class ("badge badge-secondary " ++ if nbSelected <= 0 then "empty" else "")][text (String.fromInt nbSelected)]
diff --git a/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css b/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css
index 8f6dff3db..cbb9b7655 100755
--- a/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css
+++ b/api-authorizations/src/main/resources/toserve/apiauthorizations/media.css
@@ -68,13 +68,17 @@
 .acl-category .toggle-checkbox:not(:checked) + .category-header{
   margin-bottom: 8px;
 }
+.acl-category .category-header .category-toggle-caret{
+   flex: 0 1 40px;
+   font-size: inherit;
+}
 .acl-category .category-header label{
   margin: 0;
   text-transform: capitalize;
   font-size: 22px;
   font-weight: normal;
   flex: 1;
-  padding: 4px 0 4px 40px;
+  padding: 4px 0;
   cursor: pointer;
 }
 .acl-category .category-header > label .badge.badge-secondary{