@nnc-digital/nnc-design-system 0.4.23 → 0.4.25

package/build/index.js

@@ -4414,12 +4414,18 @@ var BinCollection = function (_a) {
     var handleAddressChange = function (e) {
         var selectedUPRN = e.target.value;
         if (selectedUPRN) {
-            var startDate = getFormattedDate();
-            var endDate = getFormattedDate(28);
+            var startDate_1 = getFormattedDate();
+            var endDate_1 = getFormattedDate(28);
             // Fetch calendar events for the selected UPRN
-            axios__default["default"].get("".concat(CalendarEventsApiUrl).concat(selectedUPRN, "/").concat(startDate, "/").concat(endDate))
+            axios__default["default"].get("".concat(CalendarEventsApiUrl).concat(selectedUPRN, "/").concat(startDate_1, "/").concat(endDate_1))
                 .then(function (response) {
-                var groupedData = groupByTitle(response.data);
+                // Filter the data based on the date range
+                var filteredData = response.data.filter(function (event) {
+                    var eventDate = parseDate(event.start);
+                    var eventDateString = eventDate.toISOString().split('T')[0];
+                    return eventDateString >= startDate_1 && eventDateString <= endDate_1;
+                });
+                var groupedData = groupByTitle(filteredData);
                 if (Object.keys(groupedData).length === 0) {
                     setNoResultsFound(true);
                 }
@@ -4516,11 +4522,13 @@ var BinCollection = function (_a) {
             }
             return sortedTitles.map(function (title, index) {
                 var apiTitlesForThisType = Object.keys(calendarEvents).filter(function (apiTitle) { return formatTitle(apiTitle) === title; });
+                var dates = apiTitlesForThisType.flatMap(function (apiTitle) { return calendarEvents[apiTitle]; })
+                    .map(function (date) { return new Date(date).toISOString().split('T')[0]; })
+                    .filter(function (date, index, array) { return array.indexOf(date) === index; })
+                    .sort(function (a, b) { return new Date(a).getTime() - new Date(b).getTime(); });
                 return (React__default["default"].createElement(React__default["default"].Fragment, { key: "".concat(title, "-").concat(index) },
                     React__default["default"].createElement(Heading, { level: 3, text: title }),
-                    apiTitlesForThisType.flatMap(function (apiTitle) { return calendarEvents[apiTitle]; })
-                        .sort(function (a, b) { return new Date(a).getTime() - new Date(b).getTime(); })
-                        .map(function (date) { return (React__default["default"].createElement("p", null, date.toLocaleDateString('en-GB', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }))); })));
+                    dates.map(function (date, index) { return (React__default["default"].createElement("p", { key: index }, new Date(date).toLocaleDateString('en-GB', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }))); })));
             });
         })()),
         Object.keys(calendarEvents).length > 0 && (React__default["default"].createElement(FormButton, { size: "small", type: "button", "aria-label": "Reset", text: "Find a different address", onClick: resetForm }))));