sort workshops

GitNation · Oct 24, 2024 · 97625dd · 97625dd
1 parent b377571
commit 97625dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@focus-reactive/graphql-content-layer",
-  "version": "3.1.28",
+  "version": "3.1.29",
   "private": false,
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/fetch-workshops.js b/src/fetch-workshops.js
@@ -182,6 +182,8 @@ const fetchData = async (client, vars) => {
       additionalInfo: await markdownToHtml(wrp.additionalInfo),
       prerequisites: await markdownToHtml(wrp.prerequisites),
       finishingTime: '',
+      startDate:
+        wrp.startDate || dayjs(wrp.location, 'MMMM D, HH').toISOString(),
     })),
   );
 
@@ -220,10 +222,17 @@ const fetchData = async (client, vars) => {
     ),
   );
 
+  const sortedWorkshops = allWorkshops.sort((a, b) => {
+    return (
+      Number(a.includedToPackage) - Number(b.includedToPackage) ||
+      new Date(a.startDate).getTime() - new Date(b.startDate).getTime()
+    );
+  });
+
   return {
     trainers,
     workshopDays: data.length,
-    workshops: allWorkshops,
+    workshops: sortedWorkshops,
     speakers: {
       workshops: trainers,
     },