@platforma-sdk/ui-vue 1.30.7 → 1.30.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/ui-vue",
-  "version": "1.30.7",
+  "version": "1.30.13",
   "type": "module",
   "main": "dist/lib.umd.cjs",
   "module": "dist/lib.js",
@@ -24,7 +24,7 @@
     "ag-grid-enterprise": "^33.0.4",
     "ag-grid-vue3": "^33.0.4",
     "@milaboratories/uikit": "^2.2.72",
-    "@platforma-sdk/model": "^1.30.3"
+    "@platforma-sdk/model": "^1.30.11"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.2.0",

package/src/AgGridVue/useAgGridOptions.ts

@@ -15,7 +15,7 @@ import { PlAgChartHistogramCell } from '../components/PlAgChartHistogramCell';
 import type { ImportFileHandle } from '@platforma-sdk/model';
 import type { ImportProgress } from '@platforma-sdk/model';
 import { PlAgCellStatusTag } from '../components/PlAgCellStatusTag';
-interface GridOptionsExtended<TData = any> extends Omit<GridOptions<TData>, 'columnDefs'> {
+interface GridOptionsExtended<TData = any> extends Omit<GridOptions<TData>, 'columnDefs' | 'loadingOverlayComponentParams'> {
   /**
    * Array of Column / Column Group definitions.
    */
@@ -24,6 +24,10 @@ interface GridOptionsExtended<TData = any> extends Omit<GridOptions<TData>, 'col
    * Show row numbers column
    */
   rowNumbersColumn?: boolean;
+  /**
+   * Loading overlay text
+   */
+  loadingText?: string;
   /**
    * Not ready overlay (No datasource). Takes priority over "loading"
    */
@@ -40,6 +44,10 @@ interface GridOptionsExtended<TData = any> extends Omit<GridOptions<TData>, 'col
    * Override standard 'Empty' text for the "no rows" overlay
    */
   noRowsText?: string;
+  /**
+   * @deprecated Use loading, notReady, loadingText, loadingOverlayType instead
+   */
+  loadingOverlayComponentParams?: never;
 }
 
 // @TODO (super simple builder for now)
@@ -75,6 +83,16 @@ class Builder<TData> {
     return this;
   }
 
+  /**
+   * Set loading overlay custom text (default is "Loading")
+   * @param loadingText
+   * @returns this
+   */
+  public setLoadingText(loadingText?: string) {
+    this.#options.loadingText = loadingText;
+    return this;
+  }
+
   /**
    * Show "not ready overlay
    * @param notReady
@@ -272,7 +290,7 @@ export function useAgGridOptions<TData>(
 ) {
   const gridApi = shallowRef<GridApi>();
 
-  const gridOptions = computed<GridOptionsExtended>(() => {
+  const extOptions = computed<GridOptionsExtended>(() => {
     const def: GridOptionsExtended<TData> = {
       theme: AgGridTheme,
       loadingOverlayComponent: PlAgOverlayLoading,
@@ -301,17 +319,12 @@ export function useAgGridOptions<TData>(
       };
     }
 
-    options.loading = options.notReady || options.loading;
-
-    // @TODO
-    if (options.loading) {
-      options.loadingOverlayComponentParams = {
-        notReady: options.notReady,
-        notReadyText: options.notReadyText,
-        overlayType: options.loadingOverlayType,
-      } satisfies PlAgOverlayLoadingParams;
+    if ('loadingOverlayComponentParams' in options) {
+      console.warn('useAgGridOptions: remove loadingOverlayComponentParams from options, use loading, notReady, loadingText, loadingOverlayType instead');
     }
 
+    options.loading = options.notReady || options.loading;
+
     options.columnDefs = options.columnDefs?.map((it) => createAgGridColDef(it));
 
     // Register all special components
@@ -325,21 +338,35 @@ export function useAgGridOptions<TData>(
     return options;
   });
 
-  whenever(() => gridOptions.value.rowNumbersColumn, () => {
+  const gridOptions = computed<GridOptions>(() => {
+    const options = extOptions.value;
+
+    return {
+      ...options,
+      loadingOverlayComponentParams: {
+        notReady: options.notReady,
+        notReadyText: options.notReadyText,
+        overlayType: options.loadingOverlayType,
+      } satisfies PlAgOverlayLoadingParams,
+    };
+  });
+
+  whenever(() => extOptions.value.rowNumbersColumn, () => {
     if (gridApi.value) {
       autoSizeRowNumberColumn(gridApi.value);
     }
   });
 
   watch([
-    () => gridOptions.value.notReady,
-    () => gridOptions.value.loading,
+    () => extOptions.value.notReady,
+    () => extOptions.value.loading,
   ], ([notReady, loading]) => {
     const loadingOverlayComponentParams = {
       notReady,
       // we probably don't need to update the parameters below
-      notReadyText: gridOptions.value.notReadyText,
-      overlayType: gridOptions.value.loadingOverlayType,
+      notReadyText: extOptions.value.notReadyText,
+      overlayType: extOptions.value.loadingOverlayType,
+      loadingText: extOptions.value.loadingText,
     } satisfies PlAgOverlayLoadingParams;
 
     // Hack to apply loadingOverlayComponentParams

package/src/components/PlAgDataTable/sources/table-source-v2.ts

@@ -129,8 +129,8 @@ export async function updatePFrameGridOptions(
 
   const fields = [...indices];
 
-  const firstColumnIdx = indices.findIndex((i) => specs[i].type === 'column');
   // process label columns
+  const firstColumnIdx = indices.findIndex((i) => specs[i].type === 'column');
   for (let i = indices.length - 1; i >= firstColumnIdx; --i) {
     const idx = indices[i];
     if (!isLabelColumn(specs[idx])) continue;

package/src/components/PlAgDataTable/sources/table-source.ts

@@ -105,16 +105,18 @@ export async function updatePFrameGridOptions(
   const hColumns = getHeterogeneousColumns(specs, indices);
 
   // process label columns
-  for (let i = indices.length - 1; i >= 0; --i) {
+  const firstColumnIdx = indices.findIndex((i) => specs[i].type === 'column');
+  for (let i = indices.length - 1; i >= firstColumnIdx; --i) {
     const idx = indices[i];
     if (!isLabelColumn(specs[idx])) continue;
 
     // axis of labels
     const axisId = getAxisId((specs[idx].spec as PColumnSpec).axesSpec[0]);
     const axisIdx = indices.findIndex((idx) => lodash.isEqual(specs[idx].id, axisId));
-    if (axisIdx === -1) {
-      // no axis, it was already processed
-      continue;
+    if (axisIdx !== -1) {
+      indices[axisIdx] = idx;
+    } else {
+      console.warn(`multiple label columns match axisId: ${JSON.stringify(axisId)}`);
     }
 
     // replace in h-columns

package/src/plugins/Monetization/MonetizationSidebar.vue

@@ -52,14 +52,20 @@ const options = computed(() => {
 
 const statusText = computed(() => {
   switch (status.value) {
+    case 'active':
+      return '';
     case 'limits_exceeded':
       return 'Usage limits exceeded for the current billing period.';
     case 'payment_required':
       return 'Payment required to continue using the service.';
     case 'select-tariff':
       return 'Select a subscription plan in the Scientist Cabinet.';
+    case 'inactive':
+      return 'Not found billing period.';
+    case 'awaiting':
+      return 'Waiting for monetization information';
     default:
-      return '';
+      return 'Unknown status: ' + status.value;
   }
 });
 

package/src/plugins/Monetization/useInfo.ts

@@ -10,9 +10,11 @@ export function useInfo() {
 
   const hasMonetization = computed(() => '__mnzDate' in (app.value?.model?.args as Record<string, unknown>));
 
-  const mnzInfo = computed(() => Response.safeParse(app.value?.model.outputs['__mnzInfo']));
+  const parsed = computed(() => Response.safeParse(app.value?.model.outputs['__mnzInfo']));
 
-  const currentInfo = computed<Response | undefined>(() => mnzInfo.value?.data);
+  const currentInfo = computed<Response | undefined>(() => parsed.value?.data);
+
+  const error = computed(() => parsed.value?.error ?? info.value?.response?.error);
 
   const info = ref<Response | undefined>(undefined);
 
@@ -20,8 +22,6 @@ export function useInfo() {
 
   const version = ref(0);
 
-  const error = computed(() => mnzInfo.value?.error ?? info.value?.response?.error);
-
   watch([currentInfo], ([i]) => {
     if (i) {
       info.value = i;
@@ -38,7 +38,7 @@ export function useInfo() {
 
   const canRun = computed(() => !!result.value?.canRun);
 
-  const status = computed(() => result.value?.status);
+  const status = computed(() => currentInfo.value ? result.value?.status : 'awaiting');
 
   const customerEmail = computed(() => result.value?.customerEmail);
 

package/src/plugins/Monetization/validation.ts

@@ -28,12 +28,7 @@ const DryRunResult = z.object({
   productName: z.string().default('Unknown product'),
   customerEmail: z.string().optional(),
   canRun: z.boolean(),
-  status: z.union([
-    z.literal('select-tariff'),
-    z.literal('active'),
-    z.literal('payment_required'),
-    z.literal('limits_exceeded'),
-  ]),
+  status: z.string(), // 'select-tariff', 'active', 'payment_required', 'limits_exceeded', 'inactive', 'unknown',
   mnz: z.object({
     type: MonetizationType.optional(),
     endOfBillingPeriod: z.string().nullable().optional(),