Lineage: add "restricted" property

api/src/org/labkey/api/exp/api/ExpData.java

@@ -127,4 +127,10 @@ static String normalizeDataFileURI(URI uri)
         }
         return s;
     }
+
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpExperiment.java

@@ -76,4 +76,10 @@ public interface ExpExperiment extends ExpObject
     /** Override to signal that we never throw BatchValidationExceptions */
     @Override
     void save(User user);
+
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpLineageOptions.java

@@ -60,10 +60,12 @@ public enum LineageExpType
 
     public ExpLineageOptions()
     {
+        super();
     }
 
     public ExpLineageOptions(boolean parents, boolean children, int depth)
     {
+        super();
         _parents = parents;
         _children = children;
         _depth = depth;

api/src/org/labkey/api/exp/api/ExpMaterial.java

@@ -86,4 +86,10 @@ public interface ExpMaterial extends ExpRunItem
     Date getMaterialExpDate();
 
     ActionURL detailsURL(Container container, boolean checkForOverride);
+
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpObject.java

@@ -99,4 +99,9 @@ default ExpObject getExpObject()
     {
         return this;
     }
+
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpProtocol.java

@@ -166,4 +166,10 @@ default String getDocumentId()
     }
 
     Map<String, Object> getAuditRecordMap(AssayProvider provider);
+
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpProtocolApplication.java

@@ -119,4 +119,9 @@ public interface ExpProtocolApplication extends ExpObject
     @Override
     void save(User user);
 
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExpRun.java

@@ -146,4 +146,10 @@ default FileLike getFilePathFileLike()
     @Nullable Long getWorkflowTaskId();
 
     boolean canDelete(User user);
+
+    @Override
+    default String getExpType()
+    {
+        return DEFAULT_CPAS_TYPE;
+    }
 }

api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java

@@ -141,7 +141,7 @@ public static class Settings
         private final boolean includeInputsAndOutputs;
         private final boolean includeRunSteps;
 
-        public Settings()
+        private Settings()
         {
             this(true, true, false);
         }
@@ -153,6 +153,11 @@ public Settings(boolean includeProperties, boolean includeInputsAndOutputs, bool
             this.includeRunSteps = includeRunSteps;
         }
 
+        public Settings(ResolveLsidsForm form)
+        {
+            this(form.isIncludeProperties(), form.isIncludeInputsAndOutputs(), form.isIncludeRunSteps());
+        }
+
         public boolean isIncludeProperties()
         {
             return includeProperties;
@@ -204,7 +209,6 @@ else if (node instanceof ExpObject expObject)
     public static JSONObject serializeRunGroup(ExpExperiment runGroup, Domain domain, @NotNull Settings settings, @Nullable User user)
     {
         JSONObject jsonObject = serializeExpObject(runGroup, domain == null ? null : domain.getProperties(), settings, user);
-        jsonObject.put(ExperimentJSONConverter.EXP_TYPE, ExpExperiment.DEFAULT_CPAS_TYPE);
 
         ExpProtocol protocol = runGroup.getBatchProtocol();
         if (protocol != null)
@@ -224,7 +228,6 @@ public static JSONObject serializeRunGroup(ExpExperiment runGroup, Domain domain
     public static JSONObject serializeRun(ExpRun run, Domain domain, User user, @NotNull Settings settings)
     {
         JSONObject jsonObject = serializeExpObject(run, domain == null ? null : domain.getProperties(), settings, user);
-        jsonObject.put(ExperimentJSONConverter.EXP_TYPE, ExpRun.DEFAULT_CPAS_TYPE);
 
         ExpProtocol protocol = run.getProtocol();
         if (protocol != null)
@@ -294,9 +297,7 @@ public static JSONObject serializeRun(ExpRun run, Domain domain, User user, @Not
 
         // Just include basic protocol properties for now.
         // See GetProtocolAction and GWTProtocol for serializing an assay protocol with domain fields.
-        JSONObject jsonObject = serializeExpObject(protocol, null, DEFAULT_SETTINGS.withIncludeProperties(false), user);
-        jsonObject.put(ExperimentJSONConverter.EXP_TYPE, ExpProtocol.DEFAULT_CPAS_TYPE);
-        return jsonObject;
+        return serializeExpObject(protocol, null, DEFAULT_SETTINGS.withIncludeProperties(false), user);
     }
 
     public static JSONObject serializeRunOutputs(Collection<ExpData> data, Collection<ExpMaterial> materials, User user, @NotNull Settings settings)
@@ -388,10 +389,9 @@ else if (runInput instanceof ExpMaterialRunInput expMaterialRunInput)
     protected static JSONObject serializeRunProtocolApplication(@NotNull ExpProtocolApplication protApp, User user, Settings settings)
     {
         JSONObject json = serializeExpObject(protApp, null, settings, user);
-        json.put(ExperimentJSONConverter.EXP_TYPE, ExpProtocolApplication.DEFAULT_CPAS_TYPE);
-
         json.put(ACTION_SEQUENCE, protApp.getActionSequence());
         json.put(APPLICATION_TYPE, protApp.getApplicationType().toString());
+
         if (protApp.getComments() != null)
             json.put(COMMENT, protApp.getComments());
 
@@ -570,7 +570,7 @@ public static JSONObject serializeExpObject(
         // instead and use serializeOntologyProperties(ExpObject) so the object properties will be
         // fetched using ExpObject.getProperty().
         JSONObject jsonObject = serializeIdentifiableBean(object, user);
-        jsonObject.put(ExperimentJSONConverter.EXP_TYPE, ExpObject.DEFAULT_CPAS_TYPE);
+        jsonObject.put(ExperimentJSONConverter.EXP_TYPE, object.getExpType());
 
         long rowId = object.getRowId();
         if (rowId != 0)

api/src/org/labkey/api/exp/api/ResolveLsidsForm.java

@@ -6,13 +6,23 @@
 
 public class ResolveLsidsForm
 {
-    private boolean _singleSeedRequested = false;
+    private boolean _includeProperties;
+    private boolean _includeInputsAndOutputs;
+    private boolean _includeRunSteps;
     private List<String> _lsids;
+    private boolean _singleSeedRequested = false;
+
+    public ResolveLsidsForm()
+    {
+        this(false, false, false);
+    }
 
-    // serialization options
-    private boolean _includeProperties = false;
-    private boolean _includeInputsAndOutputs = false;
-    private boolean _includeRunSteps = false;
+    public ResolveLsidsForm(boolean includeProperties, boolean includeInputsAndOutputs, boolean includeRunSteps)
+    {
+        _includeProperties = includeProperties;
+        _includeInputsAndOutputs = includeInputsAndOutputs;
+        _includeRunSteps = includeRunSteps;
+    }
 
     public List<String> getLsids()
     {

assay/package.json

@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "7.11.0"
+    "@labkey/components": "7.12.0"
   },
   "devDependencies": {
     "@labkey/build": "8.7.0",

core/package.json

@@ -53,7 +53,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "7.11.0",
+    "@labkey/components": "7.12.0",
     "@labkey/themes": "1.5.0"
   },
   "devDependencies": {

experiment/package.json

@@ -13,7 +13,7 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "7.11.0"
+    "@labkey/components": "7.12.0"
   },
   "devDependencies": {
     "@labkey/build": "8.7.0",

experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java

@@ -7299,7 +7299,7 @@ public static class ResolveAction extends BaseResolveLsidApiAction<ResolveLsidsF
         @Override
         public Object execute(ResolveLsidsForm form, BindException errors)
         {
-            var settings = new ExperimentJSONConverter.Settings(form.isIncludeProperties(), form.isIncludeInputsAndOutputs(), form.isIncludeRunSteps());
+            var settings = new ExperimentJSONConverter.Settings(form);
             var data = _seeds.stream().map(n -> ExperimentJSONConverter.serialize(n, getUser(), settings)).collect(toList());
             return new ApiSimpleResponse("data", data);
         }