Skip to content

fix/AB#80830_fields_not_working_in_export #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 7, 2023
Merged

fix/AB#80830_fields_not_working_in_export #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b44fc6
fix: started to fix export for fields like select and multiselect wit…
RenzoPrats Dec 6, 2023
73f54e3
fix: lint
RenzoPrats Dec 6, 2023
318eb9e
fix: finished fix exports in grid
RenzoPrats Dec 7, 2023
cdc5a2c
fixed lint
RenzoPrats Dec 7, 2023
9e9ff70
simplify the logic
AntoineRelief Dec 7, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/utils/files/exportBatch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,10 @@ const getColumns = (req: any, params: ExportBatchParams): Promise<any[]> => {
if (Object.prototype.hasOwnProperty.call(data.data, field)) {
const meta = data.data[field];
const rawColumns = getColumnsFromMeta(meta, params.fields);
const columns = rawColumns.filter((x) =>
Copy link
Collaborator

@AntoineRelief AntoineRelief Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RenzoPrats
just noticed that this is breaking some of the queries
indeed, the code there put too many fields in the export
params.fields.find((f) => f.name === x.name)
);
// Edits the column to match with the fields
columns.forEach((column) => {
rawColumns.forEach((column) => {
const queryField = params.fields.find(
(f) => f.name === column.name
(f) => f.name.toLowerCase() === column.name.toLowerCase()
);
column.title = queryField.title;
if (column.subColumns) {
Expand All @@ -226,7 +223,7 @@ const getColumns = (req: any, params: ExportBatchParams): Promise<any[]> => {
}
}
});
resolve(columns);
resolve(rawColumns);
}
}
});
Expand Down
26 changes: 18 additions & 8 deletions src/utils/files/getRowsFromMeta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@ const setMultiselectRow = (column: any, data: any, row: any) => {
} else {
let value: any;
// If it's a referenceData field, extract value differently.
if (column.name.includes('.') && column.meta.field.generated) {
if (column.meta.field.graphQLFieldName) {
const path = column.name.split('.')[0];
const attribute = column.name.split('.')[1];
const values = get(data, path);
if (Array.isArray(values)) {
value = values.map((x) => x[attribute]);
const lowercasedValues = values.map((obj) => {
const lowercasedObject = Object.keys(obj).reduce((acc, key) => {
acc[key.toLowerCase()] = obj[key];
return acc;
}, {});
return lowercasedObject;
});
value = lowercasedValues.map((x) => x[attribute.toLowerCase()]);
}
} else {
value = get(data, column.field);
Expand Down Expand Up @@ -89,12 +96,15 @@ export const getRowsFromMeta = (columns: any[], records: any[]): any[] => {
}
case 'dropdown': {
let value: any = get(data, column.field);
const choices = column.meta.field.choices || [];
if (choices.length > 0) {
if (Array.isArray(value)) {
value = value.map((x) => getText(choices, x));
} else {
value = getText(choices, value);
// Only enter if not reference data
if (!column.meta.field.graphQLFieldName) {
const choices = column.meta.field.choices || [];
if (choices.length > 0) {
if (Array.isArray(value)) {
value = value.map((x) => getText(choices, x));
} else {
value = getText(choices, value);
}
}
}
set(row, column.name, Array.isArray(value) ? value.join(',') : value);
Expand Down