From b023e57717cf2df68f1d2ee590bd40c38a88850e Mon Sep 17 00:00:00 2001
From: Jose Carlos Laura Ramirez <pachonjcl@gmail.com>
Date: Thu, 13 Jun 2024 00:16:10 -0400
Subject: [PATCH] improve code

---
 .../ResourceTabs/AuditLogTab/AuditLogTab.tsx  |  2 +-
 .../SiteAuditLogEntityStatusSide.tsx          |  2 +-
 .../components/SiteAuditLogProjectStatus.tsx  | 75 ++++---------------
 .../PolygonStatus/StatusDisplay.tsx           |  4 +-
 .../elements/CommentaryBox/CommentaryBox.tsx  |  6 +-
 5 files changed, 20 insertions(+), 69 deletions(-)

diff --git a/src/admin/components/ResourceTabs/AuditLogTab/AuditLogTab.tsx b/src/admin/components/ResourceTabs/AuditLogTab/AuditLogTab.tsx
index a7e5573fa..967ddd7e3 100644
--- a/src/admin/components/ResourceTabs/AuditLogTab/AuditLogTab.tsx
+++ b/src/admin/components/ResourceTabs/AuditLogTab/AuditLogTab.tsx
@@ -67,7 +67,7 @@ const AuditLogTab: FC<IProps> = ({ label, ...rest }) => {
                 />
               </When>
               <When condition={buttonToogle === AuditLogButtonStates.PROJECT && !record?.project}>
-                <SiteAuditLogProjectStatus record={record} auditLogData={auditLogData} refresh={refetch} />
+                <SiteAuditLogProjectStatus record={record} auditLogData={auditLogData} />
               </When>
               <When condition={buttonToogle !== AuditLogButtonStates.PROJECT}>
                 <SiteAuditLogEntityStatus
diff --git a/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogEntityStatusSide.tsx b/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogEntityStatusSide.tsx
index 107b28ce9..1c760afa6 100644
--- a/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogEntityStatusSide.tsx
+++ b/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogEntityStatusSide.tsx
@@ -93,7 +93,7 @@ const SiteAuditLogEntityStatusSide = ({
       <Text variant="text-16-bold">{`${entityType} Status`}</Text>
       <StepProgressbar
         color="secondary"
-        value={(getValueForStatus && getValueForStatus(record?.status)) ?? 0}
+        value={getValueForStatus?.(record?.status) ?? 0}
         labels={progressBarLabels}
         classNameLabels="min-w-[99px] "
         className={classNames("w-[98%] pl-[1%]", entityType === "Polygon" && "pl-[6%]")}
diff --git a/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogProjectStatus.tsx b/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogProjectStatus.tsx
index 5799423df..1b9195e7c 100644
--- a/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogProjectStatus.tsx
+++ b/src/admin/components/ResourceTabs/AuditLogTab/components/SiteAuditLogProjectStatus.tsx
@@ -3,75 +3,26 @@ import { FC } from "react";
 import Text from "@/components/elements/Text/Text";
 import { AuditStatusResponse, ProjectLiteRead } from "@/generated/apiSchemas";
 
-import CommentarySection from "../../PolygonReviewTab/components/CommentarySection/CommentarySection";
 import AuditLogTable from "./AuditLogTable";
 
 export interface SiteAuditLogProjectStatusProps {
   record?: ProjectLiteRead | null;
-  refresh?: () => void;
   auditLogData?: { data: AuditStatusResponse[] };
 }
 
-export const gridData = [
-  {
-    id: "1",
-    date: "28/11/2023 09.39",
-    user: "Jessica Chaimers",
-    site: null,
-    status: "Need More Information",
-    comentary: null
-  },
-  {
-    id: "2",
-    date: "28/11/2023 09.39",
-    user: "Teresa Muthoni",
-    site: null,
-    status: "Need More Information",
-    comentary:
-      "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-  },
-  {
-    id: "3",
-    date: "28/11/2023 09.39",
-    user: "Jessica Chaimers",
-    site: null,
-    status: "Awaiting Approval",
-    comentary: null
-  },
-  {
-    id: "4",
-    date: "28/11/2023 09.39",
-    user: "Jessica Chaimers",
-    site: null,
-    status: "Awaiting Approval",
-    comentary: null
-  },
-  {
-    id: "5",
-    date: "28/11/2023 09.39",
-    user: "Jessica Chaimers",
-    site: null,
-    status: "Awaiting Approval",
-    comentary: null
-  }
-];
-
-const SiteAuditLogProjectStatus: FC<SiteAuditLogProjectStatusProps> = ({ record, auditLogData, refresh }) => {
-  return (
-    <div className="flex flex-col gap-6">
-      <div>
-        <Text variant="text-24-bold" className="mb-1">
-          Project Status and Comments
-        </Text>
-        <Text variant="text-14-light" className="mb-4">
-          Update the project status, view updates, or add comments
-        </Text>
-        <CommentarySection record={record} entity={"Project"} refresh={refresh} viewCommentsList={false} />
-      </div>
-      <Text variant="text-16-bold">History and Discussion for {record && record?.name}</Text>
-      {auditLogData && <AuditLogTable auditLogData={auditLogData} />}
+const SiteAuditLogProjectStatus: FC<SiteAuditLogProjectStatusProps> = ({ record, auditLogData }) => (
+  <div className="flex flex-col gap-6">
+    <div>
+      <Text variant="text-24-bold" className="mb-1">
+        Project Status and Comments
+      </Text>
+      <Text variant="text-14-light" className="mb-4">
+        Update the project status, view updates, or add comments
+      </Text>
     </div>
-  );
-};
+    <Text variant="text-16-bold">History and Discussion for {record && record?.name}</Text>
+    {auditLogData && <AuditLogTable auditLogData={auditLogData} />}
+  </div>
+);
 
 export default SiteAuditLogProjectStatus;
diff --git a/src/admin/components/ResourceTabs/PolygonReviewTab/components/PolygonStatus/StatusDisplay.tsx b/src/admin/components/ResourceTabs/PolygonReviewTab/components/PolygonStatus/StatusDisplay.tsx
index a0aa03e63..aa6fac8a9 100644
--- a/src/admin/components/ResourceTabs/PolygonReviewTab/components/PolygonStatus/StatusDisplay.tsx
+++ b/src/admin/components/ResourceTabs/PolygonReviewTab/components/PolygonStatus/StatusDisplay.tsx
@@ -156,8 +156,8 @@ const StatusDisplay = ({
   );
 
   const onFinallyRequest = () => {
-    refresh && refresh();
-    reloadEntity && reloadEntity();
+    refresh?.();
+    reloadEntity();
     closeModal();
   };
 
diff --git a/src/components/elements/CommentaryBox/CommentaryBox.tsx b/src/components/elements/CommentaryBox/CommentaryBox.tsx
index 71c9f7eb3..477d01afa 100644
--- a/src/components/elements/CommentaryBox/CommentaryBox.tsx
+++ b/src/components/elements/CommentaryBox/CommentaryBox.tsx
@@ -128,8 +128,8 @@ const CommentaryBox = (props: CommentaryBoxProps) => {
       <div className="flex items-center gap-2 rounded-3xl border border-grey-750 p-3">
         <div className="flex min-h-[32px] min-w-[32px] items-center justify-center self-start rounded-full bg-primary-500">
           <Text variant="text-14-semibold" className="uppercase text-white">
-            {(name && name[0]) ?? ""}
-            {(lastName && lastName[0]) ?? ""}
+            {name?.[0] ?? ""}
+            {lastName?.[0] ?? ""}
           </Text>
         </div>
         <TextArea
@@ -185,7 +185,7 @@ const CommentaryBox = (props: CommentaryBoxProps) => {
         <div className="display-grid">
           {warning && charCount > 255 && <div className="text-right text-xs text-red">{warning}</div>}
           <div className={`text-nowrap text-right text-xs ${charCount > 255 ? "text-red" : "text-grey-500"}`}>
-            {charCount}/255 characters
+            {charCount}/255 {t("characters")}
           </div>
         </div>
       </div>