chore(release): prepare next version

.github/workflows/deploy-appengine-dev.yml

@@ -31,6 +31,7 @@ jobs:
       GCS_UNIFORM: ${{ secrets.GCS_UNIFORM }}
       GCS_SERVICE_ACCOUNT: ${{ secrets.GCP_SA_KEY }}
       SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+      TRANSFER_TOKEN_SALT: ${{ secrets.TRANSFER_TOKEN_SALT }}
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/deploy-appengine.yml

@@ -31,6 +31,7 @@ jobs:
       GCS_UNIFORM: ${{ secrets.GCS_UNIFORM }}
       GCS_SERVICE_ACCOUNT: ${{ secrets.GCP_SA_KEY }}
       SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+      TRANSFER_TOKEN_SALT: ${{ secrets.TRANSFER_TOKEN_SALT }}
 
     steps:
       - uses: actions/checkout@v3

config/functions.js

@@ -106,7 +106,7 @@ module.exports = {
       if (authType === 'Basic') {
         const base64Credentials = authHeader.split(' ')[1];
         const decodedCredentials = Buffer.from(base64Credentials, 'base64').toString('ascii');
-        const [_username, password] = decodedCredentials.split(':');
+        const [, password] = decodedCredentials.split(':');
 
         if (!password) {
           return 'Password is required';
@@ -199,5 +199,21 @@ module.exports = {
     }, {}));
 
     return terms;
-  }
-};
+  },
+
+  paginate(results, { page = 1, pageSize = 25 }) {
+    const paginatedResults = results.slice(
+      (page - 1) * pageSize,
+      page * pageSize
+    );
+    const meta = {
+      pagination: {
+        page: page,
+        total: results.length,
+        pageCount: Math.ceil(results.length / pageSize),
+        pageSize: pageSize,
+      }
+    };
+    return { results: paginatedResults, meta };
+  },
+};

src/api/study/content-types/study/schema.json

@@ -94,6 +94,9 @@
       "type": "component",
       "repeatable": true,
       "component": "data.media"
+    },
+    "landing_page": {
+      "type": "richtext"
     }
   }
 }

src/api/study/controllers/study.js

@@ -9,9 +9,8 @@ const { NotFoundError } = require('@strapi/utils').errors;
 
 module.exports = createCoreController('api::study.study', ({ strapi }) => ({
   async find(ctx) {
-
     // If not providing a dataset id, return only studies that are listed
-    if (!ctx.query.filters?.datasets?.id?.$eq){
+    if (!ctx.query.filters?.datasets?.id?.$eq) {
       ctx.query.filters = {
         ...ctx.query.filters,
         is_listed: true,
@@ -79,7 +78,7 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
           fields: ['name', 'description', 'type', 'category'],
         },
         cover_dataset: {
-          fields: [false],
+          fields: ['id'],
           populate: ['media'],
         },
       },
@@ -114,6 +113,33 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
       };
     }
 
+    // If sorting by publication date, get studies and manually sort
+    // as nested sorting returns duplicates (https://github.com/strapi/strapi/issues/11892)
+    const [sort, order = 'asc'] = ctx.query.sort?.split(':') || [];
+    if (sort === 'publications.date') {
+      const studies = await strapi.entityService.findMany(
+        'api::study.study',
+        ctx.query
+      );
+
+      studies.sort((a, b) => {
+        const aLatest = Math.max(
+          ...(a.publications || []).map((p) => new Date(p.date)),
+          0
+        );
+        const bLatest = Math.max(
+          ...(b.publications || []).map((p) => new Date(p.date)),
+          0
+        );
+        return order === 'asc' ? aLatest - bLatest : bLatest - aLatest;
+      });
+
+      const { results: paginatedStudies, meta } =
+        strapi.config.functions.paginate(studies, ctx.query.pagination || {});
+
+      return this.transformResponse(paginatedStudies, meta);
+    }
+
     return await super.find(ctx);
   },
   async findOne(ctx) {
@@ -127,6 +153,7 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
         'slug',
         'lay_summary',
         'cover_video',
+        'landing_page',
         'createdAt',
         'updatedAt',
       ],
@@ -199,7 +226,7 @@ module.exports = createCoreController('api::study.study', ({ strapi }) => ({
           populate: ['media', 'data', 'resources'],
         },
         resources: true,
-        media: { fields: ['title', 'type'], populate: ['file']},
+        media: { fields: ['title', 'type'], populate: ['file'] },
         cover_dataset: {
           fields: [],
           populate: ['media'],