Skip to content

Commit d4bb8bb

Browse files
iamfaraniamfaran
committed
fix TS erros for user groups adn ws list
1 parent 263dc5c commit d4bb8bb

File tree

2 files changed

+38
-18
lines changed

2 files changed

+38
-18
lines changed

‎client/packages/lowcoder/src/pages/setting/environments/tabs/UserGroupList.tsx

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,31 @@ const SectionTitle = styled.div`
1919
}
2020
`;
2121

22+
// Define interface for user group data
23+
interface UserGroup {
24+
id: string;
25+
name: string;
26+
users: number;
27+
managed: boolean;
28+
deployed: string[];
29+
}
30+
2231
interface UserGroupListProps {
2332
environmentId: string;
2433
expanded?: boolean;
2534
}
2635

2736
const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded = false }) => {
28-
const [loading, setLoading] = useState(false);
29-
const [userGroups, setUserGroups] = useState([]);
30-
const [activeTab, setActiveTab] = useState("overview"); // This would typically come from parent component
37+
const [loading, setLoading] = useState<boolean>(false);
38+
const [userGroups, setUserGroups] = useState<UserGroup[]>([]);
39+
const [activeTab, setActiveTab] = useState<string>("overview"); // This would typically come from parent component
3140

3241
useEffect(() => {
3342
// Mock API call to fetch user groups
3443
setLoading(true);
3544
setTimeout(() => {
3645
// Mock data
37-
const mockUserGroups = [
46+
const mockUserGroups: UserGroup[] = [
3847
{
3948
id: "ug1",
4049
name: "Marketing Team",
@@ -69,7 +78,7 @@ const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded =
6978
}, 1000);
7079
}, [environmentId]);
7180

72-
const toggleUserGroupManaged = (userGroupId, currentState) => {
81+
const toggleUserGroupManaged = (userGroupId: string, currentState: boolean) => {
7382
// Mock API call to toggle user group managed state
7483
console.log(`Toggle user group ${userGroupId} managed state to ${!currentState}`);
7584

@@ -84,7 +93,7 @@ const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded =
8493
title: trans("environmentSettings.userGroupName"),
8594
dataIndex: "name",
8695
key: "name",
87-
render: (text, record) => (
96+
render: (text: string, record: UserGroup) => (
8897
<span>
8998
{text}
9099
{record.managed && (
@@ -103,7 +112,7 @@ const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded =
103112
{
104113
title: trans("environmentSettings.manage"),
105114
key: "manage",
106-
render: (_, record) => (
115+
render: (_: any, record: UserGroup) => (
107116
<StyledSwitch
108117
checked={record.managed}
109118
onChange={() => toggleUserGroupManaged(record.id, record.managed)}
@@ -113,7 +122,7 @@ const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded =
113122
{
114123
title: trans("environmentSettings.actions"),
115124
key: "actions",
116-
render: (_, record) => (
125+
render: (_: any, record: UserGroup) => (
117126
<Button
118127
type="primary"
119128
size="small"
@@ -148,7 +157,7 @@ const UserGroupList: React.FC<UserGroupListProps> = ({ environmentId, expanded =
148157
dataSource={expanded ? userGroups : userGroups.slice(0, 3)}
149158
columns={columns}
150159
rowKey="id"
151-
pagination={expanded}
160+
pagination={expanded ? {} : false}
152161
/>
153162
</Spin>
154163
</div>

‎client/packages/lowcoder/src/pages/setting/environments/tabs/WorkspaceList.tsx

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,33 @@ const SectionTitle = styled.div`
2121
}
2222
`;
2323

24+
// Define interface for workspace data
25+
interface Workspace {
26+
id: string;
27+
name: string;
28+
owner: string;
29+
users: number;
30+
apps: number;
31+
managed: boolean;
32+
deployed: string[];
33+
}
34+
2435
interface WorkspaceListProps {
2536
environmentId: string;
2637
expanded?: boolean;
2738
}
2839

2940
const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded = false }) => {
30-
const [loading, setLoading] = useState(false);
31-
const [workspaces, setWorkspaces] = useState([]);
32-
const [activeTab, setActiveTab] = useState("overview"); // This would typically come from parent component
41+
const [loading, setLoading] = useState<boolean>(false);
42+
const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
43+
const [activeTab, setActiveTab] = useState<string>("overview"); // This would typically come from parent component
3344

3445
useEffect(() => {
3546
// Mock API call to fetch workspaces
3647
setLoading(true);
3748
setTimeout(() => {
3849
// Mock data
39-
const mockWorkspaces = [
50+
const mockWorkspaces: Workspace[] = [
4051
{
4152
id: "ws1",
4253
name: "Marketing",
@@ -79,7 +90,7 @@ const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded =
7990
}, 1000);
8091
}, [environmentId]);
8192

82-
const toggleWorkspaceManaged = (workspaceId, currentState) => {
93+
const toggleWorkspaceManaged = (workspaceId: string, currentState: boolean) => {
8394
// Mock API call to toggle workspace managed state
8495
console.log(`Toggle workspace ${workspaceId} managed state to ${!currentState}`);
8596

@@ -94,7 +105,7 @@ const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded =
94105
title: trans("environmentSettings.workspaceName"),
95106
dataIndex: "name",
96107
key: "name",
97-
render: (text, record) => (
108+
render: (text: string, record: Workspace) => (
98109
<span>
99110
{text}
100111
{record.managed && (
@@ -123,7 +134,7 @@ const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded =
123134
{
124135
title: trans("environmentSettings.manage"),
125136
key: "manage",
126-
render: (_, record) => (
137+
render: (_: any, record: Workspace) => (
127138
<StyledSwitch
128139
checked={record.managed}
129140
onChange={() => toggleWorkspaceManaged(record.id, record.managed)}
@@ -133,7 +144,7 @@ const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded =
133144
{
134145
title: trans("environmentSettings.actions"),
135146
key: "actions",
136-
render: (_, record) => (
147+
render: (_: any, record: Workspace) => (
137148
<Button
138149
type="primary"
139150
size="small"
@@ -169,7 +180,7 @@ const WorkspaceList: React.FC<WorkspaceListProps> = ({ environmentId, expanded =
169180
dataSource={expanded ? workspaces : workspaces.slice(0, 3)}
170181
columns={columns}
171182
rowKey="id"
172-
pagination={expanded}
183+
pagination={expanded ? {} : false}
173184
/>
174185
</Spin>
175186
</div>

0 commit comments

Comments
 (0)