Merge branch 'staging' into fixes/fix-calandar-pending-btn

calendar/js/calendar-main.js

@@ -9360,11 +9360,7 @@ __webpack_require__.r(__webpack_exports__);
         // Rendering
         dayHeaderDidMount: _fullcalendar_rendering_dayHeaderDidMount_js__WEBPACK_IMPORTED_MODULE_11__["default"],
         eventDidMount: info => {
-          if (info.event.extendedProps.isCalendarPending) {
+          this.addPendinEventClass(info);
-            info.el.classList.add('pending-event');
-            info.el.style.backgroundColor = info.event.backgroundColor;
-            info.el.style.color = info.event.textColor;
-          }
         },
         noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
         eventOrder: ['start', '-duration', 'allDay', _fullcalendar_rendering_eventOrder_js__WEBPACK_IMPORTED_MODULE_13__["default"]],
@@ -9510,7 +9506,14 @@ __webpack_require__.r(__webpack_exports__);
           initialView
         });
       }
-    }, 5000)
+    }, 5000),
+    addPendinEventClass(info) {
+      if (info.event.extendedProps.isCalendarPending) {
+        info.el.classList.add('pending-event');
+        info.el.style.backgroundColor = info.event.backgroundColor;
+        info.el.style.color = info.event.textColor;
+      }
+    }
   }
 });
 
@@ -16548,7 +16551,7 @@ __webpack_require__.r(__webpack_exports__);
       }
       this.isViewing = true;
       try {
-        await this.save(false);
+        await this.savePendingCalendar(false);
         this.requiresActionOnRouteLeave = false;
       } catch (error) {
         this.isViewing = false;
@@ -16841,7 +16844,7 @@ __webpack_require__.r(__webpack_exports__);
       }
       this.isViewing = true;
       try {
-        await this.save(false);
+        await this.savePendingCalendar(false);
         this.requiresActionOnRouteLeave = false;
       } catch (error) {
         this.isViewing = false;

calendar/js/calendar-src_views_Calendar_vue-data_image_svg_xml_3csvg_20xmlns_27http_www_w3_org_2000_svg_27_20heigh-4a4254.js

@@ -4332,11 +4332,7 @@ __webpack_require__.r(__webpack_exports__);
         // Rendering
         dayHeaderDidMount: _fullcalendar_rendering_dayHeaderDidMount_js__WEBPACK_IMPORTED_MODULE_11__["default"],
         eventDidMount: info => {
-          if (info.event.extendedProps.isCalendarPending) {
+          this.addPendinEventClass(info);
-            info.el.classList.add('pending-event');
-            info.el.style.backgroundColor = info.event.backgroundColor;
-            info.el.style.color = info.event.textColor;
-          }
         },
         noEventsDidMount: _fullcalendar_rendering_noEventsDidMount_js__WEBPACK_IMPORTED_MODULE_14__["default"],
         eventOrder: ['start', '-duration', 'allDay', _fullcalendar_rendering_eventOrder_js__WEBPACK_IMPORTED_MODULE_13__["default"]],
@@ -4482,7 +4478,14 @@ __webpack_require__.r(__webpack_exports__);
           initialView
         });
       }
-    }, 5000)
+    }, 5000),
+    addPendinEventClass(info) {
+      if (info.event.extendedProps.isCalendarPending) {
+        info.el.classList.add('pending-event');
+        info.el.style.backgroundColor = info.event.backgroundColor;
+        info.el.style.color = info.event.textColor;
+      }
+    }
   }
 });
 
@@ -8358,7 +8361,7 @@ __webpack_require__.r(__webpack_exports__);
       }
       this.isViewing = true;
       try {
-        await this.save(false);
+        await this.savePendingCalendar(false);
         this.requiresActionOnRouteLeave = false;
       } catch (error) {
         this.isViewing = false;

calendar/src/components/CalendarGrid.vue

@@ -140,11 +140,7 @@ export default {
 				// Rendering
 				dayHeaderDidMount,
 				eventDidMount : (info) => {
-					if (info.event.extendedProps.isCalendarPending) {
+					this.addPendinEventClass(info);
-						info.el.classList.add('pending-event');	
-						info.el.style.backgroundColor = info.event.backgroundColor;
-        				info.el.style.color = info.event.textColor;
-					}
 				},
 				noEventsDidMount,
 				eventOrder: ['start', '-duration', 'allDay', eventOrder],
@@ -308,6 +304,13 @@ export default {
 				this.$store.dispatch('setInitialView', { initialView })
 			}
 		}, 5000),
+		addPendinEventClass(info){
+			if (info.event.extendedProps.isCalendarPending) {
+				info.el.classList.add('pending-event');	
+				info.el.style.backgroundColor = info.event.backgroundColor;
+				info.el.style.color = info.event.textColor;
+			}
+		}
 	},
 }
 </script>

calendar/src/mixins/EditorMixin.js

@@ -573,6 +573,8 @@ export default {
 		setPendingCalendar(isPending = true) {
 			this.calendarObjectInstance.eventComponent.isCalendarPending = isPending
 			this.calendarObjectInstance.isCalendarPending = isPending
+			
+
 		},
 		async savePendingCalendar(thisAndAllFuture = false) {
 			if (!this.calendarObject) {

calendar/src/store/calendarObjectInstance.js

@@ -1744,7 +1744,6 @@ const actions = {
 			if (isForkedItem && eventComponent.canCreateRecurrenceExceptions()) {
 				[original, fork] = eventComponent.createRecurrenceException(thisAndAllFuture)
 			}
-
 			await dispatch('updateCalendarObject', { calendarObject })
 
 			if (original !== null && fork !== null && original.root !== fork.root) {

calendar/src/views/EditSidebar.vue

@@ -752,7 +752,7 @@ export default {
 
 			this.isViewing = true;
 			try {
-				await this.save(false);
+				await this.savePendingCalendar(false);
 				this.requiresActionOnRouteLeave = false;
 			} catch (error) {
 				this.isViewing = false;

calendar/src/views/EditSimple.vue

@@ -540,7 +540,7 @@ export default {
 
 			this.isViewing = true;
 			try {
-				await this.save(false);
+				await this.savePendingCalendar(false);
 				this.requiresActionOnRouteLeave = false;
 			} catch (error) {
 				this.isViewing = false;