pat-calendar: Do not include properties not existent in the event source. Avoids problem of setting a href attribute of undefined in the calendar.

Author: thet

src/pat/calendar/calendar.js

@@ -252,6 +252,11 @@ export default Base.extend({
             contact_email: event.contact_email,
             event_url: event.event_url,
         };
+        for (const prop in ret) {
+            if (!ret[prop]) {
+                delete ret[prop];
+            }
+        }
         return ret;
     },
 

src/pat/calendar/calendar.test.js

@@ -13,9 +13,10 @@ const mockFetch = () =>
                         end: "2020-10-10T12:00:00Z",
                     },
                     {
-                        title: "Event 2",
-                        start: "2020-10-12",
-                        end: "2020-10-12",
+                        "title": "Event 2",
+                        "start": "2020-10-12",
+                        "end": "2020-10-12",
+                        "@id": "./test_event.html",
                     },
                     {
                         title: "Event 3",
@@ -228,6 +229,33 @@ describe("Calendar tests", () => {
         done();
     });
 
+    it("Loads events and does not set the href if not present", async (done) => {
+        const el = document.querySelector(".pat-calendar");
+        el.setAttribute(
+            "data-pat-calendar",
+            "initial-date: 2020-10-10; url: ./test.json;"
+        );
+
+        global.fetch = jest.fn().mockImplementation(mockFetch);
+
+        registry.scan(document.body);
+        await utils.timeout(1); // wait a tick for async to settle.
+
+        const events = [...document.querySelectorAll(".fc-event-title")];
+
+        const event1 = events.filter((it) => it.textContent === "Event 1")[0].closest(".fc-event"); // prettier-ignore
+        const event2 = events.filter((it) => it.textContent === "Event 2")[0].closest(".fc-event"); // prettier-ignore
+        const event3 = events.filter((it) => it.textContent === "Event 3")[0].closest(".fc-event"); // prettier-ignore
+
+        expect(event1.href).toBeFalsy();
+        expect(event2.href).toBe("http://localhost/test_event.html");
+        expect(event3.href).toBeFalsy();
+
+        global.fetch.mockClear();
+        delete global.fetch;
+        done();
+    });
+
     it("Loads correct date if set in query string", async (done) => {
         const el = document.querySelector(".pat-calendar");
         el.setAttribute("data-pat-calendar", "timezone: Europe/Berlin");

src/pat/calendar/test_event_source.json

@@ -4,13 +4,15 @@
       "title": "Event 1",
       "start": "2020-10-10T10:00:00",
       "end": "2020-10-10T12:00:00",
-      "class": "hello-class-1 hello-class-2 calendar-section1-category1"
+      "class": "hello-class-1 hello-class-2 calendar-section1-category1",
+      "@id": "./test_event.html"
     },
     {
       "title": "Event 2",
       "start": "2020-10-12",
       "end": "2020-10-12",
-      "class": "calendar-section1-category2"
+      "class": "calendar-section1-category2",
+      "@id": "./test_event.html"
     },
     {
       "title": "Event 3",