Merge branch 'begelundmuller/async-reconcile-integration' of https://…

…github.com/rilldata/rill into begelundmuller/async-reconcile-integration
rilldata · Oct 3, 2023 · 682eb0c · 682eb0c
2 parents 1a20387 + 7613430
commit 682eb0c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/web-admin/src/features/projects/ProjectDeploymentLogs.svelte b/web-admin/src/features/projects/ProjectDeploymentLogs.svelte
@@ -45,9 +45,11 @@
           <span class="text-red-600 break-all">
             {error.message}
           </span>
-          <span class="text-stone-500 font-semibold shrink-0">
-            {error.filePath}
-          </span>
+          {#if error.filePath}
+            <span class="text-stone-500 font-semibold shrink-0">
+              {error.filePath}
+            </span>
+          {/if}
         </li>
       {/each}
     {/if}

diff --git a/web-admin/src/features/projects/dashboards.ts b/web-admin/src/features/projects/dashboards.ts
@@ -3,12 +3,7 @@ import {
   ResourceKind,
   useFilteredResources,
 } from "@rilldata/web-common/features/entity-management/resource-selectors";
-import type {
-  V1CatalogEntry,
-  V1MetricsView,
-  V1MetricsViewSpec,
-  V1Resource,
-} from "@rilldata/web-common/runtime-client";
+import type { V1Resource } from "@rilldata/web-common/runtime-client";
 import Axios from "axios";
 
 export interface DashboardListItem {

diff --git a/web-admin/src/features/projects/getProjectErrors.ts b/web-admin/src/features/projects/getProjectErrors.ts
@@ -1,3 +1,4 @@
+import { MainResourceKinds } from "@rilldata/web-common/features/entity-management/resource-invalidations";
 import { useProjectParser } from "@rilldata/web-common/features/entity-management/resource-selectors";
 import {
   createRuntimeServiceListResources,
@@ -20,9 +21,12 @@ export function getProjectErrors(
         projectParserResp.data?.projectParser?.state?.parseErrors ?? [];
       const resourceErrors: Array<V1ParseError> =
         resourcesResp.data?.resources
-          ?.filter((r) => !!r.meta.reconcileError)
+          ?.filter(
+            (r) =>
+              !!r.meta.reconcileError && MainResourceKinds[r.meta.name.kind]
+          )
           .map((r) => ({
-            filePath: r.meta.filePaths[0],
+            filePath: r.meta.filePaths[0], // TODO: handle multiple files mapping to same resource
             message: r.meta.reconcileError,
           })) ?? [];
       return [...projectParserErrors, ...resourceErrors];

diff --git a/web-common/src/features/entity-management/resource-invalidations.ts b/web-common/src/features/entity-management/resource-invalidations.ts
@@ -17,29 +17,29 @@ import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { get } from "svelte/store";
 
-const MainResources: {
+export const MainResourceKinds: {
   [kind in ResourceKind]?: true;
 } = {
   [ResourceKind.Source]: true,
   [ResourceKind.Model]: true,
   [ResourceKind.MetricsView]: true,
 };
-const UsedResources: {
+const UsedResourceKinds: {
   [kind in ResourceKind]?: true;
 } = {
   [ResourceKind.ProjectParser]: true,
-  ...MainResources,
+  ...MainResourceKinds,
 };
 
 export function invalidateResourceResponse(
   queryClient: QueryClient,
   res: V1WatchResourcesResponse
 ) {
-  // only process for the `ResourceKind` present in `UsedResources`
-  if (!UsedResources[res.name.kind]) return;
+  // only process for the `ResourceKind` present in `UsedResourceKinds`
+  if (!UsedResourceKinds[res.name.kind]) return;
   // for main resources only invalidate if it became idle
   if (
-    MainResources[res.name.kind] &&
+    MainResourceKinds[res.name.kind] &&
     res.resource.meta.reconcileStatus !==
       V1ReconcileStatus.RECONCILE_STATUS_IDLE
   )
@@ -62,7 +62,7 @@ export function invalidateResourceResponse(
   }
 
   // only re-fetch list queries for kinds in `MainResources`
-  if (!MainResources[res.name.kind]) return;
+  if (!MainResourceKinds[res.name.kind]) return;
   resourcesStore.setResource(res.resource);
   return queryClient.refetchQueries(
     // we only use individual kind's queries