Merge branch 'develop' into exp_replace

mathesar-foundation · Aug 7, 2024 · 2ae2ec1 · 2ae2ec1
2 parents 5bed3f1 + 021a587
commit 2ae2ec1
Show file tree

Hide file tree

Showing 25 changed files with 791 additions and 169 deletions.
diff --git a/mathesar/views.py b/mathesar/views.py
@@ -9,6 +9,7 @@
 
 from mathesar.rpc.databases import list_ as databases_list
 from mathesar.rpc.schemas import list_ as schemas_list
+from mathesar.rpc.servers import list_ as get_servers_list
 from mathesar.api.serializers.databases import TypeSerializer
 from mathesar.api.serializers.tables import TableSerializer
 from mathesar.api.serializers.queries import QuerySerializer
@@ -83,6 +84,7 @@ def _get_base_data_all_routes(request, database_id=None, schema_id=None):
         'current_schema': schema_id,
         'current_release_tag_name': __version__,
         'databases': get_database_list(request),
+        'servers': get_servers_list(),
         'internal_db_connection': _get_internal_db_meta(),
         'is_authenticated': not request.user.is_anonymous,
         'queries': [],

diff --git a/mathesar_ui/src/api/rpc/database_setup.ts b/mathesar_ui/src/api/rpc/database_setup.ts
@@ -1,7 +1,7 @@
 import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-builder';
 
 import type { ConfiguredRole } from './configured_roles';
-import type { Database } from './databases';
+import type { DatabaseResponse } from './databases';
 import type { Server } from './servers';
 
 export const sampleDataOptions = [
@@ -13,15 +13,15 @@ export type SampleDataSchemaIdentifier = (typeof sampleDataOptions)[number];
 
 export interface DatabaseConnectionResult {
   server: Server;
-  database: Database;
+  database: DatabaseResponse;
   configured_role: ConfiguredRole;
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const database_setup = {
   create_new: rpcMethodTypeContainer<
     {
-      database: Database['name'];
+      database: DatabaseResponse['name'];
       sample_data?: SampleDataSchemaIdentifier[];
     },
     DatabaseConnectionResult
@@ -31,7 +31,7 @@ export const database_setup = {
     {
       host: Server['host'];
       port: Server['port'];
-      database: Database['name'];
+      database: DatabaseResponse['name'];
       role: ConfiguredRole['name'];
       password: string;
       sample_data?: SampleDataSchemaIdentifier[];

diff --git a/mathesar_ui/src/api/rpc/databases.ts b/mathesar_ui/src/api/rpc/databases.ts
@@ -2,17 +2,43 @@ import { rpcMethodTypeContainer } from '@mathesar/packages/json-rpc-client-build
 
 import type { Server } from './servers';
 
-export interface Database {
+export interface DatabaseResponse {
   id: number;
   name: string;
   server_id: Server['id'];
 }
 
+/**
+ * TODO_BETA: Modify after store discussion is resolved
+ */
+export class Database implements DatabaseResponse {
+  readonly id: number;
+
+  readonly name: string;
+
+  readonly server_id: number;
+
+  readonly server_host: string;
+
+  readonly server_port: number;
+
+  constructor(databaseResponse: DatabaseResponse, server: Server) {
+    this.id = databaseResponse.id;
+    this.name = databaseResponse.name;
+    if (databaseResponse.server_id !== server.id) {
+      throw new Error('Server ids do not match');
+    }
+    this.server_id = databaseResponse.server_id;
+    this.server_host = server.host;
+    this.server_port = server.port;
+  }
+}
+
 export const databases = {
   list: rpcMethodTypeContainer<
     {
-      server_id?: Database['server_id'];
+      server_id?: DatabaseResponse['server_id'];
     },
-    Array<Database>
+    Array<DatabaseResponse>
   >(),
 };
diff --git a/mathesar_ui/src/components/AppHeader.svelte b/mathesar_ui/src/components/AppHeader.svelte
@@ -124,7 +124,7 @@
           </LinkMenuItem>
           <MenuDivider />
           <LinkMenuItem icon={iconConnection} href={HOME_URL}>
-            {$_('database_connections')}
+            {$_('databases')}
           </LinkMenuItem>
           {#if $userProfile.isSuperUser}
             <LinkMenuItem

diff --git a/mathesar_ui/src/components/Card.svelte b/mathesar_ui/src/components/Card.svelte
@@ -0,0 +1,149 @@
+<script lang="ts">
+  import { iconMoreActions } from '@mathesar/icons';
+  import {
+    DropdownMenu,
+    makeStyleStringFromCssVariables,
+  } from '@mathesar-component-library';
+
+  export let href: string;
+  export let ariaLabel: string | undefined = undefined;
+  export let cssVariables: Record<string, string> | undefined = undefined;
+
+  let isHoveringMenuTrigger = false;
+  let isCardFocused = false;
+
+  $: style = cssVariables
+    ? makeStyleStringFromCssVariables(cssVariables)
+    : undefined;
+</script>
+
+<div
+  class="card"
+  class:focus={isCardFocused}
+  class:hovering-menu-trigger={isHoveringMenuTrigger}
+  {style}
+>
+  <a
+    class="link passthrough"
+    {href}
+    aria-label={ariaLabel}
+    on:focusin={() => {
+      isCardFocused = true;
+    }}
+    on:focusout={() => {
+      isCardFocused = false;
+    }}
+  >
+    <div class="top">
+      <slot />
+    </div>
+    {#if $$slots.description}
+      <div class="description">
+        <slot name="description" />
+      </div>
+    {/if}
+  </a>
+  {#if $$slots.menu}
+    <div
+      class="menu-container"
+      on:mouseenter={() => {
+        isHoveringMenuTrigger = true;
+      }}
+      on:mouseleave={() => {
+        isHoveringMenuTrigger = false;
+      }}
+    >
+      <DropdownMenu
+        showArrow={false}
+        triggerAppearance="ghost"
+        triggerClass="dropdown-menu-button"
+        closeOnInnerClick={true}
+        placements={['bottom-end', 'right-start', 'left-start']}
+        label=""
+        icon={iconMoreActions}
+        size="small"
+      >
+        <slot name="menu" />
+      </DropdownMenu>
+    </div>
+  {/if}
+  {#if $$slots.footer}
+    <div class="footer">
+      <slot name="footer" />
+    </div>
+  {/if}
+</div>
+
+<style>
+  .card {
+    position: relative;
+    isolation: isolate;
+    border-radius: var(--border-radius-l);
+    border: 1px solid var(--slate-200);
+    background-color: var(--white);
+    --padding-v-internal: 1rem;
+    --padding-h-internal: 1rem;
+  }
+  .card.focus {
+    outline: 2px solid var(--slate-300);
+    outline-offset: 1px;
+    border-radius: var(--border-radius-l);
+  }
+  .link {
+    display: grid;
+    grid-template: auto 1fr auto / 1fr;
+    border-radius: var(--border-radius-l);
+    cursor: pointer;
+    overflow: hidden;
+    height: 100%;
+    padding: var(--Card__padding-v, var(--padding-v-internal)) 0;
+  }
+  .link:hover {
+    border-color: var(--slate-500);
+    background-color: var(--slate-50);
+    box-shadow: 0 0.2rem 0.4rem 0 rgba(0, 0, 0, 0.1);
+  }
+  .top {
+    overflow: hidden;
+    font-size: var(--text-size-large);
+    height: var(--menu-trigger-size, auto);
+    display: flex;
+    align-items: center;
+    padding: 0 var(--Card__padding-h, var(--padding-h-internal));
+  }
+  .description:not(:empty) {
+    padding: var(--size-x-small)
+      var(--Card__padding-h, var(--padding-h-internal)) 0
+      var(--Card__padding-h, var(--padding-h-internal));
+    font-size: var(--text-size-base);
+  }
+
+  .menu-container {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: var(--size-ultra-small);
+    z-index: 1;
+  }
+  .menu-container :global(.dropdown-menu-button) {
+    width: 100%;
+    height: 100%;
+    font-size: var(--text-size-large);
+    color: var(--slate-500);
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+  }
+  .menu-container :global(.dropdown-menu-button:hover) {
+    color: var(--slate-800);
+    background: var(--slate-100);
+  }
+  .footer {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+    z-index: 1;
+    cursor: pointer;
+  }
+</style>
diff --git a/mathesar_ui/src/components/NameWithIcon.svelte b/mathesar_ui/src/components/NameWithIcon.svelte
@@ -21,7 +21,7 @@
         <Spinner />
       {:else}
         {#each icons as innerIcon}
-          <Icon {...innerIcon} size="min(1em, 0.75em + 0.25rem)" />
+          <Icon size="min(1em, 0.75em + 0.25rem)" {...innerIcon} />
         {/each}
       {/if}
     </span>&nbsp;<span class="name">
@@ -44,6 +44,7 @@
   .icon {
     color: var(--icon-color, currentcolor);
     opacity: var(--NameWithIcon__icon-opacity, 0.75);
+    vertical-align: middle;
   }
   .icon > :global(.fa-icon + .fa-icon) {
     margin-left: 0.2em;
@@ -60,5 +61,6 @@
   }
   .name {
     color: var(--name-color, currentcolor);
+    vertical-align: middle;
   }
 </style>
diff --git a/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte b/mathesar_ui/src/components/breadcrumb/BreadcrumbItem.svelte
@@ -6,7 +6,11 @@
   import NameWithIcon from '@mathesar/components/NameWithIcon.svelte';
   import SchemaName from '@mathesar/components/SchemaName.svelte';
   import TableName from '@mathesar/components/TableName.svelte';
-  import { iconConnection, iconExploration, iconRecord } from '@mathesar/icons';
+  import {
+    iconConnectDatabase,
+    iconExploration,
+    iconRecord,
+  } from '@mathesar/icons';
   import {
     HOME_URL,
     getDatabasePageUrl,
@@ -33,8 +37,8 @@
   <DatabaseSelector />
   <div class="breadcrumb-item truncate">
     <BreadcrumbLink href={HOME_URL}>
-      <NameWithIcon icon={iconConnection}>
-        {$_('connections')}
+      <NameWithIcon icon={{ ...iconConnectDatabase, size: '1.4rem' }}>
+        {$_('databases')}
       </NameWithIcon>
     </BreadcrumbLink>
   </div>

diff --git a/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte b/mathesar_ui/src/components/breadcrumb/DatabaseSelector.svelte
@@ -2,7 +2,7 @@
   import { _ } from 'svelte-i18n';
 
   import type { Database } from '@mathesar/api/rpc/databases';
-  import { iconConnection, iconDatabase } from '@mathesar/icons';
+  import { iconConnectDatabase, iconDatabase } from '@mathesar/icons';
   import { HOME_URL, getDatabasePageUrl } from '@mathesar/routes/urls';
   import { databasesStore } from '@mathesar/stores/databases';
 
@@ -29,14 +29,17 @@
 </script>
 
 <BreadcrumbSelector
-  data={new Map([[$_('connections'), breadcrumbEntries]])}
-  triggerLabel={$_('choose_connection')}
+  data={new Map([[$_('databases'), breadcrumbEntries]])}
+  triggerLabel={$_('choose_database')}
   persistentLinks={[
     {
       type: 'simple',
-      label: $_('manage_connections'),
+      label: $_('manage_databases'),
       href: HOME_URL,
-      icon: iconConnection,
+      icon: {
+        ...iconConnectDatabase,
+        size: '1.4rem',
+      },
       // TODO: Handle active states for persistent links
       isActive: () => false,
     },