Merge pull request #18 from Vizzuality/feature/cms/data_model_changes…

…_to_support_data_table Bidirectional relations for data table endpoints
Vizzuality · Oct 24, 2023 · f6f2992 · f6f2992
2 parents 5353a14 + 90a2fd7
commit f6f2992
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 21 deletions.
diff --git a/cms/config/sync/admin-role.strapi-super-admin.json b/cms/config/sync/admin-role.strapi-super-admin.json
@@ -204,7 +204,10 @@
           "totalMarineArea",
           "type",
           "groups",
-          "members"
+          "members",
+          "fishing_protection_level_stats",
+          "mpaa_protection_level_stats",
+          "protection_coverage_stats"
         ]
       },
       "conditions": []
@@ -227,7 +230,10 @@
           "totalMarineArea",
           "type",
           "groups",
-          "members"
+          "members",
+          "fishing_protection_level_stats",
+          "mpaa_protection_level_stats",
+          "protection_coverage_stats"
         ]
       },
       "conditions": []
@@ -243,7 +249,10 @@
           "totalMarineArea",
           "type",
           "groups",
-          "members"
+          "members",
+          "fishing_protection_level_stats",
+          "mpaa_protection_level_stats",
+          "protection_coverage_stats"
         ]
       },
       "conditions": []
@@ -311,7 +320,8 @@
           "area",
           "year",
           "mpaa_establishment_stage",
-          "protection_status"
+          "protection_status",
+          "mpa_protection_coverage_stats"
         ]
       },
       "conditions": []
@@ -334,7 +344,8 @@
           "area",
           "year",
           "mpaa_establishment_stage",
-          "protection_status"
+          "protection_status",
+          "mpa_protection_coverage_stats"
         ]
       },
       "conditions": []
@@ -350,7 +361,8 @@
           "area",
           "year",
           "mpaa_establishment_stage",
-          "protection_status"
+          "protection_status",
+          "mpa_protection_coverage_stats"
         ]
       },
       "conditions": []

diff --git a/...ore-store.plugin_content_manager_configuration_content_types##api##location.location.json b/...ore-store.plugin_content_manager_configuration_content_types##api##location.location.json
@@ -106,6 +106,51 @@
           "sortable": false
         }
       },
+      "fishing_protection_level_stats": {
+        "edit": {
+          "label": "fishing_protection_level_stats",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "id"
+        },
+        "list": {
+          "label": "fishing_protection_level_stats",
+          "searchable": false,
+          "sortable": false
+        }
+      },
+      "mpaa_protection_level_stats": {
+        "edit": {
+          "label": "mpaa_protection_level_stats",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "id"
+        },
+        "list": {
+          "label": "mpaa_protection_level_stats",
+          "searchable": false,
+          "sortable": false
+        }
+      },
+      "protection_coverage_stats": {
+        "edit": {
+          "label": "protection_coverage_stats",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "id"
+        },
+        "list": {
+          "label": "protection_coverage_stats",
+          "searchable": false,
+          "sortable": false
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -203,6 +248,20 @@
           {
             "name": "members",
             "size": 6
+          },
+          {
+            "name": "fishing_protection_level_stats",
+            "size": 6
+          }
+        ],
+        [
+          {
+            "name": "mpaa_protection_level_stats",
+            "size": 6
+          },
+          {
+            "name": "protection_coverage_stats",
+            "size": 6
           }
         ]
       ]

diff --git a/...fig/sync/core-store.plugin_content_manager_configuration_content_types##api##mpa.mpa.json b/...fig/sync/core-store.plugin_content_manager_configuration_content_types##api##mpa.mpa.json
@@ -106,6 +106,21 @@
           "sortable": true
         }
       },
+      "mpa_protection_coverage_stats": {
+        "edit": {
+          "label": "mpa_protection_coverage_stats",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "id"
+        },
+        "list": {
+          "label": "mpa_protection_coverage_stats",
+          "searchable": false,
+          "sortable": false
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -204,6 +219,12 @@
             "name": "protection_status",
             "size": 6
           }
+        ],
+        [
+          {
+            "name": "mpa_protection_coverage_stats",
+            "size": 6
+          }
         ]
       ]
     }

diff --git a/...api/fishing-protection-level-stat/content-types/fishing-protection-level-stat/schema.json b/...api/fishing-protection-level-stat/content-types/fishing-protection-level-stat/schema.json
@@ -14,8 +14,9 @@
   "attributes": {
     "location": {
       "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::location.location"
+      "relation": "manyToOne",
+      "target": "api::location.location",
+      "inversedBy": "fishing_protection_level_stats"
     },
     "fishing_protection_level": {
       "type": "relation",

diff --git a/cms/src/api/location/content-types/location/schema.json b/cms/src/api/location/content-types/location/schema.json
@@ -43,6 +43,24 @@
       "relation": "manyToMany",
       "target": "api::location.location",
       "inversedBy": "groups"
+    },
+    "fishing_protection_level_stats": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::fishing-protection-level-stat.fishing-protection-level-stat",
+      "mappedBy": "location"
+    },
+    "mpaa_protection_level_stats": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::mpaa-protection-level-stat.mpaa-protection-level-stat",
+      "mappedBy": "location"
+    },
+    "protection_coverage_stats": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::protection-coverage-stat.protection-coverage-stat",
+      "mappedBy": "location"
     }
   }
 }
diff --git a/...c/api/mpa-protection-coverage-stat/content-types/mpa-protection-coverage-stat/schema.json b/...c/api/mpa-protection-coverage-stat/content-types/mpa-protection-coverage-stat/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "mpa-protection-coverage-stat",
     "pluralName": "mpa-protection-coverage-stats",
-    "displayName": "MPA Protection Coverage Stats"
+    "displayName": "MPA Protection Coverage Stats",
+    "description": ""
   },
   "options": {
     "draftAndPublish": false
@@ -13,8 +14,9 @@
   "attributes": {
     "mpa": {
       "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::mpa.mpa"
+      "relation": "manyToOne",
+      "target": "api::mpa.mpa",
+      "inversedBy": "mpa_protection_coverage_stats"
     },
     "fishing_protection_level": {
       "type": "relation",

diff --git a/cms/src/api/mpa/content-types/mpa/schema.json b/cms/src/api/mpa/content-types/mpa/schema.json
@@ -36,6 +36,12 @@
       "type": "relation",
       "relation": "oneToOne",
       "target": "api::protection-status.protection-status"
+    },
+    "mpa_protection_coverage_stats": {
+      "type": "relation",
+      "relation": "oneToMany",
+      "target": "api::mpa-protection-coverage-stat.mpa-protection-coverage-stat",
+      "mappedBy": "mpa"
     }
   }
 }
diff --git a/cms/src/api/mpaa-protection-level-stat/content-types/mpaa-protection-level-stat/schema.json b/cms/src/api/mpaa-protection-level-stat/content-types/mpaa-protection-level-stat/schema.json
@@ -4,7 +4,8 @@
   "info": {
     "singularName": "mpaa-protection-level-stat",
     "pluralName": "mpaa-protection-level-stats",
-    "displayName": "MPAA Protection Level Stats"
+    "displayName": "MPAA Protection Level Stats",
+    "description": ""
   },
   "options": {
     "draftAndPublish": false
@@ -13,8 +14,9 @@
   "attributes": {
     "location": {
       "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::location.location"
+      "relation": "manyToOne",
+      "target": "api::location.location",
+      "inversedBy": "mpaa_protection_level_stats"
     },
     "mpaa_protection_level": {
       "type": "relation",

diff --git a/cms/src/api/protection-coverage-stat/content-types/protection-coverage-stat/schema.json b/cms/src/api/protection-coverage-stat/content-types/protection-coverage-stat/schema.json
@@ -14,8 +14,9 @@
   "attributes": {
     "location": {
       "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::location.location"
+      "relation": "manyToOne",
+      "target": "api::location.location",
+      "inversedBy": "protection_coverage_stats"
     },
     "protection_status": {
       "type": "relation",

diff --git a/cms/src/extensions/documentation/public/index.html b/cms/src/extensions/documentation/public/index.html
diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts
@@ -724,7 +724,7 @@ export interface ApiFishingProtectionLevelStatFishingProtectionLevelStat
   attributes: {
     location: Attribute.Relation<
       'api::fishing-protection-level-stat.fishing-protection-level-stat',
-      'oneToOne',
+      'manyToOne',
       'api::location.location'
     >;
     fishing_protection_level: Attribute.Relation<
@@ -862,6 +862,21 @@ export interface ApiLocationLocation extends Schema.CollectionType {
       'manyToMany',
       'api::location.location'
     >;
+    fishing_protection_level_stats: Attribute.Relation<
+      'api::location.location',
+      'oneToMany',
+      'api::fishing-protection-level-stat.fishing-protection-level-stat'
+    >;
+    mpaa_protection_level_stats: Attribute.Relation<
+      'api::location.location',
+      'oneToMany',
+      'api::mpaa-protection-level-stat.mpaa-protection-level-stat'
+    >;
+    protection_coverage_stats: Attribute.Relation<
+      'api::location.location',
+      'oneToMany',
+      'api::protection-coverage-stat.protection-coverage-stat'
+    >;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<
@@ -908,6 +923,11 @@ export interface ApiMpaMpa extends Schema.CollectionType {
       'oneToOne',
       'api::protection-status.protection-status'
     >;
+    mpa_protection_coverage_stats: Attribute.Relation<
+      'api::mpa.mpa',
+      'oneToMany',
+      'api::mpa-protection-coverage-stat.mpa-protection-coverage-stat'
+    >;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     createdBy: Attribute.Relation<'api::mpa.mpa', 'oneToOne', 'admin::user'> &
@@ -924,14 +944,15 @@ export interface ApiMpaProtectionCoverageStatMpaProtectionCoverageStat
     singularName: 'mpa-protection-coverage-stat';
     pluralName: 'mpa-protection-coverage-stats';
     displayName: 'MPA Protection Coverage Stats';
+    description: '';
   };
   options: {
     draftAndPublish: false;
   };
   attributes: {
     mpa: Attribute.Relation<
       'api::mpa-protection-coverage-stat.mpa-protection-coverage-stat',
-      'oneToOne',
+      'manyToOne',
       'api::mpa.mpa'
     >;
     fishing_protection_level: Attribute.Relation<
@@ -1096,14 +1117,15 @@ export interface ApiMpaaProtectionLevelStatMpaaProtectionLevelStat
     singularName: 'mpaa-protection-level-stat';
     pluralName: 'mpaa-protection-level-stats';
     displayName: 'MPAA Protection Level Stats';
+    description: '';
   };
   options: {
     draftAndPublish: false;
   };
   attributes: {
     location: Attribute.Relation<
       'api::mpaa-protection-level-stat.mpaa-protection-level-stat',
-      'oneToOne',
+      'manyToOne',
       'api::location.location'
     >;
     mpaa_protection_level: Attribute.Relation<
@@ -1148,7 +1170,7 @@ export interface ApiProtectionCoverageStatProtectionCoverageStat
   attributes: {
     location: Attribute.Relation<
       'api::protection-coverage-stat.protection-coverage-stat',
-      'oneToOne',
+      'manyToOne',
       'api::location.location'
     >;
     protection_status: Attribute.Relation<