@treely/strapi-slices 7.3.0 → 7.4.0

package/README.md

@@ -39,7 +39,8 @@ npm run build
 npm pack
 ```
 
-Go to the project which uses the strapi-slices package and remove the `node_modules` and the `.next` folder before installing the package there:
+Go to the project which uses the strapi-slices package and remove the
+`node_modules` and the `.next` folder before installing the package there:
 
 ```bash
 cd ../path/to/your/project

package/dist/models/strapi/StrapiEvent.d.ts

@@ -17,10 +17,10 @@ export declare enum EventType {
 interface StrapiEvent {
     title: string;
     description: string;
-    button: StrapiLink;
+    button?: StrapiLink;
     buttonVariant?: 'outline' | 'ghost' | 'link' | 'solid' | 'outlineWhite';
     recommended?: boolean;
-    speakers: {
+    speakers?: {
         id: number;
         name: string;
         image: StrapiImage;

package/dist/strapi-slices.cjs.development.js

@@ -6061,7 +6061,7 @@ var EventCard = function EventCard(_ref) {
     justifyContent: mobile ? undefined : 'space-between',
     flexDir: mobile ? 'column-reverse' : 'row',
     gap: mobile ? '4' : '0'
-  }, React__default.default.createElement(boemly.Flex, {
+  }, event.button && React__default.default.createElement(boemly.Flex, {
     width: mobile ? 'full' : 'auto'
   }, React__default.default.createElement(StrapiLinkButton, {
     key: event.button.id,
@@ -6072,7 +6072,7 @@ var EventCard = function EventCard(_ref) {
       size: "10"
     }),
     width: "full"
-  })), React__default.default.createElement(boemly.Flex, {
+  })), event.speakers && event.speakers.length > 0 && React__default.default.createElement(boemly.Flex, {
     flexDir: "row",
     gap: "2"
   }, event.speakers.map(function (speaker) {
@@ -6155,6 +6155,12 @@ var Events = function Events(_ref) {
   var _useState3 = React.useState([Sort.NEWEST_FIRST]),
     sort = _useState3[0],
     setSort = _useState3[1];
+  var _useState4 = React.useState([]),
+    allEventTypeOptions = _useState4[0],
+    setAllEventTypeOptions = _useState4[1];
+  var _useState5 = React.useState([]),
+    allLanguageOptions = _useState5[0],
+    setAllLanguageOptions = _useState5[1];
   var now = new Date().toISOString();
   var buildEventsUrl = function buildEventsUrl(index, batchSize, startFilter) {
     var url = new URL("/treely-events", STRAPI_URI);
@@ -6168,10 +6174,14 @@ var Events = function Events(_ref) {
     } else {
       url.searchParams.append('sort', 'start:desc');
     }
-    if (languageFilter.length || eventTypeFilter.length) {
-      [].concat(languageFilter, eventTypeFilter).forEach(function (filter, i) {
-        var filterKey = i < languageFilter.length ? 'languages' : 'eventTypes';
-        url.searchParams.append("filters[$and][" + i + "][" + filterKey + "][" + filterKey.slice(0, -1) + "]", filter);
+    if (eventTypeFilter.length) {
+      eventTypeFilter.forEach(function (filter, i) {
+        url.searchParams.append("filters[$or][" + i + "][eventTypes][eventType]", filter);
+      });
+    }
+    if (languageFilter.length) {
+      languageFilter.forEach(function (filter, i) {
+        url.searchParams.append("filters[$or][" + (eventTypeFilter.length + i) + "][languages][language]", filter);
       });
     }
     return "/treely-events" + url.search;
@@ -6217,38 +6227,66 @@ var Events = function Events(_ref) {
   var pastEvents = React.useMemo(function () {
     return processEvents(pastData);
   }, [pastData]);
-  var combinedEvents = React.useMemo(function () {
-    return upcomingEvents.concat(pastEvents);
-  }, [upcomingEvents, pastEvents]);
-  var getOptions = function getOptions(items, key, selectedFilters) {
-    var uniqueValues = new Set();
-    var options = items.flatMap(function (card) {
-      return card.attributes[key].map(function (item) {
-        return {
-          value: item[key.slice(0, -1)],
-          label: item[key.slice(0, -1)]
-        };
-      });
-    }).filter(function (option) {
-      if (uniqueValues.has(option.value)) return false;
-      uniqueValues.add(option.value);
-      return true;
-    });
-    return options.concat(selectedFilters.filter(function (selected) {
-      return !uniqueValues.has(selected);
-    }).map(function (selected) {
-      return {
-        value: selected,
-        label: selected
-      };
-    }));
-  };
-  var eventTypeOptions = React.useMemo(function () {
-    return getOptions(combinedEvents, 'eventTypes', eventTypeFilter);
-  }, [combinedEvents]);
-  var languageOptions = React.useMemo(function () {
-    return getOptions(combinedEvents, 'languages', languageFilter);
-  }, [combinedEvents]);
+  // Function to fetch all possible options
+  var fetchAllOptions = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var url, response, data, events, allEventTypes, allLanguages;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          url = new URL("/treely-events", STRAPI_URI);
+          url.searchParams.append('locale', locale);
+          url.searchParams.append('populate', 'deep,6');
+          _context.next = 5;
+          return fetch(STRAPI_URI + "/api/treely-events" + url.search);
+        case 5:
+          response = _context.sent;
+          _context.next = 8;
+          return response.json();
+        case 8:
+          data = _context.sent;
+          events = (data == null ? void 0 : data.data) || []; // Extract all event types
+          allEventTypes = new Set();
+          events.forEach(function (event) {
+            var _event$attributes;
+            if (event != null && (_event$attributes = event.attributes) != null && _event$attributes.eventTypes) {
+              event.attributes.eventTypes.forEach(function (item) {
+                allEventTypes.add(item.eventType);
+              });
+            }
+          });
+          // Extract all languages
+          allLanguages = new Set();
+          events.forEach(function (event) {
+            var _event$attributes2;
+            if (event != null && (_event$attributes2 = event.attributes) != null && _event$attributes2.languages) {
+              event.attributes.languages.forEach(function (item) {
+                allLanguages.add(item.language);
+              });
+            }
+          });
+          // Update state with all options
+          setAllEventTypeOptions(Array.from(allEventTypes).map(function (value) {
+            return {
+              value: value,
+              label: value
+            };
+          }));
+          setAllLanguageOptions(Array.from(allLanguages).map(function (value) {
+            return {
+              value: value,
+              label: value
+            };
+          }));
+        case 16:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [locale]);
+  // Fetch all options when component mounts
+  React.useEffect(function () {
+    fetchAllOptions();
+  }, [fetchAllOptions]);
   var removeFilter = function removeFilter(filterType, valueToRemove) {
     if (filterType === 'eventTypes') {
       setEventTypeFilter(function (prev) {
@@ -6300,7 +6338,7 @@ var Events = function Events(_ref) {
     searchPlaceholder: formatMessage({
       id: 'sections.events.eventsFilter.searchPlaceholder'
     }),
-    options: eventTypeOptions,
+    options: allEventTypeOptions,
     value: eventTypeFilter != null ? eventTypeFilter : [],
     onChange: function onChange(selected) {
       setEventTypeFilter(selected);
@@ -6319,7 +6357,7 @@ var Events = function Events(_ref) {
     searchPlaceholder: formatMessage({
       id: 'sections.events.eventsFilter.searchPlaceholder'
     }),
-    options: languageOptions,
+    options: allLanguageOptions,
     value: languageFilter != null ? languageFilter : [],
     onChange: function onChange(selected) {
       setLanguageFilter(selected);
@@ -6330,7 +6368,7 @@ var Events = function Events(_ref) {
     minHeight: "6",
     gap: "2"
   }, eventTypeFilter.map(function (eventType) {
-    var event = eventTypeOptions.find(function (option) {
+    var event = allEventTypeOptions.find(function (option) {
       return option.value === eventType;
     });
     return React__default.default.createElement(boemly.BoemlyTag, {
@@ -6341,7 +6379,7 @@ var Events = function Events(_ref) {
       }
     }, event == null ? void 0 : event.label);
   }), languageFilter.map(function (singleLanguage) {
-    var language = languageOptions.find(function (option) {
+    var language = allLanguageOptions.find(function (option) {
       return option.value === singleLanguage;
     });
     return React__default.default.createElement(boemly.BoemlyTag, {