@attraccess/plugin-wago 0.1.0-nightly.1003.1 → 0.1.0-nightly.1005.1

package/dist/index.js

@@ -62252,6 +62252,13 @@ function diagnosticReferences(nodes, channelIds, revision2, capabilities) {
   return nodes.map((node) => {
     const channelId2 = typeof node.data.channelId === "string" ? node.data.channelId : "";
     const control = node.type === "plugin.wago.command";
+    const conflictResourceIds = control ? [
+      ...new Set(
+        nodes.filter(
+          (other) => other.type === "plugin.wago.command" && other.resourceId !== node.resourceId && other.data.channelId === channelId2
+        ).map((other) => other.resourceId)
+      )
+    ] : [];
     return {
       nodeId: node.id,
       resourceId: node.resourceId,
@@ -62259,9 +62266,8 @@ function diagnosticReferences(nodes, channelIds, revision2, capabilities) {
       control,
       href: `/resources/${node.resourceId}/flows?node=${encodeURIComponent(node.id)}`,
       invalid: !channelIds.includes(channelId2) || control && (node.data.expectedConfigurationRevision !== revision2 || capabilities && (!own(capabilities, channelId2)?.includes("output") || node.data.action === "pulse" && !own(capabilities, channelId2)?.includes("pulse"))),
-      conflict: control && nodes.some(
-        (other) => other.type === "plugin.wago.command" && other.resourceId !== node.resourceId && other.data.channelId === channelId2
-      )
+      conflict: conflictResourceIds.length > 0,
+      conflictResourceIds
     };
   });
 }
@@ -62304,12 +62310,16 @@ var WagoDiagnosticsService = class {
     const referencesTruncated = conflictNodes.length > 1e3;
     const conflictNodesByControllerId = /* @__PURE__ */ new Map();
     for (const node of conflictNodes.slice(0, 1e3)) {
+      if (node.resourceId === resourceId) continue;
       const controllerId = node.data.controllerId;
       if (typeof controllerId !== "number") continue;
       const matchingNodes = conflictNodesByControllerId.get(controllerId) ?? [];
       matchingNodes.push(node);
       conflictNodesByControllerId.set(controllerId, matchingNodes);
     }
+    const conflictResourceIds = [...new Set([...conflictNodesByControllerId.values()].flat().map((n) => n.resourceId))];
+    const conflictResources = conflictResourceIds.length ? await this.context.dataSource.getRepository(import_plugins_backend_sdk16.Resource).createQueryBuilder("resource").select(["resource.id", "resource.name"]).where("resource.id IN (:...ids)", { ids: conflictResourceIds }).getMany() : [];
+    const resourceNames = new Map(conflictResources.map((resource) => [resource.id, resource.name]));
     const controllersResult = selectedControllerIds.map((controllerId) => {
       const controller = controllersById.get(controllerId);
       if (!controller)
@@ -62331,7 +62341,13 @@ var WagoDiagnosticsService = class {
           Object.fromEntries(
             appliedSnapshot?.logicalChannels.map((channel) => [channel.id, channel.capabilities]) ?? []
           )
-        ).filter((reference) => reference.resourceId === resourceId);
+        ).filter((reference) => reference.resourceId === resourceId).map((reference) => ({
+          ...reference,
+          conflictResources: reference.conflictResourceIds.map((id) => ({
+            id,
+            name: resourceNames.get(id) ?? `Resource ${id}`
+          }))
+        }));
         return {
           controllerId,
           name: controller.name ?? controller.hardwareId,