diff --git a/api/src/org/labkey/api/exp/api/ExpData.java b/api/src/org/labkey/api/exp/api/ExpData.java index 6227f75a03f..dac0b81068c 100644 --- a/api/src/org/labkey/api/exp/api/ExpData.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpExperiment.java b/api/src/org/labkey/api/exp/api/ExpExperiment.java index d85ec21ba91..c9ad71b2628 100644 --- a/api/src/org/labkey/api/exp/api/ExpExperiment.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpLineageOptions.java b/api/src/org/labkey/api/exp/api/ExpLineageOptions.java index 353db27e02d..27ef117ab7b 100644 --- a/api/src/org/labkey/api/exp/api/ExpLineageOptions.java +++ b/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; diff --git a/api/src/org/labkey/api/exp/api/ExpMaterial.java b/api/src/org/labkey/api/exp/api/ExpMaterial.java index c1b9b829fdb..8289edc90d7 100644 --- a/api/src/org/labkey/api/exp/api/ExpMaterial.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpObject.java b/api/src/org/labkey/api/exp/api/ExpObject.java index 7a1a86c3382..ff1296a8d03 100644 --- a/api/src/org/labkey/api/exp/api/ExpObject.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpProtocol.java b/api/src/org/labkey/api/exp/api/ExpProtocol.java index 2079789d1ac..eb633711b42 100644 --- a/api/src/org/labkey/api/exp/api/ExpProtocol.java +++ b/api/src/org/labkey/api/exp/api/ExpProtocol.java @@ -166,4 +166,10 @@ default String getDocumentId() } Map getAuditRecordMap(AssayProvider provider); + + @Override + default String getExpType() + { + return DEFAULT_CPAS_TYPE; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpProtocolApplication.java b/api/src/org/labkey/api/exp/api/ExpProtocolApplication.java index 7fc125f915a..43a46c1f032 100644 --- a/api/src/org/labkey/api/exp/api/ExpProtocolApplication.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExpRun.java b/api/src/org/labkey/api/exp/api/ExpRun.java index 76a53a4d1f8..f068a8a3a6b 100644 --- a/api/src/org/labkey/api/exp/api/ExpRun.java +++ b/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; + } } diff --git a/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java b/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java index f136d81e8f7..8defb1a3c95 100644 --- a/api/src/org/labkey/api/exp/api/ExperimentJSONConverter.java +++ b/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 data, Collection 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) diff --git a/api/src/org/labkey/api/exp/api/ResolveLsidsForm.java b/api/src/org/labkey/api/exp/api/ResolveLsidsForm.java index a3a5ae48f2e..5f1a8a49d96 100644 --- a/api/src/org/labkey/api/exp/api/ResolveLsidsForm.java +++ b/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 _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 getLsids() { diff --git a/assay/package-lock.json b/assay/package-lock.json index 07ca0258215..4843a841ff3 100644 --- a/assay/package-lock.json +++ b/assay/package-lock.json @@ -8,7 +8,7 @@ "name": "assay", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.11.0" + "@labkey/components": "7.12.0" }, "devDependencies": { "@labkey/build": "8.7.0", @@ -2482,9 +2482,9 @@ } }, "node_modules/@labkey/api": { - "version": "1.44.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.0.tgz", - "integrity": "sha512-qfHSWENWN2E1KTRACDj/Qq4Rq/tq8KIr5l6XOnMGLEoepUe8DneAnfcIVD5239oxwFDxMLEFCH83EKeat0C/9g==", + "version": "1.44.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.1.tgz", + "integrity": "sha512-VUS4KLfwAsE45A3MnJUU3j97ei0ncQHv6OVVAN3kitID0xe8+mZ7B39zETVye3Dqgwa8TbYvsCp2t46QmBmwVQ==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { @@ -2525,13 +2525,13 @@ } }, "node_modules/@labkey/components": { - "version": "7.11.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.11.0.tgz", - "integrity": "sha512-o7/0xJTn9N+iO8M9oyDqjRcNv9C5GNXzarVphkTzRdC+vpEB9WzOu2LESNEWksb11efO1FHztsmu7/Rp5RqbeA==", + "version": "7.12.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.12.0.tgz", + "integrity": "sha512-iwB+3m7JWcwJ7sPA8V+lPXeW6J0tSq/uueiRJ7EzzuaBubXgYwX4ISpZNVt4MzxtAybImzOGLU4ef4+2NFyVRw==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.44.0", + "@labkey/api": "1.44.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.0", diff --git a/assay/package.json b/assay/package.json index 0c392fc335b..bba449b3803 100644 --- a/assay/package.json +++ b/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", diff --git a/core/package-lock.json b/core/package-lock.json index 4f00b504f07..5c3d14eb20d 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -8,7 +8,7 @@ "name": "labkey-core", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.11.0", + "@labkey/components": "7.12.0", "@labkey/themes": "1.5.0" }, "devDependencies": { @@ -3504,9 +3504,9 @@ } }, "node_modules/@labkey/api": { - "version": "1.44.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.0.tgz", - "integrity": "sha512-qfHSWENWN2E1KTRACDj/Qq4Rq/tq8KIr5l6XOnMGLEoepUe8DneAnfcIVD5239oxwFDxMLEFCH83EKeat0C/9g==", + "version": "1.44.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.1.tgz", + "integrity": "sha512-VUS4KLfwAsE45A3MnJUU3j97ei0ncQHv6OVVAN3kitID0xe8+mZ7B39zETVye3Dqgwa8TbYvsCp2t46QmBmwVQ==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { @@ -3547,13 +3547,13 @@ } }, "node_modules/@labkey/components": { - "version": "7.11.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.11.0.tgz", - "integrity": "sha512-o7/0xJTn9N+iO8M9oyDqjRcNv9C5GNXzarVphkTzRdC+vpEB9WzOu2LESNEWksb11efO1FHztsmu7/Rp5RqbeA==", + "version": "7.12.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.12.0.tgz", + "integrity": "sha512-iwB+3m7JWcwJ7sPA8V+lPXeW6J0tSq/uueiRJ7EzzuaBubXgYwX4ISpZNVt4MzxtAybImzOGLU4ef4+2NFyVRw==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.44.0", + "@labkey/api": "1.44.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.0", diff --git a/core/package.json b/core/package.json index b61e48d7bad..49e27874a49 100644 --- a/core/package.json +++ b/core/package.json @@ -53,7 +53,7 @@ } }, "dependencies": { - "@labkey/components": "7.11.0", + "@labkey/components": "7.12.0", "@labkey/themes": "1.5.0" }, "devDependencies": { diff --git a/core/webapp/_images/lock.svg b/core/webapp/_images/lock.svg new file mode 100644 index 00000000000..6dfd3adc65e --- /dev/null +++ b/core/webapp/_images/lock.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/core/webapp/_images/lock_gray.svg b/core/webapp/_images/lock_gray.svg new file mode 100644 index 00000000000..67ff93fcc5d --- /dev/null +++ b/core/webapp/_images/lock_gray.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/core/webapp/_images/lock_light.svg b/core/webapp/_images/lock_light.svg new file mode 100644 index 00000000000..461eaec0f8a --- /dev/null +++ b/core/webapp/_images/lock_light.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/core/webapp/_images/lock_orange.svg b/core/webapp/_images/lock_orange.svg new file mode 100644 index 00000000000..182d92e64bf --- /dev/null +++ b/core/webapp/_images/lock_orange.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/experiment/package-lock.json b/experiment/package-lock.json index e87719953eb..d09c9ad5605 100644 --- a/experiment/package-lock.json +++ b/experiment/package-lock.json @@ -8,7 +8,7 @@ "name": "experiment", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.11.0" + "@labkey/components": "7.12.0" }, "devDependencies": { "@labkey/build": "8.7.0", @@ -3271,9 +3271,9 @@ } }, "node_modules/@labkey/api": { - "version": "1.44.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.0.tgz", - "integrity": "sha512-qfHSWENWN2E1KTRACDj/Qq4Rq/tq8KIr5l6XOnMGLEoepUe8DneAnfcIVD5239oxwFDxMLEFCH83EKeat0C/9g==", + "version": "1.44.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.1.tgz", + "integrity": "sha512-VUS4KLfwAsE45A3MnJUU3j97ei0ncQHv6OVVAN3kitID0xe8+mZ7B39zETVye3Dqgwa8TbYvsCp2t46QmBmwVQ==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { @@ -3314,13 +3314,13 @@ } }, "node_modules/@labkey/components": { - "version": "7.11.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.11.0.tgz", - "integrity": "sha512-o7/0xJTn9N+iO8M9oyDqjRcNv9C5GNXzarVphkTzRdC+vpEB9WzOu2LESNEWksb11efO1FHztsmu7/Rp5RqbeA==", + "version": "7.12.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.12.0.tgz", + "integrity": "sha512-iwB+3m7JWcwJ7sPA8V+lPXeW6J0tSq/uueiRJ7EzzuaBubXgYwX4ISpZNVt4MzxtAybImzOGLU4ef4+2NFyVRw==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.44.0", + "@labkey/api": "1.44.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.0", diff --git a/experiment/package.json b/experiment/package.json index 619e9936c2f..d1aacc6542c 100644 --- a/experiment/package.json +++ b/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", diff --git a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java index 1d257d8b06f..2573050b009 100644 --- a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java +++ b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java @@ -7299,7 +7299,7 @@ public static class ResolveAction extends BaseResolveLsidApiAction ExperimentJSONConverter.serialize(n, getUser(), settings)).collect(toList()); return new ApiSimpleResponse("data", data); } diff --git a/experiment/src/org/labkey/experiment/lineage/ExpLineageServiceImpl.java b/experiment/src/org/labkey/experiment/lineage/ExpLineageServiceImpl.java index 5dc18540660..29229a9dabe 100644 --- a/experiment/src/org/labkey/experiment/lineage/ExpLineageServiceImpl.java +++ b/experiment/src/org/labkey/experiment/lineage/ExpLineageServiceImpl.java @@ -273,7 +273,7 @@ public void streamLineage(Container container, User user, HttpServletResponse re var context = new StreamContext( user, new ApiJsonWriter(response), - new ExperimentJSONConverter.Settings(options.isIncludeProperties(), options.isIncludeInputsAndOutputs(), options.isIncludeRunSteps()), + new ExperimentJSONConverter.Settings(options), ExpLineage.processEdges(lineage.edges()), new HashMap<>() ); @@ -328,8 +328,7 @@ private static void writeNode(Identifiable node, StreamContext context) try { - if (context.hasPermission(node.getContainer())) - context.writer.writeProperty(node.getLSID(), nodeToJson(node, context.popEdges(node.getLSID()), context)); + context.writer.writeProperty(node.getLSID(), nodeToJson(node, context.popEdges(node.getLSID()), context)); } catch (IOException e) { @@ -337,20 +336,33 @@ private static void writeNode(Identifiable node, StreamContext context) } } - private static JSONObject nodeToJson(@Nullable Identifiable node, ExpLineage.Edges edges, StreamContext context) + private static @NotNull JSONObject nodeToJson(@Nullable Identifiable node, ExpLineage.Edges edges, StreamContext context) { - JSONObject json; + JSONObject json = createNodeJson(node, context); + json.put("parents", edges.parents().stream().map(ExpLineage.Edge::toParentJSON).toList()); + json.put("children", edges.children().stream().map(ExpLineage.Edge::toChildJSON).toList()); + + return json; + } + private static @NotNull JSONObject createNodeJson(@Nullable Identifiable node, StreamContext context) + { if (node == null) - json = new JSONObject(); - else + return new JSONObject(); + + if (context.hasPermission(node.getContainer())) { - json = ExperimentJSONConverter.serialize(node, context.user, context.settings); + JSONObject json = ExperimentJSONConverter.serialize(node, context.user, context.settings); json.put("type", node.getLSIDNamespacePrefix()); + return json; } - json.put("parents", edges.parents().stream().map(ExpLineage.Edge::toParentJSON).toList()); - json.put("children", edges.children().stream().map(ExpLineage.Edge::toChildJSON).toList()); + // GitHub Issue #441: Indicate there is missing lineage information when the user does not have permission to + // see the full lineage tree. + JSONObject json = new JSONObject(); + json.put(ExperimentJSONConverter.EXP_TYPE, node instanceof ExpObject expObject ? expObject.getExpType() : null); + json.put("restricted", true); + json.put("type", node.getLSIDNamespacePrefix()); return json; } diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json index d334642467e..7ba89586f45 100644 --- a/pipeline/package-lock.json +++ b/pipeline/package-lock.json @@ -8,7 +8,7 @@ "name": "pipeline", "version": "0.0.0", "dependencies": { - "@labkey/components": "7.11.0" + "@labkey/components": "7.12.0" }, "devDependencies": { "@labkey/build": "8.7.0", @@ -2716,9 +2716,9 @@ } }, "node_modules/@labkey/api": { - "version": "1.44.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.0.tgz", - "integrity": "sha512-qfHSWENWN2E1KTRACDj/Qq4Rq/tq8KIr5l6XOnMGLEoepUe8DneAnfcIVD5239oxwFDxMLEFCH83EKeat0C/9g==", + "version": "1.44.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.44.1.tgz", + "integrity": "sha512-VUS4KLfwAsE45A3MnJUU3j97ei0ncQHv6OVVAN3kitID0xe8+mZ7B39zETVye3Dqgwa8TbYvsCp2t46QmBmwVQ==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { @@ -2759,13 +2759,13 @@ } }, "node_modules/@labkey/components": { - "version": "7.11.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.11.0.tgz", - "integrity": "sha512-o7/0xJTn9N+iO8M9oyDqjRcNv9C5GNXzarVphkTzRdC+vpEB9WzOu2LESNEWksb11efO1FHztsmu7/Rp5RqbeA==", + "version": "7.12.0", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-7.12.0.tgz", + "integrity": "sha512-iwB+3m7JWcwJ7sPA8V+lPXeW6J0tSq/uueiRJ7EzzuaBubXgYwX4ISpZNVt4MzxtAybImzOGLU4ef4+2NFyVRw==", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", - "@labkey/api": "1.44.0", + "@labkey/api": "1.44.1", "@testing-library/dom": "~10.4.1", "@testing-library/jest-dom": "~6.9.1", "@testing-library/react": "~16.3.0", diff --git a/pipeline/package.json b/pipeline/package.json index 00140ffb92b..f4f0a663aba 100644 --- a/pipeline/package.json +++ b/pipeline/package.json @@ -14,7 +14,7 @@ "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile" }, "dependencies": { - "@labkey/components": "7.11.0" + "@labkey/components": "7.12.0" }, "devDependencies": { "@labkey/build": "8.7.0",