From c80905c9400c1144010f852575f6a8a7ccfa183d Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 19:59:01 +0500 Subject: [PATCH 1/6] add time columns in workspaces page --- client/packages/lowcoder/src/api/userApi.ts | 2 ++ .../lowcoder/src/constants/orgConstants.ts | 2 ++ .../packages/lowcoder/src/i18n/locales/en.ts | 4 ++- .../pages/setting/organization/orgList.tsx | 26 +++++++++++++++++++ .../lowcoder/src/util/useWorkspaceManager.ts | 3 +++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts index cd06186cad..5955071a84 100644 --- 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 index a79608b92c..d46d9957bc 100644 --- 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 index 44f5f4b1dd..72f320b73f 100644 --- a/client/packages/lowcoder/src/i18n/locales/en.ts +++ b/client/packages/lowcoder/src/i18n/locales/en.ts @@ -3062,7 +3062,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 index 2f4dc160e3..e07a059347 100644 --- a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx +++ b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx @@ -170,6 +170,8 @@ type DataItemInfo = { del: boolean; orgName: string; logoUrl: string; + createdAt?: number; + updatedAt?: number; }; function OrganizationSetting() { @@ -193,6 +195,8 @@ function OrganizationSetting() { pageSize: 10 }); + console.log("displayWorkspaces", displayWorkspaces); + // Filter to only show orgs where user has admin permissions const adminOrgs = displayWorkspaces.filter((org: Org) => { @@ -205,8 +209,12 @@ function OrganizationSetting() { del: adminOrgs.length > 1, orgName: org.name, logoUrl: org.logoUrl || "", + createdAt: org.createdAt, + updatedAt: org.updatedAt, })); + console.log("dataSource", dataSource); + return ( @@ -264,6 +272,24 @@ function OrganizationSetting() { ); }, }, + { + title: trans("orgSettings.createdAt"), + dataIndex: "createdAt", + width: "150px", + render: (createdAt: number) => { + if (!createdAt) return "-"; + return new Date(createdAt * 1000).toLocaleDateString(); + }, + }, + { + title: trans("orgSettings.updatedAt"), + dataIndex: "updatedAt", + width: "150px", + render: (updatedAt: number) => { + if (!updatedAt) return "-"; + return new Date(updatedAt * 1000).toLocaleDateString(); + }, + }, { title: " ", dataIndex: "operation", width: "208px" }, ]} dataSource={dataSource.map((item, i) => ({ diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts index 501fe77586..cef5f10e03 100644 --- a/client/packages/lowcoder/src/util/useWorkspaceManager.ts +++ b/client/packages/lowcoder/src/util/useWorkspaceManager.ts @@ -93,8 +93,11 @@ export function useWorkspaceManager({ const transformedItems = apiData.data.map(item => ({ id: item.orgId, name: item.orgName, + createdAt: item.createdAt, + updatedAt: item.updatedAt, })); + console.log("transformedItems", transformedItems); dispatch({ type: 'SET_WORKSPACES', payload: { From 2b996bde02e0ff3a39418cadd027e66ea4270570 Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 20:04:10 +0500 Subject: [PATCH 2/6] add time cols in the first page --- client/packages/lowcoder/src/redux/sagas/orgSagas.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/packages/lowcoder/src/redux/sagas/orgSagas.ts b/client/packages/lowcoder/src/redux/sagas/orgSagas.ts index a2339dca92..f427eeb92b 100644 --- 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({ From 0bcdbf622253f4184a33072793def9fa2bbc9eda Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 20:18:42 +0500 Subject: [PATCH 3/6] fix date format --- .../lowcoder/src/pages/setting/organization/orgList.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx index e07a059347..f011ba539d 100644 --- a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx +++ b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx @@ -26,6 +26,7 @@ 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; @@ -257,7 +258,7 @@ function OrganizationSetting() { onClick: () => history.push(buildOrgId((record as DataItemInfo).id)), })} columns={[ - { + { title: trans("orgSettings.orgName"), dataIndex: "orgName", ellipsis: true, @@ -278,7 +279,7 @@ function OrganizationSetting() { width: "150px", render: (createdAt: number) => { if (!createdAt) return "-"; - return new Date(createdAt * 1000).toLocaleDateString(); + return dayjs.unix(createdAt).fromNow(); }, }, { @@ -287,7 +288,7 @@ function OrganizationSetting() { width: "150px", render: (updatedAt: number) => { if (!updatedAt) return "-"; - return new Date(updatedAt * 1000).toLocaleDateString(); + return dayjs.unix(updatedAt).fromNow(); }, }, { title: " ", dataIndex: "operation", width: "208px" }, From 0224c0bf49c5c7eeb93796fb4c74c67dee31aeed Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 20:41:24 +0500 Subject: [PATCH 4/6] fix workspaces table layout --- .../lowcoder/src/pages/setting/organization/orgList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx index f011ba539d..fc6a831dc4 100644 --- a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx +++ b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx @@ -217,7 +217,7 @@ function OrganizationSetting() { console.log("dataSource", dataSource); return ( - + {trans("settings.organization")} {isSaasMode(sysConfig) && ( From b27852e61e7075eece6693f1e30f9ecd94cfaf16 Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 21:23:10 +0500 Subject: [PATCH 5/6] improve time columns UI --- .../src/pages/setting/organization/orgList.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx index fc6a831dc4..08f7b8a59f 100644 --- a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx +++ b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx @@ -19,7 +19,7 @@ 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"; @@ -279,7 +279,12 @@ function OrganizationSetting() { width: "150px", render: (createdAt: number) => { if (!createdAt) return "-"; - return dayjs.unix(createdAt).fromNow(); + return ( + + {dayjs.unix(createdAt).fromNow()} + + ); }, }, { @@ -288,7 +293,12 @@ function OrganizationSetting() { width: "150px", render: (updatedAt: number) => { if (!updatedAt) return "-"; - return dayjs.unix(updatedAt).fromNow(); + return ( + + {dayjs.unix(updatedAt).fromNow()} + + ); }, }, { title: " ", dataIndex: "operation", width: "208px" }, From 9b8295c52361cc99c1e6bf71b57f10c735c6ab44 Mon Sep 17 00:00:00 2001 From: FARAN Date: Tue, 24 Jun 2025 23:30:56 +0500 Subject: [PATCH 6/6] remove console log --- .../lowcoder/src/pages/setting/organization/orgList.tsx | 3 +-- client/packages/lowcoder/src/util/useWorkspaceManager.ts | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx index 08f7b8a59f..c60f492ead 100644 --- a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx +++ b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx @@ -196,7 +196,6 @@ function OrganizationSetting() { pageSize: 10 }); - console.log("displayWorkspaces", displayWorkspaces); // Filter to only show orgs where user has admin permissions @@ -214,7 +213,7 @@ function OrganizationSetting() { updatedAt: org.updatedAt, })); - console.log("dataSource", dataSource); + return ( diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts index cef5f10e03..59732ac539 100644 --- a/client/packages/lowcoder/src/util/useWorkspaceManager.ts +++ b/client/packages/lowcoder/src/util/useWorkspaceManager.ts @@ -97,7 +97,6 @@ export function useWorkspaceManager({ updatedAt: item.updatedAt, })); - console.log("transformedItems", transformedItems); dispatch({ type: 'SET_WORKSPACES', payload: { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy