@richardmcquiston01/dashboard-widgets-toolkit 0.16.0 → 0.17.0

package/dist/core.cjs

@@ -339,6 +339,9 @@ function viewChoices(item) {
     }))
   ];
 }
+function isProviderView(view) {
+  return view.convert === void 0;
+}
 function isKnownView(item, key) {
   return key !== void 0 && (key === BASE_VIEW_KEY || findView(item, key) !== void 0);
 }
@@ -351,6 +354,14 @@ function effectiveViewKey(item, chosen) {
 function viewKind(item, chosen) {
   return findView(item, effectiveViewKey(item, chosen))?.kind ?? item.kind;
 }
+function loadViewKey(item, chosen) {
+  const key = effectiveViewKey(item, chosen);
+  const view = findView(item, key);
+  return view !== void 0 && isProviderView(view) ? key : BASE_VIEW_KEY;
+}
+function loadViewKind(item, chosen) {
+  return findView(item, loadViewKey(item, chosen))?.kind ?? item.kind;
+}
 function cellValue(cell) {
   const value = cell?.value;
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
@@ -485,6 +496,11 @@ function convertView(widgetKey, view, data, options = {}) {
     where: `Widget ${JSON.stringify(widgetKey)} view ${JSON.stringify(view.key)}`,
     ...options.locale === void 0 ? {} : { locale: options.locale }
   };
+  if (conversion === void 0) {
+    return err(
+      `${context.where}: the provider supplies this view, so there is nothing to convert.`
+    );
+  }
   const expected = VIEW_CONVERSIONS[conversion.type]?.from;
   if (expected === void 0) {
     return err(
@@ -510,8 +526,8 @@ function convertView(widgetKey, view, data, options = {}) {
   }
 }
 function viewNote(view, data) {
-  if (data?.kind !== "TABLE") return "";
   const conversion = view.convert;
+  if (data?.kind !== "TABLE" || conversion === void 0) return "";
   let indexes;
   if (conversion.type === "tableToBarList") {
     indexes = [conversion.label, conversion.value];
@@ -528,14 +544,29 @@ function viewNote(view, data) {
 function applyView(widget, chosen, options = {}) {
   const key = effectiveViewKey(widget.definition, chosen);
   const view = findView(widget.definition, key);
-  if (view === void 0) return widget;
+  const wanted = loadViewKey(widget.definition, chosen);
+  const loaded = widget.status === "ok" ? widget.view ?? BASE_VIEW_KEY : void 0;
+  const mismatched = loaded !== void 0 && loaded !== wanted;
+  if (view === void 0) {
+    return mismatched ? {
+      definition: widget.definition,
+      status: "loading",
+      ...widget.options === void 0 ? {} : { options: widget.options }
+    } : widget;
+  }
   const definition = {
     ...widget.definition,
     kind: view.kind
   };
-  if (widget.status === "loading") return { ...widget, definition };
-  if (widget.status === "empty") return { ...widget, definition };
-  if (widget.status === "error") return { ...widget, definition };
+  if (widget.status !== "ok") return { ...widget, definition };
+  if (mismatched) {
+    return {
+      definition,
+      status: "loading",
+      ...widget.options === void 0 ? {} : { options: widget.options }
+    };
+  }
+  if (isProviderView(view)) return { ...widget, definition };
   const converted = convertView(
     widget.definition.key,
     view,
@@ -1344,6 +1375,15 @@ function optionValuesFromLayout(definitions, layout, options = {}) {
   }
   return out;
 }
+function viewValuesFromLayout(definitions, layout, options = {}) {
+  const out = {};
+  for (const definition of definitions) {
+    if (!(definition.views ?? []).some(isProviderView)) continue;
+    const locked = options.overrideLocks !== true && isOptionsLocked(definition);
+    out[definition.key] = locked ? "" : layout.settings?.[definition.key]?.view ?? "";
+  }
+  return out;
+}
 function sameSettings(a, b) {
   if (a === b) return true;
   return a?.title === b?.title && a?.width === b?.width && a?.flexible === b?.flexible && a?.view === b?.view && sameOptionValues(a?.options ?? {}, b?.options ?? {});
@@ -3156,11 +3196,7 @@ function checkViews(value, problems) {
           problems.push(`${path}.label must be a non-empty string.`);
         }
         requireOneOf(view, "kind", WIDGET_KINDS, path, problems);
-        if (view["convert"] === void 0) {
-          problems.push(
-            `${path}.convert is required: views supplied by a provider are not supported yet.`
-          );
-        } else {
+        if (view["convert"] !== void 0) {
           checkConversion(
             view["convert"],
             `${path}.convert`,
@@ -3281,7 +3317,10 @@ function resolvePayload(definition, payload, options = {}) {
   } else {
     const result = validateWidgetData(payload, {
       widgetKey: definition.key,
-      expectedKind: definition.kind
+      expectedKind: loadViewKind(
+        definition,
+        options.viewValues?.[definition.key]
+      )
     });
     if (!result.ok) {
       return { definition, status: "error", error: result.error };
@@ -3292,7 +3331,14 @@ function resolvePayload(definition, payload, options = {}) {
   if (emptyText !== null) {
     return { definition, status: "empty", emptyText };
   }
-  return { definition, status: "ok", data: checked };
+  return {
+    definition,
+    status: "ok",
+    data: checked,
+    ...hasViews(definition) ? {
+      view: loadViewKey(definition, options.viewValues?.[definition.key])
+    } : {}
+  };
 }
 function failedWidget(definition, error) {
   return { definition, status: "error", error };
@@ -3302,7 +3348,14 @@ function loadingWidgets(definitions) {
 }
 function cacheKeyFor(definition, options, values) {
   const base = options.cacheKey === void 0 ? definition.sourceKey ?? definition.key : options.cacheKey(definition);
-  return values === void 0 ? base : `${base}${optionsCacheSuffix(definition, values, options)}`;
+  const view = loadViewKey(
+    definition,
+    options.viewValues?.[definition.key]
+  );
+  const viewPart = view === BASE_VIEW_KEY ? "" : `view=${encodeURIComponent(view)}`;
+  const optionPart = values === void 0 ? "" : optionsCacheSuffix(definition, values, options);
+  if (viewPart === "") return `${base}${optionPart}`;
+  return optionPart === "" ? `${base}?${viewPart}` : `${base}?${viewPart}&${optionPart.slice(1)}`;
 }
 function optionValuesFor(definition, options) {
   return resolveOptionValues(
@@ -3313,6 +3366,9 @@ function optionValuesFor(definition, options) {
 }
 function finalizeWidget(widget, values) {
   if (Object.keys(values).length === 0) return widget;
+  if (widget.status === "ok" && widget.view !== void 0 && widget.view !== BASE_VIEW_KEY) {
+    return { ...widget, options: values };
+  }
   if (widget.status === "ok") {
     const data = applyClientOptions(
       widget.definition,
@@ -3370,7 +3426,8 @@ async function resolveWidgetUnapplied(definition, provider, context, options = {
         if (controller.signal.aborted) throw new LoadInterruption();
         return provider(context, definition, {
           signal: controller.signal,
-          options: values
+          options: values,
+          view: loadViewKey(definition, options.viewValues?.[definition.key])
         });
       }),
       interrupted
@@ -3434,9 +3491,18 @@ function createWidgetLoader(options) {
       ([key, values]) => values === void 0 ? [] : [[key, values]]
     )
   );
+  const chosenViews = new Map(
+    Object.entries(baseOptions.viewValues ?? {}).flatMap(
+      ([key, view]) => view === void 0 ? [] : [[key, view]]
+    )
+  );
   const resolveOptions = baseOptions;
   function currentOptions() {
-    return { ...resolveOptions, optionValues: Object.fromEntries(chosen) };
+    return {
+      ...resolveOptions,
+      optionValues: Object.fromEntries(chosen),
+      viewValues: Object.fromEntries(chosenViews)
+    };
   }
   const unapplied = /* @__PURE__ */ new Map();
   const visible = widgetsFor(definitions, context.roles);
@@ -3569,6 +3635,23 @@ function createWidgetLoader(options) {
     }
     start(definition, true);
   }
+  function setView(key, view) {
+    if (disposed) return;
+    const definition = definitionFor(key);
+    if (definition === void 0) return;
+    const before = loadViewKey(definition, chosenViews.get(key));
+    if (view === void 0 || view === "") chosenViews.delete(key);
+    else chosenViews.set(key, view);
+    const after = loadViewKey(definition, chosenViews.get(key));
+    if (before === after || !started.has(key)) return;
+    const current = snapshot.find(
+      (widget) => widget.definition.key === key
+    );
+    if (current !== void 0 && current.status !== "loading") {
+      replace(key, { definition, status: "loading" });
+    }
+    start(definition, true);
+  }
   function dispose() {
     disposed = true;
     abortAll(new Error("The widget loader was disposed."));
@@ -3587,6 +3670,7 @@ function createWidgetLoader(options) {
     loadAll,
     refresh,
     setOptions,
+    setView,
     dispose
   };
 }
@@ -4507,6 +4591,7 @@ exports.isHidden = isHidden;
 exports.isIsoInterval = isIsoInterval;
 exports.isMinimized = isMinimized;
 exports.isOptionsLocked = isOptionsLocked;
+exports.isProviderView = isProviderView;
 exports.isSafeHref = isSafeHref;
 exports.isSafeImageUrl = isSafeImageUrl;
 exports.isTitleInUse = isTitleInUse;
@@ -4518,6 +4603,8 @@ exports.itemWidth = itemWidth;
 exports.kindLabel = kindLabel;
 exports.kpiDelta = kpiDelta;
 exports.labelStride = labelStride;
+exports.loadViewKey = loadViewKey;
+exports.loadViewKind = loadViewKind;
 exports.loadingWidgets = loadingWidgets;
 exports.memoryAdapter = memoryAdapter;
 exports.minimizeWidget = minimizeWidget;
@@ -4589,6 +4676,7 @@ exports.validateWidgetDefinition = validateWidgetDefinition;
 exports.viewChoices = viewChoices;
 exports.viewKind = viewKind;
 exports.viewNote = viewNote;
+exports.viewValuesFromLayout = viewValuesFromLayout;
 exports.visibleWidgets = visibleWidgets;
 exports.widgetOptionValues = widgetOptionValues;
 exports.widgetsFor = widgetsFor;