Cb 4457 subcollections firestore

webapp/packages/core-sdk/src/queries/grid/getSqlExecuteTaskResults.gql

@@ -32,7 +32,6 @@ mutation getSqlExecuteTaskResults($taskId: ID!) {
             argumentCount
           }
         }
-        rows
         rowsWithMetaData {
           data
           metaData

webapp/packages/core-sdk/src/queries/grid/updateResultsDataBatch.gql

@@ -23,7 +23,6 @@ mutation updateResultsDataBatch(
       updateRowCount
       resultSet {
         id
-        rows
         rowsWithMetaData {
           data
           metaData

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetDataAction.ts

@@ -23,11 +23,7 @@ import type { IResultSetValue } from './ResultSetFormatAction';
 export class ResultSetDataAction extends DatabaseDataResultAction<IResultSetElementKey, IDatabaseResultSet> {
   static dataFormat = [ResultDataFormat.Resultset];
 
-  get rows(): IResultSetValue[][] {
-    return this.result.data?.rows || [];
-  }
-
-  get rowsWithMetadata() {
+  get rows() {
     return this.result.data?.rowsWithMetaData || [];
   }
 
@@ -39,7 +35,6 @@ export class ResultSetDataAction extends DatabaseDataResultAction<IResultSetElem
     super(source);
     makeObservable(this, {
       rows: computed,
-      rowsWithMetadata: computed,
       columns: computed,
     });
   }
@@ -96,23 +91,23 @@ export class ResultSetDataAction extends DatabaseDataResultAction<IResultSetElem
       return undefined;
     }
 
-    return this.rows[row.index];
+    return this.rows[row.index].data;
   }
 
   getRowMetadata(row: IResultSetRowKey) {
-    if (row.index >= this.rowsWithMetadata.length) {
+    if (row.index >= this.rows.length) {
       return undefined;
     }
 
-    return this.rowsWithMetadata[row.index].metaData;
+    return this.rows[row.index].metaData;
   }
 
   getCellValue(cell: IResultSetElementKey): IResultSetValue | undefined {
     if (cell.row === undefined || cell.column === undefined || cell.row.index >= this.rows.length || cell.column.index >= this.columns.length) {
       return undefined;
     }
 
-    return this.rows[cell.row.index][cell.column.index];
+    return this.rows[cell.row.index].data?.[cell.column.index];
   }
 
   getContent(cell: IResultSetElementKey): IResultSetContentValue | null {

webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts

@@ -35,7 +35,7 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
     return this.columns.map(c => ({ index: this.data.columns.indexOf(c) }));
   }
 
-  get rows(): IResultSetValue[][] {
+  get rows() {
     return this.data.rows;
   }
 
@@ -137,7 +137,7 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
       throw new Error('Cell is out of range');
     }
 
-    return this.rows[cell.row.index][cell.column.index];
+    return this.rows[cell.row.index].data?.[cell.column.index];
   }
 
   getContent(cell: IResultSetElementKey): IResultSetComplexValue | null {