From 614efd6fd477a1c16127e2d4da908762b0e5b46c Mon Sep 17 00:00:00 2001
From: Pilar Candia <pilar@2600hz.com>
Date: Thu, 1 Sep 2022 13:56:20 -0400
Subject: [PATCH] [5.1] MSPB-292: Fix issue where user can't update from
 advanced to single date (#460)

---
 submodules/strategy/strategy.js                 | 2 +-
 submodules/strategyHolidays/strategyHolidays.js | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 8a48cdb0..7fe98610 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -4316,7 +4316,7 @@ define(function(require) {
 					}, !formData.allDay && isSingleDate && {
 						time_window_start: $startTimepicker.timepicker('getSecondsFromMidnight'),
 						time_window_stop: $endTimepicker.timepicker('getSecondsFromMidnight')
-					}, ((isHolidayStartDate && formData.allDay && isSingleDate) || (isHolidayStartDate && isNotSingleDate)) && {
+					}, holidayId && ((isHolidayStartDate && formData.allDay && isSingleDate) || (isHolidayStartDate && isNotSingleDate)) && {
 						time_window_start: null,
 						time_window_stop: null
 					}),
diff --git a/submodules/strategyHolidays/strategyHolidays.js b/submodules/strategyHolidays/strategyHolidays.js
index c92a38e1..79104b72 100644
--- a/submodules/strategyHolidays/strategyHolidays.js
+++ b/submodules/strategyHolidays/strategyHolidays.js
@@ -468,6 +468,7 @@ define(function(require) {
 								if (_.isUndefined(holidayRule.holidayData.excludeYear)) {
 									holidayRule.holidayData.excludeYear = [];
 								}
+
 								holidayRule.holidayData.excludeYear.push(yearSelected);
 								holidayRule.modified = true;
 								self.appFlags.strategyHolidays.allHolidays[key] = holidayRule;
@@ -477,6 +478,9 @@ define(function(require) {
 									_.omit(data, ['holidayData.id'])
 								);
 							} else {
+								if (holidayRule.holidayType === 'advanced' && data.holidayType !== 'advanced') {
+									data.holidayData.ordinal = null;
+								}
 								self.appFlags.strategyHolidays.allHolidays[key] = data;
 							}
 						}
@@ -1044,9 +1048,12 @@ define(function(require) {
 						holidayRule.days = _.range(fromDay, toDay + 1);
 					}
 				} else {
-					holidayRule.ordinal = holidayData.ordinal;
 					holidayRule.wdays = [holidayData.wday];
 				}
+
+				if (holidayData.hasOwnProperty('ordinal')) {
+					holidayRule.ordinal = holidayData.ordinal;
+				}
 			}
 
 			if (holidayData.excludeYear) {