Skip to content

Commit f3a36d8

Browse files
iamfaraniamfaran
committed
fix tabs rendering issue
1 parent b97f125 commit f3a36d8

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,20 +172,20 @@ const WorkspaceDetail: React.FC = () => {
172172
<TabPane tab={<span><AppstoreOutlined /> Apps</span>} key="apps">
173173
<AppsTab
174174
environment={environment}
175-
workspace={workspace}
175+
workspaceId={workspace.id}
176176
/>
177177
</TabPane>
178178

179179
<TabPane tab={<span><DatabaseOutlined /> Data Sources</span>} key="dataSources">
180180
<DataSourcesTab
181181
environment={environment}
182-
workspace={workspace}
182+
workspaceId={workspace.id}
183183
/>
184184
</TabPane>
185185
<TabPane tab={<span><CodeOutlined /> Queries</span>} key="queries">
186186
<QueriesTab
187187
environment={environment}
188-
workspace={workspace}
188+
workspaceId={workspace.id}
189189
/>
190190
</TabPane>
191191

‎client/packages/lowcoder/src/pages/setting/environments/components/AppsTab.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Card, Button, Divider, Alert, message, Table, Tag, Input, Space, Toolti
33
import { SyncOutlined, CloudUploadOutlined, AuditOutlined, AppstoreOutlined, CheckCircleFilled, CloudServerOutlined, DisconnectOutlined } from '@ant-design/icons';
44
import Title from 'antd/lib/typography/Title';
55
import { Environment } from '../types/environment.types';
6-
import { Workspace } from '../types/workspace.types';
76
import { App, AppStats } from '../types/app.types';
87
import { getMergedWorkspaceApps } from '../services/apps.service';
98
import { Switch, Spin, Empty, Avatar } from 'antd';
@@ -16,10 +15,10 @@ const { Search } = Input;
1615

1716
interface AppsTabProps {
1817
environment: Environment;
19-
workspace: Workspace;
18+
workspaceId: string;
2019
}
2120

22-
const AppsTab: React.FC<AppsTabProps> = ({ environment, workspace }) => {
21+
const AppsTab: React.FC<AppsTabProps> = ({ environment, workspaceId }) => {
2322
const [apps, setApps] = useState<App[]>([]);
2423
const [stats, setStats] = useState<AppStats>({
2524
total: 0,
@@ -35,14 +34,14 @@ const AppsTab: React.FC<AppsTabProps> = ({ environment, workspace }) => {
3534

3635
// Fetch apps
3736
const fetchApps = async () => {
38-
if (!workspace.id || !environment) return;
37+
if (!workspaceId || !environment) return;
3938

4039
setLoading(true);
4140
setError(null);
4241

4342
try {
4443
const result = await getMergedWorkspaceApps(
45-
workspace.id,
44+
workspaceId,
4645
environment.environmentId,
4746
environment.environmentApikey,
4847
environment.environmentApiServiceUrl!
@@ -71,7 +70,7 @@ const AppsTab: React.FC<AppsTabProps> = ({ environment, workspace }) => {
7170

7271
useEffect(() => {
7372
fetchApps();
74-
}, [environment, workspace]);
73+
}, [environment, workspaceId]);
7574

7675
// Handle refresh
7776
const handleRefresh = () => {
@@ -196,7 +195,7 @@ const AppsTab: React.FC<AppsTabProps> = ({ environment, workspace }) => {
196195
icon={<AuditOutlined />}
197196
onClick={(e) => {
198197
e.stopPropagation();
199-
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspace.id}&appId=${app.applicationId}&pageSize=100&pageNum=1`;
198+
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspaceId}&appId=${app.applicationId}&pageSize=100&pageNum=1`;
200199
window.open(auditUrl, '_blank');
201200
}}
202201
>

‎client/packages/lowcoder/src/pages/setting/environments/components/DataSourcesTab.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
} from '@ant-design/icons';
1313
import Title from 'antd/lib/typography/Title';
1414
import { Environment } from '../types/environment.types';
15-
import { Workspace } from '../types/workspace.types';
1615
import { DataSource } from '../types/datasource.types';
1716
import { getMergedWorkspaceDataSources } from '../services/datasources.service';
1817
import { Switch, Spin, Empty, Avatar } from 'antd';
@@ -25,10 +24,10 @@ const { Search } = Input;
2524

2625
interface DataSourcesTabProps {
2726
environment: Environment;
28-
workspace: Workspace;
27+
workspaceId: string;
2928
}
3029

31-
const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspace }) => {
30+
const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspaceId }) => {
3231
const [dataSources, setDataSources] = useState<DataSource[]>([]);
3332
const [stats, setStats] = useState({
3433
total: 0,
@@ -44,14 +43,14 @@ const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspace
4443

4544
// Fetch data sources
4645
const fetchDataSources = async () => {
47-
if (!workspace.id || !environment) return;
46+
if (!workspaceId || !environment) return;
4847

4948
setLoading(true);
5049
setError(null);
5150

5251
try {
5352
const result = await getMergedWorkspaceDataSources(
54-
workspace.id,
53+
workspaceId,
5554
environment.environmentId,
5655
environment.environmentApikey,
5756
environment.environmentApiServiceUrl!
@@ -69,7 +68,7 @@ const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspace
6968

7069
useEffect(() => {
7170
fetchDataSources();
72-
}, [environment, workspace]);
71+
}, [environment, workspaceId]);
7372

7473
// Handle refresh
7574
const handleRefresh = () => {
@@ -198,7 +197,7 @@ const DataSourcesTab: React.FC<DataSourcesTabProps> = ({ environment, workspace
198197
icon={<AuditOutlined />}
199198
onClick={(e) => {
200199
e.stopPropagation();
201-
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspace.id}&datasourceId=${dataSource.id}&pageSize=100&pageNum=1`;
200+
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspaceId}&datasourceId=${dataSource.id}&pageSize=100&pageNum=1`;
202201
window.open(auditUrl, '_blank');
203202
}}
204203
>

‎client/packages/lowcoder/src/pages/setting/environments/components/QueriesTab.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ const { Search } = Input;
2626

2727
interface QueriesTabProps {
2828
environment: Environment;
29-
workspace: Workspace;
29+
workspaceId: string;
3030
}
3131

32-
const QueriesTab: React.FC<QueriesTabProps> = ({ environment, workspace }) => {
32+
const QueriesTab: React.FC<QueriesTabProps> = ({ environment, workspaceId }) => {
3333
const [queries, setQueries] = useState<Query[]>([]);
3434
const [stats, setStats] = useState({
3535
total: 0,
@@ -44,14 +44,14 @@ const QueriesTab: React.FC<QueriesTabProps> = ({ environment, workspace }) => {
4444

4545
// Fetch queries
4646
const fetchQueries = async () => {
47-
if (!workspace.id || !environment) return;
47+
if (!workspaceId || !environment) return;
4848

4949
setLoading(true);
5050
setError(null);
5151

5252
try {
5353
const result = await getMergedWorkspaceQueries(
54-
workspace.id,
54+
workspaceId,
5555
environment.environmentId,
5656
environment.environmentApikey,
5757
environment.environmentApiServiceUrl!
@@ -69,7 +69,7 @@ const QueriesTab: React.FC<QueriesTabProps> = ({ environment, workspace }) => {
6969

7070
useEffect(() => {
7171
fetchQueries();
72-
}, [environment, workspace]);
72+
}, [environment, workspaceId]);
7373

7474
// Handle refresh
7575
const handleRefresh = () => {
@@ -215,7 +215,7 @@ const QueriesTab: React.FC<QueriesTabProps> = ({ environment, workspace }) => {
215215
icon={<AuditOutlined />}
216216
onClick={(e) => {
217217
e.stopPropagation();
218-
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspace.id}&queryId=${query.id}&pageSize=100&pageNum=1`;
218+
const auditUrl = `/setting/audit?environmentId=${environment.environmentId}&orgId=${workspaceId}&queryId=${query.id}&pageSize=100&pageNum=1`;
219219
window.open(auditUrl, '_blank');
220220
}}
221221
>

0 commit comments

Comments
 (0)