Don't show the "Source imported successfully" modal when unpacking ex…

…ample projects (#6260)

* Don't show the "Source imported successfully" modal when unpacking example projects

* Review

web-common/src/features/entity-management/WatchResourcesClient.ts

@@ -22,6 +22,7 @@ import { WatchRequestClient } from "@rilldata/web-common/runtime-client/watch-re
 import { get } from "svelte/store";
 import { connectorExplorerStore } from "../connectors/connector-explorer-store";
 import { sourceImportedPath } from "../sources/sources-store";
+import { isLeafResource } from "./dag-utils";
 
 export class WatchResourcesClient {
   public readonly client: WatchRequestClient<V1WatchResourcesResponse>;
@@ -34,7 +35,7 @@ export class WatchResourcesClient {
     this.client.on("reconnect", () => this.invalidateAllRuntimeQueries());
   }
 
-  private handleWatchResourceResponse(res: V1WatchResourcesResponse) {
+  private async handleWatchResourceResponse(res: V1WatchResourcesResponse) {
     // Log resource status to the browser console during e2e tests. Currently, our e2e tests make assertions
     // based on these logs. However, the e2e tests really should make UI-based assertions.
     if (import.meta.env.VITE_PLAYWRIGHT_TEST) {
@@ -185,7 +186,8 @@ export class WatchResourcesClient {
             // If it's a new source, show the "Source imported successfully" modal
             const isNewSource =
               res.name.kind === ResourceKind.Source &&
-              res.resource.meta.specVersion === "1";
+              res.resource.meta.specVersion === "1" &&
+              (await isLeafResource(res.resource, this.instanceId)); // Protects against existing projects reconciling anew
             if (isNewSource) {
               const filePath = res.resource?.meta?.filePaths?.[0] as string;
               sourceImportedPath.set(filePath);

web-common/src/features/entity-management/dag-utils.ts

@@ -0,0 +1,21 @@
+import {
+  getRuntimeServiceListResourcesQueryKey,
+  runtimeServiceListResources,
+  type V1Resource,
+} from "@rilldata/web-common/runtime-client";
+import { queryClient } from "../../lib/svelte-query/globalQueryClient";
+
+export async function isLeafResource(resource: V1Resource, instanceId: string) {
+  const allResources = await queryClient.fetchQuery({
+    queryKey: getRuntimeServiceListResourcesQueryKey(instanceId, undefined),
+    queryFn: () => runtimeServiceListResources(instanceId, undefined),
+  });
+
+  if (!allResources || !allResources.resources) return false;
+
+  const hasDownstreamResource = allResources.resources.some((r: V1Resource) =>
+    r.meta?.refs?.some((ref) => ref.name === resource.meta?.name?.name),
+  );
+
+  return !hasDownstreamResource;
+}

web-common/src/features/welcome/ProjectCards.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import AddCircleOutline from "@rilldata/web-common/components/icons/AddCircleOutline.svelte";
   import Subheading from "@rilldata/web-common/components/typography/Subheading.svelte";
   import Card from "../../components/card/Card.svelte";
   import CardDescription from "../../components/card/CardDescription.svelte";
@@ -9,11 +10,12 @@
     BehaviourEventMedium,
   } from "../../metrics/service/BehaviourEventTypes";
   import { MetricsEventSpace } from "../../metrics/service/MetricsTypes";
-  import { createRuntimeServiceUnpackExample } from "../../runtime-client";
+  import {
+    createRuntimeServiceUnpackEmpty,
+    createRuntimeServiceUnpackExample,
+  } from "../../runtime-client";
   import { runtime } from "../../runtime-client/runtime-store";
   import { EMPTY_PROJECT_TITLE } from "./constants";
-  import AddCircleOutline from "@rilldata/web-common/components/icons/AddCircleOutline.svelte";
-  import { createRuntimeServiceUnpackEmpty } from "../../runtime-client";
 
   const unpackExampleProject = createRuntimeServiceUnpackExample();
   const unpackEmptyProject = createRuntimeServiceUnpackEmpty();