Content-Length: 6659 | pFad | http://github.com/lowcoder-org/lowcoder/pull/1806.diff

thub.com diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts index cd06186ca..5955071a8 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 a79608b92..d46d9957b 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 44f5f4b1d..72f320b73 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 2f4dc160e..c60f492ea 100644 --- 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 ( - + {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 ( + + {dayjs.unix(createdAt).fromNow()} + + ); + }, + }, + { + title: trans("orgSettings.updatedAt"), + dataIndex: "updatedAt", + width: "150px", + render: (updatedAt: number) => { + if (!updatedAt) return "-"; + return ( + + {dayjs.unix(updatedAt).fromNow()} + + ); + }, + }, { 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 index a2339dca9..f427eeb92 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({ diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts index 501fe7758..59732ac53 100644 --- 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({

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!