Merge pull request #3810 from mathesar-foundation/db-page-3

Database permissions modal - 'Share' tab

Author: seancolsen

mathesar/urls.py

@@ -52,19 +52,19 @@
     path('profile/', views.profile, name='profile'),
     path('administration/', views.admin_home, name='admin_home'),
     path('administration/users/', views.admin_home, name='admin_users_home'),
-    path('administration/users/<user_id>/', views.admin_home, name='admin_users_edit'),
+    path('administration/users/<int:user_id>/', views.admin_home, name='admin_users_edit'),
     path('administration/update/', views.admin_home, name='admin_update'),
     path('shares/tables/<slug>/', views.shared_table, name='shared_table'),
     path('shares/explorations/<slug>/', views.shared_query, name='shared_query'),
     path('databases/', views.databases, name='databases'),
     path('i18n/', include('django.conf.urls.i18n')),
     re_path(
-        r'^db/(?P<database_id>\w+)/schemas/(?P<schema_id>\w+)/',
+        r'^db/(?P<database_id>\d+)/schemas/(?P<schema_id>\d+)/',
         views.schemas_home,
         name='schema_home'
     ),
     re_path(
-        r'^db/(?P<database_id>\w+)/((schemas|settings)/)?',
+        r'^db/(?P<database_id>\d+)/((schemas|settings)/)?',
         views.schemas,
         name='schemas'
     ),

mathesar/views.py

@@ -10,6 +10,7 @@
 from mathesar.rpc.databases.configured import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
 from mathesar.rpc.servers.configured import list_ as get_servers_list
+from mathesar.rpc.tables import list_with_metadata as tables_list
 from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
@@ -33,13 +34,19 @@ def get_database_list(request):
     return databases_list(request=request)
 
 
-def get_table_list(request, schema_id):
-    # TODO: Fill this method
-    return []
+def get_table_list(request, database_id, schema_oid):
+    if database_id is not None and schema_oid is not None:
+        return tables_list(
+            request=request,
+            database_id=database_id,
+            schema_oid=schema_oid
+        )
+    else:
+        return []
 
 
 def get_queries_list(request, schema_id):
-    # TODO: Fill this method
+    # TODO_BETA: Fill this method
     return []
 
 
@@ -80,8 +87,8 @@ def _get_internal_db_meta():
 def _get_base_data_all_routes(request, database_id=None, schema_id=None):
     return {
         'abstract_types': get_ui_type_list(request, database_id),
-        'current_database': database_id,
-        'current_schema': schema_id,
+        'current_database': int(database_id) if database_id else None,
+        'current_schema': int(schema_id) if schema_id else None,
         'current_release_tag_name': __version__,
         'databases': get_database_list(request),
         'servers': get_servers_list(),
@@ -98,7 +105,7 @@ def _get_base_data_all_routes(request, database_id=None, schema_id=None):
 def get_common_data(request, database_id=None, schema_id=None):
     return {
         **_get_base_data_all_routes(request, database_id, schema_id),
-        'tables': get_table_list(request, schema_id),
+        'tables': get_table_list(request, database_id, schema_id),
         'queries': get_queries_list(request, schema_id),
         'routing_context': 'normal',
     }

mathesar_ui/src/api/rpc/databases.ts

@@ -1,6 +1,6 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
-import type { RawConfiguredRole } from './roles';
+import type { RawConfiguredRole, RawRole } from './roles';
 import type { RawServer } from './servers';
 
 export interface RawDatabase {
@@ -9,6 +9,21 @@ export interface RawDatabase {
   server_id: RawServer['id'];
 }
 
+export const allDatabasePrivileges = [
+  'CREATE',
+  'CONNECT',
+  'TEMPORARY',
+] as const;
+export type DatabasePrivilege = (typeof allDatabasePrivileges)[number];
+
+export interface RawUnderlyingDatabase {
+  oid: number;
+  name: string;
+  owner_oid: RawRole['oid'];
+  current_role_priv: DatabasePrivilege[];
+  current_role_owns: boolean;
+}
+
 export const sampleDataOptions = [
   'library_management',
   'movie_collection',
@@ -22,7 +37,18 @@ export interface DatabaseConnectionResult {
   configured_role: RawConfiguredRole;
 }
 
+export interface RawDatabasePrivilegesForRole {
+  role_oid: RawRole['oid'];
+  direct: DatabasePrivilege[];
+}
+
 export const databases = {
+  get: rpcMethodTypeContainer<
+    {
+      database_id: RawDatabase['id'];
+    },
+    RawUnderlyingDatabase
+  >(),
   configured: {
     list: rpcMethodTypeContainer<
       {
@@ -51,4 +77,19 @@ export const databases = {
       DatabaseConnectionResult
     >(),
   },
+  privileges: {
+    list_direct: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+      },
+      Array<RawDatabasePrivilegesForRole>
+    >(),
+    replace_for_roles: rpcMethodTypeContainer<
+      {
+        database_id: RawDatabase['id'];
+        privileges: Array<RawDatabasePrivilegesForRole>;
+      },
+      Array<RawDatabasePrivilegesForRole>
+    >(),
+  },
 };

mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { SvelteComponent } from 'svelte';
+  import { type SvelteComponent, createEventDispatcher } from 'svelte';
 
   import Checkbox from '@mathesar-component-library-dir/checkbox/Checkbox.svelte';
   import type { LabelGetter } from '@mathesar-component-library-dir/common/utils/formatUtils';
@@ -9,6 +9,10 @@
 
   type Option = $$Generic;
 
+  const dispatch = createEventDispatcher<{
+    artificialChange: Option[];
+  }>();
+
   export let values: Option[] = [];
   export let isInline = false;
   export let options: readonly Option[] = [];
@@ -44,6 +48,7 @@
     } else {
       values = values.filter((value) => !valuesAreEqual(value, option));
     }
+    dispatch('artificialChange', values);
   }
 </script>
 

mathesar_ui/src/component-library/collapsible/Collapsible.scss

@@ -11,10 +11,11 @@
       text-align: left;
       cursor: pointer;
       font-weight: inherit;
+      padding: var(--Collapsible_trigger-padding, 0.5em);
       .collapsible-header-title {
         flex-grow: 1;
         overflow: hidden;
-        font-weight: 600;
+        font-weight: var(--Collapsible_header-font-weight, 600);
       }
       svg {
         flex-shrink: 0;

mathesar_ui/src/component-library/common/utils/ImmutableSet.ts

@@ -54,6 +54,10 @@ export default class ImmutableSet<T> {
     return this.set.has(item);
   }
 
+  equals(other: Iterable<T> & { size: number }): boolean {
+    return this.size === other.size && this.union(other).size === this.size;
+  }
+
   get size(): number {
     return this.set.size;
   }

mathesar_ui/src/component-library/dropdown/Dropdown.scss

@@ -9,8 +9,8 @@ button.dropdown.trigger {
     text-overflow: ellipsis;
     white-space: nowrap;
     box-sizing: content-box;
-    line-height: 1.2;
-    min-height: 1.2em;
+    line-height: 1;
+    min-height: 1em;
     flex-grow: 1;
     > *:not(:last-child) {
       margin-right: 0.25rem;

mathesar_ui/src/component-library/select/Select.svelte

@@ -163,7 +163,9 @@
     on:blur
   >
     <svelte:fragment slot="trigger">
-      {#if $$slots.default}
+      {#if $$slots.trigger}
+        <slot name="trigger" option={value} label={getLabel(value)} />
+      {:else if $$slots.default}
         <slot option={value} label={getLabel(value)} />
       {:else}
         <StringOrComponent arg={getLabel(value)} />

mathesar_ui/src/component-library/tabs/TabContainer.scss

@@ -25,7 +25,7 @@
       border-radius: 2px 2px 0px 0px;
       border-bottom: 2px solid transparent;
       margin-bottom: -1px;
-      margin-right: 2rem;
+      margin-right: var(--Tab_margin-right, 2rem);
       font-size: var(--text-size-large);
 
       > div,
@@ -113,7 +113,7 @@
       > li.tab {
         font-size: var(--text-size-base);
         text-align: center;
-        margin-right: 0;
+        margin-right: var(--Tab_margin-right, 0);
         > div {
           padding: 0.5rem 0;
         }

mathesar_ui/src/contexts/DatabaseRouteContext.ts

@@ -10,9 +10,12 @@ export class DatabaseRouteContext {
 
   roles;
 
+  underlyingDatabase;
+
   constructor(database: Database) {
     this.database = database;
     this.roles = database.constructRolesStore();
+    this.underlyingDatabase = database.constructUnderlyingDatabaseStore();
   }
 
   /**

mathesar_ui/src/i18n/languages/en/dict.json

@@ -1,10 +1,13 @@
 {
+  "access_custom_help": "Custom permissions",
+  "access_for_roles_saved_successfully": "Access for roles have been saved successfully.",
   "access_level_cannot_remove_warning": "This access level cannot be removed.",
   "access_level_inheritance_help": "This access level is inherited from the {aclObject} permissions.",
   "access_level_inheritance_is_overridden_help": "This access level is inherited from the {aclObject} permissions and is overridden by the {comparedAclObject} permissions.",
   "access_level_is_overridden_help": "This access level is overridden by the {comparedAclObject} permissions.",
   "access_level_overrides_help": "This access level overrides the {comparedAclObject} permissions.",
   "access_level_precedence_help": "If a user has different access levels on the database and the schema, the access level of schema will take precedence.",
+  "access_not_granted_for_any_role": "Access has not been granted for any role.",
   "account_details": "Account Details",
   "action_cannot_be_undone": "This action cannot be undone",
   "actions": "Actions",
@@ -16,6 +19,7 @@
   "add_new_filter": "Add New Filter",
   "add_new_grouping": "Add New Grouping",
   "add_new_sort_condition": "Add new sort condition",
+  "add_roles": "Add Role(s)",
   "add_tables_to_new_schema": "You've created a new schema, now add tables to it.",
   "add_transformation_step": "Add transformation step",
   "add_user": "Add User",
@@ -49,6 +53,7 @@
   "change_password": "Change Password",
   "check_for_updates": "Check for Updates",
   "child_roles": "Child Roles",
+  "child_roles_count": "{count, plural, one {{count} child role} other {{count} child roles}}",
   "child_roles_saved_successfully": "The Child Roles have been successfully saved.",
   "choose_database": "Choose a Database",
   "choose_schema": "Choose a Schema",
@@ -91,6 +96,7 @@
   "confirm_and_create_table": "Confirm & create table",
   "confirm_delete_table": "To confirm the deletion of the [tableName] table, please enter the table name into the input field below.",
   "confirm_password": "Confirm Password",
+  "connect": "Connect",
   "connect_database": "Connect Database",
   "connect_existing_database": "Connect to an Existing Database",
   "connect_with_community_help": "Connect with Mathesar users and contributors in our community chat. Share ideas, get help, and contribute to discussions.",
@@ -117,6 +123,7 @@
   "count_new_records": "{count, plural, one {{count} new record} other {{count} new records}}",
   "count_records_deleted_successfully": "{count, plural, one {{count} record deleted successfully!} other {{count} records deleted successfully!}}",
   "count_tables": "{count, plural, one {{count} table} other {{count} tables}}",
+  "create": "Create",
   "create_a_table_by_importing": "Create a table by importing your data",
   "create_database": "Create Database",
   "create_database_mathesar_internal_server": "Create a new PostgreSQL database on Mathesar's internal server",
@@ -144,9 +151,14 @@
   "data_type_linked_column_restricted": "The data type of this column must match the referenced column and cannot be changed.",
   "data_type_pk_column_restricted": "The data type of the primary key column is restricted and cannot be changed.",
   "database": "Database",
+  "database_access_connect_help": "Can access the database",
+  "database_access_create_help": "Can access the database and create new schemas",
   "database_name": "Database Name",
   "database_not_found": "Database with id [connectionId] is not found.",
   "database_permissions": "Database Permissions",
+  "database_privilege_connect_help": "Allow connections to the database.",
+  "database_privilege_create_help": "Allow creation of new schemas.",
+  "database_privilege_temporary_help": "Allow creation of temporary tables.",
   "database_server_credentials": "Database server credentials",
   "database_type": "Database Type",
   "databases": "Databases",
@@ -258,6 +270,7 @@
   "go_to_record": "Go To Record",
   "go_to_record_page": "Go to Record Page",
   "go_to_record_with_value": "Go To Record {value}",
+  "granted_access": "Granted Access",
   "group": "Group",
   "group_by_column": "Group by Column",
   "group_records_by": "Group records by",
@@ -397,6 +410,7 @@
   "or": "or",
   "overridden": "Overridden",
   "overview": "Overview",
+  "owner": "Owner",
   "page_automatic_reload_update": "This page will automatically reload, showing the software update status again.",
   "page_doesnt_exist": "The page you're looking for doesn't exist.",
   "password": "Password",
@@ -469,6 +483,7 @@
   "role_dropped_successfully": "The Role has been dropped successfully",
   "role_has_no_child_roles": "The Role does not have any Child Roles",
   "role_name": "Role Name",
+  "role_permissions": "Role Permissions",
   "roles": "Roles",
   "row": "Row",
   "running_latest_version": "You are running the latest version",
@@ -569,6 +584,7 @@
   "this_will_remove_following_transformations": "This will remove the following transformation(s):",
   "time_to_create_exploration": "It's time to use your tables. Create your first exploration.",
   "today": "Today",
+  "transfer_ownership": "Transfer Ownership",
   "transform_results": "Transform Results",
   "transform_results_help": "Transformations can be used to summarize data, filter data, and more. Note that transformations are applied in the order they are listed.",
   "two_columns_cannot_have_same_name": "The two columns cannot have the same name.",

mathesar_ui/src/icons/customIcons.ts

@@ -121,3 +121,15 @@ export const connectDatabaseIcon: IconProps['data'] = {
     ],
   ],
 };
+
+export const treeChildNodeArrowIcon: IconProps['data'] = {
+  icon: [
+    9,
+    10,
+    [],
+    '',
+    [
+      'M0.5 5V0H1.5V5C1.5 6.933 3.067 8.5 5 8.5H9V9.5H5C2.51472 9.5 0.5 7.48528 0.5 5Z',
+    ],
+  ],
+};

mathesar_ui/src/icons/index.ts

@@ -83,6 +83,7 @@ import {
   explorationIcon,
   outcomeIcon,
   tableIcon,
+  treeChildNodeArrowIcon,
 } from './customIcons';
 
 /**
@@ -178,6 +179,9 @@ export const iconTable: IconProps = { data: tableIcon };
 export const iconInspector: IconProps = { data: faInfo };
 export const iconTableLink: IconProps = { data: faLink };
 export const iconTechnicalExplanation: IconProps = { data: faHammer };
+export const iconTreeChildNodeArrow: IconProps = {
+  data: treeChildNodeArrowIcon,
+};
 export const iconUpgradeAvailable: IconProps = { data: faCircleInfo };
 export const iconCurrentlyInstalledVersion: IconProps = { data: faCheck };
 export const iconUser: IconProps = { data: faUser };

mathesar_ui/src/models/Database.ts

@@ -63,6 +63,22 @@ export class Database {
     });
   }
 
+  constructDatabasePrivilegesStore() {
+    return new AsyncRpcApiStore(api.databases.privileges.list_direct, {
+      postProcess: (rawDbPrivilegesForRoles) =>
+        new ImmutableMap(
+          rawDbPrivilegesForRoles.map((rawDatabasePrivilegesForRole) => [
+            rawDatabasePrivilegesForRole.role_oid,
+            rawDatabasePrivilegesForRole,
+          ]),
+        ),
+    });
+  }
+
+  constructUnderlyingDatabaseStore() {
+    return new AsyncRpcApiStore(api.databases.get);
+  }
+
   addCollaborator(
     userId: number,
     configuredRoleId: ConfiguredRole['id'],