fixed error msg for falsy start date (#565)

Real-Dev-Squad · Oct 23, 2023 · a65bc3e · a65bc3e
1 parent 4699129
commit a65bc3e
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 14 deletions.
diff --git a/src/components/member-profile/active-task/index.js b/src/components/member-profile/active-task/index.js
@@ -5,14 +5,20 @@ import { percentageofDaysRemaining } from '@helper-functions/taskProgress';
 import { estimatedDays } from '@helper-functions/estimated-days';
 import { progressIndicator } from '@helper-functions/progressIndicator';
 
-const ActiveTask = ({ taskDetails }) => {
+const ActiveTask = ({ taskDetails, devUser }) => {
   const { title, purpose, startedOn, endsOn, percentCompleted } = taskDetails;
-  const completedDate = timeWas(startedOn * 1000, false, endsOn * 1000);
+  const completedDate = timeWas(
+    startedOn * 1000,
+    false,
+    endsOn * 1000,
+    devUser
+  );
   const percentOfTaskLeft = 100 - percentCompleted;
   const percentageOfDaysRemaining = percentageofDaysRemaining(
     startedOn,
     endsOn,
-    completedDate
+    completedDate,
+    devUser
   );
   const showEstimatedDay = estimatedDays(
     percentageOfDaysRemaining,

diff --git a/src/components/member-profile/contribution-type/index.js b/src/components/member-profile/contribution-type/index.js
@@ -52,7 +52,7 @@ const renderActiveTasks = (tasks, devUser) => {
   if (devUser) {
     if (tasks?.length > 0) {
       return tasks.map((task, index) => {
-        return <ActiveTask key={index} taskDetails={task} />;
+        return <ActiveTask key={index} taskDetails={task} devUser={devUser} />;
       });
     }
     return (

diff --git a/src/components/member-profile/contribution/index.js b/src/components/member-profile/contribution/index.js
@@ -115,22 +115,22 @@ const ContributionCard = ({
   if (isTitleAvailable) {
     if (status !== 'VERIFIED') {
       completedText = <span>Estimated Completion: </span>;
-      completedDate = timeWas(startedOn * 1000, false, endsOn * 1000);
+      completedDate = timeWas(startedOn * 1000, false, endsOn * 1000, devUser);
     } else {
-      completedDate = timeWas(startedOn * 1000, false, endsOn * 1000);
+      completedDate = timeWas(startedOn * 1000, false, endsOn * 1000, devUser);
       completedText = <span>Completed in: </span>;
-      featureLiveDate = timeWas(endsOn * 1000, true);
+      featureLiveDate = timeWas(endsOn * 1000, true, Date.now(), devUser);
       featureLiveOnText = featureLiveDate;
     }
   } else {
     const createdAt = +new Date(prList[0].createdAt);
     const updatedAt = +new Date(prList[0].updatedAt);
     if (prList[0].state === 'closed') {
-      completedDate = timeWas(createdAt, false, updatedAt);
+      completedDate = timeWas(createdAt, false, updatedAt, devUser);
       completedText = (
         <span className={classNames.completedText}>Completed in </span>
       );
-      featureLiveDate = timeWas(updatedAt, true);
+      featureLiveDate = timeWas(updatedAt, true, Date.now(), devUser);
       featureLiveOnText = featureLiveDate;
     }
   }
@@ -202,7 +202,7 @@ ContributionCard.propTypes = {
   imageLink: PropTypes.string.isRequired,
   devUser: PropTypes.bool.isRequired,
   url: PropTypes.string.isRequired,
-  urlObj: PropTypes.instanceOf(Object).isRequired,
+  urlObj: PropTypes.instanceOf(URL).isRequired,
 };
 
 export default Contribution;
diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
@@ -4,3 +4,4 @@ export const emptyContributionsError =
   'No Contributions have been received yet.';
 export const emptyNoteworthyContributionsError =
   'It would be wonderful to see some noteworthy contributions made.';
+export const notAvailableError = 'N/A';
diff --git a/src/helper-functions/taskProgress.js b/src/helper-functions/taskProgress.js
@@ -1,8 +1,13 @@
 import { timeWas } from '@helper-functions/time-was';
 
-const percentageofDaysRemaining = (startedOn, endsOn, completedDate) => {
-  const startDate = timeWas(startedOn * 1000, true, endsOn * 1000);
-  const endDate = timeWas(endsOn * 1000, true, startDate * 1000);
+const percentageofDaysRemaining = (
+  startedOn,
+  endsOn,
+  completedDate,
+  devUser
+) => {
+  const startDate = timeWas(startedOn * 1000, true, endsOn * 1000, devUser);
+  const endDate = timeWas(endsOn * 1000, true, startDate * 1000, devUser);
   const date1 = new Date(startDate);
   const date2 = new Date(endDate);
   const diffTime = Math.abs(date2 - date1);

diff --git a/src/helper-functions/time-was.js b/src/helper-functions/time-was.js
@@ -1,6 +1,16 @@
+import { notAvailableError } from '@constants/error-messages';
+
 const calc = (interval, cycle) => Math.floor(cycle / interval);
 
-function timeWas(timestamp, completeDate = false, differentNow = Date.now()) {
+function timeWas(
+  timestamp,
+  completeDate = false,
+  differentNow = Date.now(),
+  devUser
+) {
+  if (devUser && (!timestamp || timestamp === 0)) {
+    return notAvailableError;
+  }
   const timeInSec = Math.floor(differentNow - timestamp) / 1000;
 
   /**

diff --git a/src/test/unit/components/member-profile/index.test.js b/src/test/unit/components/member-profile/index.test.js
@@ -8,6 +8,7 @@ import {
   emptyActiveTasksError,
   emptyContributionsError,
   emptyNoteworthyContributionsError,
+  notAvailableError,
 } from '@constants/error-messages';
 
 const notaMember = {
@@ -128,6 +129,92 @@ describe('Members Profile', () => {
     );
     expect(emptyNoteworthyContributionsErrorElement).toBeInTheDocument();
   });
+  it('Should render notAvailable error message in completion date, if start date is falsy inside task/contrbution object', () => {
+    const tasksWithEmptyStartDateAsFalsy = [
+      {
+        id: 'eHjZi3jzyqep43GvK2Rf',
+        percentCompleted: 50,
+        endsOn: '1698085740',
+        github: {
+          issue: {
+            html_url: 'https://github.com/Real-Dev-Squad/mobile-app/issues/263',
+            id: '1914069956',
+            assignee: 'harshitadatra',
+            status: 'open',
+          },
+        },
+        createdBy: 'amitprakash',
+        assignee: 'prakash',
+        title: 'Animation enhancement in Goals page',
+        type: 'feature',
+        priority: 'TBD',
+        startedOn: null,
+        status: 'IN_PROGRESS',
+        featureUrl:
+          'https://github.com/Real-Dev-Squad/website-members/issues/562',
+        assigneeId: 'YzEVZ50DHr37oL1mqqbO',
+      },
+    ];
+
+    const contributionsWithStartDateAsFalsy = {
+      all: [
+        {
+          task: {
+            id: 'CdsWvmW2c9h5D08bHsYa',
+            title: 'Dummy Title',
+            endsOn: '1697155200',
+            startedOn: '0',
+            status: 'COMPLETED',
+            featureUrl:
+              'https://github.com/Real-Dev-Squad/website-members/issues/562',
+            participants: [],
+          },
+          prList: [],
+        },
+      ],
+      noteworthy: [
+        {
+          task: {
+            id: 'CdsWvmW2c9h5D08bHsYa',
+            title: 'Dummy Title',
+            endsOn: '1697155200',
+            startedOn: undefined,
+            featureUrl:
+              'https://github.com/Real-Dev-Squad/website-members/issues/562',
+            status: 'COMPLETED',
+            participants: [],
+          },
+          prList: [],
+        },
+      ],
+    };
+    render(
+      <KeyboardProvider
+        initialValue={{
+          isOptionKeyPressed: true,
+          setIsOptionKeyPressed: jest.fn(),
+        }}
+      >
+        <UserContextProvider value={initialUserContext}>
+          <TaskContextProvider>
+            <Profile
+              membersData={isaMember}
+              devUser
+              tasks={tasksWithEmptyStartDateAsFalsy}
+              contributions={contributionsWithStartDateAsFalsy}
+            />
+          </TaskContextProvider>
+        </UserContextProvider>
+      </KeyboardProvider>
+    );
+    const notAvailableCompletetionDateElements =
+      screen.queryAllByText(notAvailableError);
+    notAvailableCompletetionDateElements.forEach((element) => {
+      expect(element).toHaveTextContent(notAvailableError);
+    });
+
+    expect(notAvailableCompletetionDateElements).toHaveLength(3);
+  });
 
   it('Should render the info icon correctly', () => {
     render(