@vuu-ui/vuu-data-remote 0.8.23-debug → 0.8.24-debug

package/esm/index.js

@@ -136,6 +136,7 @@ function partition(array, test, pass = [], fail = []) {
 }
 
 // ../vuu-utils/src/column-utils.ts
+var KEY = 6;
 var metadataKeys = {
   IDX: 0,
   RENDER_IDX: 1,
@@ -143,7 +144,7 @@ var metadataKeys = {
   IS_EXPANDED: 3,
   DEPTH: 4,
   COUNT: 5,
-  KEY: 6,
+  KEY,
   SELECTED: 7,
   count: 8,
   // TODO following only used in datamodel
@@ -717,7 +718,6 @@ var ArrayBackedMovingWindow = class {
 _range = new WeakMap();
 
 // src/server-proxy/viewport.ts
-var EMPTY_GROUPBY = [];
 var { debug: debug2, debugEnabled: debugEnabled2, error, info, infoEnabled, warn } = logger("viewport");
 var isLeafUpdate = ({ rowKey, updateType }) => updateType === "U" && !rowKey.startsWith("$root");
 var NO_DATA_UPDATE = [
@@ -1215,25 +1215,17 @@ var Viewport = class {
     debug2 == null ? void 0 : debug2(\`columnRequest: \${columns}\`);
     return this.createRequest({ columns });
   }
-  filterRequest(requestId, dataSourceFilter) {
-    this.awaitOperation(requestId, {
-      type: "filter",
-      data: dataSourceFilter
-    });
-    if (this.useBatchMode) {
-      this.batchMode = true;
-    }
-    const { filter } = dataSourceFilter;
-    info == null ? void 0 : info(\`filterRequest: \${filter}\`);
-    return this.createRequest({ filterSpec: { filter } });
-  }
   setConfig(requestId, config) {
+    var _a;
     this.awaitOperation(requestId, { type: "config", data: config });
     const { filter, ...remainingConfig } = config;
     if (this.useBatchMode) {
       this.batchMode = true;
     }
     debugEnabled2 ? debug2 == null ? void 0 : debug2(\`setConfig \${JSON.stringify(config)}\`) : info == null ? void 0 : info(\`setConfig\`);
+    if (!this.isTree && config.groupBy.length > 0) {
+      (_a = this.dataWindow) == null ? void 0 : _a.clear();
+    }
     return this.createRequest(
       {
         ...remainingConfig,
@@ -1256,17 +1248,6 @@ var Viewport = class {
     info == null ? void 0 : info(\`sortRequest: \${JSON.stringify(sort.sortDefs)}\`);
     return this.createRequest({ sort });
   }
-  groupByRequest(requestId, groupBy = EMPTY_GROUPBY) {
-    var _a;
-    this.awaitOperation(requestId, { type: "groupBy", data: groupBy });
-    if (this.useBatchMode) {
-      this.batchMode = true;
-    }
-    if (!this.isTree) {
-      (_a = this.dataWindow) == null ? void 0 : _a.clear();
-    }
-    return this.createRequest({ groupBy });
-  }
   selectRequest(requestId, selected) {
     this.selectedRows = selected;
     this.awaitOperation(requestId, { type: "selection", data: selected });
@@ -1680,17 +1661,6 @@ var ServerProxy = class {
     const request = viewport.sortRequest(requestId, message.sort);
     this.sendIfReady(request, requestId, viewport.status === "subscribed");
   }
-  groupBy(viewport, message) {
-    const requestId = nextRequestId();
-    const request = viewport.groupByRequest(requestId, message.groupBy);
-    this.sendIfReady(request, requestId, viewport.status === "subscribed");
-  }
-  filter(viewport, message) {
-    const requestId = nextRequestId();
-    const { filter } = message;
-    const request = viewport.filterRequest(requestId, filter);
-    this.sendIfReady(request, requestId, viewport.status === "subscribed");
-  }
   setColumns(viewport, message) {
     const requestId = nextRequestId();
     const { columns } = message;
@@ -1863,10 +1833,6 @@ var ServerProxy = class {
             return this.aggregate(viewport, message);
           case "sort":
             return this.sort(viewport, message);
-          case "groupBy":
-            return this.groupBy(viewport, message);
-          case "filter":
-            return this.filter(viewport, message);
           case "select":
             return this.select(viewport, message);
           case "suspend":
@@ -2908,7 +2874,7 @@ var createSchemaFromTableMetadata = ({
 // src/vuu-data-source.ts
 import { parseFilter } from "@vuu-ui/vuu-filter-parser";
 import {
-  configChanged,
+  isConfigChanged,
   debounce,
   EventEmitter as EventEmitter2,
   isViewportMenusAction,
@@ -3232,8 +3198,9 @@ var VuuDataSource = class extends EventEmitter2 {
   }
   set config(config) {
     var _a;
-    if (this.applyConfig(config)) {
-      if (__privateGet(this, _config) && this.viewport && this.server) {
+    const configChanges = this.applyConfig(config);
+    if (configChanges) {
+      if (__privateGet(this, _config) && this.viewport) {
         if (config) {
           (_a = this.server) == null ? void 0 : _a.send({
             viewport: this.viewport,
@@ -3242,12 +3209,16 @@ var VuuDataSource = class extends EventEmitter2 {
           });
         }
       }
-      this.emit("config", __privateGet(this, _config));
+      this.emit("config", __privateGet(this, _config), void 0, configChanges);
     }
   }
   applyConfig(config) {
     var _a;
-    if (configChanged(__privateGet(this, _config), config)) {
+    const { noChanges, ...otherChanges } = isConfigChanged(
+      __privateGet(this, _config),
+      config
+    );
+    if (noChanges !== true) {
       if (config) {
         const newConfig = ((_a = config == null ? void 0 : config.filter) == null ? void 0 : _a.filter) && (config == null ? void 0 : config.filter.filterStruct) === void 0 ? {
           ...config,
@@ -3257,7 +3228,7 @@ var VuuDataSource = class extends EventEmitter2 {
           }
         } : config;
         __privateSet(this, _config, withConfigDefaults(newConfig));
-        return true;
+        return otherChanges;
       }
     }
   }
@@ -3304,6 +3275,7 @@ var VuuDataSource = class extends EventEmitter2 {
     return __privateGet(this, _config).sort;
   }
   set sort(sort) {
+    var _a;
     __privateSet(this, _config, {
       ...__privateGet(this, _config),
       sort
@@ -3314,9 +3286,7 @@ var VuuDataSource = class extends EventEmitter2 {
         type: "sort",
         sort
       };
-      if (this.server) {
-        this.server.send(message);
-      }
+      (_a = this.server) == null ? void 0 : _a.send(message);
     }
     this.emit("config", __privateGet(this, _config));
   }
@@ -3324,21 +3294,10 @@ var VuuDataSource = class extends EventEmitter2 {
     return __privateGet(this, _config).filter;
   }
   set filter(filter) {
-    __privateSet(this, _config, {
+    this.config = {
       ...__privateGet(this, _config),
       filter
-    });
-    if (this.viewport) {
-      const message = {
-        viewport: this.viewport,
-        type: "filter",
-        filter
-      };
-      if (this.server) {
-        this.server.send(message);
-      }
-    }
-    this.emit("config", __privateGet(this, _config));
+    };
   }
   get groupBy() {
     return __privateGet(this, _config).groupBy;
@@ -3347,20 +3306,10 @@ var VuuDataSource = class extends EventEmitter2 {
     var _a;
     if (itemsOrOrderChanged(this.groupBy, groupBy)) {
       const wasGrouped = __privateGet(this, _groupBy).length > 0;
-      __privateSet(this, _config, {
+      this.config = {
         ...__privateGet(this, _config),
         groupBy
-      });
-      if (this.viewport) {
-        const message = {
-          viewport: this.viewport,
-          type: "groupBy",
-          groupBy: __privateGet(this, _config).groupBy
-        };
-        if (this.server) {
-          this.server.send(message);
-        }
-      }
+      };
       if (!wasGrouped && groupBy.length > 0 && this.viewport) {
         (_a = this.clientCallback) == null ? void 0 : _a.call(this, {
           clientViewportId: this.viewport,
@@ -3370,7 +3319,6 @@ var VuuDataSource = class extends EventEmitter2 {
           rows: []
         });
       }
-      this.emit("config", __privateGet(this, _config));
       this.setConfigPending({ groupBy });
     }
   }