Skip to content
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

Error case improvement #2418

Merged
merged 5 commits into from
Mar 28, 2024
Merged

Error case improvement #2418

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
159c8c6
use createUpdateMetadataJob from ermrestJS when file exists but conte…
jrchudy Mar 14, 2024
9a51940
Merge branch 'master' into hatrac-new-filename
jrchudy Mar 19, 2024
edb45a0
checkout ermrestJS branch for tests
jrchudy Mar 20, 2024
555f4b0
make sure file is defined before trying to create an uipload file object
jrchudy Mar 28, 2024
ba74a40
undo branch checkout for tests
jrchudy Mar 28, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ jobs:
run: |
git clone https://github.com/informatics-isi-edu/ermrestjs.git
cd ermrestjs
git checkout custom-filename
sudo make root-install
- name: Install chaise
run: |
Expand Down
11 changes: 7 additions & 4 deletions src/utils/recordedit-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,13 @@ export function populateSubmissionRow(reference: any, formNumber: number, formDa
// dereference formData so we aren't modifying content in react-hook-form
// v is an object with `file`, `filename`, `filesize`, and `url` defined
const tempVal = { ...v };
tempVal.hatracObj = new windowRef.ERMrest.Upload(v.file, {
column: col,
reference: reference
});
tempVal.hatracObj = null
if (v.file) {
tempVal.hatracObj = new windowRef.ERMrest.Upload(v.file, {
column: col,
reference: reference
});
}

v = tempVal;
} else {
Expand Down
Loading