fix: DH-18415: Cannot expand rows after applying rollup to ui.table (#…

…1109)

Fixes #1079 
Tested with the steps in DH-18415

plugins/ui/src/js/src/elements/UITable/JsTableProxy.ts

@@ -114,7 +114,7 @@ class JsTableProxy implements dh.Table {
         const proxyHasProp = Object.prototype.hasOwnProperty.call(target, prop);
 
         if (proxyHasSetter || proxyHasProp) {
-          return Reflect.set(target, prop, value, target);
+          return Reflect.set(target, prop, value);
         }
 
         return Reflect.set(target.table, prop, value, target.table);

plugins/ui/src/js/src/elements/UITable/UITableModel.ts

@@ -12,6 +12,7 @@ import {
   ColumnName,
   IrisGridModel,
   IrisGridModelFactory,
+  IrisGridTableModel,
   type IrisGridThemeType,
   isIrisGridTableModelTemplate,
   UIRow,
@@ -130,7 +131,7 @@ function getFormatCustomColumnName(i: number): string {
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface UITableModel extends IrisGridModel {}
+interface UITableModel extends IrisGridTableModel {}
 
 type NumericValue =
   | number
@@ -141,8 +142,6 @@ type NumericValue =
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 class UITableModel extends IrisGridModel {
-  table: DhType.Table;
-
   private model: IrisGridModel;
 
   private databars: Map<ColumnName, DatabarConfig>;
@@ -159,7 +158,6 @@ class UITableModel extends IrisGridModel {
   constructor({
     dh,
     model,
-    table,
     databars,
     format,
     displayNameMap,
@@ -174,7 +172,6 @@ class UITableModel extends IrisGridModel {
     super(dh);
 
     this.model = model;
-    this.table = table;
     this.displayNameMap = displayNameMap;
 
     this.databars = new Map<ColumnName, DatabarConfig>();
@@ -209,6 +206,7 @@ class UITableModel extends IrisGridModel {
         );
 
         const trueTarget = proxyHasProp || proxyHasFn ? target : target.model;
+
         return Reflect.get(trueTarget, prop);
       },
       set(target, prop, value) {
@@ -219,10 +217,10 @@ class UITableModel extends IrisGridModel {
         const proxyHasProp = Object.prototype.hasOwnProperty.call(target, prop);
 
         if (proxyHasSetter || proxyHasProp) {
-          return Reflect.set(target, prop, value, target);
+          return Reflect.set(target, prop, value);
         }
 
-        return Reflect.set(target.model, prop, value, target.model);
+        return Reflect.set(target.model, prop, value);
       },
     });
   }
@@ -277,11 +275,11 @@ class UITableModel extends IrisGridModel {
     columnName: ColumnName,
     valueType: string
   ): number {
-    if (row != null) {
+    if (row != null && isIrisGridTableModelTemplate(this.model)) {
       let column;
 
       try {
-        column = this.table.findColumn(columnName);
+        column = this.model.table.findColumn(columnName);
       } catch {
         throw new Error(`Can't find databar ${valueType} column ${columnName}`);
       }

tests/ui_table.spec.ts

@@ -3,8 +3,7 @@ import { openPanel, gotoPage } from './utils';
 
 const REACT_PANEL_VISIBLE = '.dh-react-panel:visible';
 
-// Tests flex components render as expected
-test.describe('UI flex components', () => {
+test.describe('UI table', () => {
   [
     't_alignment',
     't_background_color',