Merge branch 'devel' into CB-4018-the-settings-button-remains-after-s…

…witching-from-charts-to-the-table
dbeaver · Mar 4, 2024 · 8af11e2 · 8af11e2
2 parents 61bcaa0 + 2894b21
commit 8af11e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/server/bundles/io.cloudbeaver.service.security/plugin.xml b/server/bundles/io.cloudbeaver.service.security/plugin.xml
@@ -29,8 +29,8 @@
             <configuration>
                 <propertyGroup label="Configuration">
                     <property id="logout-url" label="Logout url" type="string" description="Logout url"/>
-                    <property id="user-header" label="User header name" type="string" description="User header name"/>
-                    <property id="team-header" label="Team name" type="string" description="Team header name"/>
+                    <property id="user-header" label="Username header" type="string" description="Username header"/>
+                    <property id="team-header" label="Team header" type="string" description="Team header"/>
                     <property id="team-delimiter" label="Team delimiter symbol" type="string" description="Team delimiter symbol, default: |"/>
                     <property id="first-name-header" label="First name header" type="string" description="First name header name"/>
                     <property id="last-name-header" label="Last name header" type="string" description="Last name header name"/>

diff --git a/...ackages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts b/...ackages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
@@ -5,7 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import { action, makeObservable, observable } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
 import { DataTypeLogicalOperation, ResultDataFormat, SqlResultColumn } from '@cloudbeaver/core-sdk';
 
@@ -55,6 +55,10 @@ export class ResultSetViewAction extends DatabaseDataAction<any, IDatabaseResult
     makeObservable<this, 'columnsOrder'>(this, {
       columnsOrder: observable,
       setColumnOrder: action,
+      rows: computed,
+      rowKeys: computed,
+      columns: computed,
+      columnKeys: computed,
     });
   }