SWC-7064, SWC-7092 - Use Elemental2 for JsInterop models #5559
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickgros
changed the title
nickgros
commented
Oct 24, 2024
| @@ -43,10 +43,6 @@ public LayoutResult nChartlayout( | |||
|
|
|||
| public void setPageDescription(String newDescription); | |||
|
|
|||
| public JavaScriptObject getFileList(String fileFieldId); | |||
There was a problem hiding this comment.
Moved these to a new SynapseJsInteropUtils interface & class
nickgros
commented
Oct 24, 2024
| import jsinterop.base.Js; | ||
| import org.sagebionetworks.web.client.callback.MD5Callback; | ||
|
|
||
| public class SynapseJsInteropUtilsImpl implements SynapseJsInteropUtils { |
There was a problem hiding this comment.
Rewrote all of these from JSNI to JsInterop using the Elemental2 classes
nickgros
commented
Oct 24, 2024
Comment on lines
+43
to
+48
| @Override | ||
| public String getWebkitRelativePath(FileList fileList, double index) { | ||
| return (String) Js | ||
| .asPropertyMap(fileList.item(index)) | ||
| .get("webkitRelativePath"); | ||
| } |
There was a problem hiding this comment.
Elemental2's File model does not surface the webkitRelativePath field, but we can easily get it with Js.asPropertyMap(obj).get("key")
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/widget/aws/AwsSdk.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/SynapseJSNIUtilsImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/GlobalApplicationStateImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/widget/upload/CroppedImageUploadViewImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/widget/upload/ImageUploadViewImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/GlobalApplicationStateImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
src/main/java/org/sagebionetworks/web/client/widget/upload/ImageUploadViewImpl.java
Outdated
Show resolved
Hide resolved
nickgros
commented
Oct 24, 2024
Comment on lines
+573
to
+574
| File blob = fileList.item(this.currIndex); | ||
| long fileSize = blob.size; |
There was a problem hiding this comment.
In many cases where it was more simple, I just replaced calls on utils methods with direct calls to the new JsInterop methods
nickgros
commented
Oct 24, 2024
Comment on lines
+956
to
+965
| <dependency> | ||
| <groupId>com.google.elemental2</groupId> | ||
| <artifactId>elemental2-core</artifactId> | ||
| <version>1.2.2</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.elemental2</groupId> | ||
| <artifactId>elemental2-dom</artifactId> | ||
| <version>1.2.2</version> |
There was a problem hiding this comment.
Elemental2 provides JsInterop bindings for browser APIs.
jay-hodgson
approved these changes
Oct 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To support SWC-7064, SWC-7092, we will have to update logic related to File uploads. Instead of manipulating JSNI code, I opted to