From b5dceef605c8ad9fdd34c2cafcfc0df94c55bd04 Mon Sep 17 00:00:00 2001
From: DenisSinelnikov <142215442+DenisSinelnikov@users.noreply.github.com>
Date: Fri, 1 Mar 2024 14:57:11 +0400
Subject: [PATCH 1/2] CB-4792. Change attribute names for rp identity provider
 (#2435)

Co-authored-by: DenisSinelnikov <denis.sinelnikov@dbaever.com>
---
 server/bundles/io.cloudbeaver.service.security/plugin.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.service.security/plugin.xml b/server/bundles/io.cloudbeaver.service.security/plugin.xml
index f3389a96fc..6fb281f13a 100644
--- 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"/>

From 2894b21960e467509d3bbedb7c53a0fb4b95fdc0 Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:23:54 +0100
Subject: [PATCH 2/2] CB-4779 mark rows and columns getters as computed values
 (#2430)

* CB-4779 mark rows and columns getters as computed values

* CB-4779 wrap keys in computed

* CB-4779 remove unused import

---------

Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>
---
 .../Actions/ResultSet/ResultSetViewAction.ts                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
index 986085afdf..20c0051994 100644
--- a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/Actions/ResultSet/ResultSetViewAction.ts
+++ b/webapp/packages/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,
     });
   }