Add slug to Dataset to fix issue w/ labels layer

Vizzuality · Aug 30, 2024 · 0e1ded0 · 0e1ded0
1 parent cdf3d07
commit 0e1ded0
Show file tree

Hide file tree

Showing 8 changed files with 873 additions and 890 deletions.
diff --git a/cms/config/sync/admin-role.strapi-author.json b/cms/config/sync/admin-role.strapi-author.json
diff --git a/cms/config/sync/admin-role.strapi-editor.json b/cms/config/sync/admin-role.strapi-editor.json
diff --git a/cms/config/sync/admin-role.strapi-super-admin.json b/cms/config/sync/admin-role.strapi-super-admin.json
diff --git a/.../core-store.plugin_content_manager_configuration_content_types##api##dataset.dataset.json b/.../core-store.plugin_content_manager_configuration_content_types##api##dataset.dataset.json
@@ -49,6 +49,20 @@
           "sortable": false
         }
       },
+      "slug": {
+        "edit": {
+          "label": "slug",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "slug",
+          "searchable": true,
+          "sortable": true
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -109,23 +123,29 @@
       }
     },
     "layouts": {
-      "list": [
-        "id",
-        "name",
-        "layers",
-        "createdAt"
-      ],
       "edit": [
         [
           {
             "name": "name",
             "size": 6
           },
+          {
+            "name": "slug",
+            "size": 6
+          }
+        ],
+        [
           {
             "name": "layers",
             "size": 6
           }
         ]
+      ],
+      "list": [
+        "id",
+        "name",
+        "layers",
+        "createdAt"
       ]
     }
   },

diff --git a/cms/src/api/dataset/content-types/dataset/schema.json b/cms/src/api/dataset/content-types/dataset/schema.json
@@ -30,6 +30,16 @@
       "type": "relation",
       "relation": "oneToMany",
       "target": "api::layer.layer"
+    },
+    "slug": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": false
+        }
+      },
+      "type": "string",
+      "unique": false,
+      "required": true
     }
   }
 }
diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts
@@ -1132,6 +1132,13 @@ export interface ApiDatasetDataset extends Schema.CollectionType {
       'oneToMany',
       'api::layer.layer'
     >;
+    slug: Attribute.String &
+      Attribute.Required &
+      Attribute.SetPluginOptions<{
+        i18n: {
+          localized: false;
+        };
+      }>;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;

diff --git a/frontend/src/containers/map/sidebar/layers-panel/index.tsx b/frontend/src/containers/map/sidebar/layers-panel/index.tsx
@@ -120,7 +120,7 @@ const LayersPanel: FCWithMessages = (): JSX.Element => {
                 })}
 
                 <>
-                  {dataset.attributes?.name === 'Basemap' && (
+                  {dataset.attributes?.slug === 'basemap' && (
                     <li className="flex items-center justify-between">
                       <span className="flex gap-2">
                         <Switch

diff --git a/frontend/src/types/generated/strapi.schemas.ts b/frontend/src/types/generated/strapi.schemas.ts
@@ -2151,6 +2151,7 @@ export type ProtectionCoverageStatLocationDataAttributesFishingProtectionLevelSt
     location?: ProtectionCoverageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
     fishing_protection_level?: ProtectionCoverageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
     area?: number;
+    pct?: number;
     createdAt?: string;
     updatedAt?: string;
     createdBy?: ProtectionCoverageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -2852,6 +2853,7 @@ export type MpaaProtectionLevelStatLocationDataAttributesFishingProtectionLevelS
     location?: MpaaProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
     fishing_protection_level?: MpaaProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
     area?: number;
+    pct?: number;
     createdAt?: string;
     updatedAt?: string;
     createdBy?: MpaaProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -3927,6 +3929,7 @@ export type MpaaEstablishmentStageStatLocationDataAttributesFishingProtectionLev
     location?: MpaaEstablishmentStageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
     fishing_protection_level?: MpaaEstablishmentStageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
     area?: number;
+    pct?: number;
     createdAt?: string;
     updatedAt?: string;
     createdBy?: MpaaEstablishmentStageStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -5295,6 +5298,7 @@ export type MpaChildrenDataItemAttributesLocationDataAttributesFishingProtection
     location?: MpaChildrenDataItemAttributesLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
     fishing_protection_level?: MpaChildrenDataItemAttributesLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
     area?: number;
+    pct?: number;
     createdAt?: string;
     updatedAt?: string;
     createdBy?: MpaChildrenDataItemAttributesLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -6164,6 +6168,7 @@ export type LocationGroupsDataItemAttributesFishingProtectionLevelStatsDataItemA
   location?: LocationGroupsDataItemAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
   fishing_protection_level?: LocationGroupsDataItemAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
   area?: number;
+  pct?: number;
   createdAt?: string;
   updatedAt?: string;
   createdBy?: LocationGroupsDataItemAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -6662,6 +6667,7 @@ export type LayerDatasetDataAttributesLocalizations = {
 export type LayerDatasetDataAttributes = {
   name?: string;
   layers?: LayerDatasetDataAttributesLayers;
+  slug?: string;
   createdAt?: string;
   updatedAt?: string;
   publishedAt?: string;
@@ -7515,6 +7521,7 @@ export type HabitatStatLocationDataAttributesFishingProtectionLevelStatsDataItem
   location?: HabitatStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
   fishing_protection_level?: HabitatStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
   area?: number;
+  pct?: number;
   createdAt?: string;
   updatedAt?: string;
   createdBy?: HabitatStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -8169,6 +8176,7 @@ export interface FishingProtectionLevelStat {
   location?: FishingProtectionLevelStatLocation;
   fishing_protection_level?: FishingProtectionLevelStatFishingProtectionLevel;
   area: number;
+  pct?: number;
   createdAt?: string;
   updatedAt?: string;
   createdBy?: FishingProtectionLevelStatCreatedBy;
@@ -8521,6 +8529,7 @@ export type FishingProtectionLevelStatLocationDataAttributesFishingProtectionLev
     location?: FishingProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesLocation;
     fishing_protection_level?: FishingProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesFishingProtectionLevel;
     area?: number;
+    pct?: number;
     createdAt?: string;
     updatedAt?: string;
     createdBy?: FishingProtectionLevelStatLocationDataAttributesFishingProtectionLevelStatsDataItemAttributesCreatedBy;
@@ -9141,6 +9150,7 @@ export type DatasetCreatedBy = {
 export interface Dataset {
   name: string;
   layers?: DatasetLayers;
+  slug: string;
   createdAt?: string;
   updatedAt?: string;
   publishedAt?: string;
@@ -9237,6 +9247,7 @@ export type DatasetLayersDataItemAttributesDatasetDataAttributesLocalizations =
 export type DatasetLayersDataItemAttributesDatasetDataAttributes = {
   name?: string;
   layers?: DatasetLayersDataItemAttributesDatasetDataAttributesLayers;
+  slug?: string;
   createdAt?: string;
   updatedAt?: string;
   publishedAt?: string;
@@ -9544,6 +9555,7 @@ export type DatasetRequestDataLayersItem = number | string;
 export type DatasetRequestData = {
   name: string;
   layers?: DatasetRequestDataLayersItem[];
+  slug: string;
   locale?: string;
 };
 
@@ -9556,6 +9568,7 @@ export type DatasetLocalizationRequestLayersItem = number | string;
 export interface DatasetLocalizationRequest {
   name: string;
   layers?: DatasetLocalizationRequestLayersItem[];
+  slug: string;
   locale: string;
 }