Skip to content

Commit be13d13

Browse files
committed
update count fields in schemas
remove category field from dataset schema fixes #48
1 parent 204a88a commit be13d13

4 files changed

Lines changed: 12 additions & 43 deletions

File tree

src/api/dataset/content-types/dataset/schema.json

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,18 @@
4545
"target": "api::study.study",
4646
"inversedBy": "datasets"
4747
},
48-
"category": {
49-
"type": "enumeration",
50-
"enum": [
51-
"scRNA-seq",
52-
"CITE-seq",
53-
"Smart-seq2",
54-
"VDJ",
55-
"Visium",
56-
"Xenium",
57-
"MERFISH"
58-
]
59-
},
6048
"uid": {
6149
"type": "uid",
6250
"targetField": "dataset_id",
6351
"required": true
6452
},
53+
"is_featured": {
54+
"type": "boolean",
55+
"default": false
56+
},
6557
"metadata": {
6658
"type": "json"
6759
},
68-
"experiments": {
69-
"type": "relation",
70-
"relation": "manyToMany",
71-
"target": "api::experiment.experiment",
72-
"inversedBy": "datasets"
73-
},
7460
"data": {
7561
"type": "component",
7662
"repeatable": true,
@@ -100,6 +86,10 @@
10086
"count": {
10187
"type": "integer"
10288
},
89+
"unit": {
90+
"type": "string",
91+
"default": "cell"
92+
},
10393
"diseases": {
10494
"type": "customField",
10595
"options": {

src/api/dataset/controllers/dataset.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = createCoreController('api::dataset.dataset', ({ strapi }) => ({
3333
ctx.query = {
3434
...ctx.query,
3535
fields: [
36-
'name', 'category', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'description'
36+
'name', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'unit', 'description', 'is_featured'
3737
],
3838
populate: {
3939
media: true,
@@ -55,7 +55,7 @@ module.exports = createCoreController('api::dataset.dataset', ({ strapi }) => ({
5555
ctx.query = {
5656
...ctx.query,
5757
fields: [
58-
'name', 'category', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'description'
58+
'name', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'unit', 'description', 'is_featured'
5959
],
6060
populate: {
6161
media: true,

src/api/study/content-types/study/schema.json

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,11 @@
3737
"relation": "oneToMany",
3838
"target": "api::publication.publication"
3939
},
40-
"analyses": {
41-
"type": "relation",
42-
"relation": "oneToMany",
43-
"target": "api::analysis.analysis"
44-
},
4540
"uid": {
4641
"type": "uid",
4742
"targetField": "study_id",
4843
"required": true
4944
},
50-
"experiments": {
51-
"type": "relation",
52-
"relation": "oneToMany",
53-
"target": "api::experiment.experiment",
54-
"mappedBy": "study"
55-
},
5645
"datasets": {
5746
"type": "relation",
5847
"relation": "oneToMany",
@@ -69,17 +58,11 @@
6958
"repeatable": true,
7059
"component": "contributions.people"
7160
},
72-
"view_count": {
73-
"type": "integer"
74-
},
7561
"teams": {
7662
"type": "component",
7763
"repeatable": true,
7864
"component": "contributions.team"
7965
},
80-
"cell_count": {
81-
"type": "integer"
82-
},
8366
"subtitle": {
8467
"type": "text"
8568
},

src/api/study/controllers/study.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
3737
'subtitle',
3838
'createdAt',
3939
'updatedAt',
40-
'view_count',
41-
'cell_count',
4240
],
4341
populate: {
4442
cover_image: true,
@@ -70,7 +68,7 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
7068
},
7169
},
7270
datasets: {
73-
fields: ['name', 'description', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count'],
71+
fields: ['name', 'description', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'unit'],
7472
populate: ['media'],
7573
},
7674
resources: {
@@ -93,8 +91,6 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
9391
'subtitle',
9492
'createdAt',
9593
'updatedAt',
96-
'view_count',
97-
'cell_count',
9894
],
9995
populate: {
10096
cover_image: true,
@@ -126,7 +122,7 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
126122
},
127123
},
128124
datasets: {
129-
fields: ['name', 'description', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count'],
125+
fields: ['name', 'description', 'tissues', 'organisms', 'assays', 'diseases', 'celltypes', 'human_developmental_stages', 'count', 'unit'],
130126
populate: ['media', 'data', 'resources'],
131127
},
132128
resources: true

0 commit comments

Comments
 (0)