From 0eee0078f66d41896671cd45910f6971f3c43688 Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Wed, 15 Mar 2023 14:53:14 +0100
Subject: [PATCH] SSDM-13463 : Export selection of fields from tables - UI part
- send import_compatible parameter to the server
---
ui-admin/src/js/components/common/grid/GridController.js | 1 +
ui-admin/src/js/components/common/grid/GridWithOpenbis.jsx | 4 +++-
.../eln-lims/html/js/views/DataGrid/DataGridController.js | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ui-admin/src/js/components/common/grid/GridController.js b/ui-admin/src/js/components/common/grid/GridController.js
index 44d8bc55f05..ce33ffdad45 100644
--- a/ui-admin/src/js/components/common/grid/GridController.js
+++ b/ui-admin/src/js/components/common/grid/GridController.js
@@ -1349,6 +1349,7 @@ export default class GridController {
exportedIds: exportedIds,
exportedFields: exportedFields,
exportedValues: state.exportOptions.values,
+ exportedImportCompatible: state.exportOptions.importCompatible,
exportedReferredMasterData:
exportable.fileContent === GridExportOptions.TYPES_CONTENT &&
state.exportOptions.includeDependencies
diff --git a/ui-admin/src/js/components/common/grid/GridWithOpenbis.jsx b/ui-admin/src/js/components/common/grid/GridWithOpenbis.jsx
index 58214125132..e6384226cfd 100644
--- a/ui-admin/src/js/components/common/grid/GridWithOpenbis.jsx
+++ b/ui-admin/src/js/components/common/grid/GridWithOpenbis.jsx
@@ -67,7 +67,8 @@ export default class GridWithOpenbis extends React.PureComponent {
exportedIds,
exportedFields,
exportedValues,
- exportedReferredMasterData
+ exportedReferredMasterData,
+ exportedImportCompatible
}) {
const serviceId = new openbis.CustomASServiceCode(ids.EXPORT_SERVICE)
@@ -81,6 +82,7 @@ export default class GridWithOpenbis extends React.PureComponent {
)
serviceOptions.withParameter('export_fields', exportedFields)
serviceOptions.withParameter('text_formatting', exportedValues)
+ serviceOptions.withParameter('import_compatible', exportedImportCompatible)
const sessionToken = AppController.getInstance().getSessionToken()
const exportResult = await openbis.executeService(serviceId, serviceOptions)
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
index b4bc3eec1a3..7d33778cfe8 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
@@ -285,7 +285,8 @@ function DataGridController(
"ids" : parameters.exportedIds,
"export_referred_master_data" : parameters.exportedReferredMasterData,
"export_fields" : parameters.exportedFields,
- "text_formatting" : parameters.exportedValues
+ "text_formatting" : parameters.exportedValues,
+ "import_compatible" : parameters.exportedImportCompatible
}
return new Promise(function(resolve, reject){
--
GitLab