From 351df4c817a3ea875932acd55c7fb79a2f5983c5 Mon Sep 17 00:00:00 2001
From: ElysaSrc <101974839+ElysaSrc@users.noreply.github.com>
Date: Sat, 14 Sep 2024 10:55:52 +0200
Subject: [PATCH] backend, frontend: revamp utoipa/ts types

---
 ...f570fe793ad077357017afd4aa456569e5162.json |  28 +++
 ...8b13b28df1369b0f1971c8f4c65b9a065cb13.json |  28 ---
 backend/Cargo.toml                            |   2 +-
 backend/src/api/admin/entities.rs             |   6 +-
 backend/src/api/admin/statistics.rs           |   2 +-
 backend/src/api/map.rs                        |   2 +-
 backend/src/doc.rs                            |   6 +-
 backend/src/models/access_token.rs            | 136 ++++++-----
 backend/src/models/entity.rs                  |  10 +-
 backend/src/models/entity_cache.rs            |  10 +-
 backend/src/models/family.rs                  |   6 +-
 backend/src/models/statistics.rs              |  27 ++-
 frontend/components/admin/Navbar.vue          |  15 +-
 .../components/admin/families/EditForm.vue    |   8 +-
 frontend/components/form/DynamicField.vue     |  14 +-
 frontend/lib.d.ts                             |  57 ++---
 frontend/lib/admin-client.ts                  |  21 +-
 frontend/lib/admin-state.ts                   |  33 ++-
 frontend/lib/viewer-state.ts                  |  10 +-
 frontend/openapi.json                         | 214 ++++++++++++++----
 frontend/pages/admin/access-tokens/[id].vue   |   2 +-
 21 files changed, 402 insertions(+), 235 deletions(-)
 create mode 100644 backend/.sqlx/query-1f3ff6a401eab7441ce33dda930f570fe793ad077357017afd4aa456569e5162.json
 delete mode 100644 backend/.sqlx/query-26285b50be723917b21f3fc61168b13b28df1369b0f1971c8f4c65b9a065cb13.json

diff --git a/backend/.sqlx/query-1f3ff6a401eab7441ce33dda930f570fe793ad077357017afd4aa456569e5162.json b/backend/.sqlx/query-1f3ff6a401eab7441ce33dda930f570fe793ad077357017afd4aa456569e5162.json
new file mode 100644
index 0000000..07f751c
--- /dev/null
+++ b/backend/.sqlx/query-1f3ff6a401eab7441ce33dda930f570fe793ad077357017afd4aa456569e5162.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT\n                COALESCE((\n                    WITH origins AS (\n                        SELECT DISTINCT(COALESCE(referrer, 'unknown')) AS referrer, COUNT(*) AS total\n                        FROM access_tokens_visits\n                        WHERE token_id = $1\n                        GROUP BY referrer\n                    )\n                    SELECT json_object_agg(referrer, total) FROM origins\n                ), '{}') as \"origins: JsonValue\",\n                (\n                    WITH date_series AS (\n                        SELECT generate_series(\n                            NOW()::date - INTERVAL '30 days',\n                            NOW()::date,\n                            INTERVAL '1 day'\n                        )::date AS visit_date\n                    ),\n                    aggregated_visits AS (\n                        SELECT\n                            ds.visit_date,\n                            COALESCE(COUNT(atv.visited_at), 0) AS visit_count\n                        FROM\n                            date_series ds\n                        LEFT JOIN\n                            access_tokens_visits atv\n                        ON\n                            ds.visit_date = DATE(atv.visited_at) \n                            AND atv.token_id = $1\n                        GROUP BY\n                            ds.visit_date\n                        ORDER BY\n                            ds.visit_date\n                    )\n                    SELECT COALESCE(json_object_agg(\n                        TO_CHAR(visit_date, 'YYYY-MM-DD'),\n                        visit_count\n                    ), '{}') AS visits\n                    FROM aggregated_visits\n                ) as \"visits_30_days: JsonValue\"\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "origins: JsonValue",
+        "type_info": "Json"
+      },
+      {
+        "ordinal": 1,
+        "name": "visits_30_days: JsonValue",
+        "type_info": "Json"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "1f3ff6a401eab7441ce33dda930f570fe793ad077357017afd4aa456569e5162"
+}
diff --git a/backend/.sqlx/query-26285b50be723917b21f3fc61168b13b28df1369b0f1971c8f4c65b9a065cb13.json b/backend/.sqlx/query-26285b50be723917b21f3fc61168b13b28df1369b0f1971c8f4c65b9a065cb13.json
deleted file mode 100644
index 31ef0c0..0000000
--- a/backend/.sqlx/query-26285b50be723917b21f3fc61168b13b28df1369b0f1971c8f4c65b9a065cb13.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n            COALESCE((\n                WITH origins AS (\n                    SELECT DISTINCT(COALESCE(referrer, 'unknown')) AS referrer, COUNT(*) AS total\n                    FROM access_tokens_visits\n                    WHERE token_id = $1\n                    GROUP BY referrer\n                )\n                SELECT json_object_agg(referrer, total) FROM origins\n            ), '{}') as \"origins!\",\n            (\n                WITH date_series AS (\n                    SELECT generate_series(\n                        NOW()::date - INTERVAL '30 days',\n                        NOW()::date,\n                        INTERVAL '1 day'\n                    )::date AS visit_date\n                ),\n                aggregated_visits AS (\n                    SELECT\n                        ds.visit_date,\n                        COALESCE(COUNT(atv.visited_at), 0) AS visit_count\n                    FROM\n                        date_series ds\n                    LEFT JOIN\n                        access_tokens_visits atv\n                    ON\n                        ds.visit_date = DATE(atv.visited_at) \n                        AND atv.token_id = $1\n                    GROUP BY\n                        ds.visit_date\n                    ORDER BY\n                        ds.visit_date\n                )\n                SELECT COALESCE(json_object_agg(\n                    TO_CHAR(visit_date, 'YYYY-MM-DD'),\n                    visit_count\n                ), '{}') AS visits\n                FROM aggregated_visits\n            ) as \"visits_30_days!\";\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "origins!",
-        "type_info": "Json"
-      },
-      {
-        "ordinal": 1,
-        "name": "visits_30_days!",
-        "type_info": "Json"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid"
-      ]
-    },
-    "nullable": [
-      null,
-      null
-    ]
-  },
-  "hash": "26285b50be723917b21f3fc61168b13b28df1369b0f1971c8f4c65b9a065cb13"
-}
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c1cc5de..db2dca8 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -30,7 +30,7 @@ jsonwebtoken = "9"
 tracing = "0.1"
 tower-http = { version = "0.5", features = ["fs", "trace", "cors"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-utoipa = { version = "4.2.0", features = ["axum_extras", "uuid", "chrono"] }
+utoipa = { version = "4", features = ["axum_extras", "uuid", "chrono"] }
 clap = { version = "4", features = ["derive"] }
 clap_derive = { version = "4" }
 number_range = "0.3.2"
diff --git a/backend/src/api/admin/entities.rs b/backend/src/api/admin/entities.rs
index 25ff9ec..a08f9a4 100644
--- a/backend/src/api/admin/entities.rs
+++ b/backend/src/api/admin/entities.rs
@@ -41,8 +41,10 @@ pub struct AdminEntityWithRelations {
     pub display_name: String,
     pub category_id: Uuid,
     pub family_id: Uuid,
-    #[schema(value_type = Object)]
+
+    #[schema(value_type = Vec<UnprocessedLocation>)]
     pub locations: sqlx::types::Json<Vec<UnprocessedLocation>>,
+
     pub data: Value,
     pub tags: Vec<Uuid>,
     pub hidden: bool,
@@ -64,7 +66,7 @@ pub struct AdminEntityWithRelations {
         ("page_size" = i64, Query, description = "Number of items per page (default: 20)")
     ),
     responses(
-        (status = 200, description = "Search results for entities", body = PaginatedVec<AdminCachedEntity>),
+        (status = 200, description = "Search results for entities", body = AdminCachedEntitiesWithPagination),
         (status = 401, description = "Invalid permissions", body = ErrorResponse),
     )
 )]
diff --git a/backend/src/api/admin/statistics.rs b/backend/src/api/admin/statistics.rs
index e38b179..3dc2320 100644
--- a/backend/src/api/admin/statistics.rs
+++ b/backend/src/api/admin/statistics.rs
@@ -21,7 +21,7 @@ pub async fn admin_home_stats(
     get,
     path = "/api/admin/stats/count-comments-entities",
     responses(
-        (status = 200, description = "Dicts of entities and comments counts by family and category id"),
+        (status = 200, description = "Dicts of entities and comments counts by family and category id", body = (HashMap<String, (u32, u32, u32, u32)>,HashMap<String, (u32, u32, u32, u32)>),),
         (status = 401, description = "Invalid permissions", body = ErrorResponse),
     )
 )]
diff --git a/backend/src/api/map.rs b/backend/src/api/map.rs
index cd71968..669124d 100644
--- a/backend/src/api/map.rs
+++ b/backend/src/api/map.rs
@@ -242,7 +242,7 @@ impl Display for SearchRequest {
     path = "/api/map/search",
     request_body = SearchRequest,
     responses(
-        (status = 200, description = "List of entities", body = PaginatedVec<ViewerSearchedCachedEntity>),
+        (status = 200, description = "List of entities", body = ViewerCachedEntitiesWithPagination),
         (status = 401, description = "Invalid token", body = ErrorResponse),
     )
 )]
diff --git a/backend/src/doc.rs b/backend/src/doc.rs
index 4ba8b32..e1e633d 100644
--- a/backend/src/doc.rs
+++ b/backend/src/doc.rs
@@ -28,8 +28,8 @@ use crate::{
         },
         entity_cache::{
             AdminCachedEntitiesWithPagination, AdminCachedEntity, Cluster, EntitiesAndClusters,
-            LocationRepresentation, PaginatedVec, ParentRepresentation,
-            ViewerCachedEntitiesWithPagination, ViewerCachedEntity, ViewerSearchedCachedEntity,
+            LocationRepresentation, ParentRepresentation, ViewerCachedEntitiesWithPagination,
+            ViewerCachedEntity, ViewerSearchedCachedEntity,
         },
         family::{Family, Field, FieldType, Form, NewOrUpdateFamily},
         options::{
@@ -161,8 +161,6 @@ use utoipa::OpenApi;
         PublicEntity,
         PublicListedEntity,
         PublicNewEntity,
-        PaginatedVec<ViewerSearchedCachedEntity>,
-        PaginatedVec<AdminCachedEntity>,
         ViewerCachedEntity,
         ViewerSearchedCachedEntity,
         LocationRepresentation,
diff --git a/backend/src/models/access_token.rs b/backend/src/models/access_token.rs
index d16fb15..46c3436 100644
--- a/backend/src/models/access_token.rs
+++ b/backend/src/models/access_token.rs
@@ -1,7 +1,12 @@
+use std::collections::{BTreeMap, HashMap};
+
 use crate::{api::AppError, helpers::postgis_polygons::MultiPolygon};
 use serde::{Deserialize, Serialize};
-use serde_json::{to_value, Value};
-use sqlx::{types::Json, PgConnection};
+use serde_json::{json, to_value};
+use sqlx::{
+    types::{Json, JsonValue},
+    PgConnection,
+};
 use utoipa::ToSchema;
 use uuid::Uuid;
 
@@ -55,7 +60,7 @@ pub struct PermissionPolicy {
 pub struct NewOrUpdateAccessToken {
     pub title: String,
     pub token: String,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Permissions)]
     pub permissions: Json<Permissions>,
     pub active: bool,
 }
@@ -65,7 +70,7 @@ pub struct AccessToken {
     pub id: Uuid,
     pub title: String,
     pub token: String,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Permissions)]
     pub permissions: Json<Permissions>,
     pub last_week_visits: i64,
     pub active: bool,
@@ -73,11 +78,8 @@ pub struct AccessToken {
 
 #[derive(Deserialize, Serialize, ToSchema, Debug)]
 pub struct AccessTokenStats {
-    #[schema(value_type = Object)]
-    pub origins: Json<Value>,
-
-    #[schema(value_type = Object)]
-    pub visits_30_days: Json<Value>,
+    pub origins: HashMap<String, u32>,
+    pub visits_30_days: BTreeMap<String, u32>,
 }
 
 impl AccessToken {
@@ -249,54 +251,72 @@ impl AccessToken {
         access_token_id: Uuid,
         conn: &mut PgConnection,
     ) -> Result<AccessTokenStats, AppError> {
-        sqlx::query_as!(
-            AccessTokenStats,
-            r#"
-            SELECT
-            COALESCE((
-                WITH origins AS (
-                    SELECT DISTINCT(COALESCE(referrer, 'unknown')) AS referrer, COUNT(*) AS total
-                    FROM access_tokens_visits
-                    WHERE token_id = $1
-                    GROUP BY referrer
-                )
-                SELECT json_object_agg(referrer, total) FROM origins
-            ), '{}') as "origins!",
-            (
-                WITH date_series AS (
-                    SELECT generate_series(
-                        NOW()::date - INTERVAL '30 days',
-                        NOW()::date,
-                        INTERVAL '1 day'
-                    )::date AS visit_date
-                ),
-                aggregated_visits AS (
-                    SELECT
-                        ds.visit_date,
-                        COALESCE(COUNT(atv.visited_at), 0) AS visit_count
-                    FROM
-                        date_series ds
-                    LEFT JOIN
-                        access_tokens_visits atv
-                    ON
-                        ds.visit_date = DATE(atv.visited_at) 
-                        AND atv.token_id = $1
-                    GROUP BY
-                        ds.visit_date
-                    ORDER BY
-                        ds.visit_date
-                )
-                SELECT COALESCE(json_object_agg(
-                    TO_CHAR(visit_date, 'YYYY-MM-DD'),
-                    visit_count
-                ), '{}') AS visits
-                FROM aggregated_visits
-            ) as "visits_30_days!";
-            "#,
-            access_token_id
-        )
-        .fetch_one(conn)
-        .await
-        .map_err(AppError::Database)
+        let result = sqlx::query!(
+                r#"
+                SELECT
+                COALESCE((
+                    WITH origins AS (
+                        SELECT DISTINCT(COALESCE(referrer, 'unknown')) AS referrer, COUNT(*) AS total
+                        FROM access_tokens_visits
+                        WHERE token_id = $1
+                        GROUP BY referrer
+                    )
+                    SELECT json_object_agg(referrer, total) FROM origins
+                ), '{}') as "origins: JsonValue",
+                (
+                    WITH date_series AS (
+                        SELECT generate_series(
+                            NOW()::date - INTERVAL '30 days',
+                            NOW()::date,
+                            INTERVAL '1 day'
+                        )::date AS visit_date
+                    ),
+                    aggregated_visits AS (
+                        SELECT
+                            ds.visit_date,
+                            COALESCE(COUNT(atv.visited_at), 0) AS visit_count
+                        FROM
+                            date_series ds
+                        LEFT JOIN
+                            access_tokens_visits atv
+                        ON
+                            ds.visit_date = DATE(atv.visited_at) 
+                            AND atv.token_id = $1
+                        GROUP BY
+                            ds.visit_date
+                        ORDER BY
+                            ds.visit_date
+                    )
+                    SELECT COALESCE(json_object_agg(
+                        TO_CHAR(visit_date, 'YYYY-MM-DD'),
+                        visit_count
+                    ), '{}') AS visits
+                    FROM aggregated_visits
+                ) as "visits_30_days: JsonValue"
+                "#,
+                access_token_id
+            )
+            .fetch_one(conn)
+            .await
+            .map_err(AppError::Database)?;
+
+        // Provide a default empty object if origins is None
+        let origins_json: JsonValue = result.origins.unwrap_or_else(|| json!({}));
+        let visits_30_days_json: JsonValue = result.visits_30_days.unwrap_or_else(|| json!({}));
+
+        // Convert the JsonValue to HashMap<String, u32>
+        let origins: HashMap<String, u32> =
+            serde_json::from_value(origins_json).map_err(|err| {
+                AppError::Internal(format!("Failed to deserialize origins: {}", err).into())
+            })?;
+        let visits_30_days: BTreeMap<String, u32> = serde_json::from_value(visits_30_days_json)
+            .map_err(|err| {
+                AppError::Internal(format!("Failed to deserialize visits_30_days: {}", err).into())
+            })?;
+
+        Ok(AccessTokenStats {
+            origins,
+            visits_30_days,
+        })
     }
 }
diff --git a/backend/src/models/entity.rs b/backend/src/models/entity.rs
index 90cf869..18f5145 100644
--- a/backend/src/models/entity.rs
+++ b/backend/src/models/entity.rs
@@ -40,13 +40,13 @@ pub struct PublicEntity {
     pub display_name: String,
     pub category_id: Uuid,
     pub family_id: Uuid,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Vec<UnprocessedLocation>)]
     pub locations: Json<Vec<UnprocessedLocation>>,
     pub data: Value,
     pub tags: Vec<Uuid>,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Form)]
     pub entity_form: Json<Form>,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Form)]
     pub comment_form: Json<Form>,
     pub created_at: chrono::NaiveDateTime,
     pub updated_at: chrono::NaiveDateTime,
@@ -196,7 +196,7 @@ impl PublicEntity {
 pub struct AdminNewOrUpdateEntity {
     pub display_name: String,
     pub category_id: Uuid,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Vec<UnprocessedLocation>)]
     pub locations: Json<Vec<UnprocessedLocation>>,
     pub data: Value,
     pub tags: Vec<Uuid>,
@@ -224,7 +224,7 @@ pub struct AdminEntity {
     pub display_name: String,
     pub category_id: Uuid,
     pub family_id: Uuid,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Vec<UnprocessedLocation>)]
     pub locations: Json<Vec<UnprocessedLocation>>,
     pub data: Value,
     pub tags: Vec<Uuid>,
diff --git a/backend/src/models/entity_cache.rs b/backend/src/models/entity_cache.rs
index 1c0402f..1b57d21 100644
--- a/backend/src/models/entity_cache.rs
+++ b/backend/src/models/entity_cache.rs
@@ -146,9 +146,12 @@ impl From<Vec<AdminPaginatedCachedEntity>> for AdminCachedEntitiesWithPagination
     }
 }
 
-#[derive(Deserialize, Serialize, ToSchema, Debug)]
+#[derive(Serialize, ToSchema, Debug)]
+#[aliases(
+    ViewerCachedEntitiesWithPagination = PaginatedVec<ViewerSearchedCachedEntity>, 
+    AdminCachedEntitiesWithPagination = PaginatedVec<AdminCachedEntity>
+)]
 pub struct PaginatedVec<T> {
-    #[schema(value_type = Object)]
     pub entities: Vec<T>,
 
     pub total_results: i64,
@@ -156,9 +159,6 @@ pub struct PaginatedVec<T> {
     pub response_current_page: i64,
 }
 
-pub type ViewerCachedEntitiesWithPagination = PaginatedVec<ViewerSearchedCachedEntity>;
-pub type AdminCachedEntitiesWithPagination = PaginatedVec<AdminCachedEntity>;
-
 #[derive(Deserialize, Serialize, ToSchema, Debug)]
 pub struct CachedClusteredEntity {
     pub id: Uuid,
diff --git a/backend/src/models/family.rs b/backend/src/models/family.rs
index a5d68b7..ffd8ca4 100644
--- a/backend/src/models/family.rs
+++ b/backend/src/models/family.rs
@@ -48,7 +48,7 @@ pub struct Field {
     /// only for the frontend. For instance, if the field is an enum
     /// use it to store possible values. If it is a SingleLineText, specify
     /// if it's an email, a phone number, etc...
-    #[schema(value_type = Object)]
+    #[schema(value_type = Value, additional_properties)]
     pub field_type_metadata: Option<Value>,
 
     /// Sets if the field is indexed (used in full text search, or constraints search)
@@ -80,9 +80,9 @@ pub struct Family {
     pub id: Uuid,
     pub title: String,
     pub icon_hash: Option<String>,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Form)]
     pub entity_form: Json<Form>,
-    #[schema(value_type = Object)]
+    #[schema(value_type = Form)]
     pub comment_form: Json<Form>,
     pub sort_order: i32,
     pub version: i32,
diff --git a/backend/src/models/statistics.rs b/backend/src/models/statistics.rs
index 2bce73e..0deb5aa 100644
--- a/backend/src/models/statistics.rs
+++ b/backend/src/models/statistics.rs
@@ -2,9 +2,8 @@
 
 use crate::api::AppError;
 use serde::Serialize;
-use serde_json::Value;
-use sqlx::{types::Json, PgConnection};
-use std::collections::HashMap;
+use sqlx::PgConnection;
+use std::collections::{BTreeMap, HashMap};
 use utoipa::ToSchema;
 
 pub type CountResult = (
@@ -93,13 +92,11 @@ pub struct HomePageStats {
     pub total_visits_30_days: i64,
     pub total_visits_7_days: i64,
 
-    #[schema(value_type = Object)]
-    pub visits_30_days: Json<Value>,
+    pub visits_30_days: BTreeMap<String, i64>,
 }
 
 pub async fn home_page_stats(conn: &mut PgConnection) -> Result<HomePageStats, AppError> {
-    let stats = sqlx::query_as!(
-        HomePageStats,
+    let result = sqlx::query!(
         r#"
         SELECT
             (SELECT COUNT(*) FROM entities WHERE moderated) as "total_entities!",
@@ -146,5 +143,19 @@ pub async fn home_page_stats(conn: &mut PgConnection) -> Result<HomePageStats, A
     .await
     .map_err(AppError::Database)?;
 
-    Ok(stats)
+    // Deserialize the visits_30_days field into a HashMap<String, i64>
+    let visits_30_days: BTreeMap<String, i64> = serde_json::from_value(result.visits_30_days)
+        .map_err(|err| {
+            AppError::Internal(format!("Failed to deserialize visits_30_days: {}", err).into())
+        })?;
+
+    Ok(HomePageStats {
+        total_entities: result.total_entities,
+        total_comments: result.total_comments,
+        pending_entities: result.pending_entities,
+        pending_comments: result.pending_comments,
+        total_visits_30_days: result.total_visits_30_days,
+        total_visits_7_days: result.total_visits_7_days,
+        visits_30_days,
+    })
 }
diff --git a/frontend/components/admin/Navbar.vue b/frontend/components/admin/Navbar.vue
index facf0eb..fcdf8ed 100644
--- a/frontend/components/admin/Navbar.vue
+++ b/frontend/components/admin/Navbar.vue
@@ -128,15 +128,18 @@
       Une mise à jour est disponible.<br>
       <a href="https://github.com/SafeHavenMaps/safehaven/releases">Rendez-vous sur GitHub</a> pour voir et mettre à jour vers la dernière version.
     </Message>
-    <p>
+    <div class="m-1">
       Version actuelle: <pre>{{ state.versionInformation?.version ?? 'Inconnu' }}</pre>
-    </p>
-    <p>
+    </div>
+    <div class="m-1">
       Git hash: <pre>{{ state.versionInformation?.git_hash ?? 'Inconnu' }}</pre>
-    </p>
-    <p v-if="state.versionInformation?.github_latest_version">
+    </div>
+    <div
+      v-if="state.versionInformation?.github_latest_version"
+      class="m-1"
+    >
       Dernière version: <pre>{{ state.versionInformation?.github_latest_version }}</pre>
-    </p>
+    </div>
   </Dialog>
 </template>
 
diff --git a/frontend/components/admin/families/EditForm.vue b/frontend/components/admin/families/EditForm.vue
index 95c6467..db91fea 100644
--- a/frontend/components/admin/families/EditForm.vue
+++ b/frontend/components/admin/families/EditForm.vue
@@ -521,7 +521,7 @@
 
 <script setup lang="ts">
 import type { ConfirmationOptions } from 'primevue/confirmationoptions'
-import type { FormField, StringFieldTypeMetadata, OptionsFieldTypeMetadata, EventsFieldTypeMetadata } from '~/lib'
+import type { FormField, StringFieldTypeMetadata, OptionsFieldTypeMetadata, EventsFieldTypeMetadata, FieldTypeMetadataEnum } from '~/lib'
 
 const props = defineProps<{
   kind: 'entity' | 'comment'
@@ -715,7 +715,7 @@ function onDisplayIndexChange(field: FormField, new_display_index: 'notDisplayed
 function onFieldTypeChange(field: FormField) {
   switch (field.field_type) {
     case 'SingleLineText':
-      if (!field.field_type_metadata || !('format' in field.field_type_metadata)) {
+      if (!field.field_type_metadata || !('format' in (field as Extract<FieldTypeMetadataEnum, { field_type: 'SingleLineText' }>))) {
         field.field_type_metadata = { format: 'none' }
       }
       break
@@ -724,12 +724,12 @@ function onFieldTypeChange(field: FormField) {
       break
     case 'EnumSingleOption':
     case 'EnumMultiOption':
-      if (!field.field_type_metadata || !('options' in field.field_type_metadata)) {
+      if (!field.field_type_metadata || !('options' in ((field as Extract<FieldTypeMetadataEnum, { field_type: 'EnumSingleOption' | 'EnumMultiOption' }>)).field_type_metadata)) {
         field.field_type_metadata = { options: [] }
       }
       break
     case 'EventList':
-      if (!field.field_type_metadata || !('event_types' in field.field_type_metadata)) {
+      if (!field.field_type_metadata || !('event_types' in ((field as Extract<FieldTypeMetadataEnum, { field_type: 'EventList' }>)).field_type_metadata)) {
         field.field_type_metadata = { event_types: [] }
       }
       break
diff --git a/frontend/components/form/DynamicField.vue b/frontend/components/form/DynamicField.vue
index ab81179..2dd4986 100644
--- a/frontend/components/form/DynamicField.vue
+++ b/frontend/components/form/DynamicField.vue
@@ -21,7 +21,7 @@
     <InputText
       v-if="props.formField.field_type=='SingleLineText'"
       :id="props.formField.key"
-      v-tooltip="formatTooltip[props.formField.field_type_metadata!.format]"
+      v-tooltip="formatTooltip[(props.formField as Extract<FieldTypeMetadataEnum, { field_type: 'SingleLineText' }>).field_type_metadata!.format]"
       :model-value="props.fieldContent as (string | undefined)"
       :variant="props.hasBeenEdited ? 'filled': 'outlined'"
       :invalid="!isValid && hasLostFocus"
@@ -86,7 +86,7 @@
       v-if="props.formField.field_type=='EnumSingleOption'"
       :id="props.formField.key"
       :model-value="(props.fieldContent as (string | undefined))"
-      :options="props.formField.field_type_metadata?.options"
+      :options="(props.formField as Extract<FieldTypeMetadataEnum, { field_type: 'EnumSingleOption' }>).field_type_metadata?.options"
       :invalid="!isValid && hasLostFocus"
       option-value="value"
       option-label="label"
@@ -97,7 +97,7 @@
       v-if="props.formField.field_type=='EnumMultiOption'"
       :id="props.formField.key"
       :model-value="(props.fieldContent as (string[] | undefined))"
-      :options="props.formField.field_type_metadata?.options"
+      :options="(props.formField as Extract<FieldTypeMetadataEnum, { field_type: 'EnumSingleOption' }>).field_type_metadata.options"
       :invalid="!isValid && hasLostFocus"
       option-value="value"
       option-label="label"
@@ -121,7 +121,7 @@
             v-model="event.type"
             placeholder="type d'évènement"
             class="grow"
-            :options="props.formField.field_type_metadata?.event_types"
+            :options="(props.formField as Extract<FieldTypeMetadataEnum, { field_type: 'EventList' }>).field_type_metadata?.event_types"
             option-value="value"
             option-label="label"
           />
@@ -188,7 +188,7 @@
 <script setup lang="ts">
 import DatePicker from 'primevue/datepicker'
 import validator from 'validator'
-import type { EntityOrCommentEvent, FieldContentMap, FormField } from '~/lib'
+import type { EntityOrCommentEvent, FieldContentMap, FieldTypeMetadataEnum, FormField } from '~/lib'
 import { isValidNumber, isValidRichText, isValidText } from '~/lib/validation'
 
 type FormProps<T extends FormField> = {
@@ -222,10 +222,10 @@ const isValid = computed(() => {
     return !props.formField.mandatory
 
   // otherwise if it has a required format we need to check it against this format
-  if (!props.formField.field_type_metadata || !('format' in props.formField.field_type_metadata))
+  if (!props.formField.field_type_metadata || !('format' in (props.formField.field_type_metadata as { format: string | undefined })))
     return true
 
-  switch (props.formField.field_type_metadata.format) {
+  switch ((props.formField.field_type_metadata as { format: string | undefined }).format) {
     case 'url':
       return validator.isURL(props.fieldContent as string)
     case 'email':
diff --git a/frontend/lib.d.ts b/frontend/lib.d.ts
index b4e86d6..e8f9eae 100644
--- a/frontend/lib.d.ts
+++ b/frontend/lib.d.ts
@@ -24,7 +24,6 @@ export type PublicNewEntity = api.components['schemas']['PublicNewEntity']
 export type PublicNewEntityRequest = api.components['schemas']['PublicNewEntityRequest']
 export type PublicNewEntityResponse = api.components['schemas']['PublicNewEntityResponse']
 export type Cluster = api.components['schemas']['Cluster']
-type PaginatedVec<T> = Omit<api.components['schemas']['PaginatedVec'], 'entities'> & { entities: T[] }
 
 export type ViewerCachedEntity = api.components['schemas']['ViewerCachedEntity']
 export type ViewerSearchedCachedEntity = api.components['schemas']['ViewerSearchedCachedEntity']
@@ -40,9 +39,7 @@ export type ResolvedFetchedEntity = FetchedEntity & {
 export type AdminEntity = api.components['schemas']['AdminEntity']
 export type AdminListedEntity = api.components['schemas']['AdminListedEntity']
 export type AdminEntityWithRelations = api.components['schemas']['AdminEntityWithRelations']
-export type AdminNewOrUpdateEntity = api.components['schemas']['AdminNewOrUpdateEntity'] & {
-  locations: UnprocessedLocation[]
-}
+export type AdminNewOrUpdateEntity = api.components['schemas']['AdminNewOrUpdateEntity']
 export type AdminSearchRequestBody = api.components['schemas']['AdminSearchRequest']
 export type AdminCachedEntity = api.components['schemas']['AdminCachedEntity']
 export type AdminPaginatedCachedEntities = PaginatedVec<AdminCachedEntity>
@@ -60,22 +57,12 @@ export type NewOrUpdateCategory = api.components['schemas']['NewOrUpdateCategory
 export type NewOrUpdateTag = api.components['schemas']['NewOrUpdateTag']
 export type PermissionPolicy = api.components['schemas']['PermissionPolicy']
 export type Permissions = api.components['schemas']['Permissions']
-export type NewOrUpdateAccessToken = api.components['schemas']['NewOrUpdateAccessToken'] & { permissions: Permissions }
+export type NewOrUpdateAccessToken = api.components['schemas']['NewOrUpdateAccessToken']
 export type AccessToken = api.components['schemas']['AccessToken']
-  & {
-    permissions: Permissions & { geographic_restrictions: null | [number, number][][] }
-  }
 export type AccessTokenStats = api.components['schemas']['AccessTokenStats']
-export type PublicPermissions = {
-  can_list_entities: boolean
-  can_access_entity: boolean
-  can_add_entity: boolean
-  can_access_comments: boolean
-  can_add_comment: boolean
-  can_list_without_query: boolean
-  can_list_with_filters: boolean
-  can_list_with_enum_constraints: boolean
-}
+export type PublicPermissions = api.components['schemas']['Permissions']
+
+export type LimitedPublicPermissions = Omit<api.components['schemas']['Permissions'], 'categories_policy', 'families_policy', 'geographic_restrictions', 'tags_policy'>
 
 export type User = api.components['schemas']['User']
 export type NewOrUpdatedUser = api.components['schemas']['NewOrUpdatedUser']
@@ -131,35 +118,33 @@ export type FieldTypeMetadataEnum = {
   field_type: 'SingleLineText'
   field_type_metadata: StringFieldTypeMetadata
 } | {
-  field_type: 'EnumSingleOption' | 'EnumMultiOption'
+  field_type: 'EnumSingleOption'
+  field_type_metadata: OptionsFieldTypeMetadata
+} | {
+  field_type: 'EnumMultiOption'
   field_type_metadata: OptionsFieldTypeMetadata
 } | {
   field_type: 'EventList'
   field_type_metadata: EventsFieldTypeMetadata
 } | {
   field_type_metadata?: null
+} | {
+  field_type: 'MultiLineText' | 'RichText'
+} | {
+  field_type: 'Number'
+} | {
+  field_type: 'Boolean'
+} | {
+  field_type: 'DiscreteScore'
+} | {
+  field_type: 'Date'
 }
 
-export type NewOrUpdateFamily = api.components['schemas']['NewOrUpdateFamily'] & {
-  comment_form: {
-    fields: FieldTypeMetadataEnum[]
-  }
-} & {
-  entity_form: {
-    fields: FieldTypeMetadataEnum[]
-  }
-}
+export type NewOrUpdateFamily = api.components['schemas']['NewOrUpdateFamily']
 
 export type FormField = NewOrUpdateFamily['entity_form']['fields'][number]
 
-export type Family = Omit<api.components['schemas']['Family'], 'entity_form' | 'comment_form'> & {
-  entity_form: api.components['schemas']['Form'] & {
-    fields: FormField[]
-  }
-  comment_form: api.components['schemas']['Form'] & {
-    fields: FormField[]
-  }
-}
+export type Family = api.components['schemas']['Family']
 
 export type EntityOrCommentEvent = {
   date: Date | undefined
diff --git a/frontend/lib/admin-client.ts b/frontend/lib/admin-client.ts
index daa2e99..dacbca7 100644
--- a/frontend/lib/admin-client.ts
+++ b/frontend/lib/admin-client.ts
@@ -2,7 +2,6 @@ import createClient from 'openapi-fetch'
 import type { paths } from './api'
 import createAuthMiddleware from './admin-auth-middleware'
 import type {
-  Family,
   NewOrUpdateFamily,
   Category,
   NewOrUpdateCategory,
@@ -14,13 +13,11 @@ import type {
   AdminComment,
   AdminListedComment,
   AdminNewOrUpdateComment,
-  AccessToken,
   NewOrUpdateAccessToken,
   User,
   NewOrUpdatedUser,
   SafeHavenOptions,
   ConfigurationOption,
-  AdminPaginatedCachedEntities,
   AdminSearchRequestBody,
   AccessTokenStats,
   AdminEntityWithRelations,
@@ -163,13 +160,13 @@ export default function useClient() {
       return data
     },
 
-    async listFamilies(): Promise<Family[]> {
+    async listFamilies() {
       const { data, error } = await this.rawClient.GET('/api/admin/families')
       if (error) throw error
       return data
     },
 
-    async getFamily(id: string): Promise<Family> {
+    async getFamily(id: string) {
       const { data, error } = await this.rawClient.GET('/api/admin/families/{id}', {
         params: { path: { id } },
       })
@@ -177,13 +174,13 @@ export default function useClient() {
       return data
     },
 
-    async createFamily(family: NewOrUpdateFamily): Promise<Family> {
+    async createFamily(family: NewOrUpdateFamily) {
       const { data, error } = await this.rawClient.POST('/api/admin/families', { body: family })
       if (error) throw error
       return data
     },
 
-    async updateFamily(id: string, family: NewOrUpdateFamily): Promise<Family> {
+    async updateFamily(id: string, family: NewOrUpdateFamily) {
       const { data, error } = await this.rawClient.PUT('/api/admin/families/{id}', {
         body: family,
         params: { path: { id } },
@@ -211,7 +208,7 @@ export default function useClient() {
     async searchEntities(
       pagination: { page: number, page_size: number },
       search_request: AdminSearchRequestBody,
-    ): Promise<AdminPaginatedCachedEntities> {
+    ) {
       const { data, error } = await this.rawClient.POST('/api/admin/entities/search', {
         params: { query: pagination },
         body: search_request,
@@ -384,19 +381,19 @@ export default function useClient() {
       return data
     },
 
-    async listAccessTokens(): Promise<AccessToken[]> {
+    async listAccessTokens() {
       const { data, error } = await this.rawClient.GET('/api/admin/access_tokens')
       if (error) throw error
       return data
     },
 
-    async createAccessToken(token: NewOrUpdateAccessToken): Promise<AccessToken> {
+    async createAccessToken(token: NewOrUpdateAccessToken) {
       const { data, error } = await this.rawClient.POST('/api/admin/access_tokens', { body: token })
       if (error) throw error
       return data
     },
 
-    async getAccessToken(id: string): Promise<AccessToken> {
+    async getAccessToken(id: string) {
       const { data, error } = await this.rawClient.GET('/api/admin/access_tokens/{id}', {
         params: { path: { id } },
       })
@@ -412,7 +409,7 @@ export default function useClient() {
       return data
     },
 
-    async updateAccessToken(id: string, token: NewOrUpdateAccessToken): Promise<AccessToken> {
+    async updateAccessToken(id: string, token: NewOrUpdateAccessToken) {
       const { data, error } = await this.rawClient.PUT('/api/admin/access_tokens/{id}', {
         body: token,
         params: { path: { id } },
diff --git a/frontend/lib/admin-state.ts b/frontend/lib/admin-state.ts
index aaa5bcf..ddb5262 100644
--- a/frontend/lib/admin-state.ts
+++ b/frontend/lib/admin-state.ts
@@ -94,12 +94,35 @@ export class AppState {
       general: {
         subtitle: 'Carte associative',
         title: 'SafeHaven',
+        information: null,
+        logo_url: null,
+        redirect_url: null,
+      },
+      cartography_source: {
+        dark_map_attributions: '',
+        dark_map_url: '',
+        light_map_attributions: '',
+        light_map_url: '',
+      },
+      init_popup: {
+        popup: null,
+        popup_check_text: null,
+      },
+      safe_mode: {
+        enabled: false,
+        hcaptcha_secret: '',
+        hcaptcha_sitekey: '',
+      },
+      cartography_init: {
+        center_lat: 0,
+        center_lng: 0,
+        zoom: 0,
+      },
+      cartography_cluster: {
+        characteristic_distance: 0,
+        declustering_speed: 0,
+        minimal_cluster_size: 0,
       },
-      cartography_source: {},
-      init_popup: {},
-      safe_mode: {},
-      cartography_init: {},
-      cartography_cluster: {},
     }
 
     if (raw_options.general.information != undefined)
diff --git a/frontend/lib/viewer-state.ts b/frontend/lib/viewer-state.ts
index f91c333..5c5ab17 100644
--- a/frontend/lib/viewer-state.ts
+++ b/frontend/lib/viewer-state.ts
@@ -12,8 +12,8 @@ import type {
   FetchedEntity,
   InitConfig,
   EnumFilter,
-  PublicPermissions,
   ViewerPaginatedCachedEntities,
+  LimitedPublicPermissions,
 } from '~/lib'
 
 type ViewData = {
@@ -34,7 +34,7 @@ export class AppState {
   }
 
   public initConfig: InitConfig | null = null
-  public permissions: PublicPermissions | null = null
+  public permissions: LimitedPublicPermissions | null = null
 
   private familiesData: Family[] | null = null
   private categoriesData: AllowedCategory[] | null = null
@@ -278,7 +278,7 @@ export class AppState {
           }
         })
 
-    this.familiesData.forEach((family) => {
+    this.familiesData?.forEach((family) => {
       this.familiesLookupTable[family.id] = family
     })
 
@@ -290,11 +290,11 @@ export class AppState {
       this.tagsLookupTable[tag.id] = tag
     })
 
-    if (this.familiesData.length === 0) {
+    if (this.familiesData?.length === 0) {
       throw new Error('No families available')
     }
 
-    this.activeFamily = this.familiesData[0]
+    this.activeFamily = this.familiesData![0]
 
     this.initialized = true
   }
diff --git a/frontend/openapi.json b/frontend/openapi.json
index fcf1576..3d8e7ed 100644
--- a/frontend/openapi.json
+++ b/frontend/openapi.json
@@ -946,7 +946,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PaginatedVec"
+                  "$ref": "#/components/schemas/AdminCachedEntitiesWithPagination"
                 }
               }
             }
@@ -1823,7 +1823,78 @@
         "operationId": "admin_count_comments_entities",
         "responses": {
           "200": {
-            "description": "Dicts of entities and comments counts by family and category id"
+            "description": "Dicts of entities and comments counts by family and category id",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "allOf": [
+                      {
+                        "type": "object",
+                        "additionalProperties": {
+                          "type": "array",
+                          "items": {
+                            "allOf": [
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              }
+                            ]
+                          }
+                        }
+                      },
+                      {
+                        "type": "object",
+                        "additionalProperties": {
+                          "type": "array",
+                          "items": {
+                            "allOf": [
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              },
+                              {
+                                "type": "integer",
+                                "format": "int32",
+                                "minimum": 0
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
           },
           "401": {
             "description": "Invalid permissions",
@@ -2545,7 +2616,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PaginatedVec"
+                  "$ref": "#/components/schemas/ViewerCachedEntitiesWithPagination"
                 }
               }
             }
@@ -2658,7 +2729,7 @@
             "format": "int64"
           },
           "permissions": {
-            "type": "object"
+            "$ref": "#/components/schemas/Permissions"
           },
           "title": {
             "type": "string"
@@ -2676,10 +2747,49 @@
         ],
         "properties": {
           "origins": {
-            "type": "object"
+            "type": "object",
+            "additionalProperties": {
+              "type": "integer",
+              "format": "int32",
+              "minimum": 0
+            }
           },
           "visits_30_days": {
-            "type": "object"
+            "type": "object",
+            "additionalProperties": {
+              "type": "integer",
+              "format": "int32",
+              "minimum": 0
+            }
+          }
+        }
+      },
+      "AdminCachedEntitiesWithPagination": {
+        "type": "object",
+        "required": [
+          "entities",
+          "total_results",
+          "total_pages",
+          "response_current_page"
+        ],
+        "properties": {
+          "entities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AdminCachedEntity"
+            }
+          },
+          "response_current_page": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "total_pages": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "total_results": {
+            "type": "integer",
+            "format": "int64"
           }
         }
       },
@@ -2822,7 +2932,10 @@
             "format": "uuid"
           },
           "locations": {
-            "type": "object"
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UnprocessedLocation"
+            }
           },
           "moderated": {
             "type": "boolean"
@@ -2897,7 +3010,10 @@
             "format": "uuid"
           },
           "locations": {
-            "type": "object"
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UnprocessedLocation"
+            }
           },
           "moderated": {
             "type": "boolean"
@@ -3075,7 +3191,10 @@
             "type": "boolean"
           },
           "locations": {
-            "type": "object"
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UnprocessedLocation"
+            }
           },
           "moderated": {
             "type": "boolean"
@@ -3468,10 +3587,10 @@
         ],
         "properties": {
           "comment_form": {
-            "type": "object"
+            "$ref": "#/components/schemas/Form"
           },
           "entity_form": {
-            "type": "object"
+            "$ref": "#/components/schemas/Form"
           },
           "icon_hash": {
             "type": "string",
@@ -3587,7 +3706,6 @@
             "$ref": "#/components/schemas/FieldType"
           },
           "field_type_metadata": {
-            "type": "object",
             "description": "Used to store detail about the field that relevent\nonly for the frontend. For instance, if the field is an enum\nuse it to store possible values. If it is a SingleLineText, specify\nif it's an email, a phone number, etc..."
           },
           "form_page": {
@@ -3733,7 +3851,11 @@
             "format": "int64"
           },
           "visits_30_days": {
-            "type": "object"
+            "type": "object",
+            "additionalProperties": {
+              "type": "integer",
+              "format": "int64"
+            }
           }
         }
       },
@@ -3852,7 +3974,7 @@
             "type": "boolean"
           },
           "permissions": {
-            "type": "object"
+            "$ref": "#/components/schemas/Permissions"
           },
           "title": {
             "type": "string"
@@ -3983,32 +4105,6 @@
           }
         }
       },
-      "PaginatedVec": {
-        "type": "object",
-        "required": [
-          "entities",
-          "total_results",
-          "total_pages",
-          "response_current_page"
-        ],
-        "properties": {
-          "entities": {
-            "type": "object"
-          },
-          "response_current_page": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "total_pages": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "total_results": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
       "ParentRepresentation": {
         "type": "object",
         "required": [
@@ -4172,7 +4268,7 @@
             "format": "uuid"
           },
           "comment_form": {
-            "type": "object"
+            "$ref": "#/components/schemas/Form"
           },
           "created_at": {
             "type": "string",
@@ -4183,7 +4279,7 @@
             "type": "string"
           },
           "entity_form": {
-            "type": "object"
+            "$ref": "#/components/schemas/Form"
           },
           "family_id": {
             "type": "string",
@@ -4194,7 +4290,10 @@
             "format": "uuid"
           },
           "locations": {
-            "type": "object"
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UnprocessedLocation"
+            }
           },
           "tags": {
             "type": "array",
@@ -4672,6 +4771,35 @@
           }
         }
       },
+      "ViewerCachedEntitiesWithPagination": {
+        "type": "object",
+        "required": [
+          "entities",
+          "total_results",
+          "total_pages",
+          "response_current_page"
+        ],
+        "properties": {
+          "entities": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ViewerSearchedCachedEntity"
+            }
+          },
+          "response_current_page": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "total_pages": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "total_results": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
       "ViewerCachedEntity": {
         "type": "object",
         "required": [
diff --git a/frontend/pages/admin/access-tokens/[id].vue b/frontend/pages/admin/access-tokens/[id].vue
index bc85900..840e7b2 100644
--- a/frontend/pages/admin/access-tokens/[id].vue
+++ b/frontend/pages/admin/access-tokens/[id].vue
@@ -125,7 +125,7 @@
     <PolygonDrawer
       v-if="geographicRestrictionsOn"
       ref="polygonDrawer"
-      v-model:polygon-list="editedAccessToken.permissions.geographic_restrictions"
+      v-model:polygon-list="editedAccessToken.permissions.geographic_restrictions as [number, number][][]"
       :max-polygons="3"
     />