From 54bd69d5433c2beb83afb9e8f2582160ad143c1f Mon Sep 17 00:00:00 2001
From: Faran Javed <faran1997@outlook.com>
Date: Fri, 9 May 2025 13:51:06 +0500
Subject: [PATCH 1/2] Add gid columns for objects

---
 .../setting/environments/WorkspaceDetail.tsx   |  3 +++
 .../environments/config/apps.config.tsx        |  4 +++-
 .../config/data-sources.config.tsx             |  4 +++-
 .../environments/config/query.config.tsx       |  4 +++-
 .../environments/config/workspace.config.tsx   |  4 +++-
 .../environments/utils/columnFactories.tsx     | 18 ++++++++++++++++++
 6 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx b/client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx
index 79b861882c..9079756af5 100644
--- 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
index 90b673f346..0ba63e5930 100644
--- 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
index 567e460a79..d31b0fa3dc 100644
--- 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
index 00721f0331..3940a5e587 100644
--- 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
index c6d3a7dc22..c07a192106 100644
--- 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/utils/columnFactories.tsx b/client/packages/lowcoder/src/pages/setting/environments/utils/columnFactories.tsx
index b33685ab70..e0e89465e2 100644
--- 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',

From 2d134003a93f914392bd3f07e868e674d3f0d08f Mon Sep 17 00:00:00 2001
From: Faran Javed <faran1997@outlook.com>
Date: Thu, 15 May 2025 14:07:31 +0500
Subject: [PATCH 2/2] update deployment endpoints for DS and QL

---
 .../setting/environments/services/datasources.service.ts | 9 ++++++++-
 .../pages/setting/environments/services/query.service.ts | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

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
index b1fe06745f..71d6929ac5 100644
--- 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
index 39eda02355..8f5ad68927 100644
--- 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);

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>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.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1685.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1685.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1685.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/lowcoder-org/lowcoder/pull/1685.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>