@devicechain/dashboards 0.27.0-rc.1 → 1.0.0-rc.1

package/dist/index.js

@@ -858,7 +858,13 @@ function parseCandidates(raw) {
   const token = (v) => typeof v === "string" && v ? v : void 0;
   const areaType = token(raw.areaType);
   const assetType = token(raw.assetType);
-  return areaType || assetType ? { areaType, assetType } : void 0;
+  const deviceType = token(raw.deviceType);
+  if (!areaType && !assetType && !deviceType) return void 0;
+  return {
+    ...areaType ? { areaType } : {},
+    ...assetType ? { assetType } : {},
+    ...deviceType ? { deviceType } : {}
+  };
 }
 function parseScope(raw) {
   if (!isRecord(raw)) return void 0;
@@ -1419,7 +1425,7 @@ async function resolveSlotCandidates(definition, slot, bindings, resolver, liste
   if (def.type === "device") {
     let rows2;
     try {
-      rows2 = await lister("device");
+      rows2 = await listEntities(lister, "device", def.candidates?.deviceType);
     } catch {
       return [];
     }
@@ -1770,12 +1776,18 @@ function setSlotScope(def, slotName, scope) {
 function setSlotCandidates(def, slotName, candidates) {
   if (!def.slots || !Object.prototype.hasOwnProperty.call(def.slots, slotName)) return def;
   const current = def.slots[slotName];
-  if (current.type !== "anchor" || current.scope) return def;
+  if (current.scope) return def;
   const next = {};
-  if (candidates?.areaType) next.areaType = candidates.areaType;
-  if (candidates?.assetType) next.assetType = candidates.assetType;
+  if (current.type === "anchor") {
+    if (candidates?.areaType) next.areaType = candidates.areaType;
+    if (candidates?.assetType) next.assetType = candidates.assetType;
+  } else if (candidates?.deviceType) {
+    next.deviceType = candidates.deviceType;
+  }
+  const asked = !!(candidates?.areaType || candidates?.assetType || candidates?.deviceType);
+  if (asked && !next.areaType && !next.assetType && !next.deviceType) return def;
   const { candidates: _drop, ...rest } = current;
-  const slot = next.areaType || next.assetType ? { ...rest, candidates: next } : rest;
+  const slot = next.areaType || next.assetType || next.deviceType ? { ...rest, candidates: next } : rest;
   return { ...def, slots: { ...def.slots, [slotName]: slot } };
 }
 function widgetBinding(def, widget) {
@@ -1928,7 +1940,7 @@ function createEntityLister() {
 function fetchKind(kind, criteria, typeToken) {
   switch (kind) {
     case "device":
-      return gql("device-management", LIST_DEVICES, { criteria }).then((r) => r.devices.results);
+      return gql("device-management", LIST_DEVICES, { criteria: { ...criteria, deviceType: typeToken } }).then((r) => r.devices.results);
     case "customer":
       return gql("device-management", LIST_CUSTOMERS, { criteria }).then((r) => r.customers.results);
     case "area":
@@ -2128,7 +2140,7 @@ var ALARM_SEVERITY_COUNTS = `
 var ALARM_STREAM = `
   subscription DashboardAlarmStream(
     $originatorType: String
-    $originator: String
+    $originatorToken: String
     $state: String
     $severity: String
     $alarmKey: String
@@ -2136,7 +2148,7 @@ var ALARM_STREAM = `
   ) {
     alarmStream(
       originatorType: $originatorType
-      originator: $originator
+      originatorToken: $originatorToken
       state: $state
       severity: $severity
       alarmKey: $alarmKey
@@ -2579,7 +2591,7 @@ var DashboardHub = class {
       severity: sub.severity ?? null,
       acknowledged: sub.acknowledged ?? null
     };
-    const originators = tenantWide || anchor ? [{ originatorType: null, originator: null, anchor }] : tokens.map((token) => ({ originatorType: "device", originator: token }));
+    const originators = tenantWide || anchor ? [{ originatorType: null, originatorToken: null, anchor }] : tokens.map((token) => ({ originatorType: "device", originatorToken: token }));
     if (sub.countBySeverity) {
       const pages2 = await Promise.all(
         originators.map(
@@ -5319,11 +5331,23 @@ function duplicateWidget(def, id) {
 }
 
 // src/resolver.ts
-import { gql as gql3, isScopeUnsupportedError as isScopeUnsupportedError2 } from "@devicechain/client";
+import { decodeToken, gql as gql3, isScoped, isScopeUnsupportedError as isScopeUnsupportedError2, resolveAuthToken } from "@devicechain/client";
 var ANCHOR_PAGE_SIZE = 500;
 var DECLARED_BATCH_SIZE = 100;
 var trueSize = (reported, page) => Math.max(reported ?? page, page);
-function readAnchorPage(anchor) {
+async function viewerIsScoped(viewer) {
+  if (viewer.scoped !== null) return viewer.scoped;
+  let token = null;
+  try {
+    token = await resolveAuthToken();
+  } catch {
+    token = null;
+  }
+  if (!token) return false;
+  viewer.scoped = isScoped(decodeToken(token));
+  return viewer.scoped;
+}
+function readAnchorPage(anchor, viewer) {
   if (anchor.targetType === "customer") {
     return gql3("device-management", CUSTOMER_DEVICES, {
       criteria: {
@@ -5342,9 +5366,9 @@ function readAnchorPage(anchor) {
       };
     });
   }
-  return readAreaOrAssetPage(anchor);
+  return readAreaOrAssetPage(anchor, viewer);
 }
-function readAreaOrAssetPage(anchor) {
+async function readAreaOrAssetPage(anchor, viewer) {
   const read = (relationshipType) => gql3("device-management", ANCHOR_DEVICES, {
     criteria: {
       pageNumber: 1,
@@ -5354,8 +5378,10 @@ function readAreaOrAssetPage(anchor) {
       relationshipType
     }
   });
-  return read(anchor.relationship).catch((err) => {
-    if (!isScopeUnsupportedError2(err)) throw err;
+  const first = await viewerIsScoped(viewer) ? read() : read(anchor.relationship);
+  return first.catch((err) => {
+    if (!isScopeUnsupportedError2(err) || viewer.scoped === true) throw err;
+    viewer.scoped = true;
     return read();
   }).then((r) => {
     const rows = r.anchorDevices.results;
@@ -5368,6 +5394,7 @@ function readAreaOrAssetPage(anchor) {
   });
 }
 function createDeviceResolver() {
+  const viewer = { scoped: null };
   const anchorCache = /* @__PURE__ */ new Map();
   const memberCache = /* @__PURE__ */ new Map();
   const existsCache = /* @__PURE__ */ new Map();
@@ -5380,7 +5407,7 @@ function createDeviceResolver() {
     const key = anchorKey(anchor);
     let pending = anchorCache.get(key);
     if (!pending) {
-      pending = readAnchorPage(anchor).catch((err) => {
+      pending = readAnchorPage(anchor, viewer).catch((err) => {
         anchorCache.delete(key);
         throw err;
       });