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

Jump to bottom

Fix file uploading node expression. #6689

Merged
merged 8 commits into from
May 19, 2023
Merged

Fix file uploading node expression. #6689

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
480d369
Fix file uploading path
farmaazon May 15, 2023
dd223ef
Fix test
farmaazon May 15, 2023
81d4b08
Comment checksum
farmaazon May 15, 2023
236bb9b
TODO information
farmaazon May 15, 2023
08c9110
Merge remote-tracking branch 'origin/develop' into wip/ao/file-upload…
farmaazon May 19, 2023
be5e7db
Fix linter
farmaazon May 19, 2023
bdc4bae
Restore skipping checksum
farmaazon May 19, 2023
0ca2cd9
Fix tests
farmaazon May 19, 2023
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
8 changes: 5 additions & 3 deletions app/gui/src/controller/upload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ impl<DP: DataProvider> FileUploadProcess<DP> {
);
self.bytes_uploaded = self.file.size;
}
self.check_checksum().await?;
//TODO[ao]: The language server checksum method sometimes fails:
// https://github.com/enso-org/enso/issues/6691 so we skip the check until fixed.
// self.check_checksum().await?;
Ok(UploadingState::Finished)
}
Err(err) => Err(err),
Expand Down Expand Up @@ -308,7 +310,7 @@ impl NodeFromDroppedFileHandler {
}

fn uploading_node_expression(name: &str) -> String {
format!("File_Uploading.file_uploading Enso_Project.data/\"{name}\"")
format!("Visualization.file_uploading enso_project.data/\"{name}\"")
}

fn uploaded_node_expression(name: &str) -> String {
Expand Down Expand Up @@ -694,7 +696,7 @@ mod test {

fn module_code_uploading(file_name: &str) -> String {
format!(
"{}\n operator1 = File_Uploading.file_uploading Enso_Project.data/\"{}\"",
"{}\n operator1 = Visualization.file_uploading Enso_Project.data/\"{}\"",
mock::data::CODE,
file_name
)
Expand Down