Merge branch 'master' into feat(frontend)/add-overlay-scrollbar

Author: alcercu

cms-backend/src/api/annual-report/content-types/annual-report/schema.json

@@ -12,11 +12,18 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "url": {
-      "type": "string"
-    },
     "year": {
       "type": "integer"
+    },
+    "file": {
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ],
+      "type": "media",
+      "multiple": true
     }
   }
 }

cms-backend/src/api/risk-report/content-types/risk-report/schema.json

@@ -12,9 +12,6 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "url": {
-      "type": "string"
-    },
     "month": {
       "type": "enumeration",
       "enum": [
@@ -34,6 +31,16 @@
     },
     "year": {
       "type": "integer"
+    },
+    "file": {
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ],
+      "type": "media",
+      "multiple": true
     }
   }
 }

cms-backend/src/api/treasury-report/content-types/treasury-report/schema.json

@@ -12,9 +12,6 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "url": {
-      "type": "string"
-    },
     "month": {
       "type": "enumeration",
       "enum": [
@@ -34,6 +31,16 @@
     },
     "year": {
       "type": "integer"
+    },
+    "file": {
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ],
+      "type": "media",
+      "multiple": true
     }
   }
 }

cms-backend/src/components/r-and-d-page/downloadable-format.json

@@ -0,0 +1,22 @@
+{
+  "collectionName": "components_r_and_d_page_downloadable_formats",
+  "info": {
+    "displayName": "DownloadableFormat"
+  },
+  "options": {},
+  "attributes": {
+    "name": {
+      "type": "string"
+    },
+    "file": {
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ],
+      "type": "media",
+      "multiple": true
+    }
+  }
+}

cms-backend/src/components/r-and-d-page/kleros-book.json

@@ -1,7 +1,8 @@
 {
   "collectionName": "components_r_and_d_page_kleros_books",
   "info": {
-    "displayName": "KlerosBook"
+    "displayName": "KlerosBook",
+    "description": ""
   },
   "options": {},
   "attributes": {
@@ -11,20 +12,21 @@
     "bookTitle": {
       "type": "string"
     },
-    "downloadFormats": {
-      "type": "component",
-      "repeatable": true,
-      "component": "content.button-link"
-    },
     "bookCover": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
       "allowedTypes": [
         "images",
         "files",
         "videos",
         "audios"
-      ],
-      "type": "media",
-      "multiple": false
+      ]
+    },
+    "downloadFormats": {
+      "type": "component",
+      "repeatable": true,
+      "component": "r-and-d-page.downloadable-format"
     }
   }
 }

cms-backend/types/generated/components.d.ts

@@ -308,15 +308,33 @@ export interface PnkTokenPageTokenStatDisplay extends Struct.ComponentSchema {
   };
 }
 
+export interface RAndDPageDownloadableFormat extends Struct.ComponentSchema {
+  collectionName: 'components_r_and_d_page_downloadable_formats';
+  info: {
+    displayName: 'DownloadableFormat';
+  };
+  attributes: {
+    file: Schema.Attribute.Media<
+      'images' | 'files' | 'videos' | 'audios',
+      true
+    >;
+    name: Schema.Attribute.String;
+  };
+}
+
 export interface RAndDPageKlerosBook extends Struct.ComponentSchema {
   collectionName: 'components_r_and_d_page_kleros_books';
   info: {
+    description: '';
     displayName: 'KlerosBook';
   };
   attributes: {
     bookCover: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
     bookTitle: Schema.Attribute.String;
-    downloadFormats: Schema.Attribute.Component<'content.button-link', true>;
+    downloadFormats: Schema.Attribute.Component<
+      'r-and-d-page.downloadable-format',
+      true
+    >;
     subtitle: Schema.Attribute.String;
   };
 }
@@ -402,6 +420,7 @@ declare module '@strapi/strapi' {
       'home.cta': HomeCta;
       'home.introduction': HomeIntroduction;
       'pnk-token-page.token-stat-display': PnkTokenPageTokenStatDisplay;
+      'r-and-d-page.downloadable-format': RAndDPageDownloadableFormat;
       'r-and-d-page.kleros-book': RAndDPageKlerosBook;
       'r-and-d-page.waitlist-section': RAndDPageWaitlistSection;
       'table.table': TableTable;

cms-backend/types/generated/contentTypes.d.ts

@@ -385,6 +385,10 @@ export interface ApiAnnualReportAnnualReport
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
+    file: Schema.Attribute.Media<
+      'images' | 'files' | 'videos' | 'audios',
+      true
+    >;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<
       'oneToMany',
@@ -395,7 +399,6 @@ export interface ApiAnnualReportAnnualReport
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    url: Schema.Attribute.String;
     year: Schema.Attribute.Integer;
   };
 }
@@ -2330,6 +2333,10 @@ export interface ApiRiskReportRiskReport extends Struct.CollectionTypeSchema {
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
+    file: Schema.Attribute.Media<
+      'images' | 'files' | 'videos' | 'audios',
+      true
+    >;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<
       'oneToMany',
@@ -2356,7 +2363,6 @@ export interface ApiRiskReportRiskReport extends Struct.CollectionTypeSchema {
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    url: Schema.Attribute.String;
     year: Schema.Attribute.Integer;
   };
 }
@@ -2598,6 +2604,10 @@ export interface ApiTreasuryReportTreasuryReport
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
+    file: Schema.Attribute.Media<
+      'images' | 'files' | 'videos' | 'audios',
+      true
+    >;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<
       'oneToMany',
@@ -2624,7 +2634,6 @@ export interface ApiTreasuryReportTreasuryReport
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
-    url: Schema.Attribute.String;
     year: Schema.Attribute.Integer;
   };
 }