964: Fixed check for existence

os2display · Apr 5, 2024 · 93c7d99 · 93c7d99
1 parent 2dbdd23
commit 93c7d99
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/build/calendar-config-develop.json b/build/calendar-config-develop.json
@@ -4,9 +4,9 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1712312137403",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1712312137403",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json?ts=1712312137403",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1712320739376",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1712320739376",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json?ts=1712320739376",
     "assets": [],
     "options": {},
     "content": {}

diff --git a/build/calendar-config-main.json b/build/calendar-config-main.json
@@ -4,9 +4,9 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1712312137403",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1712312137403",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json?ts=1712312137403",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1712320739376",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1712320739376",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json?ts=1712320739376",
     "assets": [],
     "options": {},
     "content": {}

diff --git a/build/calendar.js b/build/calendar.js
diff --git a/src/calendar/calendar-single-booking.js b/src/calendar/calendar-single-booking.js
@@ -36,11 +36,9 @@ function CalendarSingleBooking({
   const tenantKey = localStorage.getItem("tenantKey");
   const apiUrl = localStorage.getItem("apiUrl");
 
-  const instantBookingLocalStorageKey = "instantBookings";
+  const instantBookingKey = "instantBookings";
   const getInstantBookingFromLocalStorage = (slideId) => {
-    const localstorageEntry = localStorage.getItem(
-      instantBookingLocalStorageKey
-    );
+    const localstorageEntry = localStorage.getItem(instantBookingKey);
 
     if (localstorageEntry === null) {
       return null;
@@ -52,19 +50,18 @@ function CalendarSingleBooking({
   };
 
   const setInstantBookingFromLocalStorage = (slideId, value) => {
-    const localstorageEntry = localStorage.getItem(
-      instantBookingLocalStorageKey
-    );
+    const localstorageEntry = localStorage.getItem(instantBookingKey);
 
     const instantBookings =
       localstorageEntry !== null ? JSON.parse(localstorageEntry) : {};
 
-    instantBookings[slideId] = value;
+    if (value !== null) {
+      instantBookings[slideId] = value;
+    } else {
+      delete instantBookings[slideId];
+    }
 
-    localStorage.setItem(
-      instantBookingLocalStorageKey,
-      JSON.stringify(instantBookings)
-    );
+    localStorage.setItem(instantBookingKey, JSON.stringify(instantBookings));
   };
 
   const [bookableIntervals, setBookableIntervals] = useState([]);
@@ -190,9 +187,11 @@ function CalendarSingleBooking({
 
     const instantBooking = getInstantBookingFromLocalStorage(slide["@id"]);
 
-    if (instantBooking !== null) {
-      if (dayjs(instantBooking.interval.to) > dayjs) {
+    // Clean out old instantBookings.
+    if (instantBooking) {
+      if (dayjs(instantBooking.interval.to) < dayjs()) {
         setInstantBookingFromLocalStorage(slide["@id"], null);
+        setBookingResult(null);
       } else {
         setBookingResult(instantBooking);
       }