@treely/strapi-slices 7.15.0 → 7.15.1

package/dist/components/portfolio/ProjectInfo/messages.de.d.ts

@@ -9,8 +9,8 @@ declare const messagesDe: {
     'features.projectInfo.properties.verificationStandard.label': string;
     'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': string;
     'features.projectInfo.properties.verificationStandard.value.MfKWCH': string;
-    'features.projectInfo.properties.forecastedAmountYear.toolTip': string;
-    'features.projectInfo.properties.forecastedAmountYear.label': string;
+    'features.projectInfo.properties.projectVolume.toolTip': string;
+    'features.projectInfo.properties.projectVolume.label': string;
     'features.projectInfo.properties.riskBuffer': string;
     'features.projectInfo.properties.year': string;
 };

package/dist/components/portfolio/ProjectInfo/messages.en.d.ts

@@ -9,8 +9,8 @@ declare const messagesEn: {
     'features.projectInfo.properties.verificationStandard.label': string;
     'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': string;
     'features.projectInfo.properties.verificationStandard.value.MfKWCH': string;
-    'features.projectInfo.properties.forecastedAmountYear.label': string;
-    'features.projectInfo.properties.forecastedAmountYear.toolTip': string;
+    'features.projectInfo.properties.projectVolume.label': string;
+    'features.projectInfo.properties.projectVolume.toolTip': string;
     'features.projectInfo.properties.riskBuffer': string;
     'features.projectInfo.properties.year': string;
 };

package/dist/integrations/strapi/getFpmProjectById.d.ts

@@ -0,0 +1,3 @@
+import FPMProject from '../../models/fpm/FPMProject';
+declare const getFpmProjectById: (projectId: string) => Promise<FPMProject>;
+export default getFpmProjectById;

package/dist/rootMessages.de.d.ts

@@ -62,8 +62,8 @@ declare const rootMessagesDe: {
     'features.projectInfo.properties.verificationStandard.label': string;
     'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': string;
     'features.projectInfo.properties.verificationStandard.value.MfKWCH': string;
-    'features.projectInfo.properties.forecastedAmountYear.toolTip': string;
-    'features.projectInfo.properties.forecastedAmountYear.label': string;
+    'features.projectInfo.properties.projectVolume.toolTip': string;
+    'features.projectInfo.properties.projectVolume.label': string;
     'features.projectInfo.properties.riskBuffer': string;
     'features.projectInfo.properties.year': string;
     'features.portfolio.documentsDownloadList.projectDocuments': string;

package/dist/rootMessages.en.d.ts

@@ -62,8 +62,8 @@ declare const rootMessagesEn: {
     'features.projectInfo.properties.verificationStandard.label': string;
     'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': string;
     'features.projectInfo.properties.verificationStandard.value.MfKWCH': string;
-    'features.projectInfo.properties.forecastedAmountYear.label': string;
-    'features.projectInfo.properties.forecastedAmountYear.toolTip': string;
+    'features.projectInfo.properties.projectVolume.label': string;
+    'features.projectInfo.properties.projectVolume.toolTip': string;
     'features.projectInfo.properties.riskBuffer': string;
     'features.projectInfo.properties.year': string;
     'features.portfolio.documentsDownloadList.projectDocuments': string;

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

@@ -555,10 +555,10 @@ var getStrapiProjects = /*#__PURE__*/function () {
 }();
 
 var getPortfolioProjects = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(locale, preview) {
+  var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(locale, preview) {
     var cache, _yield$Promise$all, fpmProjects, strapiProjects;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
           if (locale === void 0) {
             locale = 'en';
@@ -567,72 +567,34 @@ var getPortfolioProjects = /*#__PURE__*/function () {
             preview = false;
           }
           cache = preview ? false : undefined;
-          _context2.next = 5;
+          _context.next = 5;
           return Promise.all([fpmClient.get('/public/projects', {
             cache: cache
           }), getStrapiProjects(locale, STRAPI_DEFAULT_POPULATE_DEPTH, preview)]);
         case 5:
-          _yield$Promise$all = _context2.sent;
+          _yield$Promise$all = _context.sent;
           fpmProjects = _yield$Promise$all[0].data;
           strapiProjects = _yield$Promise$all[1];
-          return _context2.abrupt("return", Promise.all(fpmProjects.map(/*#__PURE__*/function () {
-            var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(fpmProject) {
-              var _strapiProject$attrib;
-              var fpmProjectWithAverageSellableAmountPerYear, _error$response, strapiProject, toReturn;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.prev = 0;
-                    _context.next = 3;
-                    return fpmClient.get("/public/projects/" + fpmProject.id, {
-                      cache: cache
-                    });
-                  case 3:
-                    fpmProjectWithAverageSellableAmountPerYear = _context.sent;
-                    fpmProject.averageSellableAmountPerYear = fpmProjectWithAverageSellableAmountPerYear.data.averageSellableAmountPerYear;
-                    // Handle 404 errors for private projects
-                    _context.next = 14;
-                    break;
-                  case 7:
-                    _context.prev = 7;
-                    _context.t0 = _context["catch"](0);
-                    if (!(((_error$response = _context.t0.response) == null ? void 0 : _error$response.status) === 404)) {
-                      _context.next = 13;
-                      break;
-                    }
-                    fpmProject.averageSellableAmountPerYear = 0;
-                    _context.next = 14;
-                    break;
-                  case 13:
-                    throw _context.t0;
-                  case 14:
-                    strapiProject = strapiProjects.get(fpmProject.id);
-                    toReturn = fpmProject;
-                    if (strapiProject != null && strapiProject.attributes.slug) {
-                      toReturn.slug = strapiProject.attributes.slug;
-                    }
-                    if (strapiProject != null && strapiProject.attributes.thumbnail) {
-                      toReturn.thumbnail = strapiProject == null ? void 0 : strapiProject.attributes.thumbnail;
-                    }
-                    if (strapiProject != null && (_strapiProject$attrib = strapiProject.attributes.portfolio.data) != null && _strapiProject$attrib.attributes.host) {
-                      toReturn.portfolioHost = strapiProject.attributes.portfolio.data.attributes.host;
-                    }
-                    return _context.abrupt("return", toReturn);
-                  case 20:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee, null, [[0, 7]]);
-            }));
-            return function (_x3) {
-              return _ref2.apply(this, arguments);
-            };
-          }())));
+          return _context.abrupt("return", fpmProjects.map(function (fpmProject) {
+            var _strapiProject$attrib;
+            var strapiProject = strapiProjects.get(fpmProject.id);
+            var toReturn = fpmProject;
+            if (strapiProject != null && strapiProject.attributes.slug) {
+              toReturn.slug = strapiProject.attributes.slug;
+            }
+            if (strapiProject != null && strapiProject.attributes.thumbnail) {
+              toReturn.thumbnail = strapiProject == null ? void 0 : strapiProject.attributes.thumbnail;
+            }
+            if (strapiProject != null && (_strapiProject$attrib = strapiProject.attributes.portfolio.data) != null && _strapiProject$attrib.attributes.host) {
+              toReturn.portfolioHost = strapiProject.attributes.portfolio.data.attributes.host;
+            }
+            return toReturn;
+          }));
         case 9:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return function getPortfolioProjects(_x, _x2) {
     return _ref.apply(this, arguments);
@@ -1471,8 +1433,8 @@ var messagesDe$7 = {
   'features.projectInfo.properties.verificationStandard.label': 'Verifizierungsstandard',
   'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': 'SILVACONSULT® Forest Carbon Standard, ISO 14064-2',
   'features.projectInfo.properties.verificationStandard.value.MfKWCH': 'Methodik für Klimaschutzprojekte im Wald für die Schweiz',
-  'features.projectInfo.properties.forecastedAmountYear.toolTip': 'Dies ist der jährlich verkaufbare Betrag an Credits pro Jahr im Durchschnitt. Dieser Wert repräsentiert nicht die Verfügbarkeiten.',
-  'features.projectInfo.properties.forecastedAmountYear.label': 'Projektvolumen',
+  'features.projectInfo.properties.projectVolume.toolTip': 'Dies ist die durchschnittliche Anzahl der Credits, die pro Jahr ausgestellt werden. Dieser Wert entspricht nicht den Verfügbarkeiten.',
+  'features.projectInfo.properties.projectVolume.label': 'Projektvolumen',
   'features.projectInfo.properties.riskBuffer': 'Anteil Risikopuffer',
   'features.projectInfo.properties.year': '{years} {years, plural, one {Jahr} other {Jahre} }'
 };
@@ -1612,8 +1574,8 @@ var messagesEn$3 = {
   'features.projectInfo.properties.verificationStandard.label': 'Verification Standard',
   'features.projectInfo.properties.verificationStandard.value.SilvaconsultFCSISO14': 'SILVACONSULT® Forest Carbon Standard, ISO 14064-2',
   'features.projectInfo.properties.verificationStandard.value.MfKWCH': 'Methodik für Klimaschutzprojekte im Wald für die Schweiz',
-  'features.projectInfo.properties.forecastedAmountYear.label': 'Project Volume',
-  'features.projectInfo.properties.forecastedAmountYear.toolTip': "This is the average amount of credits that are issued per year. This value doesn't represent availabilities.",
+  'features.projectInfo.properties.projectVolume.label': 'Project Volume',
+  'features.projectInfo.properties.projectVolume.toolTip': "This is the average amount of credits that are issued per year. This value doesn't represent availabilities.",
   'features.projectInfo.properties.riskBuffer': 'Risk Buffer Share',
   'features.projectInfo.properties.year': '{years} {years, plural, one {year} other {years} }'
 };
@@ -5646,7 +5608,7 @@ var ProjectInfo = function ProjectInfo(_ref) {
     style: {
       objectFit: 'contain'
     }
-  })))) : React__default.default.createElement(React__default.default.Fragment, null), project.averageSellableAmountPerYear !== 0 || project.riskBuffer ? React__default.default.createElement(React__default.default.Fragment, null, React__default.default.createElement(boemly.Spacer, {
+  })))) : React__default.default.createElement(React__default.default.Fragment, null), project.averageSellableAmountPerYear && project.averageSellableAmountPerYear > 0 || project.riskBuffer ? React__default.default.createElement(React__default.default.Fragment, null, React__default.default.createElement(boemly.Spacer, {
     height: "8"
   }), React__default.default.createElement(boemly.Divider, null), React__default.default.createElement(boemly.Spacer, {
     height: "8"
@@ -5654,13 +5616,13 @@ var ProjectInfo = function ProjectInfo(_ref) {
     columns: [1, null, null, 2],
     spacingX: "10",
     spacingY: "8"
-  }, project.averageSellableAmountPerYear !== 0 && React__default.default.createElement(boemly.Tooltip, {
+  }, project.averageSellableAmountPerYear && project.averageSellableAmountPerYear > 0 && React__default.default.createElement(boemly.Tooltip, {
     label: formatMessage({
-      id: 'features.projectInfo.properties.forecastedAmountYear.toolTip'
+      id: 'features.projectInfo.properties.projectVolume.toolTip'
     })
   }, React__default.default.createElement(boemly.Box, null, React__default.default.createElement(boemly.LabelTextPair, {
     label: formatMessage({
-      id: 'features.projectInfo.properties.forecastedAmountYear.label'
+      id: 'features.projectInfo.properties.projectVolume.label'
     }),
     text: formatMessage({
       id: 'unit.formatter.tonsCo2PerYear'
@@ -5780,18 +5742,97 @@ var Contact = function Contact(_ref) {
   }) : React__default.default.createElement(React__default.default.Fragment, null)));
 };
 
+var getFpmProjectById = /*#__PURE__*/function () {
+  var _ref = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(projectId) {
+    var fpmResponse;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return fpmClient.get("/public/projects/" + projectId);
+        case 2:
+          fpmResponse = _context.sent;
+          return _context.abrupt("return", fpmResponse.data);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getFpmProjectById(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 var ProjectFacts = function ProjectFacts(_ref) {
   var slice = _ref.slice,
     project = _ref.project;
-  if (!project) {
+  var _useState = React.useState(project),
+    enhancedProject = _useState[0],
+    setEnhancedProject = _useState[1];
+  var _useState2 = React.useState(false),
+    isLoading = _useState2[0],
+    setIsLoading = _useState2[1];
+  React.useEffect(function () {
+    var fetchCompleteProjectData = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var completeFpmProject, mergedProject;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(project && project.id)) {
+                _context.next = 17;
+                break;
+              }
+              setIsLoading(true);
+              _context.prev = 2;
+              _context.next = 5;
+              return getFpmProjectById(project.id);
+            case 5:
+              completeFpmProject = _context.sent;
+              // Merge the complete FPM data with existing project data (preserving Strapi fields like slug, portfolioHost, thumbnail)
+              mergedProject = _extends({}, completeFpmProject, {
+                slug: project.slug,
+                portfolioHost: project.portfolioHost,
+                thumbnail: project.thumbnail
+              });
+              setEnhancedProject(mergedProject);
+              _context.next = 14;
+              break;
+            case 10:
+              _context.prev = 10;
+              _context.t0 = _context["catch"](2);
+              console.error('Error fetching complete project data:', _context.t0);
+              // Fallback to original project data if fetch fails
+              setEnhancedProject(project);
+            case 14:
+              _context.prev = 14;
+              setIsLoading(false);
+              return _context.finish(14);
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[2, 10, 14, 17]]);
+      }));
+      return function fetchCompleteProjectData() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    fetchCompleteProjectData();
+  }, [project]);
+  if (!enhancedProject) {
     return React__default.default.createElement(React__default.default.Fragment, null, "Invalid configuration, check if a project this id exists in the FPM");
   }
+  if (isLoading) {
+    return React__default.default.createElement(boemly.DefaultSectionContainer, null, React__default.default.createElement(boemly.Wrapper, null, React__default.default.createElement("div", null, "Loading project data...")));
+  }
   return React__default.default.createElement(boemly.DefaultSectionContainer, null, React__default.default.createElement(boemly.Wrapper, null, React__default.default.createElement(boemly.Flex, {
     flexDir: ['column', null, null, 'row'],
     gap: "4",
     width: "full"
   }, React__default.default.createElement(ProjectInfo, {
-    project: project,
+    project: enhancedProject,
     subtitles: slice
   }), React__default.default.createElement(boemly.Flex, {
     flexDir: "column",