Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions frontend/src/pages/BulkImport/BulkImportTask.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ const BulkImportTask = observer(() => {
user: item.submitter?.displayName || "-",
occurrenceID: item.occurrenceId || "-",
individualID: item.individualId || "-",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You mean to keep individualID here and add individualName? Or replace individualID with individualName?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

As a double check: is there the possibility for more confusion here?

Could the user enter in their spreadsheet:

"Bob"

our logic reconciles "Bob" to individual <some_UUID>

we then return that individual's display name, which is a complex set of logic that might return some other value like "MX-4567"?

Is it worth just showing the Excel field value "Bob" so long as it can be validated to an existing individual's UUID?

individualName: item.individualDisplayName || item.individualId || "-",
imageCount: item.numberMediaAssets,
class: classArray,
};
Expand Down Expand Up @@ -165,15 +166,15 @@ const BulkImportTask = observer(() => {
},
{
name: "Individual ID",
selector: (row) => row.individualID,
selector: (row) => row.individualName,
cell: (row) =>
row.individualID !== "-" ? (
row.individualName !== "-" ? (
<a
href={`/individuals.jsp?id=${row.individualID}`}
target="_blank"
rel="noreferrer"
>
{row.individualID}
{row.individualName}
</a>
) : (
"-"
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/ecocean/api/BulkImport.java
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,7 @@ private static JSONObject taskJson(ImportTask task, boolean detailed, Shepherd m
if (enc.hasMarkedIndividual()) {
indivIds.add(enc.getIndividualID());
encj.put("individualId", enc.getIndividualID());
encj.put("individualDisplayName", enc.getDisplayName());
}
encj.put("numberMediaAssets", enc.numAnnotations());
User sub = enc.getSubmitterUser(myShepherd);
Expand Down
Loading