gatsby-core-theme 44.4.21 → 44.4.23

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [44.4.23](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.22...v44.4.23) (2025-07-24)
+
+
+### Bug Fixes
+
+* comments enhancing ([f81d966](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f81d966f04711a59c67088c44707a18507453ea9))
+
+## [44.4.22](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.21...v44.4.22) (2025-07-24)
+
+
+### Bug Fixes
+
+* removed typecasting from comment id ([7e84117](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7e84117d6425fbfd31b0c347208805b2a02312dd))
+
 ## [44.4.21](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.20...v44.4.21) (2025-07-23)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "44.4.21",
+  "version": "44.4.23",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/molecules/comment/index.js

@@ -12,7 +12,7 @@ import useTranslate from '~hooks/useTranslate/useTranslate';
 import styles from './comment.module.scss';
 
 const Comment = ({ pageContext, comment, authors, isReply }) => {
-    const commentName = comment?.author_id ? authors?.[comment?.author_id]?.name : comment.name;
+    const commentName = comment?.author_id ? authors?.[comment?.author_id]?.name : comment.author_name;
     const commentJobTitle = comment?.author_id ? authors?.[comment?.author_id]?.author_title : undefined;
     const date = new Date(comment.updated_at);
     const day = String(date.getUTCDate()).padStart(2, '0');
@@ -89,7 +89,7 @@ Comment.propTypes = {
     comment: PropTypes.shape({
         comment_id: PropTypes.number,
         author_id: PropTypes.number,
-        name: PropTypes.string,
+        author_name: PropTypes.string,
         email: PropTypes.string,
         comment: PropTypes.string,
         updated_at: PropTypes.string,

package/src/components/molecules/leave-comment-form/index.js

@@ -15,19 +15,19 @@ const LeaveCommentForm = ({
     showLabels = true,
     showButtonIcon = false,
     buttonLabel = 'Add Comment',
-    successMessage = 'Comment Added',
+    successMessage = 'Comment Submitted for Approval',
     failMessage = 'Comment Not Added',
     validationMessage = 'Fill all required fields',
     buttonIcon = <FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />,
 }) => {
     const activeMarket = page?.market;
 
-    const customSubmit = (form) => {
+    const customSubmit = (form, resetForm) => {
         const formData = new FormData(form);
         const data = Object.fromEntries(formData.entries());
 
         if(data?.["g-recaptcha-response"] === '' || !data?.tnc) return;
-        if(parentCommentID) data.parent_id = parseInt(parentCommentID);
+        if(parentCommentID) data.parent_id = parentCommentID;
 
         data.reference_id = page?.id;
         data.site_id = parseInt(process.env.SITE_ID);
@@ -35,7 +35,7 @@ const LeaveCommentForm = ({
 
         data.market_short_code = activeMarket;
         
-        if(data?.post_anonymously) delete data?.name;
+        if(!data?.post_anonymously) data.author_name = data?.name;
         if(!data?.rate) delete data?.rate;
 
         delete data?.post_anonymously;
@@ -53,6 +53,7 @@ const LeaveCommentForm = ({
             .post('/api/post-comment', data, headers)
             .then((response) => {
                 response.ok = response.status === 200;
+                if (response.ok) resetForm();
                 resolve(response);
             })
             .catch((error) => reject(error?.response?.data?.errors?.join() || error.message));

package/src/components/organisms/form/index.js

@@ -50,6 +50,17 @@ const FormComponent = ({
     setElements({ ...elements, [name]: value });
   };
 
+  const resetForm = () => {
+    const clearedValues = Object.keys(elements).reduce((acc, key) => {
+      acc[key] = '';
+      return acc;
+    }, {});
+
+    setElements(clearedValues);
+    formRef?.current?.reset(); 
+    recaptchaRef?.current?.reset(); 
+};
+
   async function postData(url = '', data = {}) {
     return fetch(url, {
       method: 'POST',
@@ -75,7 +86,7 @@ const FormComponent = ({
     try {
       let response;
       if (customeSubmit) {
-        response = await customeSubmit(form);
+        response = await customeSubmit(form, resetForm);
       } else {
         response = await postData(submitUrl, new FormData(form));
       }
@@ -203,9 +214,9 @@ const FormComponent = ({
           )}
           {!customError && (state.success || state.failed || !state.isValid) && (
             <div className={styles.formAlerts || ''}>
-              {state.success && <div className={styles.alertSuccess || ''}>{useTranslate("success_message",successMessage)}</div>}
-              {state.failed && <div className={styles.alertDanger || ''}>{useTranslate('fail_message', failMessage)}</div>}
-              {!state.isValid && (
+              {!state.loading && state.success && <div className={styles.alertSuccess || ''}>{useTranslate("success_message",successMessage)}</div>}
+              {!state.loading && state.failed && <div className={styles.alertDanger || ''}>{useTranslate('fail_message', failMessage)}</div>}
+              {!state.loading && !state.isValid && (
                 <div className={styles.alertWarning || ''}>{useTranslate('validation_message',validationMessage)}</div>
               )}
             </div>

package/src/resolver/comments.mjs

@@ -7,6 +7,7 @@ export function transformComments(comments) {
         if (!transformedComments[refId]) {
             transformedComments[refId] = [];
         }
+        
         if(comment.approved){
             transformedComments[refId].push({
                 replies: transformComments(comment?.replies)[refId],
@@ -17,6 +18,7 @@ export function transformComments(comments) {
                 comment: comment?.comment,
                 rate: comment?.rate,
                 author_id: comment?.author_id,
+                author_name: comment?.author_name,
                 votes_down: comment.votes_down,
                 votes_up: comment.votes_up,
                 created_at: comment?.created_at,

package/src/resolver/comments.test.js

@@ -17,6 +17,7 @@ describe('transformComments', () => {
           comment_id: '684aa52e584a3feef503fc42',
           rate: 2,
           author_id: 229,
+          author_name: 'John Doe',
           votes_down: 0,
           votes_up: 0,
           created_at: '2025-06-12T10:00:14.273000Z',

package/tests/factories/comments/comments.factory.js

@@ -13,7 +13,7 @@ export default function getCommentsFactory() {
       reference_type: 'page',
       reference_id: 214206,
       market_short_code: 'gb_en',
-      author_name: null,
+      author_name: 'John Doe',
       votes_up: 0,
       votes_down: 0,
       updated_at: '2025-06-12T10:00:14.273000Z',