Skip to content

feat: Export options updated #1096

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

Draft
pranavkparti wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: Export options updated #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/components/Captures/CaptureTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@ const columns = [
},
];

//additional columns for export options, passed to ExportCaptures
const exportColumns = [
...columns,
{
attr: 'id',
label: 'Capture UUID',
},
{
attr: 'wallet_token_id',
label: 'Wallet UUID',
},
];

const CaptureTable = () => {
const {
filter,
Expand Down Expand Up @@ -227,7 +240,7 @@ const CaptureTable = () => {
<ExportCaptures
isOpen={isOpenExport}
handleClose={() => setOpenExport(false)}
columns={columns}
columns={exportColumns}
filter={filter}
speciesLookup={speciesLookup}
/>
Expand Down Expand Up @@ -323,7 +336,7 @@ export const formatCell = (capture, speciesLookup, attr, renderer) => {
/>
);
} else if (attr === 'species_id') {
return capture[attr] === null ? '--' : speciesLookup[capture[attr]];
return capture[attr] === null ? '' : speciesLookup[capture[attr]];
} else {
return renderer ? renderer(capture[attr]) : capture[attr];
}
Expand Down
4 changes: 3 additions & 1 deletion src/components/ExportCaptures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ const ExportCaptures = (props) => {
return captures.map((capture) => {
let formattedCapture = {};
Object.keys(selectedColumns).forEach((attr) => {
if (['id', 'grower_account_id', 'imageUrl'].includes(attr)) {
if (
['reference_id', 'grower_reference_id', 'image_url'].includes(attr)
) {
formattedCapture[attr] = capture[attr];
} else {
const renderer = selectedColumns[attr].renderer;
Expand Down