From 59695c2032250c8c7acb03332e5f2e7ea4edbb24 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Wed, 1 May 2024 22:59:03 +0100
Subject: [PATCH] Team activity item dates

---
 .../TeamActivity/TeamActivityItem.tsx         | 15 ++++++++-------
 .../TeamActivity/TeamActivityPage.tsx         |  1 +
 src/lib/date.ts                               | 19 +++++++++++++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/components/TeamActivity/TeamActivityItem.tsx b/src/components/TeamActivity/TeamActivityItem.tsx
index f63c2def2..68a07c1ff 100644
--- a/src/components/TeamActivity/TeamActivityItem.tsx
+++ b/src/components/TeamActivity/TeamActivityItem.tsx
@@ -5,6 +5,7 @@ import { ChevronsDown, ChevronsUp } from 'lucide-react';
 
 type TeamActivityItemProps = {
   onTopicClick?: (activity: TeamStreamActivity) => void;
+  teamId: string;
   user: {
     activities: TeamStreamActivity[];
     _id: string;
@@ -15,7 +16,7 @@ type TeamActivityItemProps = {
 };
 
 export function TeamActivityItem(props: TeamActivityItemProps) {
-  const { user, onTopicClick } = props;
+  const { user, onTopicClick, teamId } = props;
   const { activities } = user;
 
   const [showAll, setShowAll] = useState(false);
@@ -42,7 +43,7 @@ export function TeamActivityItem(props: TeamActivityItemProps) {
       <a
         className="font-medium underline transition-colors hover:cursor-pointer hover:text-black"
         target="_blank"
-        href={resourceUrl}
+        href={`${resourceUrl}?t=${teamId}`}
       >
         {resourceTitle}
       </a>
@@ -51,7 +52,7 @@ export function TeamActivityItem(props: TeamActivityItemProps) {
 
   const timeAgo = (date: string | Date) => (
     <span className="ml-1 text-xs text-gray-400">
-      {getRelativeTimeString(new Date(date).toISOString())}
+      {getRelativeTimeString(new Date(date).toISOString(), true)}
     </span>
   );
   const userAvatar = user.avatar
@@ -77,7 +78,7 @@ export function TeamActivityItem(props: TeamActivityItemProps) {
     return (
       <li
         key={user._id}
-        className="flex items-center flex-wrap gap-1 rounded-md border px-2 py-2.5 text-sm"
+        className="flex flex-wrap items-center gap-1 rounded-md border px-2 py-2.5 text-sm"
       >
         {actionType === 'in_progress' && (
           <>
@@ -122,13 +123,13 @@ export function TeamActivityItem(props: TeamActivityItemProps) {
   const activityLimit = showAll ? activities.length : 5;
 
   return (
-    <li key={user._id} className="rounded-md border overflow-hidden">
+    <li key={user._id} className="overflow-hidden rounded-md border">
       <h3 className="flex flex-wrap items-center gap-1 bg-gray-100 px-2 py-2.5 text-sm">
         {username} has {activities.length} updates in {uniqueResourcesCount}{' '}
         resource(s)
       </h3>
       <div className="py-3">
-        <ul className="flex flex-col gap-2 ml-2 sm:ml-[36px]">
+        <ul className="ml-2 flex flex-col gap-2 sm:ml-[36px]">
           {activities.slice(0, activityLimit).map((activity) => {
             const { actionType, topicIds } = activity;
             const topicCount = topicIds?.length || 0;
@@ -173,7 +174,7 @@ export function TeamActivityItem(props: TeamActivityItemProps) {
 
         {activities.length > 5 && (
           <button
-            className="mt-3 flex items-center gap-2 rounded-md border border-gray-300 p-1 text-xs uppercase tracking-wide text-gray-600 transition-colors hover:border-black hover:bg-black hover:text-white"
+            className="ml-2 mt-3 flex items-center gap-2 rounded-md border border-gray-300 p-1 text-xs uppercase tracking-wide text-gray-600 transition-colors hover:border-black hover:bg-black hover:text-white sm:ml-[36px]"
             onClick={() => setShowAll(!showAll)}
           >
             {showAll ? (
diff --git a/src/components/TeamActivity/TeamActivityPage.tsx b/src/components/TeamActivity/TeamActivityPage.tsx
index 23da24938..1c124214e 100644
--- a/src/components/TeamActivity/TeamActivityPage.tsx
+++ b/src/components/TeamActivity/TeamActivityPage.tsx
@@ -161,6 +161,7 @@ export function TeamActivityPage() {
                 <TeamActivityItem
                   key={user._id}
                   user={user}
+                  teamId={teamId}
                   onTopicClick={setSelectedActivity}
                 />
               );
diff --git a/src/lib/date.ts b/src/lib/date.ts
index ecb6bd726..170981833 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -1,4 +1,9 @@
-export function getRelativeTimeString(date: string): string {
+import dayjs from 'dayjs';
+
+export function getRelativeTimeString(
+  date: string,
+  isTimed: boolean = false,
+): string {
   if (!Intl?.RelativeTimeFormat) {
     return date;
   }
@@ -22,8 +27,18 @@ export function getRelativeTimeString(date: string): string {
     relativeTime = rtf.format(-diffInMinutes, 'minute');
   } else if (diffInHours < 24) {
     relativeTime = rtf.format(-diffInHours, 'hour');
+  } else if (diffInDays < 7) {
+    if (isTimed) {
+      relativeTime = dayjs(date).format('ddd h:mm A');
+    } else {
+      relativeTime = rtf.format(-diffInDays, 'day');
+    }
   } else {
-    relativeTime = rtf.format(-diffInDays, 'day');
+    if (isTimed) {
+      relativeTime = dayjs(date).format('MMM D, YYYY h:mm A');
+    } else {
+      relativeTime = rtf.format(-Math.round(diffInDays / 7), 'week');
+    }
   }
 
   if (relativeTime === 'this minute') {