Merge pull request #1806 from iamfaran/feat/time-col-org

raheeliftikhar5 · web-flow · commit 5467971a4603 · 2025-07-01T10:28:17.000-07:00
[Feat]: Add Create/Update Time column on the Orgs Page
diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts
@@ -65,6 +65,8 @@ export interface GetMyOrgsResponse extends ApiResponse {
     data: Array<{
       orgId: string;
       orgName: string;
+      createdAt?: number;
+      updatedAt?: number;
     }>;
     pageNum: number;
     pageSize: number;
diff --git a/client/packages/lowcoder/src/constants/orgConstants.ts b/client/packages/lowcoder/src/constants/orgConstants.ts
@@ -54,6 +54,8 @@ export type Org = {
   createdBy: string;
   commonSettings: CommonSettingResponseData;
   createTime?: string;
+  createdAt?: number;
+  updatedAt?: number;
 };
 
 export type OrgAndRole = {
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -3068,7 +3068,9 @@ export const en = {
     "inviteSuccessMessage": "Join the Workspace Successfully",
     "inviteFailMessage": "Failed to Join Workspace",
     "uploadErrorMessage": "Upload Error",
-    "orgName": "Workspace Name"
+    "orgName": "Workspace Name",
+    "createdAt": "Created",
+    "updatedAt": "Updated"
   },
   "freeLimit": "Free Trial",
 
diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx
@@ -19,13 +19,14 @@ import { isSaasMode } from "util/envUtils";
 import { selectSystemConfig } from "redux/selectors/configSelectors";
 import { default as Form } from "antd/es/form";
 import { default as Input } from "antd/es/input";
-import { Pagination, Spin } from "antd";
+import { Pagination, Spin, Tooltip } from "antd";
 import { getUser } from "redux/selectors/usersSelectors";
 import { getOrgCreateStatus } from "redux/selectors/orgSelectors";
 import { useWorkspaceManager } from "util/useWorkspaceManager";
 import { Org } from "constants/orgConstants";
 import { useState } from "react";
 import { SwapOutlined } from "@ant-design/icons";
+import dayjs from "dayjs";
 
 const OrgName = styled.div`
   display: flex;
@@ -170,6 +171,8 @@ type DataItemInfo = {
   del: boolean;
   orgName: string;
   logoUrl: string;
+  createdAt?: number;
+  updatedAt?: number;
 };
 
 function OrganizationSetting() {
@@ -194,6 +197,7 @@ function OrganizationSetting() {
   });
 
 
+
   // Filter to only show orgs where user has admin permissions
   const adminOrgs = displayWorkspaces.filter((org: Org) => {
     const role = user.orgRoleMap.get(org.id);
@@ -205,10 +209,14 @@ function OrganizationSetting() {
     del: adminOrgs.length > 1,
     orgName: org.name,
     logoUrl: org.logoUrl || "",
+    createdAt: org.createdAt,
+    updatedAt: org.updatedAt,
   }));
 
+
+
   return (
-    <Level1SettingPageContentWithList>
+    <Level1SettingPageContentWithList style={{ minWidth: "1000px" }}>
       <Level1SettingPageTitleWithBtn>
         {trans("settings.organization")}
         {isSaasMode(sysConfig) && (
@@ -249,7 +257,7 @@ function OrganizationSetting() {
                 onClick: () => history.push(buildOrgId((record as DataItemInfo).id)),
               })}
               columns={[
-                {
+                                {
                   title: trans("orgSettings.orgName"),
                   dataIndex: "orgName",
                   ellipsis: true,
@@ -264,6 +272,34 @@ function OrganizationSetting() {
                     );
                   },
                 },
+                {
+                  title: trans("orgSettings.createdAt"),
+                  dataIndex: "createdAt",
+                  width: "150px",
+                  render: (createdAt: number) => {
+                    if (!createdAt) return "-";
+                    return (
+                      <Tooltip title={dayjs.unix(createdAt).format("YYYY/MM/DD HH:mm:ss")}
+                               placement="bottom">
+                        <span style={{ color: "#8b8fa3" }}>{dayjs.unix(createdAt).fromNow()}</span>
+                      </Tooltip>
+                    );
+                  },
+                },
+                {
+                  title: trans("orgSettings.updatedAt"),
+                  dataIndex: "updatedAt", 
+                  width: "150px",
+                  render: (updatedAt: number) => {
+                    if (!updatedAt) return "-";
+                    return (
+                      <Tooltip title={dayjs.unix(updatedAt).format("YYYY/MM/DD HH:mm:ss")}
+                               placement="bottom">
+                        <span style={{ color: "#8b8fa3" }}>{dayjs.unix(updatedAt).fromNow()}</span>
+                        </Tooltip>
+                    );
+                  },
+                },
                 { title: " ", dataIndex: "operation", width: "208px" },
               ]}
               dataSource={dataSource.map((item, i) => ({
diff --git a/client/packages/lowcoder/src/redux/sagas/orgSagas.ts b/client/packages/lowcoder/src/redux/sagas/orgSagas.ts
@@ -370,6 +370,8 @@ export function* fetchWorkspacesSaga(action: ReduxAction<{page: number, pageSize
       const transformedItems = apiData.data.map(item => ({
         id: item.orgId,
         name: item.orgName,
+        createdAt: item.createdAt,
+        updatedAt: item.updatedAt,
       }));
         
       yield put({
diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts
@@ -93,6 +93,8 @@ export function useWorkspaceManager({
           const transformedItems = apiData.data.map(item => ({
             id: item.orgId,
             name: item.orgName,
+            createdAt: item.createdAt,
+            updatedAt: item.updatedAt,
           }));
 
           dispatch({
