Merge branch 'main' into canvas/add-flat-to-canvas

Author: djbarnwal

runtime/compilers/rillv1/parse_canvas.go

@@ -244,6 +244,7 @@ func (p *Parser) parseCanvas(node *Node) error {
 	}
 	// NOTE: After calling insertResource, an error must not be returned. Any validation should be done before calling it.
 
+	r.CanvasSpec.DisplayName = tmp.DisplayName
 	if r.CanvasSpec.DisplayName == "" {
 		r.CanvasSpec.DisplayName = ToDisplayName(node.Name)
 	}

web-admin/src/features/bookmarks/BaseBookmarkForm.svelte

@@ -95,7 +95,11 @@ Managed bookmarks will be available to all viewers of this dashboard.`;
     />
   </ProjectAccessControls>
   <div class="flex items-center space-x-2">
-    <Switch bind:checked={$form["filtersOnly"]} id="filtersOnly" />
+    <Switch
+      bind:checked={$form["filtersOnly"]}
+      id="filtersOnly"
+      label="Filters only"
+    />
     <Label class="font-normal flex gap-x-1 items-center" for="filtersOnly">
       <span>Save filters only</span>
       <Tooltip distance={8}>
@@ -112,7 +116,11 @@ Managed bookmarks will be available to all viewers of this dashboard.`;
     </Label>
   </div>
   <div class="flex items-center space-x-2">
-    <Switch bind:checked={$form["absoluteTimeRange"]} id="absoluteTimeRange" />
+    <Switch
+      bind:checked={$form["absoluteTimeRange"]}
+      id="absoluteTimeRange"
+      label="Absolute time range"
+    />
     <Label class="flex flex-col font-normal" for="absoluteTimeRange">
       <div class="text-left text-sm flex gap-x-1 items-center">
         <span>Absolute time range</span>

web-admin/src/features/bookmarks/Bookmarks.svelte

@@ -89,7 +89,12 @@
 
 <DropdownMenu bind:open typeahead={false}>
   <DropdownMenuTrigger asChild let:builder>
-    <Button builders={[builder]} compact type="secondary">
+    <Button
+      builders={[builder]}
+      compact
+      type="secondary"
+      label="Bookmark dropdown"
+    >
       <BookmarkIcon
         class="inline-flex"
         fill={open ? "black" : "none"}

web-admin/src/features/bookmarks/BookmarksDropdownMenuItem.svelte

@@ -40,14 +40,15 @@
     on:mouseleave={() => (hovered = false)}
     role="menuitem"
     tabindex="-1"
+    aria-label={`${bookmark.resource.displayName ?? ""} Bookmark Entry`}
   >
     <a href={bookmark.url} class="flex flex-row gap-x-2 w-full min-h-7">
       {#if bookmark.resource.default}
         <HomeBookmark size="16px" />
       {:else if bookmark.filtersOnly}
         <Filter size="16px" />
       {:else}
-        <BookmarkIcon size="16px" />
+        <BookmarkIcon size="16px" aria-label="Bookmark Icon" />
       {/if}
       <div class="flex flex-col gap-y-0.5">
         <div

web-admin/src/features/bookmarks/createOrUpdateHomeBookmark.ts

@@ -20,7 +20,7 @@ export function createHomeBookmarkModifier(exploreName: string) {
         data: {
           bookmarkId: homeBookmark.id,
           displayName: "Home",
-          description: "Main view For this dashboard",
+          description: "Main view for this dashboard",
           shared: true,
           default: true,
           data,
@@ -30,7 +30,7 @@ export function createHomeBookmarkModifier(exploreName: string) {
       return get(bookmarkCreator).mutateAsync({
         data: {
           displayName: "Home",
-          description: "Main view For this dashboard",
+          description: "Main view for this dashboard",
           projectId,
           resourceKind: ResourceKind.Explore,
           resourceName: exploreName,

web-admin/src/routes/[organization]/[project]/-/dashboards/[dashboard]/+page.svelte

@@ -1,22 +1,28 @@
 <script lang="ts">
   import { page } from "$app/stores";
   import CanvasDashboardEmbed from "@rilldata/web-common/features/canvas/CanvasDashboardEmbed.svelte";
+  import CanvasThemeProvider from "@rilldata/web-common/features/canvas/CanvasThemeProvider.svelte";
+  import StateManagersProvider from "@rilldata/web-common/features/canvas/state-managers/StateManagersProvider.svelte";
   import {
     ResourceKind,
     useResource,
   } from "@rilldata/web-common/features/entity-management/resource-selectors.js";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store.js";
-  import CanvasThemeProvider from "@rilldata/web-common/features/canvas/CanvasThemeProvider.svelte";
-  import StateManagersProvider from "@rilldata/web-common/features/canvas/state-managers/StateManagersProvider.svelte";
 
   $: ({ instanceId } = $runtime);
   $: canvasName = $page.params.dashboard;
 
   $: canvasQuery = useResource(instanceId, canvasName, ResourceKind.Canvas);
 
   $: canvasResource = $canvasQuery.data;
+
+  $: canvasTitle = canvasResource?.canvas?.state?.validSpec?.displayName;
 </script>
 
+<svelte:head>
+  <title>{canvasTitle || `${canvasName} - Rill`}</title>
+</svelte:head>
+
 <StateManagersProvider {canvasName}>
   <CanvasThemeProvider>
     <CanvasDashboardEmbed resource={canvasResource} />