Merge branch 'develop' into SKY30-87-fe-navigation-to-the-data-table

SkyTruth · Oct 31, 2023 · 593c3f3 · 593c3f3
2 parents af01f8c + 66e3dd9
commit 593c3f3
Show file tree

Hide file tree

Showing 21 changed files with 1,652 additions and 224 deletions.
diff --git a/cms/config/sync/admin-role.strapi-super-admin.json b/cms/config/sync/admin-role.strapi-super-admin.json
@@ -10,7 +10,8 @@
       "properties": {
         "fields": [
           "slug",
-          "content"
+          "content",
+          "data_sources"
         ]
       },
       "conditions": []
@@ -29,7 +30,8 @@
       "properties": {
         "fields": [
           "slug",
-          "content"
+          "content",
+          "data_sources"
         ]
       },
       "conditions": []
@@ -41,7 +43,54 @@
       "properties": {
         "fields": [
           "slug",
-          "content"
+          "content",
+          "data_sources"
+        ]
+      },
+      "conditions": []
+    },
+    {
+      "action": "plugin::content-manager.explorer.create",
+      "actionParameters": {},
+      "subject": "api::data-source.data-source",
+      "properties": {
+        "fields": [
+          "slug",
+          "title",
+          "url"
+        ]
+      },
+      "conditions": []
+    },
+    {
+      "action": "plugin::content-manager.explorer.delete",
+      "actionParameters": {},
+      "subject": "api::data-source.data-source",
+      "properties": {},
+      "conditions": []
+    },
+    {
+      "action": "plugin::content-manager.explorer.read",
+      "actionParameters": {},
+      "subject": "api::data-source.data-source",
+      "properties": {
+        "fields": [
+          "slug",
+          "title",
+          "url"
+        ]
+      },
+      "conditions": []
+    },
+    {
+      "action": "plugin::content-manager.explorer.update",
+      "actionParameters": {},
+      "subject": "api::data-source.data-source",
+      "properties": {
+        "fields": [
+          "slug",
+          "title",
+          "url"
         ]
       },
       "conditions": []
@@ -330,7 +379,8 @@
           "members",
           "fishing_protection_level_stats",
           "mpaa_protection_level_stats",
-          "protection_coverage_stats"
+          "protection_coverage_stats",
+          "bounds"
         ]
       },
       "conditions": []
@@ -356,7 +406,8 @@
           "members",
           "fishing_protection_level_stats",
           "mpaa_protection_level_stats",
-          "protection_coverage_stats"
+          "protection_coverage_stats",
+          "bounds"
         ]
       },
       "conditions": []
@@ -375,7 +426,8 @@
           "members",
           "fishing_protection_level_stats",
           "mpaa_protection_level_stats",
-          "protection_coverage_stats"
+          "protection_coverage_stats",
+          "bounds"
         ]
       },
       "conditions": []

diff --git a/...e-store.plugin_content_manager_configuration_content_types##api##data-info.data-info.json b/...e-store.plugin_content_manager_configuration_content_types##api##data-info.data-info.json
@@ -48,6 +48,21 @@
           "sortable": true
         }
       },
+      "data_sources": {
+        "edit": {
+          "label": "data_sources",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true,
+          "mainField": "slug"
+        },
+        "list": {
+          "label": "data_sources",
+          "searchable": false,
+          "sortable": false
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -108,12 +123,6 @@
       }
     },
     "layouts": {
-      "list": [
-        "id",
-        "slug",
-        "content",
-        "createdAt"
-      ],
       "edit": [
         [
           {
@@ -124,7 +133,19 @@
             "name": "content",
             "size": 6
           }
+        ],
+        [
+          {
+            "name": "data_sources",
+            "size": 6
+          }
         ]
+      ],
+      "list": [
+        "id",
+        "slug",
+        "content",
+        "data_sources"
       ]
     }
   },

diff --git a/...ore.plugin_content_manager_configuration_content_types##api##data-source.data-source.json b/...ore.plugin_content_manager_configuration_content_types##api##data-source.data-source.json
@@ -0,0 +1,154 @@
+{
+  "key": "plugin_content_manager_configuration_content_types::api::data-source.data-source",
+  "value": {
+    "uid": "api::data-source.data-source",
+    "settings": {
+      "bulkable": true,
+      "filterable": true,
+      "searchable": true,
+      "pageSize": 10,
+      "mainField": "slug",
+      "defaultSortBy": "slug",
+      "defaultSortOrder": "ASC"
+    },
+    "metadatas": {
+      "id": {
+        "edit": {},
+        "list": {
+          "label": "id",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "slug": {
+        "edit": {
+          "label": "slug",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "slug",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "title": {
+        "edit": {
+          "label": "title",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "title",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "url": {
+        "edit": {
+          "label": "url",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "url",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "createdAt": {
+        "edit": {
+          "label": "createdAt",
+          "description": "",
+          "placeholder": "",
+          "visible": false,
+          "editable": true
+        },
+        "list": {
+          "label": "createdAt",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "updatedAt": {
+        "edit": {
+          "label": "updatedAt",
+          "description": "",
+          "placeholder": "",
+          "visible": false,
+          "editable": true
+        },
+        "list": {
+          "label": "updatedAt",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "createdBy": {
+        "edit": {
+          "label": "createdBy",
+          "description": "",
+          "placeholder": "",
+          "visible": false,
+          "editable": true,
+          "mainField": "firstname"
+        },
+        "list": {
+          "label": "createdBy",
+          "searchable": true,
+          "sortable": true
+        }
+      },
+      "updatedBy": {
+        "edit": {
+          "label": "updatedBy",
+          "description": "",
+          "placeholder": "",
+          "visible": false,
+          "editable": true,
+          "mainField": "firstname"
+        },
+        "list": {
+          "label": "updatedBy",
+          "searchable": true,
+          "sortable": true
+        }
+      }
+    },
+    "layouts": {
+      "list": [
+        "id",
+        "slug",
+        "title",
+        "url"
+      ],
+      "edit": [
+        [
+          {
+            "name": "slug",
+            "size": 6
+          },
+          {
+            "name": "title",
+            "size": 6
+          }
+        ],
+        [
+          {
+            "name": "url",
+            "size": 6
+          }
+        ]
+      ]
+    }
+  },
+  "type": "object",
+  "environment": null,
+  "tag": null
+}
diff --git a/...tion_content_types##api##fishing-protection-level-stat.fishing-protection-level-stat.json b/...tion_content_types##api##fishing-protection-level-stat.fishing-protection-level-stat.json
@@ -127,24 +127,24 @@
       "list": [
         "id",
         "location",
-        "fishing_protection_level",
-        "area"
+        "area",
+        "fishing_protection_level"
       ],
       "edit": [
         [
           {
             "name": "location",
             "size": 6
-          },
-          {
-            "name": "fishing_protection_level",
-            "size": 6
           }
         ],
         [
           {
             "name": "area",
             "size": 4
+          },
+          {
+            "name": "fishing_protection_level",
+            "size": 6
           }
         ]
       ]

diff --git a/...e.plugin_content_manager_configuration_content_types##api##habitat-stat.habitat-stat.json b/...e.plugin_content_manager_configuration_content_types##api##habitat-stat.habitat-stat.json
@@ -152,12 +152,6 @@
       }
     },
     "layouts": {
-      "list": [
-        "id",
-        "location",
-        "habitat",
-        "year"
-      ],
       "edit": [
         [
           {
@@ -183,6 +177,14 @@
             "size": 4
           }
         ]
+      ],
+      "list": [
+        "id",
+        "location",
+        "habitat",
+        "year",
+        "protectedArea",
+        "totalArea"
       ]
     }
   },