Skip to content

Support DerivationDataScope domain property #28

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

Merged
merged 4 commits into from
Jul 7, 2022
Merged

Support DerivationDataScope domain property #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8e8344
Support aliquot fields types in sample type creation
XingY Jul 5, 2022
279b9a6
Merge branch 'develop' into fb_aliquotOptions
XingY Jul 6, 2022
62eb01f
update changelog
XingY Jul 7, 2022
7c387b5
Update release date and to next snapshot version
labkey-susanh Jul 7, 2022
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
3 changes: 2 additions & 1 deletion labkey-client-api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# The LabKey Remote API Library for Java - Change Log

## version 1.5.1
*Released*: TBD
*Released*: 7 July 2022
* Fix NPE when saving assay protocol with transform scripts
* Add derivationDataScope to PropertyDescriptor

## version 1.5.0
*Released*: 20 April 2022
Expand Down
2 changes: 1 addition & 1 deletion labkey-client-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ repositories {

group "org.labkey.api"

version "1.5.1-SNAPSHOT"
version "1.6.0-SNAPSHOT"

dependencies {
implementation "org.apache.httpcomponents:httpmime:${httpmimeVersion}"
Expand Down
17 changes: 17 additions & 0 deletions labkey-client-api/src/org/labkey/remoteapi/domain/PropertyDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class PropertyDescriptor extends ResponseObject
private String _lookupSchema;
private String _lookupQuery;
private String _lookupContainer;
private String _derivationDataScope;
private List<ConditionalFormat> _conditionalFormats = new ArrayList<>();

public PropertyDescriptor()
Expand Down Expand Up @@ -85,6 +86,8 @@ public PropertyDescriptor(JSONObject json)
_lookupQuery = (String)json.get("lookupQuery");
if (json.get("lookupContainer") != null)
_lookupContainer = (String)json.get("lookupContainer");
if (json.get("derivationDataScope") != null)
_derivationDataScope = (String)json.get("derivationDataScope");
if (json.get("mvEnabled") != null)
_mvEnabled = (Boolean)json.get("mvEnabled");
}
Expand Down Expand Up @@ -115,6 +118,9 @@ public JSONObject toJSONObject(boolean forProtocol)
result.put("propertyURI", _propertyURI);
result.put("conditionalFormats", serializeConditionalFormats());

if (_derivationDataScope != null)
result.put("derivationDataScope", _derivationDataScope);

if (_rangeURI != null)
result.put("rangeURI", _rangeURI);

Expand Down Expand Up @@ -314,4 +320,15 @@ public List<ConditionalFormat> getConditionalFormats()
{
return Collections.unmodifiableList(_conditionalFormats);
}

public String getDerivationDataScope()
{
return _derivationDataScope;
}

public void setDerivationDataScope(String derivationDataScope)
{
_derivationDataScope = derivationDataScope;
}

}