Skip to content

Commit 54bd69d

Browse files
committed
Add gid columns for objects
1 parent 2ec863a commit 54bd69d

File tree

6 files changed

+33
-4
lines changed

6 files changed

+33
-4
lines changed

client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ const WorkspaceDetail: React.FC = () => {
112112
<Text type="secondary" style={{ marginRight: "16px" }}>
113113
ID: {workspace.id}
114114
</Text>
115+
<Text type="secondary" style={{ marginRight: "16px" }}>
116+
GID: {workspace.gid || 'N/A'}
117+
</Text>
115118
<Tag color={workspace.managed ? "green" : "default"}>
116119
{workspace.managed ? "Managed" : "Unmanaged"}
117120
</Tag>

client/packages/lowcoder/src/pages/setting/environments/config/apps.config.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import {
1616
createManagedColumn,
1717
createDeployColumn,
1818
createAuditColumn,
19-
createIdColumn
19+
createIdColumn,
20+
createApplicationGidColumn
2021
} from '../utils/columnFactories';
2122

2223
// Define AppStats interface if not already defined
@@ -73,6 +74,7 @@ export const appsConfig: DeployableItemConfig<App, AppStats> = {
7374
getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
7475
const columns = [
7576
createIdColumn<App>(),
77+
createApplicationGidColumn<App>(),
7678
createNameColumn<App>(),
7779
createPublishedColumn<App>(),
7880
];

client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
createDatasourceStatusColumn,
1515
createManagedColumn,
1616
createDeployColumn,
17-
createAuditColumn
17+
createAuditColumn,
18+
createGidColumn
1819
} from '../utils/columnFactories';
1920

2021

@@ -123,6 +124,7 @@ export const dataSourcesConfig: DeployableItemConfig<DataSource, DataSourceStats
123124
getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
124125
const columns = [
125126
createNameColumn<DataSource>(),
127+
createGidColumn<DataSource>(),
126128
createTypeColumn<DataSource>(),
127129
createDatabaseColumn<DataSource>(),
128130
createDatasourceStatusColumn<DataSource>(),

client/packages/lowcoder/src/pages/setting/environments/config/query.config.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import {
1515
createQueryTypeColumn,
1616
createManagedColumn,
1717
createDeployColumn,
18-
createAuditColumn
18+
createAuditColumn,
19+
createGidColumn
1920
} from '../utils/columnFactories';
2021

2122
// Define QueryStats interface
@@ -100,6 +101,7 @@ export const queryConfig: DeployableItemConfig<Query, QueryStats> = {
100101
getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
101102
const columns = [
102103
createNameColumn<Query>(),
104+
createGidColumn<Query>(),
103105
createCreatorColumn<Query>(),
104106
createDateColumn<Query>('createTime', 'Creation Date'),
105107
createQueryTypeColumn<Query>(),

client/packages/lowcoder/src/pages/setting/environments/config/workspace.config.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
createDateColumn,
1515
createStatusColumn,
1616
createManagedColumn,
17-
createAuditColumn
17+
createAuditColumn,
18+
createGidColumn
1819
} from '../utils/columnFactories';
1920

2021
export const workspaceConfig: DeployableItemConfig<Workspace, WorkspaceStats> = {
@@ -101,6 +102,7 @@ export const workspaceConfig: DeployableItemConfig<Workspace, WorkspaceStats> =
101102
getColumns: ({ environment, refreshing, onToggleManaged, additionalParams }) => {
102103
const columns = [
103104
createIdColumn<Workspace>(),
105+
createGidColumn<Workspace>(),
104106
createNameColumn<Workspace>(),
105107
createRoleColumn<Workspace>(),
106108
createManagedColumn<Workspace>(),

client/packages/lowcoder/src/pages/setting/environments/utils/columnFactories.tsx

+18
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ export function createIdColumn<T extends { id: string }>(): ColumnType<T> {
2424
};
2525
}
2626

27+
export function createGidColumn<T extends { gid?: string }>(): ColumnType<T> {
28+
return {
29+
title: 'GID',
30+
dataIndex: 'gid',
31+
key: 'gid',
32+
ellipsis: true,
33+
};
34+
}
35+
36+
export function createApplicationGidColumn<T extends { applicationGid?: string }>(): ColumnType<T> {
37+
return {
38+
title: 'GID',
39+
dataIndex: 'applicationGid',
40+
key: 'applicationGid',
41+
ellipsis: true,
42+
};
43+
}
44+
2745
export function createRoleColumn<T extends { role?: string }>(): ColumnType<T> {
2846
return {
2947
title: 'Role',

0 commit comments

Comments
 (0)