diff --git a/pydatalab/schemas/cell.json b/pydatalab/schemas/cell.json index 24af57967..cda818bbb 100644 --- a/pydatalab/schemas/cell.json +++ b/pydatalab/schemas/cell.json @@ -417,14 +417,7 @@ "title": "Num Items", "type": "integer" } -<<<<<<< HEAD - }, - "required": [ - "collection_id" - ] -======= } ->>>>>>> main }, "File": { "title": "File", diff --git a/pydatalab/schemas/sample.json b/pydatalab/schemas/sample.json index a2cfb979f..c58827e5f 100644 --- a/pydatalab/schemas/sample.json +++ b/pydatalab/schemas/sample.json @@ -376,14 +376,7 @@ "title": "Num Items", "type": "integer" } -<<<<<<< HEAD - }, - "required": [ - "collection_id" - ] -======= } ->>>>>>> main }, "File": { "title": "File", diff --git a/pydatalab/schemas/startingmaterial.json b/pydatalab/schemas/startingmaterial.json index 602764da0..c72cfa0be 100644 --- a/pydatalab/schemas/startingmaterial.json +++ b/pydatalab/schemas/startingmaterial.json @@ -427,14 +427,7 @@ "title": "Num Items", "type": "integer" } -<<<<<<< HEAD - }, - "required": [ - "collection_id" - ] -======= } ->>>>>>> main }, "File": { "title": "File", diff --git a/webapp/src/components/CollectionInformation.vue b/webapp/src/components/CollectionInformation.vue index 661f353f7..b8aa2f902 100644 --- a/webapp/src/components/CollectionInformation.vue +++ b/webapp/src/components/CollectionInformation.vue @@ -25,11 +25,13 @@ > + + + + + diff --git a/webapp/src/server_fetch_utils.js b/webapp/src/server_fetch_utils.js index e3d3d8da2..c31db78c8 100644 --- a/webapp/src/server_fetch_utils.js +++ b/webapp/src/server_fetch_utils.js @@ -166,6 +166,18 @@ export function getSampleList() { }); } +export function getCollectionSampleList(collection_id) { + return fetch_get(`${API_URL}/collections/${collection_id}`) + .then(function (response_json) { + store.commit("setCollectionSampleList", collection_id, response_json.child_items); + }) + .catch((error) => { + console.error("Error when fetching collection sample list"); + console.error(error); + throw error; + }); +} + export function getCollectionList() { return fetch_get(`${API_URL}/collections/`) .then(function (response_json) {