misc: addressed ui comments

frontend/src/hooks/api/workspace/types.ts

@@ -14,6 +14,7 @@ export type Workspace = {
   orgId: string;
   version: ProjectVersion;
   upgradeStatus: string | null;
+  updatedAt: string;
   autoCapitalization: boolean;
   environments: WorkspaceEnv[];
   slug: string;
@@ -128,4 +129,4 @@ export type TUpdateWorkspaceGroupRoleDTO = {
         temporaryAccessStartTime: string;
       }
   )[];
-};
+};

frontend/src/lib/fn/date.ts

@@ -0,0 +1,46 @@
+export const timeAgo = (inputDate: Date, currentDate: Date): string => {
+  const now = new Date(currentDate).getTime();
+  const date = new Date(inputDate).getTime();
+  const elapsedMilliseconds = now - date;
+  const elapsedSeconds = Math.abs(Math.floor(elapsedMilliseconds / 1000));
+  const elapsedMinutes = Math.abs(Math.floor(elapsedSeconds / 60));
+  const elapsedHours = Math.abs(Math.floor(elapsedMinutes / 60));
+  const elapsedDays = Math.abs(Math.floor(elapsedHours / 24));
+  const elapsedWeeks = Math.abs(Math.floor(elapsedDays / 7));
+  const elapsedMonths = Math.abs(Math.floor(elapsedDays / 30));
+  const elapsedYears = Math.abs(Math.floor(elapsedDays / 365));
+
+  if (elapsedYears > 0) {
+    return `${elapsedYears} year${elapsedYears === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  if (elapsedMonths > 0) {
+    return `${elapsedMonths} month${elapsedMonths === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  if (elapsedWeeks > 0) {
+    return `${elapsedWeeks} week${elapsedWeeks === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  if (elapsedDays > 0) {
+    return `${elapsedDays} day${elapsedDays === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  if (elapsedHours > 0) {
+    return `${elapsedHours} hour${elapsedHours === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  if (elapsedMinutes > 0) {
+    return `${elapsedMinutes} minute${elapsedMinutes === 1 ? "" : "s"} ${
+      elapsedMilliseconds >= 0 ? "ago" : "from now"
+    }`;
+  }
+  return `${elapsedSeconds} second${elapsedSeconds === 1 ? "" : "s"} ${
+    elapsedMilliseconds >= 0 ? "ago" : "from now"
+  }`;
+};

frontend/src/pages/org/[id]/overview/index.tsx

@@ -12,6 +12,8 @@ import { faFolderOpen } from "@fortawesome/free-regular-svg-icons";
 import {
   faArrowRight,
   faArrowUpRightFromSquare,
+  faBorderAll,
+  faBoxesStacked,
   faCheck,
   faCheckCircle,
   faClipboard,
@@ -22,9 +24,6 @@ import {
   faNetworkWired,
   faPlug,
   faPlus,
-  faProjectDiagram,
-  faTableCells,
-  faTableColumns,
   faUserPlus
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -38,10 +37,8 @@ import onboardingCheck from "@app/components/utilities/checks/OnboardingCheck";
 import {
   Button,
   Checkbox,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
   FormControl,
+  IconButton,
   Input,
   Modal,
   ModalContent,
@@ -66,6 +63,7 @@ import {
 // import { fetchUserWsKey } from "@app/hooks/api/keys/queries";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
 import { usePopUp } from "@app/hooks/usePopUp";
+import { timeAgo } from "@app/lib/fn/date";
 
 const features = [
   {
@@ -478,7 +476,6 @@ const formSchema = yup.object({
 type TAddProjectFormData = yup.InferType<typeof formSchema>;
 
 // #TODO: Update all the workspaceIds
-
 const OrganizationPage = withPermission(
   () => {
     const { t } = useTranslation();
@@ -641,14 +638,19 @@ const OrganizationPage = withPermission(
                 localStorage.setItem("projectData.id", workspace.id);
               }}
               key={workspace.id}
-              className="min-w-72 group flex h-12 cursor-pointer flex-row items-center justify-between border border-mineshaft-600 bg-mineshaft-800 px-6 hover:bg-mineshaft-700"
+              className="min-w-72 group grid h-14 cursor-pointer grid-cols-6 border border-mineshaft-600 bg-mineshaft-800 px-6 hover:bg-mineshaft-700"
             >
-              <div className="flex items-center">
+              <div className="flex items-center sm:col-span-3 lg:col-span-4">
-                <FontAwesomeIcon icon={faProjectDiagram} className="text-sm text-white" />
+                <FontAwesomeIcon icon={faBoxesStacked} className="text-sm text-white" />
                 <div className="ml-4 truncate text-lg text-mineshaft-100">{workspace.name}</div>
               </div>
-              <div className="text-sm text-mineshaft-300">
+              <div className="grid grid-cols-2 sm:col-span-3 lg:col-span-2">
-                {workspace.environments?.length || 0} environments
+                <div className="col-span-1 flex items-center justify-start text-center text-sm text-mineshaft-300 xl:pl-8">
+                  {workspace.environments?.length || 0} environments
+                </div>
+                <div className="col-span-1 flex items-center justify-start text-sm text-mineshaft-300">
+                  last update: {timeAgo(new Date(workspace.updatedAt), new Date())}
+                </div>
               </div>
             </div>
           ))}
@@ -686,41 +688,30 @@ const OrganizationPage = withPermission(
         <div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl">
           <div className="flex w-full justify-between">
             <p className="mr-4 font-semibold text-white">Projects</p>
-            <DropdownMenu>
+            <div className="flex">
-              <DropdownMenuTrigger asChild>
+              <IconButton
-                <Button variant="outline_bg" leftIcon={<FontAwesomeIcon icon={faTableColumns} />}>
+                variant="outline_bg"
-                  Display
+                onClick={() => {
-                </Button>
+                  localStorage.setItem("projectsViewMode", ProjectsViewMode.GRID);
-              </DropdownMenuTrigger>
+                  setProjectsViewMode(ProjectsViewMode.GRID);
-              <DropdownMenuContent align="end">
+                }}
-                <div className="flex flex-col space-y-1 p-1.5">
+                ariaLabel="grid"
-                  <Button
+                className="mr-1 min-w-[2.8rem]"
-                    leftIcon={<FontAwesomeIcon icon={faTableCells} className="pr-2" />}
+              >
-                    onClick={() => {
+                <FontAwesomeIcon icon={faBorderAll} />
-                      localStorage.setItem("projectsViewMode", ProjectsViewMode.GRID);
+              </IconButton>
-                      setProjectsViewMode(ProjectsViewMode.GRID);
+              <IconButton
-                    }}
+                variant="outline_bg"
-                    variant="outline_bg"
+                onClick={() => {
-                    className="h-10 text-left"
+                  localStorage.setItem("projectsViewMode", ProjectsViewMode.LIST);
-                    isFullWidth
+                  setProjectsViewMode(ProjectsViewMode.LIST);
-                  >
+                }}
-                    Grid
+                ariaLabel="list"
-                  </Button>
+                className="min-w-[2.8rem]"
-                  <Button
+              >
-                    leftIcon={<FontAwesomeIcon icon={faList} className="pr-2" />}
+                <FontAwesomeIcon icon={faList} />
-                    onClick={() => {
+              </IconButton>
-                      localStorage.setItem("projectsViewMode", ProjectsViewMode.LIST);
+            </div>
-                      setProjectsViewMode(ProjectsViewMode.LIST);
-                    }}
-                    variant="outline_bg"
-                    className="h-10 text-left"
-                    isFullWidth
-                  >
-                    List
-                  </Button>
-                </div>
-              </DropdownMenuContent>
-            </DropdownMenu>
           </div>
           <div className="mt-6 flex w-full flex-row">
             <Input