Merge pull request #1685 from iamfaran/gid-column-for-envs

dragonpoo · web-flow · commit 402b2cd11e52 · 2025-05-15T13:22:20.000-04:00
Add gid columns for objects
diff --git a/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx
@@ -112,6 +112,9 @@ const WorkspaceDetail: React.FC = () => {
               <Text type="secondary" style={{ marginRight: "16px" }}>
                 ID: {workspace.id}
               </Text>
+              <Text type="secondary" style={{ marginRight: "16px" }}>
+                GID: {workspace.gid || 'N/A'}
+              </Text>
               <Tag color={workspace.managed ? "green" : "default"}>
                 {workspace.managed ? "Managed" : "Unmanaged"}
               </Tag>
diff --git a/client/packages/lowcoder/src/pages/setting/environments/config/apps.config.tsx b/client/packages/lowcoder/src/pages/setting/environments/config/apps.config.tsx
@@ -16,7 +16,8 @@ import {
   createManagedColumn, 
   createDeployColumn,
   createAuditColumn, 
-  createIdColumn
+  createIdColumn,
+  createApplicationGidColumn
 } from '../utils/columnFactories';
 
 // Define AppStats interface if not already defined
@@ -73,6 +74,7 @@ export const appsConfig: DeployableItemConfig<App, AppStats> = {
   getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
     const columns = [
       createIdColumn<App>(),
+      createApplicationGidColumn<App>(),
       createNameColumn<App>(),
       createPublishedColumn<App>(),
     ];
diff --git a/client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx b/client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx
@@ -14,7 +14,8 @@ import {
   createDatasourceStatusColumn,
   createManagedColumn, 
   createDeployColumn,
-  createAuditColumn 
+  createAuditColumn,
+  createGidColumn
 } from '../utils/columnFactories';
 
 
@@ -123,6 +124,7 @@ export const dataSourcesConfig: DeployableItemConfig<DataSource, DataSourceStats
   getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
     const columns = [
       createNameColumn<DataSource>(),
+      createGidColumn<DataSource>(),
       createTypeColumn<DataSource>(),
       createDatabaseColumn<DataSource>(),
       createDatasourceStatusColumn<DataSource>(),
diff --git a/client/packages/lowcoder/src/pages/setting/environments/config/query.config.tsx b/client/packages/lowcoder/src/pages/setting/environments/config/query.config.tsx
@@ -15,7 +15,8 @@ import {
   createQueryTypeColumn,
   createManagedColumn, 
   createDeployColumn,
-  createAuditColumn 
+  createAuditColumn,
+  createGidColumn
 } from '../utils/columnFactories';
 
 // Define QueryStats interface
@@ -100,6 +101,7 @@ export const queryConfig: DeployableItemConfig<Query, QueryStats> = {
   getColumns: ({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams }) => {
     const columns = [
       createNameColumn<Query>(),
+      createGidColumn<Query>(),
       createCreatorColumn<Query>(),
       createDateColumn<Query>('createTime', 'Creation Date'),
       createQueryTypeColumn<Query>(),
diff --git a/client/packages/lowcoder/src/pages/setting/environments/config/workspace.config.tsx b/client/packages/lowcoder/src/pages/setting/environments/config/workspace.config.tsx
@@ -14,7 +14,8 @@ import {
   createDateColumn, 
   createStatusColumn, 
   createManagedColumn, 
-  createAuditColumn 
+  createAuditColumn,
+  createGidColumn 
 } from '../utils/columnFactories';
 
 export const workspaceConfig: DeployableItemConfig<Workspace, WorkspaceStats> = {
@@ -101,6 +102,7 @@ export const workspaceConfig: DeployableItemConfig<Workspace, WorkspaceStats> =
   getColumns: ({ environment, refreshing, onToggleManaged, additionalParams }) => {
     const columns = [
       createIdColumn<Workspace>(),
+      createGidColumn<Workspace>(),
       createNameColumn<Workspace>(),
       createRoleColumn<Workspace>(),
       createManagedColumn<Workspace>(),
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts
@@ -152,7 +152,14 @@ export async function getMergedWorkspaceDataSources(
 // Function to deploy a data source to another environment
 export async function deployDataSource(params: DeployDataSourceParams): Promise<boolean> {
   try {
-    const response = await axios.post('/api/plugins/enterprise/datasource/deploy', params);
+    const response = await axios.post('/api/plugins/enterprise/datasource/deploy', null, {
+      params: {
+        envId: params.envId,
+        targetEnvId: params.targetEnvId,
+        datasourceId: params.datasourceId,
+        updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
+      }
+    });
     return response.status === 200;
   } catch (error) {
     console.error('Error deploying data source:', error);
diff --git a/client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts b/client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts
@@ -78,7 +78,14 @@ export interface MergedQueriesResult {
 
   export async function deployQuery(params: DeployQueryParams): Promise<boolean> {
     try {
-      const response = await axios.post('/api/plugins/enterprise/qlQuery/deploy', params);
+      const response = await axios.post('/api/plugins/enterprise/qlQuery/deploy', null, {
+        params: {
+          envId: params.envId,
+          targetEnvId: params.targetEnvId,
+          queryId: params.queryId,
+          updateDependenciesIfNeeded: params.updateDependenciesIfNeeded ?? false
+        }
+      });
       return response.status === 200;
     } catch (error) {
       console.error('Error deploying query:', error);
diff --git a/client/packages/lowcoder/src/pages/setting/environments/utils/columnFactories.tsx b/client/packages/lowcoder/src/pages/setting/environments/utils/columnFactories.tsx
@@ -24,6 +24,24 @@ export function createIdColumn<T extends { id: string }>(): ColumnType<T> {
   };
 }
 
+export function createGidColumn<T extends { gid?: string }>(): ColumnType<T> {
+  return {
+    title: 'GID',
+    dataIndex: 'gid',
+    key: 'gid',
+    ellipsis: true,
+  };
+}
+
+export function createApplicationGidColumn<T extends { applicationGid?: string }>(): ColumnType<T> {
+  return {
+    title: 'GID',
+    dataIndex: 'applicationGid',
+    key: 'applicationGid',
+    ellipsis: true,
+  };
+}
+
 export function createRoleColumn<T extends { role?: string }>(): ColumnType<T> {
   return {
     title: 'Role',
