From e53cd9097662d1f8b7e71db0f18d82428fa03f7b Mon Sep 17 00:00:00 2001 From: pkupczyk <piotr.kupczyk@id.ethz.ch> Date: Tue, 8 Nov 2022 11:08:57 +0100 Subject: [PATCH] SSDM-13152 : Exports for master data and metadata UI - fix for exporting only visible columns --- .../js/components/common/grid/GridController.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openbis_ng_ui/src/js/components/common/grid/GridController.js b/openbis_ng_ui/src/js/components/common/grid/GridController.js index e43161b6b71..020636d595e 100644 --- a/openbis_ng_ui/src/js/components/common/grid/GridController.js +++ b/openbis_ng_ui/src/js/components/common/grid/GridController.js @@ -1075,14 +1075,17 @@ export default class GridController { } else if ( state.exportOptions.columns === GridExportOptions.VISIBLE_COLUMNS ) { - const { newAllColumns } = await this._loadColumns( - exportedRows, - state.columnsVisibility, - state.columnsSorting - ) + const { newAllColumns, newColumnsVisibility, newColumnsSorting } = + await this._loadColumns( + exportedRows, + state.columnsVisibility, + state.columnsSorting + ) + + this._sortColumns(newAllColumns, newColumnsSorting) newAllColumns.forEach(column => { - if (column.exportableProperty) { + if (column.exportableProperty && newColumnsVisibility[column.name]) { const propertyCode = column.exportableProperty.code const propertyTypesMap = column.exportableProperty.types -- GitLab