From 01888f2538c5648755eb115f79dd37fad5514aff Mon Sep 17 00:00:00 2001
From: Vishal Joshi <vishalwebdev0987@gmail.com>
Date: Mon, 16 Dec 2024 21:03:37 +0530
Subject: [PATCH 1/6] Added Table Permission Modal in Table Card Menu

---
 mathesar_ui/src/pages/schema/TableCard.svelte |  5 ++-
 .../table-inspector/table/TableMode.svelte    |  2 +-
 .../table/TablePermissions.svelte             | 34 ++++++++++++-------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 0b9afb3a33..5cf452d85c 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -29,6 +29,7 @@
     Icon,
     Truncate,
   } from '@mathesar-component-library';
+    import TablePermissions from '@mathesar/systems/table-view/table-inspector/table/TablePermissions.svelte';
 
   const recordSelector = getRecordSelectorFromContext();
 
@@ -127,7 +128,7 @@
       showArrow={false}
       triggerAppearance="ghost"
       triggerClass="dropdown-menu-button"
-      closeOnInnerClick={true}
+      closeOnInnerClick={false}
       placements={['bottom-end', 'right-start', 'left-start']}
       label=""
       icon={iconMoreActions}
@@ -148,6 +149,8 @@
         >
           {$_('edit_table')}
         </ButtonMenuItem>
+        <TablePermissions {table} fromTableCard={true}/>
+          
       {/if}
       <ButtonMenuItem
         on:click={handleDeleteTable}
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 27e32ccc22..5e1eb3e36e 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -39,7 +39,7 @@
     <div slot="content" class="content-container">
       <TableName disabled={!$currentRoleOwns} />
       <TableDescription disabled={!$currentRoleOwns} />
-      <TablePermissions />
+      <TablePermissions {table}/>
     </div>
   </Collapsible>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
index 5695cd4a6f..acf94409db 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
@@ -15,7 +15,6 @@
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
   import { modal } from '@mathesar/stores/modal';
-  import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { toast } from '@mathesar/stores/toast';
   import {
     type AccessControlConfig,
@@ -23,12 +22,12 @@
     PermissionsOverview,
     TransferOwnership,
   } from '@mathesar/systems/permissions';
-  import { Button, ImmutableMap } from '@mathesar-component-library';
+  import { Button, ButtonMenuItem, ImmutableMap } from '@mathesar-component-library';
 
   const controller = modal.spawnModalController();
-  const tabularData = getTabularDataStoreFromContext();
-
-  $: table = $tabularData.table;
+  
+  export let table: Table;
+  export let fromTableCard = false;
   $: tablePrivileges = table.constructTablePrivilegesStore();
 
   const databaseContext = DatabaseRouteContext.get();
@@ -135,14 +134,23 @@
 </script>
 
 <div>
-  <Button
-    appearance="secondary"
-    on:click={() => controller.open()}
-    size="small"
-  >
-    <Icon {...iconPermissions} />
-    <span>{$_('table_permissions')}</span>
-  </Button>
+  {#if fromTableCard}
+    <ButtonMenuItem
+      on:click={() => controller.open()}
+      icon={iconPermissions}
+    >
+      {$_('table_permissions')}
+    </ButtonMenuItem>
+  {:else}
+    <Button
+      appearance="secondary"
+      on:click={() => controller.open()}
+      size="small"
+    >
+      <Icon {...iconPermissions} />
+      <span>{$_('table_permissions')}</span>
+    </Button>
+  {/if}
 </div>
 
 <PermissionsModal

From 0c7f59f461eae251b2fc007ce877e6cc7be98557 Mon Sep 17 00:00:00 2001
From: Vishal Joshi <vishalwebdev0987@gmail.com>
Date: Wed, 18 Dec 2024 23:03:06 +0530
Subject: [PATCH 2/6] Changed TablePermissions component to
 TablePermissionsModal

---
 mathesar_ui/src/pages/schema/TableCard.svelte | 17 ++++++++---
 .../table-inspector/table/TableMode.svelte    | 22 +++++++++++++--
 ...ns.svelte => TablePermissionsModal.svelte} | 28 ++-----------------
 3 files changed, 35 insertions(+), 32 deletions(-)
 rename mathesar_ui/src/systems/table-view/table-inspector/table/{TablePermissions.svelte => TablePermissionsModal.svelte} (84%)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 5cf452d85c..1d243f73a3 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -8,6 +8,7 @@
     iconEdit,
     iconExploration,
     iconMoreActions,
+    iconPermissions,
     iconSelectRecord,
   } from '@mathesar/icons';
   import type { Database } from '@mathesar/models/Database';
@@ -22,6 +23,7 @@
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
+  import TablePermissionsModal from '@mathesar/systems/table-view/table-inspector/table/TablePermissionsModal.svelte';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import {
     ButtonMenuItem,
@@ -29,7 +31,7 @@
     Icon,
     Truncate,
   } from '@mathesar-component-library';
-    import TablePermissions from '@mathesar/systems/table-view/table-inspector/table/TablePermissions.svelte';
+    import { modal } from '@mathesar/stores/modal';
 
   const recordSelector = getRecordSelectorFromContext();
 
@@ -43,6 +45,7 @@
   let isHoveringMenuTrigger = false;
   let isHoveringBottomButton = false;
   let isTableCardFocused = false;
+  const permissionModal = modal.spawnModalController();
 
   $: requiresImportConfirmation = tableRequiresImportConfirmation(table);
   $: tablePageUrl = requiresImportConfirmation
@@ -128,7 +131,7 @@
       showArrow={false}
       triggerAppearance="ghost"
       triggerClass="dropdown-menu-button"
-      closeOnInnerClick={false}
+      closeOnInnerClick={true}
       placements={['bottom-end', 'right-start', 'left-start']}
       label=""
       icon={iconMoreActions}
@@ -149,8 +152,12 @@
         >
           {$_('edit_table')}
         </ButtonMenuItem>
-        <TablePermissions {table} fromTableCard={true}/>
-          
+        <ButtonMenuItem
+          on:click={() => permissionModal.open()}
+          icon={iconPermissions}
+        >
+          {$_('table_permissions')}
+        </ButtonMenuItem>
       {/if}
       <ButtonMenuItem
         on:click={handleDeleteTable}
@@ -179,6 +186,8 @@
     </button>
   {/if}
 </div>
+<TablePermissionsModal {table} controller={permissionModal}/>
+
 
 <style>
   .table-card {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 5e1eb3e36e..4e5d25cd0b 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -19,9 +19,14 @@
   import TableActions from './TableActions.svelte';
   import TableDescription from './TableDescription.svelte';
   import TableName from './TableName.svelte';
-  import TablePermissions from './TablePermissions.svelte';
+  import TablePermissionsModal from './TablePermissionsModal.svelte';
+    import { modal } from '@mathesar/stores/modal';
+    import Button from '@mathesar/component-library/button/Button.svelte';
+    import { iconPermissions } from '@mathesar/icons';
+    import Icon from '@mathesar/component-library/icon/Icon.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
+  const permissionModal = modal.spawnModalController();
   $: ({ table } = $tabularData);
   $: ({ currentRoleOwns } = table.currentAccess);
 </script>
@@ -39,7 +44,18 @@
     <div slot="content" class="content-container">
       <TableName disabled={!$currentRoleOwns} />
       <TableDescription disabled={!$currentRoleOwns} />
-      <TablePermissions {table}/>
+      <div>
+        <Button
+          appearance="secondary"
+          on:click={() => permissionModal.open()}
+          size="small"
+          class="permissions-button"
+        >
+          <Icon {...iconPermissions} />
+          <span>{$_('table_permissions')}</span>
+        </Button>
+      </div>
+      
     </div>
   </Collapsible>
 
@@ -88,6 +104,8 @@
   </Collapsible>
 </div>
 
+<TablePermissionsModal {table} controller={permissionModal} />
+
 <style lang="scss">
   .table-mode-container {
     padding-bottom: var(--size-small);
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
similarity index 84%
rename from mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
rename to mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
index acf94409db..6127b411ae 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissions.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
@@ -7,14 +7,11 @@
     RawTablePrivilegesForRole,
     TablePrivilege,
   } from '@mathesar/api/rpc/tables';
-  import Icon from '@mathesar/component-library/icon/Icon.svelte';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
-  import { iconPermissions } from '@mathesar/icons';
   import type { Role } from '@mathesar/models/Role';
   import type { Table } from '@mathesar/models/Table';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
   import { AsyncStoreValue } from '@mathesar/stores/AsyncStore';
-  import { modal } from '@mathesar/stores/modal';
   import { toast } from '@mathesar/stores/toast';
   import {
     type AccessControlConfig,
@@ -22,14 +19,12 @@
     PermissionsOverview,
     TransferOwnership,
   } from '@mathesar/systems/permissions';
-  import { Button, ButtonMenuItem, ImmutableMap } from '@mathesar-component-library';
+  import { ImmutableMap, ModalController } from '@mathesar-component-library';
 
-  const controller = modal.spawnModalController();
   
+  export let controller: ModalController;
   export let table: Table;
-  export let fromTableCard = false;
   $: tablePrivileges = table.constructTablePrivilegesStore();
-
   const databaseContext = DatabaseRouteContext.get();
   $: ({ roles, currentRole } = $databaseContext);
 
@@ -133,25 +128,6 @@
   }
 </script>
 
-<div>
-  {#if fromTableCard}
-    <ButtonMenuItem
-      on:click={() => controller.open()}
-      icon={iconPermissions}
-    >
-      {$_('table_permissions')}
-    </ButtonMenuItem>
-  {:else}
-    <Button
-      appearance="secondary"
-      on:click={() => controller.open()}
-      size="small"
-    >
-      <Icon {...iconPermissions} />
-      <span>{$_('table_permissions')}</span>
-    </Button>
-  {/if}
-</div>
 
 <PermissionsModal
   {controller}

From dfed30fce429d556104a897edd736383b978ce7a Mon Sep 17 00:00:00 2001
From: Vishal Joshi <vishalwebdev0987@gmail.com>
Date: Wed, 18 Dec 2024 23:17:48 +0530
Subject: [PATCH 3/6] Solved Lint errors

---
 mathesar_ui/src/pages/schema/TableCard.svelte         |  2 +-
 .../table-view/table-inspector/table/TableMode.svelte | 11 ++++-------
 .../table/TablePermissionsModal.svelte                |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 1d243f73a3..42090e0b0d 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -24,6 +24,7 @@
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
   import TablePermissionsModal from '@mathesar/systems/table-view/table-inspector/table/TablePermissionsModal.svelte';
+  import { modal } from '@mathesar/stores/modal';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import {
     ButtonMenuItem,
@@ -31,7 +32,6 @@
     Icon,
     Truncate,
   } from '@mathesar-component-library';
-    import { modal } from '@mathesar/stores/modal';
 
   const recordSelector = getRecordSelectorFromContext();
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 4e5d25cd0b..86f88bf806 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { _ } from 'svelte-i18n';
 
+  import { iconPermissions } from '@mathesar/icons';
   import {
     tableInspectorTableActionsVisible,
     tableInspectorTableAdvancedVisible,
@@ -9,7 +10,8 @@
     tableInspectorTableRecordSummaryVisible,
   } from '@mathesar/stores/localStorage';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
-  import { Collapsible } from '@mathesar-component-library';
+  import { Button, Collapsible, Icon } from '@mathesar-component-library';
+  import { modal } from '@mathesar/stores/modal';
 
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
   import TableRecordSummaryConfig from '../record-summary/TableRecordSummaryConfig.svelte';
@@ -20,10 +22,6 @@
   import TableDescription from './TableDescription.svelte';
   import TableName from './TableName.svelte';
   import TablePermissionsModal from './TablePermissionsModal.svelte';
-    import { modal } from '@mathesar/stores/modal';
-    import Button from '@mathesar/component-library/button/Button.svelte';
-    import { iconPermissions } from '@mathesar/icons';
-    import Icon from '@mathesar/component-library/icon/Icon.svelte';
 
   const tabularData = getTabularDataStoreFromContext();
   const permissionModal = modal.spawnModalController();
@@ -54,8 +52,7 @@
           <Icon {...iconPermissions} />
           <span>{$_('table_permissions')}</span>
         </Button>
-      </div>
-      
+      </div>  
     </div>
   </Collapsible>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
index 6127b411ae..bb53781053 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
@@ -21,7 +21,6 @@
   } from '@mathesar/systems/permissions';
   import { ImmutableMap, ModalController } from '@mathesar-component-library';
 
-  
   export let controller: ModalController;
   export let table: Table;
   $: tablePrivileges = table.constructTablePrivilegesStore();

From 8d321413dacbbdf9e2051122e18336ce6198789e Mon Sep 17 00:00:00 2001
From: Vishal Joshi <vishalwebdev0987@gmail.com>
Date: Wed, 18 Dec 2024 23:39:53 +0530
Subject: [PATCH 4/6] Solved Lint errors and added formatting

---
 mathesar_ui/src/pages/schema/TableCard.svelte               | 5 ++---
 .../table-view/table-inspector/table/TableMode.svelte       | 4 ++--
 .../table-inspector/table/TablePermissionsModal.svelte      | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index 42090e0b0d..c9d2df7829 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -19,12 +19,12 @@
     getTablePageUrl,
   } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
+  import { modal } from '@mathesar/stores/modal';
   import { deleteTable } from '@mathesar/stores/tables';
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
   import TablePermissionsModal from '@mathesar/systems/table-view/table-inspector/table/TablePermissionsModal.svelte';
-  import { modal } from '@mathesar/stores/modal';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import {
     ButtonMenuItem,
@@ -186,8 +186,7 @@
     </button>
   {/if}
 </div>
-<TablePermissionsModal {table} controller={permissionModal}/>
-
+<TablePermissionsModal {table} controller={permissionModal} />
 
 <style>
   .table-card {
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
index 86f88bf806..674fbc00fb 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TableMode.svelte
@@ -9,9 +9,9 @@
     tableInspectorTablePropertiesVisible,
     tableInspectorTableRecordSummaryVisible,
   } from '@mathesar/stores/localStorage';
+  import { modal } from '@mathesar/stores/modal';
   import { getTabularDataStoreFromContext } from '@mathesar/stores/table-data';
   import { Button, Collapsible, Icon } from '@mathesar-component-library';
-  import { modal } from '@mathesar/stores/modal';
 
   import CollapsibleHeader from '../CollapsibleHeader.svelte';
   import TableRecordSummaryConfig from '../record-summary/TableRecordSummaryConfig.svelte';
@@ -52,7 +52,7 @@
           <Icon {...iconPermissions} />
           <span>{$_('table_permissions')}</span>
         </Button>
-      </div>  
+      </div>
     </div>
   </Collapsible>
 
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
index bb53781053..09df674a0a 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
@@ -19,7 +19,10 @@
     PermissionsOverview,
     TransferOwnership,
   } from '@mathesar/systems/permissions';
-  import { ImmutableMap, ModalController } from '@mathesar-component-library';
+  import {
+    ImmutableMap,
+    type ModalController,
+  } from '@mathesar-component-library';
 
   export let controller: ModalController;
   export let table: Table;
@@ -127,7 +130,6 @@
   }
 </script>
 
-
 <PermissionsModal
   {controller}
   getAsyncStores={getAsyncStoresForPermissions}

From a7c2ee958daa38e41e0e051e0800210dd4a08c40 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 3 Jan 2025 12:59:35 -0500
Subject: [PATCH 5/6] Move table permissions modal up to TableList

---
 mathesar_ui/src/pages/schema/TableCard.svelte |  7 ++---
 .../src/pages/schema/TablesList.svelte        | 31 ++++++++++++++++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/mathesar_ui/src/pages/schema/TableCard.svelte b/mathesar_ui/src/pages/schema/TableCard.svelte
index c9d2df7829..aee6a711ff 100644
--- a/mathesar_ui/src/pages/schema/TableCard.svelte
+++ b/mathesar_ui/src/pages/schema/TableCard.svelte
@@ -19,12 +19,10 @@
     getTablePageUrl,
   } from '@mathesar/routes/urls';
   import { confirmDelete } from '@mathesar/stores/confirmation';
-  import { modal } from '@mathesar/stores/modal';
   import { deleteTable } from '@mathesar/stores/tables';
   import { createDataExplorerUrlToExploreATable } from '@mathesar/systems/data-explorer';
   import { getRecordSelectorFromContext } from '@mathesar/systems/record-selector/RecordSelectorController';
   import TableDeleteConfirmationBody from '@mathesar/systems/table-view/table-inspector/table/TableDeleteConfirmationBody.svelte';
-  import TablePermissionsModal from '@mathesar/systems/table-view/table-inspector/table/TablePermissionsModal.svelte';
   import { tableRequiresImportConfirmation } from '@mathesar/utils/tables';
   import {
     ButtonMenuItem,
@@ -39,13 +37,13 @@
   export let database: Database;
   export let schema: Schema;
   export let openEditTableModal: (_table: Table) => void;
+  export let openTablePermissionsModal: (_table: Table) => void;
 
   $: ({ currentRoleOwns, currentRolePrivileges } = table.currentAccess);
 
   let isHoveringMenuTrigger = false;
   let isHoveringBottomButton = false;
   let isTableCardFocused = false;
-  const permissionModal = modal.spawnModalController();
 
   $: requiresImportConfirmation = tableRequiresImportConfirmation(table);
   $: tablePageUrl = requiresImportConfirmation
@@ -153,7 +151,7 @@
           {$_('edit_table')}
         </ButtonMenuItem>
         <ButtonMenuItem
-          on:click={() => permissionModal.open()}
+          on:click={() => openTablePermissionsModal(table)}
           icon={iconPermissions}
         >
           {$_('table_permissions')}
@@ -186,7 +184,6 @@
     </button>
   {/if}
 </div>
-<TablePermissionsModal {table} controller={permissionModal} />
 
 <style>
   .table-card {
diff --git a/mathesar_ui/src/pages/schema/TablesList.svelte b/mathesar_ui/src/pages/schema/TablesList.svelte
index dda5c2736b..c198a32b17 100644
--- a/mathesar_ui/src/pages/schema/TablesList.svelte
+++ b/mathesar_ui/src/pages/schema/TablesList.svelte
@@ -7,23 +7,31 @@
   import type { Table } from '@mathesar/models/Table';
   import { highlightNewItems } from '@mathesar/packages/new-item-highlighter';
   import { modal } from '@mathesar/stores/modal';
+  import TablePermissionsModal from '@mathesar/systems/table-view/table-inspector/table/TablePermissionsModal.svelte';
 
   import EditTableModal from './EditTableModal.svelte';
   import EmptyEntity from './EmptyEntity.svelte';
   import TableCard from './TableCard.svelte';
 
   const editTableModal = modal.spawnModalController();
+  const tablePermissionsModal = modal.spawnModalController();
 
   export let tables: Table[];
   export let database: Database;
   export let schema: Schema;
 
-  let selectedTable: Table | undefined;
+  let tableForEditing: Table | undefined;
+  let tableForPermissions: Table | undefined;
 
   function openEditTableModal(table: Table) {
-    selectedTable = table;
+    tableForEditing = table;
     editTableModal.open();
   }
+
+  function openTablePermissionsModal(table: Table) {
+    tableForPermissions = table;
+    tablePermissionsModal.open();
+  }
 </script>
 
 <div class="tables-list">
@@ -33,7 +41,13 @@
       use:highlightNewItems={{ scrollHint: $_('table_new_items_scroll_hint') }}
     >
       {#each tables as table (table.oid)}
-        <TableCard {table} {database} {schema} {openEditTableModal} />
+        <TableCard
+          {table}
+          {database}
+          {schema}
+          {openEditTableModal}
+          {openTablePermissionsModal}
+        />
       {/each}
     </div>
   {:else}
@@ -43,8 +57,15 @@
   {/if}
 </div>
 
-{#if selectedTable}
-  <EditTableModal controller={editTableModal} table={selectedTable} />
+{#if tableForEditing}
+  <EditTableModal controller={editTableModal} table={tableForEditing} />
+{/if}
+
+{#if tableForPermissions}
+  <TablePermissionsModal
+    controller={tablePermissionsModal}
+    table={tableForPermissions}
+  />
 {/if}
 
 <style lang="scss">

From a18839658c45dcef8943ecf3a37cc7f3895f8610 Mon Sep 17 00:00:00 2001
From: Sean Colsen <colsen.sean@gmail.com>
Date: Fri, 3 Jan 2025 13:12:18 -0500
Subject: [PATCH 6/6] Show DB object name in permissions modals

---
 mathesar_ui/src/i18n/languages/en/dict.json              | 3 +++
 .../database/permissions/DatabasePermissionsModal.svelte | 8 +++++++-
 .../src/pages/schema/SchemaPermissionsModal.svelte       | 9 ++++++++-
 .../table-inspector/table/TablePermissionsModal.svelte   | 8 +++++++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/mathesar_ui/src/i18n/languages/en/dict.json b/mathesar_ui/src/i18n/languages/en/dict.json
index 4b9ad4e757..1f8afdcfe4 100644
--- a/mathesar_ui/src/i18n/languages/en/dict.json
+++ b/mathesar_ui/src/i18n/languages/en/dict.json
@@ -437,6 +437,9 @@
   "passwords_do_not_match": "Passwords do not match",
   "paste_data_import": "Paste the data you want to import",
   "permission": "Permission",
+  "permissions_for_named_database": "Permissions for [databaseName] database",
+  "permissions_for_named_schema": "Permissions for [schemaName] schema",
+  "permissions_for_named_table": "Permissions for [tableName] table",
   "pick": "Pick",
   "pick_best_data_type_column": "Pick the best data type for each column",
   "pick_record": "Pick a record",
diff --git a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
index 215337f097..1796eb6422 100644
--- a/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
+++ b/mathesar_ui/src/pages/database/permissions/DatabasePermissionsModal.svelte
@@ -6,6 +6,8 @@
     DatabasePrivilege,
     RawDatabasePrivilegesForRole,
   } from '@mathesar/api/rpc/databases';
+  import Identifier from '@mathesar/components/Identifier.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import type { Role } from '@mathesar/models/Role';
   import AsyncRpcApiStore from '@mathesar/stores/AsyncRpcApiStore';
@@ -106,7 +108,11 @@
   onClose={() => databasePrivileges.reset()}
 >
   <span slot="title">
-    {$_('database_permissions')}
+    <RichText text={$_('permissions_for_named_database')} let:slotName>
+      {#if slotName === 'databaseName'}
+        <Identifier>{database.name}</Identifier>
+      {/if}
+    </RichText>
   </span>
   <PermissionsOverview
     slot="share"
diff --git a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
index 452f9970d6..8d535fcac6 100644
--- a/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
+++ b/mathesar_ui/src/pages/schema/SchemaPermissionsModal.svelte
@@ -7,6 +7,8 @@
     RawSchemaPrivilegesForRole,
     SchemaPrivilege,
   } from '@mathesar/api/rpc/schemas';
+  import Identifier from '@mathesar/components/Identifier.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import type { Role } from '@mathesar/models/Role';
   import type { Schema } from '@mathesar/models/Schema';
@@ -28,6 +30,7 @@
   export let schema: Schema;
 
   $: schemaPrivileges = schema.constructSchemaPrivilegesStore();
+  $: schemaName = schema.name;
 
   const databaseContext = DatabaseRouteContext.get();
   $: ({ roles, currentRole } = $databaseContext);
@@ -118,7 +121,11 @@
   onClose={() => schemaPrivileges.reset()}
 >
   <span slot="title">
-    {$_('schema_permissions')}
+    <RichText text={$_('permissions_for_named_schema')} let:slotName>
+      {#if slotName === 'schemaName'}
+        <Identifier>{$schemaName}</Identifier>
+      {/if}
+    </RichText>
   </span>
   <PermissionsOverview
     slot="share"
diff --git a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
index 09df674a0a..cd03d37a96 100644
--- a/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
+++ b/mathesar_ui/src/systems/table-view/table-inspector/table/TablePermissionsModal.svelte
@@ -7,6 +7,8 @@
     RawTablePrivilegesForRole,
     TablePrivilege,
   } from '@mathesar/api/rpc/tables';
+  import Identifier from '@mathesar/components/Identifier.svelte';
+  import { RichText } from '@mathesar/components/rich-text';
   import { DatabaseRouteContext } from '@mathesar/contexts/DatabaseRouteContext';
   import type { Role } from '@mathesar/models/Role';
   import type { Table } from '@mathesar/models/Table';
@@ -136,7 +138,11 @@
   onClose={() => tablePrivileges.reset()}
 >
   <span slot="title">
-    {$_('table_permissions')}
+    <RichText text={$_('permissions_for_named_table')} let:slotName>
+      {#if slotName === 'tableName'}
+        <Identifier>{table.name}</Identifier>
+      {/if}
+    </RichText>
   </span>
   <PermissionsOverview
     slot="share"