-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5374 from Sage-Bionetworks/develop
Merge develop into release-498
- Loading branch information
Showing
20 changed files
with
555 additions
and
245 deletions.
There are no files selected for viewing
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
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
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
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
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
59 changes: 59 additions & 0 deletions
59
.../org/sagebionetworks/web/client/jsinterop/CreateOrUpdateAccessRequirementWizardProps.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package org.sagebionetworks.web.client.jsinterop; | ||
|
|
||
| import jsinterop.annotations.JsFunction; | ||
| import jsinterop.annotations.JsNullable; | ||
| import jsinterop.annotations.JsOverlay; | ||
| import jsinterop.annotations.JsPackage; | ||
| import jsinterop.annotations.JsType; | ||
| import org.sagebionetworks.repo.model.RestrictableObjectDescriptor; | ||
|
|
||
| @JsType(isNative = true, namespace = JsPackage.GLOBAL, name = "Object") | ||
| public class CreateOrUpdateAccessRequirementWizardProps | ||
| extends ReactComponentProps { | ||
|
|
||
| @FunctionalInterface | ||
| @JsFunction | ||
| public interface OnComplete { | ||
| void onComplete(); | ||
| } | ||
|
|
||
| @FunctionalInterface | ||
| @JsFunction | ||
| public interface OnCancel { | ||
| void onCancel(); | ||
| } | ||
|
|
||
| boolean open; | ||
|
|
||
| @JsNullable | ||
| RestrictableObjectDescriptorJsObject subject; | ||
|
|
||
| @JsNullable | ||
| String accessRequirementId; | ||
|
|
||
| @JsNullable | ||
| OnComplete onComplete; | ||
|
|
||
| @JsNullable | ||
| OnCancel onCancel; | ||
|
|
||
| @JsOverlay | ||
| public static CreateOrUpdateAccessRequirementWizardProps create( | ||
| boolean open, | ||
| RestrictableObjectDescriptor subject, | ||
| String accessRequirementId, | ||
| OnComplete onComplete, | ||
| OnCancel onCancel | ||
| ) { | ||
| CreateOrUpdateAccessRequirementWizardProps props = | ||
| new CreateOrUpdateAccessRequirementWizardProps(); | ||
| props.open = open; | ||
| if (subject != null) { | ||
| props.subject = RestrictableObjectDescriptorJsObject.create(subject); | ||
| } | ||
| props.accessRequirementId = accessRequirementId; | ||
| props.onComplete = onComplete; | ||
| props.onCancel = onCancel; | ||
| return props; | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...n/java/org/sagebionetworks/web/client/jsinterop/RestrictableObjectDescriptorJsObject.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.sagebionetworks.web.client.jsinterop; | ||
|
|
||
| import jsinterop.annotations.JsOverlay; | ||
| import jsinterop.annotations.JsPackage; | ||
| import jsinterop.annotations.JsType; | ||
| import org.sagebionetworks.repo.model.RestrictableObjectDescriptor; | ||
|
|
||
| @JsType(isNative = true, namespace = JsPackage.GLOBAL, name = "Object") | ||
| public class RestrictableObjectDescriptorJsObject extends ReactComponentProps { | ||
|
|
||
| String id; | ||
| String type; | ||
|
|
||
| @JsOverlay | ||
| public static RestrictableObjectDescriptorJsObject create( | ||
| RestrictableObjectDescriptor rod | ||
| ) { | ||
| RestrictableObjectDescriptorJsObject props = | ||
| new RestrictableObjectDescriptorJsObject(); | ||
| props.id = rod.getId(); | ||
| props.type = rod.getType().toString(); | ||
| return props; | ||
| } | ||
| } |
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
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
Oops, something went wrong.