From 9e4e4296a3686d2912f38df674185d508e0e96dc Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Tue, 8 Nov 2022 11:10:02 +0100
Subject: [PATCH] SSDM-13152 : Exports for master data and metadata UI - change
values of options to be the same as the exporter expects
---
.../src/js/components/common/grid/GridExportOptions.js | 4 ++--
.../src/js/components/common/grid/GridWithSettings.jsx | 10 +---------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/openbis_ng_ui/src/js/components/common/grid/GridExportOptions.js b/openbis_ng_ui/src/js/components/common/grid/GridExportOptions.js
index cefe80f972d..dc22f039dff 100644
--- a/openbis_ng_ui/src/js/components/common/grid/GridExportOptions.js
+++ b/openbis_ng_ui/src/js/components/common/grid/GridExportOptions.js
@@ -7,8 +7,8 @@ const CURRENT_PAGE = 'CURRENT_PAGE'
const SELECTED_ROWS = 'SELECTED_ROWS'
const ROWS_OPTIONS = [ALL_PAGES, CURRENT_PAGE, SELECTED_ROWS]
-const PLAIN_TEXT = 'PLAIN_TEXT'
-const RICH_TEXT = 'RICH_TEXT'
+const PLAIN_TEXT = 'PLAIN'
+const RICH_TEXT = 'RICH'
const VALUES_OPTIONS = [PLAIN_TEXT, RICH_TEXT]
export default {
diff --git a/openbis_ng_ui/src/js/components/common/grid/GridWithSettings.jsx b/openbis_ng_ui/src/js/components/common/grid/GridWithSettings.jsx
index c35a1f01a38..030b2f88bf2 100644
--- a/openbis_ng_ui/src/js/components/common/grid/GridWithSettings.jsx
+++ b/openbis_ng_ui/src/js/components/common/grid/GridWithSettings.jsx
@@ -1,7 +1,6 @@
import React from 'react'
import autoBind from 'auto-bind'
import Grid from '@src/js/components/common/grid/Grid.jsx'
-import GridExportOptions from '@src/js/components/common/grid/GridExportOptions.js'
import openbis from '@src/js/services/openbis.js'
import ids from '@src/js/common/consts/ids.js'
import logger from '@src/js/common/logger.js'
@@ -72,14 +71,7 @@ export default class GridWithSettings extends React.PureComponent {
serviceOptions.withParameter('ids', exportedIds)
serviceOptions.withParameter('export_referred', true)
serviceOptions.withParameter('export_properties', exportedProperties)
-
- if (exportedValues === GridExportOptions.PLAIN_TEXT) {
- serviceOptions.withParameter('text_formatting', 'PLAIN')
- } else if (exportedValues === GridExportOptions.RICH_TEXT) {
- serviceOptions.withParameter('text_formatting', 'RICH')
- } else {
- throw Error('Unsupported text formatting ' + exportedValues)
- }
+ serviceOptions.withParameter('text_formatting', exportedValues)
return await openbis.executeService(serviceId, serviceOptions)
}
--
GitLab