From 777f6a11cdd277ffe91c233334b1a56d9f611f72 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 20 Sep 2022 01:13:27 +0200
Subject: [PATCH] fix: add ignore Ts errors to project billable

---
 .../ProjectBillableEntriesForm.schema.tsx                 | 2 ++
 .../ProjectBillableEntriesForm.tsx                        | 2 ++
 .../ProjectBillableEntriesFormContent.tsx                 | 2 ++
 .../ProjectBillableEntriesFormDialogContent.tsx           | 1 +
 .../ProjectBillableEntriesFormFields.tsx                  | 2 ++
 .../ProjectBillableEntriesFormFloatingActions.tsx         | 2 ++
 .../ProjectBillableEntriesFormProvider.tsx                | 2 ++
 .../ProjectBillableEntriesFormDialog/components.tsx       | 2 ++
 .../containers/ProjectBillableEntriesFormDialog/index.tsx | 2 ++
 .../ProjectTimeSheets/ProjectTimesheetsTable.tsx          | 1 +
 .../ProjectDetails/ProjectTimeSheets/components.tsx       | 8 +++++---
 .../containers/ProjectDetails/ProjectTimeSheets/hooks.ts  | 2 +-
 .../Projects/containers/ProjectTaskFormDialog/utils.tsx   | 4 ++--
 .../Projects/containers/common/modalChargeOptions.ts      | 6 +++---
 src/containers/Projects/hooks/projectBillableEntries.tsx  | 2 ++
 15 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.schema.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.schema.tsx
index 7c3631e73..047d03a82 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.schema.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.schema.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import * as Yup from 'yup';
 import intl from 'react-intl-universal';
 
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx
index 3dc19cf5e..e10b46d3a 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import intl from 'react-intl-universal';
 import { Formik } from 'formik';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormContent.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormContent.tsx
index 1b85dfad4..36b5de71f 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormContent.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormContent.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import { Form } from 'formik';
 import ProjectBillableEntriesFormFields from './ProjectBillableEntriesFormFields';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormDialogContent.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormDialogContent.tsx
index 19e128e56..eaf66c1c4 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormDialogContent.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormDialogContent.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React from 'react';
 import { ProjectBillableEntriesFormProvider } from './ProjectBillableEntriesFormProvider';
 import ProjectBillableEntriesForm from './ProjectBillableEntriesForm';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFields.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFields.tsx
index 60ea2c538..636ea8966 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFields.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFields.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import { useFormikContext } from 'formik';
 import { Classes } from '@blueprintjs/core';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx
index cb0f6e331..e11502d57 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import styled from 'styled-components';
 import { useFormikContext } from 'formik';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormProvider.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormProvider.tsx
index d8845811d..589bd3f89 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormProvider.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormProvider.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import { useProjectBillableEntries } from '../../hooks';
 import { DialogContent } from '@/components';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/components.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/components.tsx
index 4d938c890..b10523a6e 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/components.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/components.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import { Button } from '@blueprintjs/core';
 import intl from 'react-intl-universal';
diff --git a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/index.tsx b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/index.tsx
index b94ea65d7..25cf0d7e4 100644
--- a/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/index.tsx
+++ b/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/index.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react';
 import styled from 'styled-components';
 import { Dialog, DialogSuspense, FormattedMessage as T } from '@/components';
diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx
index 1e83a8762..f0f1eaed6 100644
--- a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx
+++ b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx
@@ -87,6 +87,7 @@ const ProjectTimesheetDataTable = styled(DataTable)`
 
     .tbody {
       .tr .td {
+        padding: 0.4rem 0.8rem;
       }
 
       .avatar.td {
diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/components.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/components.tsx
index 430a112f9..f8442d511 100644
--- a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/components.tsx
+++ b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/components.tsx
@@ -35,7 +35,7 @@ export function ActionsMenu({
  */
 export const AvatarCell = ({ row: { original }, size }) => (
   <span className="avatar" data-size={size}>
-    {firstLettersArgs(original?.display_name, original?.name)}
+    {firstLettersArgs(original?.display_name, original?.task_name)}
   </span>
 );
 
@@ -46,11 +46,13 @@ export const TimesheetAccessor = (timesheet) => (
   <React.Fragment>
     <TimesheetHeader>
       <TimesheetTitle>{timesheet.display_name}</TimesheetTitle>
-      <TimesheetSubTitle>{timesheet.name}</TimesheetSubTitle>
+      <TimesheetSubTitle>{timesheet.task_name}</TimesheetSubTitle>
     </TimesheetHeader>
     <TimesheetContent>
       <FormatDate value={timesheet.date} />
-      <TimesheetDescription>{timesheet.description}</TimesheetDescription>
+      {timesheet.description && (
+        <TimesheetDescription>{timesheet.description}</TimesheetDescription>
+      )}
     </TimesheetContent>
   </React.Fragment>
 );
diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/hooks.ts b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/hooks.ts
index 3d44b09bb..491a17623 100644
--- a/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/hooks.ts
+++ b/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/hooks.ts
@@ -32,7 +32,7 @@ export function useProjectTimesheetColumns() {
         id: 'duration',
         Header: '',
         accessor: 'duration',
-        width: 120,
+        width: 150,
         className: 'duration',
         align: 'right',
         clickable: true,
diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
index 5ae5414af..8fb8de99f 100644
--- a/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
+++ b/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
@@ -15,13 +15,13 @@ export function EstimateAmount({ baseCurrency }) {
     <EstimatedAmountBase>
       <EstimatedAmountContent>
         <Choose>
-          <Choose.When condition={values?.charge_type === 'hourly_rate'}>
+          <Choose.When condition={values?.charge_type === 'TIME'}>
             <T id={'project_task.dialog.estimated_amount'} />
             <EstimatedAmount>
               <Money amount={estimatedAmount} currency={baseCurrency} />
             </EstimatedAmount>
           </Choose.When>
-          <Choose.When condition={values?.charge_type === 'fixed_price'}>
+          <Choose.When condition={values?.charge_type === 'FIXED'}>
             <T id={'project_task.dialog.total'} />
             <EstimatedAmount>
               <Money amount={values.rate} currency={baseCurrency} />
diff --git a/src/containers/Projects/containers/common/modalChargeOptions.ts b/src/containers/Projects/containers/common/modalChargeOptions.ts
index 122b7ee91..e1dd36b5a 100644
--- a/src/containers/Projects/containers/common/modalChargeOptions.ts
+++ b/src/containers/Projects/containers/common/modalChargeOptions.ts
@@ -2,9 +2,9 @@
 import intl from 'react-intl-universal';
 
 export const taskChargeOptions = [
-  { name: intl.get('project_task.dialog.hourly_rate'), value: 'time' },
-  { name: intl.get('project_task.dialog.fixed_price'), value: 'fixed' },
-  { name: intl.get('project_task.dialog.non_chargeable'), value: 'non_chargable' },
+  { name: intl.get('project_task.dialog.hourly_rate'), value: 'TIME' },
+  { name: intl.get('project_task.dialog.fixed_price'), value: 'FIXED' },
+  { name: intl.get('project_task.dialog.non_chargeable'), value: 'NON_CHARGABLE' },
 ];
 
 export const expenseChargeOption = [
diff --git a/src/containers/Projects/hooks/projectBillableEntries.tsx b/src/containers/Projects/hooks/projectBillableEntries.tsx
index 171e2cc1c..72f63a90f 100644
--- a/src/containers/Projects/hooks/projectBillableEntries.tsx
+++ b/src/containers/Projects/hooks/projectBillableEntries.tsx
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import { useRequestQuery } from '@/hooks/useQueryRequest';
 import t from './type';