Merge pull request #45 from Vizzuality/SKY30-85-fe-highlight-and-zoom…

…-to-a [SKY30-85]: bounds and highlight EEZ
Vizzuality · Nov 8, 2023 · 150990c · 150990c
2 parents df91c6b + 6ee40d4
commit 150990c
Show file tree

Hide file tree

Showing 21 changed files with 234 additions and 159 deletions.
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
@@ -123,6 +123,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "slug",
+        "content",
+        "createdAt"
+      ],
       "edit": [
         [
           {
@@ -140,12 +146,6 @@
             "size": 6
           }
         ]
-      ],
-      "list": [
-        "id",
-        "slug",
-        "content",
-        "data_sources"
       ]
     }
   },

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",
-        "area",
-        "fishing_protection_level"
+        "fishing_protection_level",
+        "area"
       ],
       "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,6 +152,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "location",
+        "habitat",
+        "year"
+      ],
       "edit": [
         [
           {
@@ -177,14 +183,6 @@
             "size": 4
           }
         ]
-      ],
-      "list": [
-        "id",
-        "location",
-        "habitat",
-        "year",
-        "protectedArea",
-        "totalArea"
       ]
     }
   },

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
@@ -229,9 +229,7 @@
         "id",
         "code",
         "name",
-        "type",
-        "totalMarineArea",
-        "groups"
+        "totalMarineArea"
       ],
       "edit": [
         [
@@ -245,36 +243,36 @@
           }
         ],
         [
+          {
+            "name": "totalMarineArea",
+            "size": 4
+          },
           {
             "name": "type",
             "size": 6
           }
         ],
         [
           {
-            "name": "totalMarineArea",
-            "size": 4
+            "name": "groups",
+            "size": 6
           },
           {
-            "name": "groups",
+            "name": "members",
             "size": 6
           }
         ],
         [
           {
-            "name": "members",
+            "name": "fishing_protection_level_stats",
             "size": 6
           },
           {
-            "name": "fishing_protection_level_stats",
+            "name": "mpaa_protection_level_stats",
             "size": 6
           }
         ],
         [
-          {
-            "name": "mpaa_protection_level_stats",
-            "size": 6
-          },
           {
             "name": "protection_coverage_stats",
             "size": 6

diff --git a/...ration_content_types##api##mpa-protection-coverage-stat.mpa-protection-coverage-stat.json b/...ration_content_types##api##mpa-protection-coverage-stat.mpa-protection-coverage-stat.json
@@ -154,6 +154,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "mpa",
+        "fishing_protection_level",
+        "mpaa_protection_level"
+      ],
       "edit": [
         [
           {
@@ -181,13 +187,6 @@
             "size": 4
           }
         ]
-      ],
-      "list": [
-        "id",
-        "mpa",
-        "fishing_protection_level",
-        "mpaa_protection_level",
-        "location"
       ]
     }
   },

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
@@ -181,6 +181,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "wdpaid",
+        "name",
+        "year"
+      ],
       "edit": [
         [
           {
@@ -220,15 +226,6 @@
             "size": 6
           }
         ]
-      ],
-      "list": [
-        "id",
-        "wdpaid",
-        "name",
-        "year",
-        "protection_status",
-        "mpaa_establishment_stage",
-        "area"
       ]
     }
   },

diff --git a/...tion_content_types##api##mpaa-establishment-stage-stat.mpaa-establishment-stage-stat.json b/...tion_content_types##api##mpaa-establishment-stage-stat.mpaa-establishment-stage-stat.json
@@ -153,6 +153,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "location",
+        "mpaa_establishment_stage",
+        "protection_status"
+      ],
       "edit": [
         [
           {
@@ -180,14 +186,6 @@
             "size": 4
           }
         ]
-      ],
-      "list": [
-        "id",
-        "location",
-        "mpaa_establishment_stage",
-        "protection_status",
-        "year",
-        "area"
       ]
     }
   },

diff --git a/..._configuration_content_types##api##protection-coverage-stat.protection-coverage-stat.json b/..._configuration_content_types##api##protection-coverage-stat.protection-coverage-stat.json
@@ -166,6 +166,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "location",
+        "protection_status",
+        "year"
+      ],
       "edit": [
         [
           {
@@ -197,14 +203,6 @@
             "size": 4
           }
         ]
-      ],
-      "list": [
-        "id",
-        "location",
-        "protection_status",
-        "year",
-        "cumSumProtectedArea",
-        "protectedAreasCount"
       ]
     }
   },

diff --git a/cms/config/sync/user-role.public.json b/cms/config/sync/user-role.public.json
@@ -9,36 +9,12 @@
     {
       "action": "api::data-info.data-info.findOne"
     },
-    {
-      "action": "api::data-source.data-source.find"
-    },
-    {
-      "action": "api::data-source.data-source.findOne"
-    },
-    {
-      "action": "api::fishing-protection-level-stat.fishing-protection-level-stat.find"
-    },
-    {
-      "action": "api::fishing-protection-level-stat.fishing-protection-level-stat.findOne"
-    },
-    {
-      "action": "api::fishing-protection-level.fishing-protection-level.find"
-    },
-    {
-      "action": "api::fishing-protection-level.fishing-protection-level.findOne"
-    },
     {
       "action": "api::habitat-stat.habitat-stat.find"
     },
     {
       "action": "api::habitat-stat.habitat-stat.findOne"
     },
-    {
-      "action": "api::habitat.habitat.find"
-    },
-    {
-      "action": "api::habitat.habitat.findOne"
-    },
     {
       "action": "api::layer.layer.find"
     },
@@ -57,48 +33,12 @@
     {
       "action": "api::mpa-protection-coverage-stat.mpa-protection-coverage-stat.findOne"
     },
-    {
-      "action": "api::mpa.mpa.find"
-    },
-    {
-      "action": "api::mpa.mpa.findOne"
-    },
-    {
-      "action": "api::mpaa-establishment-stage-stat.mpaa-establishment-stage-stat.find"
-    },
-    {
-      "action": "api::mpaa-establishment-stage-stat.mpaa-establishment-stage-stat.findOne"
-    },
-    {
-      "action": "api::mpaa-establishment-stage.mpaa-establishment-stage.find"
-    },
-    {
-      "action": "api::mpaa-establishment-stage.mpaa-establishment-stage.findOne"
-    },
-    {
-      "action": "api::mpaa-protection-level-stat.mpaa-protection-level-stat.find"
-    },
-    {
-      "action": "api::mpaa-protection-level-stat.mpaa-protection-level-stat.findOne"
-    },
-    {
-      "action": "api::mpaa-protection-level.mpaa-protection-level.find"
-    },
-    {
-      "action": "api::mpaa-protection-level.mpaa-protection-level.findOne"
-    },
     {
       "action": "api::protection-coverage-stat.protection-coverage-stat.find"
     },
     {
       "action": "api::protection-coverage-stat.protection-coverage-stat.findOne"
     },
-    {
-      "action": "api::protection-status.protection-status.find"
-    },
-    {
-      "action": "api::protection-status.protection-status.findOne"
-    },
     {
       "action": "plugin::users-permissions.auth.callback"
     },

diff --git a/frontend/package.json b/frontend/package.json
@@ -54,7 +54,7 @@
     "lucide-react": "^0.274.0",
     "mapbox-gl": "2.15.0",
     "next": "13.5.6",
-    "next-usequerystate": "1.8.4",
+    "next-usequerystate": "1.9.2",
     "orval": "6.18.1",
     "postcss": "8.4.21",
     "react": "18.2.0",

diff --git a/frontend/src/containers/data-tool/content/index.tsx b/frontend/src/containers/data-tool/content/index.tsx
@@ -7,7 +7,7 @@ const DataToolContent: React.FC = () => {
   const [{ showDetails }] = useSyncDataToolContentSettings();
 
   return (
-    <div className="relative h-full w-full">
+    <div className="absolute h-full w-full">
       <Map />
       {showDetails && <Details />}
     </div>