Merge pull request #454 from honyanya/fix/date-extract

Author: swfz

src/components/kusa/contributions/by-repo/comments.tsx

@@ -16,7 +16,7 @@ import {
   IssueClosedIcon,
   IssueOpenedIcon,
 } from '@primer/octicons-react';
-import { iso8601DateExtract } from '@lib/iso8601-date-extract';
+import { iso8601DateTimeExtract } from '@lib/iso8601-date-time-extract';
 
 const withIssue = (
   value:
@@ -103,7 +103,7 @@ const Comments = ({ comments }: { comments: Summary['comments'] }) => {
                     <li key={htmlUrl} className="flwx-wrap flex odd:bg-gray-100">
                       <span className="ml-3">
                         <CommentIcon size={20} />
-                        {iso8601DateExtract(updatedAt)}
+                        {iso8601DateTimeExtract(updatedAt)}
                         <a target="_blank" rel="noreferrer" href={htmlUrl} className="text-blue-600 hover:underline">
                           {withIssue(c) && c.issue && c.issue.state === 'open' ? (
                             <span className="text-green-800">

src/components/kusa/contributions/by-repo/commits.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { CommitIcon, InfoIcon } from '@primer/octicons-react';
 import { Summary } from '../types';
 import { toHtmlUrl } from '@lib/to-html-url';
-import { iso8601DateExtract } from '@lib/iso8601-date-extract';
+import { iso8601DateTimeExtract } from '@lib/iso8601-date-time-extract';
 
 const Commits = ({ commits }: { commits: Summary['commits'] }) => {
   const count = Object.values(commits).reduce((acc, c) => acc + c.data.length, 0);
@@ -38,7 +38,7 @@ const Commits = ({ commits }: { commits: Summary['commits'] }) => {
                     <li key={commit.sha} className="flex flex-wrap odd:bg-gray-100">
                       <span className="basis-full sm:basis-1/6">
                         <CommitIcon size={20} />
-                        {iso8601DateExtract(commit.date)}{' '}
+                        {iso8601DateTimeExtract(commit.date)}{' '}
                         <a
                           target="_blank"
                           rel="noreferrer"

src/components/kusa/contributions/by-repo/pullrequests.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Summary } from '../types';
 import { toHtmlUrl } from '@lib/to-html-url';
 import { GitMergeIcon, GitPullRequestClosedIcon, GitPullRequestIcon, InfoIcon } from '@primer/octicons-react';
-import { iso8601DateExtract } from '@lib/iso8601-date-extract';
+import { iso8601DateTimeExtract } from '@lib/iso8601-date-time-extract';
 
 const PullRequests = ({ pullRequests }: { pullRequests: Summary['pullRequests'] }) => {
   const totalCount = Object.values(pullRequests).reduce((acc, prs) => acc + prs.data.length, 0);
@@ -70,7 +70,7 @@ const PullRequests = ({ pullRequests }: { pullRequests: Summary['pullRequests']
                             <GitPullRequestIcon size={20} />
                           </span>
                         )}
-                        {iso8601DateExtract(pr.pull_request.updated_at)}
+                        {iso8601DateTimeExtract(pr.pull_request.updated_at)}
                         <a
                           target="_blank"
                           rel="noreferrer"

src/components/kusa/contributions/contributions-simple.tsx

@@ -14,7 +14,7 @@ import type {
   WatchEventPayload,
 } from './types';
 import { toHtmlUrl } from '@lib/to-html-url';
-import { iso8601DateExtract } from '@lib/iso8601-date-extract';
+import { iso8601DateTimeExtract } from '@lib/iso8601-date-time-extract';
 
 type Props = {
   result: any;
@@ -155,7 +155,7 @@ const CommitCommentEvent = ({ payload }: { payload: CommitCommentEventPayload })
       <a className="text-blue-600 hover:underline" target="_blank" rel="noreferrer" href={payload.comment.html_url}>
         {payload.comment.commit_id?.substring(0, 6)}
       </a>{' '}
-      at {payload.comment.updated_at.split('T')[1].replace('Z', '')}
+      at {iso8601DateTimeExtract(payload.comment.updated_at, 1)}
     </div>
   );
 };
@@ -180,7 +180,7 @@ const ContributionsSimple = (props: Props) => {
       {props.result.map((row: GitHubEvent) => {
         return (
           <div key={row.id} className="flex flex-wrap text-sm odd:bg-gray-100">
-            <div className="basis-1/4 sm:basis-1/12">{iso8601DateExtract(row.created_at)}</div>
+            <div className="basis-1/4 sm:basis-1/12">{iso8601DateTimeExtract(row.created_at)}</div>
             <div className="basis-3/4 text-blue-600 hover:underline sm:basis-4/12">
               {row.repo.url ? (
                 <a href={toHtmlUrl(row.repo.url)} target="_blank" rel="noreferrer">

src/lib/__tests__/iso8601-date-extract.spec.tsx

@@ -1,7 +1,11 @@
-import { iso8601DateExtract } from '../iso8601-date-extract';
+import { iso8601DateTimeExtract } from '../iso8601-date-time-extract';
 
 describe('iso8601DateExtract', () => {
+  const dateTime = "2022-09-22T11:26:19Z";
   test('extraction date only', () => {
-    expect(iso8601DateExtract("2022-09-22T11:26:19Z")).toBe("2022-09-22")
+    expect(iso8601DateTimeExtract(dateTime)).toBe("2022-09-22")
+  });
+  test('extraction time only', () => {
+    expect(iso8601DateTimeExtract(dateTime, 1)).toBe("11:26:19")
   });
 });

src/lib/iso8601-date-extract.tsx

@@ -0,0 +1,3 @@
+export const iso8601DateTimeExtract = (datetime: string, index: number = 0) => {
+  return index ? datetime.split('T')[index].replace('Z', '') : datetime.split('T')[index];
+};