From 62200eda9e162e1a06b8825096037217cbe11d9f Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Sat, 13 Aug 2022 19:47:04 +1200
Subject: [PATCH] Pull secondary form into matrix component to allow multiple
 in the same page

---
 app/views/console/comps/permissions-matrix.phtml | 16 +++++++++++++---
 app/views/console/databases/collection.phtml     |  2 --
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/views/console/comps/permissions-matrix.phtml b/app/views/console/comps/permissions-matrix.phtml
index 2ea99b4227..1e34e2fa65 100644
--- a/app/views/console/comps/permissions-matrix.phtml
+++ b/app/views/console/comps/permissions-matrix.phtml
@@ -6,6 +6,7 @@ $method = $this->getParam('method', '');
 $params = $this->getParam('params', []);
 $events = $this->getParam('events', '');
 $data = $this->getParam('data', '');
+$form = $this->getParam('form', 'permissionsForm');
 $permissions = $this->getParam('permissions', Database::PERMISSIONS);
 
 $escapedPermissions = \array_map(function ($perm) {
@@ -30,9 +31,11 @@ $escapedPermissions = \array_map(function ($perm) {
     class="permissions-matrix margin-bottom-large"
     x-data="permissionsMatrix">
 
+    <form id="<?php echo $form ?>"></form>
+
     <input
         type="hidden"
-        name="permissions"
+        name="<?php echo $form; ?>"
         data-cast-from="csv"
         data-cast-to="array"
         data-ls-bind="{{<?php echo $data ?>.$permissions}}"
@@ -71,7 +74,7 @@ $escapedPermissions = \array_map(function ($perm) {
             </tr>
         </template>
         <tr x-data="permissionsRow"
-            @addrow.window="addPermission(role,<?php echo \implode(',', $escapedPermissions) ?>)">
+            @addrow.window="addPermission(<?php echo $form; ?>,role,{<?php echo \implode(',', $escapedPermissions) ?>})">
             <td>
                 <datalist id="types">
                     <option value="user:">
@@ -81,7 +84,14 @@ $escapedPermissions = \array_map(function ($perm) {
                     <option value="any">
                 </datalist>
 
-                <input required id="role" form="permissions" type="text" name="role" x-model="role" list="types"/>
+                <input
+                    required
+                    id="<?php echo $form; ?>"
+                    name="<?php echo $form; ?>"
+                    form="<?php echo $form ?>"
+                    list="types"
+                    type="text"
+                    x-model="role" />
             </td>
             <?php foreach ($escapedPermissions as $permission): ?>
                 <td>
diff --git a/app/views/console/databases/collection.phtml b/app/views/console/databases/collection.phtml
index f6dfbbdedd..f5f037a248 100644
--- a/app/views/console/databases/collection.phtml
+++ b/app/views/console/databases/collection.phtml
@@ -512,8 +512,6 @@ $permissions = $this->getParam('permissions', null);
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
 
-                        <form id="permissions"></form>
-
                         <form
                             data-analytics
                             data-analytics-activity