From 5e76e03a55bd9a49adc3367d84af2eb62c9baa0c Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 14 Aug 2023 16:20:53 +0530
Subject: [PATCH] style: profile activity loader (#1858)

---
 .../workspace/sidebar-quick-action.tsx        |   6 +-
 .../[workspaceSlug]/me/profile/activity.tsx   | 326 +++++++++---------
 2 files changed, 165 insertions(+), 167 deletions(-)

diff --git a/apps/app/components/workspace/sidebar-quick-action.tsx b/apps/app/components/workspace/sidebar-quick-action.tsx
index 781ef353f..3f6982903 100644
--- a/apps/app/components/workspace/sidebar-quick-action.tsx
+++ b/apps/app/components/workspace/sidebar-quick-action.tsx
@@ -15,7 +15,7 @@ export const WorkspaceSidebarQuickAction = () => {
       }`}
     >
       <button
-        className={`flex items-center gap-2 flex-grow rounded flex-shrink-0  py-2 ${
+        className={`flex items-center gap-2 flex-grow rounded flex-shrink-0  py-1.5 ${
           store?.theme?.sidebarCollapsed
             ? "px-2 hover:bg-custom-sidebar-background-80"
             : "px-3 shadow border-[0.5px] border-custom-border-300"
@@ -25,7 +25,7 @@ export const WorkspaceSidebarQuickAction = () => {
           document.dispatchEvent(e);
         }}
       >
-        <Icon iconName="edit_square" className="!text-xl !leading-5 text-custom-sidebar-text-300" />
+        <Icon iconName="edit_square" className="!text-lg !leading-4 text-custom-sidebar-text-300" />
         {!store?.theme?.sidebarCollapsed && <span className="text-sm font-medium">New Issue</span>}
       </button>
 
@@ -40,7 +40,7 @@ export const WorkspaceSidebarQuickAction = () => {
           document.dispatchEvent(e);
         }}
       >
-        <Icon iconName="search" className="!text-xl !leading-5 text-custom-sidebar-text-300" />
+        <Icon iconName="search" className="!text-lg !leading-4 text-custom-sidebar-text-300" />
       </button>
     </div>
   );
diff --git a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
index 1b04388e6..ce6fd0d3d 100644
--- a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
@@ -27,17 +27,6 @@ const ProfileActivity = () => {
 
   const { data: userActivity } = useSWR(USER_ACTIVITY, () => userService.getUserActivity());
 
-  if (!userActivity) {
-    return (
-      <Loader className="space-y-5">
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-      </Loader>
-    );
-  }
-
   return (
     <WorkspaceAuthorizationLayout
       breadcrumbs={
@@ -56,174 +45,183 @@ const ProfileActivity = () => {
           </div>
           <SettingsNavbar profilePage />
         </div>
-        {userActivity && userActivity.results.length > 0 && (
-          <div>
-            <ul role="list" className="-mb-4">
-              {userActivity.results.map((activityItem: any, activityIdx: number) => {
-                if (activityItem.field === "comment") {
-                  return (
-                    <div key={activityItem.id} className="mt-2">
-                      <div className="relative flex items-start space-x-3">
-                        <div className="relative px-1">
-                          {activityItem.field ? (
-                            activityItem.new_value === "restore" && (
-                              <Icon iconName="history" className="text-sm text-custom-text-200" />
-                            )
-                          ) : activityItem.actor_detail.avatar &&
-                            activityItem.actor_detail.avatar !== "" ? (
-                            <img
-                              src={activityItem.actor_detail.avatar}
-                              alt={activityItem.actor_detail.display_name}
-                              height={30}
-                              width={30}
-                              className="grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white"
-                            />
-                          ) : (
-                            <div
-                              className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
-                            >
-                              {activityItem.actor_detail.display_name?.charAt(0)}
-                            </div>
-                          )}
+        {userActivity ? (
+          userActivity.results.length > 0 ? (
+            <div>
+              <ul role="list" className="-mb-4">
+                {userActivity.results.map((activityItem: any, activityIdx: number) => {
+                  if (activityItem.field === "comment") {
+                    return (
+                      <div key={activityItem.id} className="mt-2">
+                        <div className="relative flex items-start space-x-3">
+                          <div className="relative px-1">
+                            {activityItem.field ? (
+                              activityItem.new_value === "restore" && (
+                                <Icon iconName="history" className="text-sm text-custom-text-200" />
+                              )
+                            ) : activityItem.actor_detail.avatar &&
+                              activityItem.actor_detail.avatar !== "" ? (
+                              <img
+                                src={activityItem.actor_detail.avatar}
+                                alt={activityItem.actor_detail.display_name}
+                                height={30}
+                                width={30}
+                                className="grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white"
+                              />
+                            ) : (
+                              <div
+                                className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-500 text-white`}
+                              >
+                                {activityItem.actor_detail.display_name?.charAt(0)}
+                              </div>
+                            )}
 
-                          <span className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
-                            <ChatBubbleLeftEllipsisIcon
-                              className="h-3.5 w-3.5 text-custom-text-200"
-                              aria-hidden="true"
-                            />
-                          </span>
-                        </div>
-                        <div className="min-w-0 flex-1">
-                          <div>
-                            <div className="text-xs">
-                              {activityItem.actor_detail.is_bot
-                                ? activityItem.actor_detail.first_name + " Bot"
-                                : activityItem.actor_detail.display_name}
-                            </div>
-                            <p className="mt-0.5 text-xs text-custom-text-200">
-                              Commented {timeAgo(activityItem.created_at)}
-                            </p>
+                            <span className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
+                              <ChatBubbleLeftEllipsisIcon
+                                className="h-3.5 w-3.5 text-custom-text-200"
+                                aria-hidden="true"
+                              />
+                            </span>
                           </div>
-                          <div className="issue-comments-section p-0">
-                            <RemirrorRichTextEditor
-                              value={
-                                activityItem.new_value && activityItem.new_value !== ""
-                                  ? activityItem.new_value
-                                  : activityItem.old_value
-                              }
-                              editable={false}
-                              noBorder
-                              customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
-                            />
+                          <div className="min-w-0 flex-1">
+                            <div>
+                              <div className="text-xs">
+                                {activityItem.actor_detail.is_bot
+                                  ? activityItem.actor_detail.first_name + " Bot"
+                                  : activityItem.actor_detail.display_name}
+                              </div>
+                              <p className="mt-0.5 text-xs text-custom-text-200">
+                                Commented {timeAgo(activityItem.created_at)}
+                              </p>
+                            </div>
+                            <div className="issue-comments-section p-0">
+                              <RemirrorRichTextEditor
+                                value={
+                                  activityItem.new_value && activityItem.new_value !== ""
+                                    ? activityItem.new_value
+                                    : activityItem.old_value
+                                }
+                                editable={false}
+                                noBorder
+                                customClassName="text-xs border border-custom-border-200 bg-custom-background-100"
+                              />
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
-                  );
-                }
+                    );
+                  }
 
-                const message =
-                  activityItem.verb === "created" &&
-                  activityItem.field !== "cycles" &&
-                  activityItem.field !== "modules" &&
-                  activityItem.field !== "attachment" &&
-                  activityItem.field !== "link" &&
-                  activityItem.field !== "estimate" ? (
-                    <span className="text-custom-text-200">
-                      created{" "}
-                      <Link
-                        href={`/${workspaceSlug}/projects/${activityItem.project}/issues/${activityItem.issue}`}
-                      >
-                        <a className="inline-flex items-center hover:underline">
-                          this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
-                        </a>
-                      </Link>
-                    </span>
-                  ) : activityItem.field ? (
-                    <ActivityMessage activity={activityItem} showIssue />
-                  ) : (
-                    "created the issue."
-                  );
+                  const message =
+                    activityItem.verb === "created" &&
+                    activityItem.field !== "cycles" &&
+                    activityItem.field !== "modules" &&
+                    activityItem.field !== "attachment" &&
+                    activityItem.field !== "link" &&
+                    activityItem.field !== "estimate" ? (
+                      <span className="text-custom-text-200">
+                        created{" "}
+                        <Link
+                          href={`/${workspaceSlug}/projects/${activityItem.project}/issues/${activityItem.issue}`}
+                        >
+                          <a className="inline-flex items-center hover:underline">
+                            this issue. <ArrowTopRightOnSquareIcon className="ml-1 h-3.5 w-3.5" />
+                          </a>
+                        </Link>
+                      </span>
+                    ) : activityItem.field ? (
+                      <ActivityMessage activity={activityItem} showIssue />
+                    ) : (
+                      "created the issue."
+                    );
 
-                if ("field" in activityItem && activityItem.field !== "updated_by") {
-                  return (
-                    <li key={activityItem.id}>
-                      <div className="relative pb-1">
-                        {userActivity.results.length > 1 &&
-                        activityIdx !== userActivity.results.length - 1 ? (
-                          <span
-                            className="absolute top-5 left-5 -ml-px h-full w-0.5 bg-custom-background-80"
-                            aria-hidden="true"
-                          />
-                        ) : null}
-                        <div className="relative flex items-start space-x-2">
-                          <>
-                            <div>
-                              <div className="relative px-1.5">
-                                <div className="mt-1.5">
-                                  <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
-                                    {activityItem.field ? (
-                                      activityItem.new_value === "restore" ? (
-                                        <Icon
-                                          iconName="history"
-                                          className="text-sm text-custom-text-200"
+                  if ("field" in activityItem && activityItem.field !== "updated_by") {
+                    return (
+                      <li key={activityItem.id}>
+                        <div className="relative pb-1">
+                          {userActivity.results.length > 1 &&
+                          activityIdx !== userActivity.results.length - 1 ? (
+                            <span
+                              className="absolute top-5 left-5 -ml-px h-full w-0.5 bg-custom-background-80"
+                              aria-hidden="true"
+                            />
+                          ) : null}
+                          <div className="relative flex items-start space-x-2">
+                            <>
+                              <div>
+                                <div className="relative px-1.5">
+                                  <div className="mt-1.5">
+                                    <div className="ring-6 flex h-7 w-7 items-center justify-center rounded-full bg-custom-background-80 text-custom-text-200 ring-white">
+                                      {activityItem.field ? (
+                                        activityItem.new_value === "restore" ? (
+                                          <Icon
+                                            iconName="history"
+                                            className="text-sm text-custom-text-200"
+                                          />
+                                        ) : (
+                                          <ActivityIcon activity={activityItem} />
+                                        )
+                                      ) : activityItem.actor_detail.avatar &&
+                                        activityItem.actor_detail.avatar !== "" ? (
+                                        <img
+                                          src={activityItem.actor_detail.avatar}
+                                          alt={activityItem.actor_detail.display_name}
+                                          height={24}
+                                          width={24}
+                                          className="rounded-full"
                                         />
                                       ) : (
-                                        <ActivityIcon activity={activityItem} />
-                                      )
-                                    ) : activityItem.actor_detail.avatar &&
-                                      activityItem.actor_detail.avatar !== "" ? (
-                                      <img
-                                        src={activityItem.actor_detail.avatar}
-                                        alt={activityItem.actor_detail.display_name}
-                                        height={24}
-                                        width={24}
-                                        className="rounded-full"
-                                      />
-                                    ) : (
-                                      <div
-                                        className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
-                                      >
-                                        {activityItem.actor_detail.display_name?.charAt(0)}
-                                      </div>
-                                    )}
+                                        <div
+                                          className={`grid h-7 w-7 place-items-center rounded-full border-2 border-white bg-gray-700 text-xs text-white`}
+                                        >
+                                          {activityItem.actor_detail.display_name?.charAt(0)}
+                                        </div>
+                                      )}
+                                    </div>
                                   </div>
                                 </div>
                               </div>
-                            </div>
-                            <div className="min-w-0 flex-1 py-3">
-                              <div className="text-xs text-custom-text-200 break-words">
-                                {activityItem.field === "archived_at" &&
-                                activityItem.new_value !== "restore" ? (
-                                  <span className="text-gray font-medium">Plane</span>
-                                ) : activityItem.actor_detail.is_bot ? (
-                                  <span className="text-gray font-medium">
-                                    {activityItem.actor_detail.first_name} Bot
+                              <div className="min-w-0 flex-1 py-3">
+                                <div className="text-xs text-custom-text-200 break-words">
+                                  {activityItem.field === "archived_at" &&
+                                  activityItem.new_value !== "restore" ? (
+                                    <span className="text-gray font-medium">Plane</span>
+                                  ) : activityItem.actor_detail.is_bot ? (
+                                    <span className="text-gray font-medium">
+                                      {activityItem.actor_detail.first_name} Bot
+                                    </span>
+                                  ) : (
+                                    <Link
+                                      href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}
+                                    >
+                                      <a className="text-gray font-medium">
+                                        {activityItem.actor_detail.display_name}
+                                      </a>
+                                    </Link>
+                                  )}{" "}
+                                  {message}{" "}
+                                  <span className="whitespace-nowrap">
+                                    {timeAgo(activityItem.created_at)}
                                   </span>
-                                ) : (
-                                  <Link
-                                    href={`/${workspaceSlug}/profile/${activityItem.actor_detail.id}`}
-                                  >
-                                    <a className="text-gray font-medium">
-                                      {activityItem.actor_detail.display_name}
-                                    </a>
-                                  </Link>
-                                )}{" "}
-                                {message}{" "}
-                                <span className="whitespace-nowrap">
-                                  {timeAgo(activityItem.created_at)}
-                                </span>
+                                </div>
                               </div>
-                            </div>
-                          </>
+                            </>
+                          </div>
                         </div>
-                      </div>
-                    </li>
-                  );
-                }
-              })}
-            </ul>
-          </div>
+                      </li>
+                    );
+                  }
+                })}
+              </ul>
+            </div>
+          ) : null
+        ) : (
+          <Loader className="space-y-5">
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+          </Loader>
         )}
       </div>
     </WorkspaceAuthorizationLayout>