Merge branch 'staging' of github.com:Vizzuality/global-rangelands-dat…

…a-platform into staging
Vizzuality · Jun 13, 2024 · a7a50a8 · a7a50a8
2 parents 249652d + d131524
commit a7a50a8
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 19 deletions.
diff --git a/client/src/types/generated/strapi.schemas.ts b/client/src/types/generated/strapi.schemas.ts
@@ -1821,6 +1821,7 @@ export interface Dataset {
   citations?: DefaultCitationsComponent[];
   createdAt?: string;
   createdBy?: DatasetCreatedBy;
+  description?: string;
   layers: DefaultLayerComponent[];
   locale?: string;
   localizations?: DatasetLocalizations;
@@ -1902,6 +1903,7 @@ export const DatasetRequestDataType = {
 
 export type DatasetRequestData = {
   citations?: DefaultCitationsComponent[];
+  description?: string;
   layers: DefaultLayerComponent[];
   locale?: string;
   slug?: string;
@@ -1925,6 +1927,7 @@ export const DatasetLocalizationRequestType = {
 
 export interface DatasetLocalizationRequest {
   citations?: DefaultCitationsComponent[];
+  description?: string;
   layers: DefaultLayerComponent[];
   locale: string;
   slug?: string;

diff --git a/cms/config/sync/admin-role.strapi-super-admin.json b/cms/config/sync/admin-role.strapi-super-admin.json
@@ -17,7 +17,8 @@
           "citations.url",
           "sources.name",
           "sources.url",
-          "slug"
+          "slug",
+          "description"
         ],
         "locales": [
           "en",
@@ -67,7 +68,8 @@
           "citations.url",
           "sources.name",
           "sources.url",
-          "slug"
+          "slug",
+          "description"
         ],
         "locales": [
           "en",
@@ -91,7 +93,8 @@
           "citations.url",
           "sources.name",
           "sources.url",
-          "slug"
+          "slug",
+          "description"
         ],
         "locales": [
           "en",
@@ -110,7 +113,8 @@
           "title",
           "slug",
           "code",
-          "rangeland"
+          "rangeland",
+          "color"
         ],
         "locales": [
           "en",
@@ -155,7 +159,8 @@
           "title",
           "slug",
           "code",
-          "rangeland"
+          "rangeland",
+          "color"
         ],
         "locales": [
           "en",
@@ -174,7 +179,8 @@
           "title",
           "slug",
           "code",
-          "rangeland"
+          "rangeland",
+          "color"
         ],
         "locales": [
           "en",

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
@@ -103,6 +103,20 @@
           "sortable": true
         }
       },
+      "description": {
+        "edit": {
+          "label": "description",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "description",
+          "searchable": true,
+          "sortable": true
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -163,6 +177,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "title",
+        "type",
+        "layers"
+      ],
       "edit": [
         [
           {
@@ -199,13 +219,13 @@
             "name": "sources",
             "size": 12
           }
+        ],
+        [
+          {
+            "name": "description",
+            "size": 6
+          }
         ]
-      ],
-      "list": [
-        "id",
-        "title",
-        "type",
-        "layers"
       ]
     },
     "uid": "api::dataset.dataset"

diff --git a/...e-store.plugin_content_manager_configuration_content_types##api##ecoregion.ecoregion.json b/...e-store.plugin_content_manager_configuration_content_types##api##ecoregion.ecoregion.json
@@ -76,6 +76,20 @@
           "sortable": true
         }
       },
+      "color": {
+        "edit": {
+          "label": "color",
+          "description": "",
+          "placeholder": "",
+          "visible": true,
+          "editable": true
+        },
+        "list": {
+          "label": "color",
+          "searchable": true,
+          "sortable": true
+        }
+      },
       "createdAt": {
         "edit": {
           "label": "createdAt",
@@ -136,6 +150,12 @@
       }
     },
     "layouts": {
+      "list": [
+        "id",
+        "title",
+        "slug",
+        "code"
+      ],
       "edit": [
         [
           {
@@ -159,14 +179,12 @@
           {
             "name": "rangeland",
             "size": 6
+          },
+          {
+            "name": "color",
+            "size": 6
           }
         ]
-      ],
-      "list": [
-        "id",
-        "title",
-        "slug",
-        "code"
       ]
     },
     "uid": "api::ecoregion.ecoregion"

diff --git a/cms/src/api/dataset/content-types/dataset/schema.json b/cms/src/api/dataset/content-types/dataset/schema.json
@@ -79,6 +79,14 @@
         }
       },
       "type": "string"
+    },
+    "description": {
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "type": "text"
     }
   }
 }
diff --git a/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/cms/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -21,7 +21,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2024-06-13T09:41:29.062Z"
+    "x-generation-date": "2024-06-13T09:43:31.605Z"
   },
   "servers": [
     {
@@ -126,6 +126,9 @@
           "slug": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "locale": {
             "type": "string"
           }
@@ -176,6 +179,9 @@
               "slug": {
                 "type": "string"
               },
+              "description": {
+                "type": "string"
+              },
               "locale": {
                 "type": "string"
               }
@@ -336,6 +342,9 @@
           "slug": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "createdAt": {
             "type": "string",
             "format": "date-time"

diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts
@@ -420,6 +420,12 @@ export interface ApiDatasetDataset extends Schema.CollectionType {
           localized: false;
         };
       }>;
+    description: Attribute.Text &
+      Attribute.SetPluginOptions<{
+        i18n: {
+          localized: true;
+        };
+      }>;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;