diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/+layout.svelte b/web-admin/src/routes/[organization]/[project]/-/edit/+layout.svelte
new file mode 100644
index 00000000000..e58b8b6df09
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/+layout.svelte
@@ -0,0 +1,245 @@
+
+
+
+ {#if isOtherOwner}
+
+
+
+
+
+ This editing session belongs to another user
+
+ You can preview this branch in read-only mode.
+
+ Preview this branch
+
+
+
+ {:else if isReady && deployment?.id && instanceId && runtimeHost && jwt}
+ {#key `${runtimeHost}::${instanceId}`}
+
+
+
+
+
+
+
+
+
+
+ {/key}
+ {:else if isErrored}
+
+
+ {:else if isStopped && deployment?.id}
+
+
(starting = true)}
+ />
+ {:else if isLoading}
+
+ {:else}
+
+
+ {/if}
+
+
+
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/edit/+page.svelte
new file mode 100644
index 00000000000..cc25d299c38
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/+page.svelte
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.svelte
new file mode 100644
index 00000000000..fa0a6639207
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.svelte
@@ -0,0 +1,24 @@
+
+
+
+ Rill | {canvasName}
+
+
+{#key client.instanceId}
+
+
+
+
+
+{/key}
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.ts b/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.ts
new file mode 100644
index 00000000000..5eac70894c4
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/canvas/[name]/+page.ts
@@ -0,0 +1,5 @@
+export const load = ({ params }) => {
+ const canvasName = params.name;
+
+ return { canvasName };
+};
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.svelte
new file mode 100644
index 00000000000..41c411e6baa
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.svelte
@@ -0,0 +1,48 @@
+
+
+
+ Rill | {exploreName}
+
+
+{#if measures.length === 0}
+
+{:else if metricsViewName}
+
+ {#key exploreName}
+
+
+
+
+
+ {/key}
+
+{/if}
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.ts b/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.ts
new file mode 100644
index 00000000000..2125d3ec9b1
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/explore/[name]/+page.ts
@@ -0,0 +1,5 @@
+export const load = async ({ params }) => {
+ return {
+ exploreName: params.name,
+ };
+};
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.svelte
new file mode 100644
index 00000000000..7cf7b8c603b
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.svelte
@@ -0,0 +1,19 @@
+
+
+
diff --git a/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.ts b/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.ts
new file mode 100644
index 00000000000..687c02746a6
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/edit/files/[...file]/+page.ts
@@ -0,0 +1,24 @@
+import { addLeadingSlash } from "@rilldata/web-common/features/entity-management/entity-mappers.js";
+import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts.js";
+import { error } from "@sveltejs/kit";
+
+export const load = async ({ params: { file } }) => {
+ const path = addLeadingSlash(file);
+ const fileArtifact = fileArtifacts.getFileArtifact(path);
+
+ if (fileArtifact.fileTypeUnsupported) {
+ throw error(
+ 400,
+ "No renderer available for file type: " + fileArtifact.fileExtension,
+ );
+ }
+
+ // Don't eagerly fetch content here. Unlike web-local, the runtime
+ // credentials aren't available until the edit layout fetches them
+ // asynchronously. The workspace components will fetch content
+ // reactively once the runtime is ready.
+
+ return {
+ fileArtifact,
+ };
+};
diff --git a/web-admin/src/routes/[organization]/[project]/-/reports/[report]/open/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/reports/[report]/open/+page.svelte
index 40d37547ab8..9ee1995227b 100644
--- a/web-admin/src/routes/[organization]/[project]/-/reports/[report]/open/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/reports/[report]/open/+page.svelte
@@ -5,8 +5,7 @@
import CtaLayoutContainer from "@rilldata/web-common/components/calls-to-action/CTALayoutContainer.svelte";
import CtaMessage from "@rilldata/web-common/components/calls-to-action/CTAMessage.svelte";
import type { ExploreState } from "@rilldata/web-common/features/dashboards/stores/explore-state";
- import Spinner from "@rilldata/web-common/features/entity-management/Spinner.svelte";
- import { EntityStatus } from "@rilldata/web-common/features/entity-management/types";
+ import LoadingSpinner from "@rilldata/web-common/components/LoadingSpinner.svelte";
import { mapQueryToDashboard } from "@rilldata/web-common/features/explore-mappers/map-to-explore";
import { getExplorePageUrlSearchParams } from "@rilldata/web-common/features/explore-mappers/utils";
import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
@@ -89,8 +88,8 @@
{#if $dashboardStateForReport.isLoading}
-
-
+
+
{:else if $dashboardStateForReport.error}
diff --git a/web-admin/src/routes/[organization]/[project]/-/settings/+layout.svelte b/web-admin/src/routes/[organization]/[project]/-/settings/+layout.svelte
index 07a8d2e9741..71580c82ae1 100644
--- a/web-admin/src/routes/[organization]/[project]/-/settings/+layout.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/settings/+layout.svelte
@@ -2,11 +2,14 @@
diff --git a/web-common/src/components/LoadingPage.svelte b/web-common/src/components/LoadingPage.svelte
index 87439f01a13..a6da30f8886 100644
--- a/web-common/src/components/LoadingPage.svelte
+++ b/web-common/src/components/LoadingPage.svelte
@@ -1,14 +1,13 @@
-
-
+
+
diff --git a/web-common/src/components/LoadingSpinner.svelte b/web-common/src/components/LoadingSpinner.svelte
new file mode 100644
index 00000000000..f474be43799
--- /dev/null
+++ b/web-common/src/components/LoadingSpinner.svelte
@@ -0,0 +1,8 @@
+
+
+
+
+
diff --git a/web-common/src/components/editor/line-status/line-number-gutter.svelte.ts b/web-common/src/components/editor/line-status/line-number-gutter.svelte.ts
index e963ed48517..d506eaf8b8d 100644
--- a/web-common/src/components/editor/line-status/line-number-gutter.svelte.ts
+++ b/web-common/src/components/editor/line-status/line-number-gutter.svelte.ts
@@ -93,11 +93,9 @@ export const createLineNumberGutter = () =>
);
},
lineMarkerChange(update) {
- return update.transactions.some((tr) => {
- const effectPresent = tr.effects.some((effect) =>
- effect.is(updateLineStatuses),
- );
- return effectPresent || update;
- });
+ if (update.docChanged || update.selectionSet) return true;
+ return update.transactions.some((tr) =>
+ tr.effects.some((effect) => effect.is(updateLineStatuses)),
+ );
},
});
diff --git a/web-common/src/features/connectors/connectors-utils.ts b/web-common/src/features/connectors/connectors-utils.ts
index 166faba0632..17bd3a0c249 100644
--- a/web-common/src/features/connectors/connectors-utils.ts
+++ b/web-common/src/features/connectors/connectors-utils.ts
@@ -1,3 +1,4 @@
+import { workspaceRoute } from "@rilldata/web-common/features/workspaces/workspace-routing";
import type { V1AnalyzedConnector } from "../../runtime-client";
export const OLAP_DRIVERS_WITHOUT_MODELING = ["clickhouse", "druid", "pinot"];
@@ -87,21 +88,35 @@ export function makeTablePreviewHref(
): string | null {
switch (driver) {
case "clickhouse":
- return `/connector/clickhouse/${connectorName}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/clickhouse/${connectorName}/${databaseSchema}/${table}`,
+ );
case "druid":
- return `/connector/druid/${connectorName}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/druid/${connectorName}/${databaseSchema}/${table}`,
+ );
case "duckdb":
- return `/connector/duckdb/${connectorName}/${database}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/duckdb/${connectorName}/${database}/${databaseSchema}/${table}`,
+ );
case "snowflake":
- return `/connector/snowflake/${connectorName}/${database}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/snowflake/${connectorName}/${database}/${databaseSchema}/${table}`,
+ );
case "bigquery":
- return `/connector/bigquery/${connectorName}/${database}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/bigquery/${connectorName}/${database}/${databaseSchema}/${table}`,
+ );
case "redshift":
- return `/connector/redshift/${connectorName}/${database}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/redshift/${connectorName}/${database}/${databaseSchema}/${table}`,
+ );
case "athena":
- return `/connector/athena/${connectorName}/${database}/${databaseSchema}/${table}`;
+ return workspaceRoute(
+ `/connector/athena/${connectorName}/${database}/${databaseSchema}/${table}`,
+ );
case "pinot":
- return `/connector/pinot/${connectorName}/${table}`;
+ return workspaceRoute(`/connector/pinot/${connectorName}/${table}`);
default:
return null;
}
diff --git a/web-common/src/features/connectors/explorer/TableMenuItems.svelte b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
index 617c71e3987..7b56ffca46b 100644
--- a/web-common/src/features/connectors/explorer/TableMenuItems.svelte
+++ b/web-common/src/features/connectors/explorer/TableMenuItems.svelte
@@ -1,6 +1,6 @@
-
-
-
+
Hang tight! We're building your dashboard{multipleDashboards
? "s"
diff --git a/web-common/src/features/dashboards/state-managers/loaders/DashboardLoading.svelte b/web-common/src/features/dashboards/state-managers/loaders/DashboardLoading.svelte
index f64ca7ba66c..8cbb0948567 100644
--- a/web-common/src/features/dashboards/state-managers/loaders/DashboardLoading.svelte
+++ b/web-common/src/features/dashboards/state-managers/loaders/DashboardLoading.svelte
@@ -1,6 +1,5 @@
diff --git a/web-common/src/features/entity-management/FileAndResourceWatcher.svelte b/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
index c500eeabe7b..aee1b3e3589 100644
--- a/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
+++ b/web-common/src/features/entity-management/FileAndResourceWatcher.svelte
@@ -17,6 +17,9 @@
export let host: string;
export let instanceId: string;
+ export let errorBody = "Try restarting the Rill via the CLI";
+ /** Keep the SSE connection open indefinitely (no auto-close on idle). */
+ export let keepAlive = false;
// Set client synchronously so children can access it during initial render.
// init() (in onMount) handles the async resource prefetch.
@@ -32,15 +35,23 @@
$: status = $statusStore;
onMount(() => {
+ if (keepAlive) {
+ fileAndResourceWatcher.disableAutoClose();
+ }
void fileArtifacts.init(runtimeClient, queryClient);
- return () => fileAndResourceWatcher.close(true);
+ return () => {
+ if (keepAlive) {
+ fileAndResourceWatcher.enableAutoClose();
+ }
+ fileAndResourceWatcher.close(true);
+ };
});
function handleVisibilityChange() {
if (document.visibilityState === "visible") {
heartbeat();
- } else {
+ } else if (!keepAlive) {
scheduleAutoClose(true);
}
}
@@ -48,7 +59,9 @@
scheduleAutoClose()}
+ onblur={() => {
+ if (!keepAlive) scheduleAutoClose();
+ }}
onclick={heartbeat}
onkeydown={heartbeat}
onfocus={heartbeat}
@@ -59,7 +72,7 @@
fatal
statusCode={500}
header="Error connecting to runtime"
- body="Try restarting the Rill via the CLI"
+ body={errorBody}
/>
{:else}
diff --git a/web-common/src/features/entity-management/RenameAssetModal.svelte b/web-common/src/features/entity-management/RenameAssetModal.svelte
index 66d75eabce9..b0b04af9c19 100644
--- a/web-common/src/features/entity-management/RenameAssetModal.svelte
+++ b/web-common/src/features/entity-management/RenameAssetModal.svelte
@@ -1,7 +1,10 @@
+
+
+ Rill Developer | {fileName}
+
+
+
+
+ {#if workspace}
+
+ {:else}
+
+
+
+
+
+
+ {/if}
+
+
-
+ {#if showFooterLinks}
+
+ {/if}
diff --git a/web-local/src/routes/(application)/(workspace)/files/[...file]/+page.svelte b/web-local/src/routes/(application)/(workspace)/files/[...file]/+page.svelte
index e3a5f886a00..979b5eb5008 100644
--- a/web-local/src/routes/(application)/(workspace)/files/[...file]/+page.svelte
+++ b/web-local/src/routes/(application)/(workspace)/files/[...file]/+page.svelte
@@ -1,115 +1,16 @@
-
- Rill Developer | {fileName}
-
-
- {#if $generatingCanvas}
-
- {:else if workspace}
-
- {:else}
-
-
-
-
-
-
- {/if}
+
diff --git a/web-local/src/routes/(misc)/deploy/+page.svelte b/web-local/src/routes/(misc)/deploy/+page.svelte
index eaec1ed5e0e..03d858ffe09 100644
--- a/web-local/src/routes/(misc)/deploy/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/+page.svelte
@@ -3,7 +3,7 @@
import { page } from "$app/stores";
import CTAMessage from "@rilldata/web-common/components/calls-to-action/CTAMessage.svelte";
import CancelCircleInverse from "@rilldata/web-common/components/icons/CancelCircleInverse.svelte";
- import { EntityStatus } from "@rilldata/web-common/features/entity-management/types";
+ import LoadingSpinner from "@rilldata/web-common/components/LoadingSpinner.svelte";
import {
getCreateOrganizationRoute,
getSelectOrganizationRoute,
@@ -21,7 +21,6 @@
} from "@rilldata/web-common/runtime-client/local-service";
import CTAHeader from "@rilldata/web-common/components/calls-to-action/CTAHeader.svelte";
import CTANeedHelp from "@rilldata/web-common/components/calls-to-action/CTANeedHelp.svelte";
- import Spinner from "@rilldata/web-common/features/entity-management/Spinner.svelte";
import { onMount } from "svelte";
import { get } from "svelte/store";
@@ -108,9 +107,7 @@
-
-
+
Hang tight! We're deploying your project...
diff --git a/web-local/src/routes/(misc)/deploy/project/create/+page.svelte b/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
index 4b0f47e9082..86c42c47dd4 100644
--- a/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
@@ -1,6 +1,6 @@
{#if loading}
-
-
-
+
Hang tight! We're deploying your project...
diff --git a/web-local/src/routes/(misc)/deploy/project/update/+page.svelte b/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
index d4f645a73b1..c692072afbb 100644
--- a/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
@@ -1,5 +1,5 @@
{#if loading}
-
-
-
+
Hang tight! We're deploying your project...