@treely/strapi-slices 7.5.2 → 7.5.4

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

@@ -407,45 +407,16 @@ var strapiClient = /*#__PURE__*/axiosCacheInterceptor.setupCache(/*#__PURE__*/ax
   ttl: /*#__PURE__*/STRAPI_URI.includes('127.0.0.1') || /*#__PURE__*/STRAPI_URI.includes('localhost') ? 0 : 10 * 60 * 1000 // 10 minutes
 });
 
-var getAvailableLocalesFromStrapi = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _yield$strapiClient$g, data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return strapiClient.get('/i18n/locales');
-        case 2:
-          _yield$strapiClient$g = _context.sent;
-          data = _yield$strapiClient$g.data;
-          return _context.abrupt("return", data.map(function (locale) {
-            return locale.code;
-          }));
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getAvailableLocalesFromStrapi() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var getAllSlugsFromStrapi = /*#__PURE__*/function () {
   var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(path, locales, _temp) {
-    var _ref2, _ref2$filters, filters, allLocales, slugPromises, slugResults, allSlugs, missingLocales;
+    var _ref2, _ref2$filters, filters, slugPromises, slugResults, allSlugs, missingLocales;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _ref2 = _temp === void 0 ? {
             filters: {}
           } : _temp, _ref2$filters = _ref2.filters, filters = _ref2$filters === void 0 ? {} : _ref2$filters;
-          _context.next = 3;
-          return getAvailableLocalesFromStrapi();
-        case 3:
-          allLocales = _context.sent;
-          slugPromises = allLocales.map(function (locale) {
+          slugPromises = locales.map(function (locale) {
             return strapiClient.get(path, {
               params: {
                 locale: locale,
@@ -469,9 +440,9 @@ var getAllSlugsFromStrapi = /*#__PURE__*/function () {
               throw error;
             });
           });
-          _context.next = 7;
+          _context.next = 4;
           return Promise.all(slugPromises);
-        case 7:
+        case 4:
           slugResults = _context.sent;
           allSlugs = slugResults.flat(); // Identify missing locales for each slug
           missingLocales = locales.flatMap(function (locale) {
@@ -488,7 +459,7 @@ var getAllSlugsFromStrapi = /*#__PURE__*/function () {
             }); // Clone only for missing locales
           });
           return _context.abrupt("return", [].concat(allSlugs, missingLocales));
-        case 11:
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -532,12 +503,10 @@ var getPortfolioProjects = /*#__PURE__*/function () {
           params = {
             pLevel: '6',
             locale: locale,
-            'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE
+            'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
+            status: preview ? 'draft' : 'published'
           };
-          if (preview) {
-            params.publicationState = 'preview';
-          }
-          _context.next = 7;
+          _context.next = 6;
           return Promise.all([fpmClient.get('/public/projects', {
             cache: cache
           }), strapiClient.get('/projects', {
@@ -549,7 +518,7 @@ var getPortfolioProjects = /*#__PURE__*/function () {
             }),
             cache: cache
           })]);
-        case 7:
+        case 6:
           _yield$Promise$all = _context.sent;
           fpmProjects = _yield$Promise$all[0].data;
           strapiProjectsLocalized = _yield$Promise$all[1].data;
@@ -576,7 +545,7 @@ var getPortfolioProjects = /*#__PURE__*/function () {
             }
             return toReturn;
           }));
-        case 14:
+        case 13:
         case "end":
           return _context.stop();
       }
@@ -589,61 +558,64 @@ var getPortfolioProjects = /*#__PURE__*/function () {
 
 var getStrapiCollectionType = /*#__PURE__*/function () {
   var _ref2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(path, key, _ref) {
-    var _ref$locale, locale, _ref$preview, preview, _ref$filters, filters, cache, allLocales, promises, responses, results, localizedResponses, fallbackResponses, result;
+    var _ref$locale, locale, _ref$preview, preview, _ref$filters, filters, cache, sharedParams, requestedLocaleData, fallbackLocaleData, results;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _ref$locale = _ref.locale, locale = _ref$locale === void 0 ? 'en' : _ref$locale, _ref$preview = _ref.preview, preview = _ref$preview === void 0 ? false : _ref$preview, _ref$filters = _ref.filters, filters = _ref$filters === void 0 ? {} : _ref$filters;
           cache = preview ? false : undefined;
-          _context.next = 4;
-          return getAvailableLocalesFromStrapi();
-        case 4:
-          allLocales = _context.sent;
-          if (!allLocales.includes(STRAPI_FALLBACK_LOCALE)) {
-            allLocales.push(STRAPI_FALLBACK_LOCALE);
-          }
-          promises = allLocales.map(function (loc) {
-            return strapiClient.get(path, {
-              params: _extends({
-                pLevel: '6',
-                locale: loc,
-                'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
-                filters: filters
-              }, preview ? {
-                publicationState: 'preview'
-              } : {}),
-              cache: cache
-            }).then(function (response) {
-              return response.data.data;
-            })
-            // when a collection type for a requested locale does not exist, Strapi returns a 404. In this case, we return an empty array instead of throwing an error
-            ["catch"](function (error) {
-              var _error$response;
-              if (((_error$response = error.response) == null ? void 0 : _error$response.status) === 404) {
-                return [];
-              }
-              throw error;
-            });
-          });
-          _context.next = 9;
-          return Promise.all(promises);
-        case 9:
-          responses = _context.sent;
-          results = responses.flat();
-          localizedResponses = results.filter(function (d) {
-            return d.attributes.locale === locale;
+          sharedParams = {
+            pLevel: '6',
+            'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
+            filters: filters,
+            status: preview ? 'draft' : 'published'
+          };
+          _context.next = 5;
+          return strapiClient.get(path, {
+            params: _extends({}, sharedParams, {
+              locale: locale
+            }),
+            cache: cache
+          }).then(function (response) {
+            return response.data.data;
+          })
+          // when a collection type for a requested locale does not exist, Strapi returns a 404. In this case, we return an empty array instead of throwing an error
+          ["catch"](function (error) {
+            var _error$response;
+            if (((_error$response = error.response) == null ? void 0 : _error$response.status) === 404) {
+              return [];
+            }
+            throw error;
           });
-          fallbackResponses = results.filter(function (d) {
-            return d.attributes.locale === STRAPI_FALLBACK_LOCALE;
+        case 5:
+          requestedLocaleData = _context.sent;
+          _context.next = 8;
+          return strapiClient.get(path, {
+            params: _extends({}, sharedParams, {
+              locale: STRAPI_FALLBACK_LOCALE
+            }),
+            cache: cache
+          }).then(function (response) {
+            return response.data.data;
+          })
+          // when a collection type for a requested locale does not exist, Strapi returns a 404. In this case, we return an empty array instead of throwing an error
+          ["catch"](function (error) {
+            var _error$response2;
+            if (((_error$response2 = error.response) == null ? void 0 : _error$response2.status) === 404) {
+              return [];
+            }
+            throw error;
           });
-          result = fallbackResponses.map(function (fallbackResponse) {
-            var localizedResponse = localizedResponses.find(function (localized) {
-              return localized.attributes[key] === fallbackResponse.attributes[key];
+        case 8:
+          fallbackLocaleData = _context.sent;
+          results = fallbackLocaleData.map(function (fallbackLocaleDataEntry) {
+            var requestedLocale = requestedLocaleData.find(function (localized) {
+              return localized.attributes[key] === fallbackLocaleDataEntry.attributes[key];
             });
-            return localizedResponse || fallbackResponse;
+            return requestedLocale || fallbackLocaleDataEntry;
           });
-          return _context.abrupt("return", result);
-        case 15:
+          return _context.abrupt("return", results);
+        case 11:
         case "end":
           return _context.stop();
       }
@@ -666,44 +638,42 @@ var getStrapiSingleType = /*#__PURE__*/function () {
             pLevel: '6',
             locale: locale,
             'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
-            filters: filters
+            filters: filters,
+            status: preview ? 'draft' : 'published'
           };
-          if (preview) {
-            params.publicationState = 'preview';
-          }
-          _context.prev = 4;
-          _context.next = 7;
+          _context.prev = 3;
+          _context.next = 6;
           return strapiClient.get(path, {
             params: params,
             cache: cache
           });
-        case 7:
+        case 6:
           response = _context.sent;
           return _context.abrupt("return", response.data.data);
-        case 11:
-          _context.prev = 11;
-          _context.t0 = _context["catch"](4);
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](3);
           if (!(_context.t0.isAxiosError && ((_error$response = _context.t0.response) == null ? void 0 : _error$response.status) === 404)) {
-            _context.next = 18;
+            _context.next = 17;
             break;
           }
-          _context.next = 16;
+          _context.next = 15;
           return strapiClient.get(path, {
             params: _extends({}, params, {
               locale: STRAPI_FALLBACK_LOCALE
             }),
             cache: cache
           });
-        case 16:
+        case 15:
           response = _context.sent;
           return _context.abrupt("return", response.data.data);
-        case 18:
+        case 17:
           throw _context.t0;
-        case 19:
+        case 18:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 11]]);
+    }, _callee, null, [[3, 10]]);
   }));
   return function getStrapiSingleType(_x, _x2) {
     return _ref2.apply(this, arguments);