rename invite->calendar, calendar is optional on dev_meeting

ocaml · Nov 13, 2023 · 58abe45 · 58abe45
1 parent b2b3a25
commit 58abe45
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/data/governance.yml b/data/governance.yml
@@ -256,7 +256,7 @@ teams:
       date: Every third Tuesday
       time: 6:00 PM CET
       link: https://meet.google.com/bwy-fyqo-dnf
-      invite: https://calendar.google.com/calendar/u/4?cid=Y19iMDA5ZDA4MDg0YzIwYWMzMDQ4NjJhN2FkZWJiYjdmOTU0NGIxYzEwMmU0MDMyMTAzMDFiY2ZhYjcwMDBmMjNlQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
+      calendar: https://calendar.google.com/calendar/u/4?cid=Y19iMDA5ZDA4MDg0YzIwYWMzMDQ4NjJhN2FkZWJiYjdmOTU0NGIxYzEwMmU0MDMyMTAzMDFiY2ZhYjcwMDBmMjNlQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
       notes: https://github.com/ocaml-ppx/ppxlib/wiki
     members:
     - name: Sonja Heinze
@@ -504,7 +504,7 @@ working-groups:
     date: Biweekly on Mondays
     time: 10:00 AM BST
     link: http://meet.google.com/byo-dfiz-dou
-    invite: https://calendar.google.com/calendar/u/4?cid=Y19iMDA5ZDA4MDg0YzIwYWMzMDQ4NjJhN2FkZWJiYjdmOTU0NGIxYzEwMmU0MDMyMTAzMDFiY2ZhYjcwMDBmMjNlQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
+    calendar: https://calendar.google.com/calendar/u/4?cid=Y19iMDA5ZDA4MDg0YzIwYWMzMDQ4NjJhN2FkZWJiYjdmOTU0NGIxYzEwMmU0MDMyMTAzMDFiY2ZhYjcwMDBmMjNlQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
     notes: https://docs.google.com/document/d/1ZBfbjAkvEkv9ldumpZV5VXrEc_HpPeYjHPW_TiwJe4Q/
   members:
   - name: Sudha Parimala
@@ -541,7 +541,7 @@ working-groups:
     date: Biweekly on Mondays
     time: 18:00 CET
     link: https://us06web.zoom.us/j/86793886593?pwd=cXFMN201dGY0b0w3VDZoTXV1MUlMdz09
-    invite: https://calendar.google.com/calendar/u/0?cid=Y18wMmU0MWIyYWQwMDE2NWI0MDQ3ODlmYWQ3YzVkZjdlYTNhNGFlNjI3NDRjMTMzMDdlZTdmYjNmZDczODJmMWRkQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
+    calendar: https://calendar.google.com/calendar/u/0?cid=Y18wMmU0MWIyYWQwMDE2NWI0MDQ3ODlmYWQ3YzVkZjdlYTNhNGFlNjI3NDRjMTMzMDdlZTdmYjNmZDczODJmMWRkQGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20
     notes: https://docs.google.com/document/d/1ricnsicOB35TmuOM86guYr6HWo8A1iyVrHdb0cNxOXg/edit
   members:
   - name: Sabine Schmaltz

diff --git a/src/ocamlorg_data/data.mli b/src/ocamlorg_data/data.mli
@@ -476,7 +476,7 @@ module Governance : sig
     date : string;
     time : string;
     link : string;
-    invite : string;
+    calendar : string option;
     notes : string;
   }
 

diff --git a/src/ocamlorg_frontend/pages/governance_team.eml b/src/ocamlorg_frontend/pages/governance_team.eml
@@ -29,10 +29,12 @@ let render_dev_meeting (dev_meeting : Data.Governance.dev_meeting) _class =
         <%s! Icons.community "w-6 h-6" %>
         Meeting Link
       </a>
-      <a class="underline flex gap-1 py-2 font-semibold" href="<%s dev_meeting.invite %>">
+      <% match dev_meeting.calendar with | None -> () | Some calendar -> %>
+      <a class="underline flex gap-1 py-2 font-semibold" href="<%s calendar %>">
         <%s! Icons.calendar "w-6 h-6" %>
         Calendar Invite
       </a>
+      <% ; %>
     </div>
   </div>
 

diff --git a/tool/ood-gen/lib/governance.ml b/tool/ood-gen/lib/governance.ml
@@ -34,7 +34,7 @@ type dev_meeting = {
   date : string;
   time : string;
   link : string;
-  invite : string;
+  calendar : string option;
   notes : string;
 }
 [@@deriving yaml, show { with_path = false }]
@@ -89,7 +89,7 @@ type dev_meeting = {
   date : string;
   time : string;
   link : string;
-  invite : string;
+  calendar : string option;
   notes : string;
 }