Fixed include key code attribute labels in records export (#3147)

* Fixed include key code attribute labels in records export * changed export label * records table: hide buttons when there is no data --------- Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Nov 17, 2023 · 83a5b60 · 83a5b60
1 parent 441f95c
commit 83a5b60
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/core/i18n/resources/en.js b/core/i18n/resources/en.js
@@ -673,6 +673,7 @@ Are you sure you want to continue?`,
       demoteAllRecordsFromAnalysis: 'Analysis -> Cleansing',
       demoteAllRecordsFromCleansing: 'Cleansing -> Entry',
       editRecord: 'Edit record',
+      exportList: 'Export list',
       filterPlaceholder: 'Filter by keys or owner',
       viewRecord: 'View record',
       owner: 'Owner',

diff --git a/server/modules/record/repository/recordRepository.js b/server/modules/record/repository/recordRepository.js
@@ -161,10 +161,10 @@ export const fetchRecordsSummaryBySurveyId = async (
     {}
   )
   const nodeDefKeysSelect = nodeDefKeys
-    ?.map(
-      (nodeDefKey) =>
-        `${rootEntityTableAlias}.${getNodeDefKeyColumnName(nodeDefKey)} as "${getNodeDefKeyColAlias(nodeDefKey)}"`
-    )
+    ?.flatMap((nodeDefKey) => {
+      const colNames = NodeDefTable.getColumnNames(nodeDefKey)
+      return colNames.map((keyColName) => `${rootEntityTableAlias}.${keyColName} AS ${keyColName}`)
+    })
     .join(', ')
 
   const nodeDefKeysSelectSearch = nodeDefKeys

diff --git a/server/modules/record/service/recordService.js b/server/modules/record/service/recordService.js
@@ -2,6 +2,8 @@ import * as fs from 'fs'
 
 import * as Log from '@server/log/log'
 
+import * as NodeDefTable from '@common/surveyRdb/nodeDefTable'
+
 import * as A from '@core/arena'
 import SystemError from '@core/systemError'
 import * as PromiseUtils from '@core/promiseUtils'
@@ -86,11 +88,15 @@ export const exportRecordsSummaryToCsv = async ({ res, surveyId, cycle }) => {
     const validation = Validation.getValidation(recordSummary)
     return {
       step: Record.getStep(recordSummary),
-      ...nodeDefKeys.reduce((keysAcc, nodeDef) => {
-        const name = NodeDef.getName(nodeDef)
-        const value = recordSummary[A.camelize(name)]
-        const formatter = valueFormattersByType[NodeDef.getType(nodeDef)]
-        return { ...keysAcc, [name]: value && formatter ? formatter({ value }) : value }
+      ...nodeDefKeys.reduce((keysAcc, nodeDefKey) => {
+        const nodeDefKeyColumnNames = NodeDefTable.getColumnNames(nodeDefKey)
+        nodeDefKeyColumnNames.forEach((nodeDefKeyColumnName) => {
+          const value = recordSummary[A.camelize(nodeDefKeyColumnName)]
+          const formatter = valueFormattersByType[NodeDef.getType(nodeDefKey)]
+          const valueFormatted = formatter ? formatter({ value }) : value
+          keysAcc[nodeDefKeyColumnName] = valueFormatted
+        })
+        return keysAcc
       }, {}),
       data_created: DateUtils.formatDateTimeExport(Record.getDateCreated(recordSummary)),
       date_modified: DateUtils.formatDateTimeExport(Record.getDateModified(recordSummary)),
@@ -105,7 +111,7 @@ export const exportRecordsSummaryToCsv = async ({ res, surveyId, cycle }) => {
   Response.setContentTypeFile({ res, fileName, contentType: Response.contentTypes.csv })
 
   const fields = [
-    ...nodeDefKeys.map(NodeDef.getName),
+    ...nodeDefKeys.flatMap((nodeDefKey) => NodeDefTable.getColumnNames(nodeDefKey)),
     'step',
     'owner_name',
     'data_created',

diff --git a/webapp/components/Table/Header/Header.js b/webapp/components/Table/Header/Header.js
@@ -4,12 +4,19 @@ import PropTypes from 'prop-types'
 import { VisibleColumnsMenu } from './VisibleColumnsMenu'
 
 const Header = (props) => {
-  const { columns, headerLeftComponent, headerProps, onVisibleColumnsChange, visibleColumnsSelectionEnabled } = props
+  const {
+    columns,
+    headerLeftComponent,
+    headerProps,
+    onVisibleColumnsChange,
+    totalCount,
+    visibleColumnsSelectionEnabled,
+  } = props
 
   return (
     <div className="table__header">
       {React.createElement(headerLeftComponent, { ...props, ...headerProps })}
-      {visibleColumnsSelectionEnabled && (
+      {visibleColumnsSelectionEnabled && totalCount > 0 && (
         <VisibleColumnsMenu columns={columns} onSelectionChange={onVisibleColumnsChange} />
       )}
     </div>
@@ -25,6 +32,7 @@ Header.propTypes = {
   list: PropTypes.array.isRequired,
   offset: PropTypes.number.isRequired,
   onVisibleColumnsChange: PropTypes.func.isRequired,
+  totalCount: PropTypes.number.isRequired,
   visibleColumnsSelectionEnabled: PropTypes.bool,
 }
 

diff --git a/webapp/views/App/views/Data/Records/HeaderLeft/HeaderLeft.js b/webapp/views/App/views/Data/Records/HeaderLeft/HeaderLeft.js
@@ -89,12 +89,12 @@ const HeaderLeft = ({ handleSearch, navigateToRecord, onRecordsUpdate, search, s
           onChange={(e) => handleSearch(e.target.value)}
         />
       )}
-      {canExportRecordsSummary && (
+      {canExportRecordsSummary && totalCount > 0 && (
         <ButtonDownload
           testId={TestId.records.exportBtn}
           href={`/api/survey/${surveyId}/records/summary/export`}
           requestParams={{ cycle }}
-          label="common.export"
+          label="dataView.records.exportList"
         />
       )}
       {published && canUpdateRecordsStep && selectedItemsCount > 0 && (