feat(fe-piattaforma): fe updates 10272022

teamdigitale · Oct 27, 2022 · 79b19b3 · 79b19b3
1 parent 1849eba
commit 79b19b3
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 49 deletions.
diff --git a/fe-piattaforma/src/components/Comments/answersSection.tsx b/fe-piattaforma/src/components/Comments/answersSection.tsx
@@ -14,11 +14,15 @@ interface AnswerSectionI {
 }
 
 const AnswersSection: React.FC<AnswerSectionI> = (props) => {
-  const { thread, showReplies, replies } = props;
+  const { thread, showReplies, replies = [] } = props;
   const device = useAppSelector(selectDevice);
 
   const dispatch = useDispatch();
 
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  if (replies === '[]') return null;
+
   return (
     <div>
       {showReplies && (
@@ -31,40 +35,39 @@ const AnswersSection: React.FC<AnswerSectionI> = (props) => {
             thread && !device.mediaIsPhone && 'comment-container__thread'
           )}
         >
-          {replies &&
-            replies.map((comment, index: number) => (
-              <CommentAnswer
-                key={index}
-                {...comment}
-                noBorder={replies.length > 1 && index < replies.length - 1}
-                onDeleteComment={() =>
-                  dispatch(
-                    openModal({
-                      id: 'delete-forum-entity',
-                      payload: {
-                        text: 'Confermi di voler eliminare questo contenuto?',
-                        entity: 'comment',
-                        id: comment.id,
-                        author: comment.author
-                      },
-                    })
-                  )
-                }
-                onEditComment={() =>
-                  dispatch(
-                    openModal({
-                      id: 'comment-modal',
-                      payload: {
-                        title: 'Modifica commento',
-                        action: 'edit',
-                        id: comment.id,
-                        body: comment.body,
-                      },
-                    })
-                  )
-                }
-              />
-            ))}
+          {(replies || []).map((comment, index: number) => (
+                <CommentAnswer
+                  key={index}
+                  {...comment}
+                  noBorder={replies.length > 1 && index < replies.length - 1}
+                  onDeleteComment={() =>
+                    dispatch(
+                      openModal({
+                        id: 'delete-forum-entity',
+                        payload: {
+                          text: 'Confermi di voler eliminare questo contenuto?',
+                          entity: 'comment',
+                          id: comment.id,
+                          author: comment.author,
+                        },
+                      })
+                    )
+                  }
+                  onEditComment={() =>
+                    dispatch(
+                      openModal({
+                        id: 'comment-modal',
+                        payload: {
+                          title: 'Modifica commento',
+                          action: 'edit',
+                          id: comment.id,
+                          body: comment.body,
+                        },
+                      })
+                    )
+                  }
+                />
+              ))}
         </div>
       )}
     </div>

diff --git a/fe-piattaforma/src/components/Comments/comment.tsx b/fe-piattaforma/src/components/Comments/comment.tsx
@@ -56,7 +56,7 @@ const Comment: React.FC<CommentI> = (props) => {
     date,
     author,
     section,
-    replies,
+    replies = [],
     likes,
     user_like,
     views,
@@ -322,10 +322,18 @@ const Comment: React.FC<CommentI> = (props) => {
         <div style={{ width: '94%' }}>{body}</div>
         <div className='comment-container__border mt-4 mb-2'></div>
         <SocialBar
-          replies={section === 'community' ? replies.length : undefined}
+          replies={
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            section === 'community' && replies !== '[]'
+              ? replies?.length
+              : undefined
+          }
           views={section === 'community' ? views : undefined}
           onShowReplies={
-            section === 'community' && replies.length
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            section === 'community' && replies !== '[]' && replies?.length
               ? () => setShowReplies((prev) => !prev)
               : undefined
           }

diff --git a/fe-piattaforma/src/components/Comments/commentSection.tsx b/fe-piattaforma/src/components/Comments/commentSection.tsx
@@ -24,7 +24,7 @@ const CommentSection: React.FC<commentSectionI> = ({ section }) => {
       </div>
       {comments.map((comment, i) => (
         <Comment
-          key={comment.id}
+          key={`${comment.id}-${comment.body}`}
           section={section}
           thread={comments.length > 1 && i < comments.length - 1}
           {...comment}

diff --git a/fe-piattaforma/src/components/Comments/socialBar.tsx b/fe-piattaforma/src/components/Comments/socialBar.tsx
@@ -35,6 +35,8 @@ const SocialBar: React.FC<SocialI> = (props) => {
 
   const device = useAppSelector(selectDevice);
 
+  console.log('replies', replies)
+
   return (
     <div
       className={clsx(
@@ -175,10 +177,12 @@ const SocialBar: React.FC<SocialI> = (props) => {
               >
                 {`${showReplies ? 'NASCONDI RISPOSTE' : 'MOSTRA RISPOSTE'}`}
               </p>
-              <span
-                className='primary-color pl-1 letter-spacing'
-                style={{ fontWeight: 400 }}
-              >{`(${replies})`}</span>
+              {replies ? (
+                <span
+                  className='primary-color pl-1 letter-spacing'
+                  style={{ fontWeight: 400 }}
+                >{`(${replies})`}</span>
+              ) : null}
             </div>
           </Button>
         </div>

diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageComment.tsx b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageComment.tsx
@@ -104,11 +104,12 @@ const ManageComment: React.FC<ManageCommentI> = ({
       }
     }
   };
+
   return (
     <GenericModal
       id={modalId}
       primaryCTA={{
-        disabled: newComment.trim() === '',
+        disabled: newComment?.toString()?.trim() === '',
         label: creation ? 'Conferma' : 'Salva',
         onClick: handleSaveComment,
       }}

diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageDocument.tsx b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageDocument.tsx
@@ -68,6 +68,7 @@ const ManageDocument: React.FC<ManageDocumentI> = ({
             id,
             {
               ...newFormValues,
+              title: newFormValues.title?.toString(),
               program_label:
                 newFormValues.program === 'public'
                   ? 'Tutti i programmi'

diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageNews.tsx b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageNews.tsx
@@ -122,6 +122,7 @@ const ManageNews: React.FC<ManageNewsI> = ({
             id,
             {
               ...newFormValues,
+              title: newFormValues.title?.toString(),
               program_label:
                 newFormValues.program === 'public'
                   ? 'Tutti i programmi'

diff --git a/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageTopic.tsx b/fe-piattaforma/src/pages/administrator/AdministrativeArea/Entities/modals/manageTopic.tsx
@@ -65,6 +65,7 @@ const ManageTopic: React.FC<ManageTopicI> = ({
             id,
             {
               ...newFormValues,
+              title: newFormValues.title?.toString(),
               entity:
                 userProfile?.idProgetto || userProfile?.idProgramma
                   ? userProfile.nomeEnte

diff --git a/fe-piattaforma/src/redux/features/forum/comments/commentsThunk.ts b/fe-piattaforma/src/redux/features/forum/comments/commentsThunk.ts
@@ -18,7 +18,7 @@ export const GetCommentsList =
       );
       // const res = await API.get(`/item/${itemId}/comments/user/${userId}`)
       if (res) {
-        dispatch(setCommentsList(res.data.data.items || []));
+        dispatch(setCommentsList(res.data?.data?.items || []));
       }
     } catch (error) {
       console.log('GetCommentsList error', error);
@@ -36,10 +36,12 @@ export const CreateComment =
     try {
       dispatch(showLoader());
       dispatch({ ...CreateCommentAction });
-      const res = await proxyCall(`/item/${itemId}/comment`, 'POST', {
-        comment_body: comment,
-      });
-      return res;
+      if (comment) {
+        const res = await proxyCall(`/item/${itemId}/comment`, 'POST', {
+          comment_body: comment?.toString(),
+        });
+        return res;
+      }
     } catch (error) {
       console.log('CreateComment error', error);
       return false;