llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 05:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Deprecate the id field in group (#1987)

Browse Source
This commit is contained in:
Yaodong Yu
2023-06-18 23:33:13 +08:00
committed by GitHub
parent 3562c36817
commit d0ac265c91
10 changed files with 52 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/GroupEdit.js
View File

@ -44,11 +44,6 @@ class GroupEditPage extends React.Component {
GroupBackend.getGroup(this.state.organizationName, this.state.groupName)
.then((res) => {
if (res.status === "ok") {
if (res.data === null) {
this.props.history.push("/404");
return;
}
this.setState({
group: res.data,
});
@ -96,12 +91,12 @@ class GroupEditPage extends React.Component {
}
getParentIdOptions() {
const groups = this.state.groups.filter((group) => group.id !== this.state.group.id);
const groups = this.state.groups.filter((group) => group.name !== this.state.group.name);
const organization = this.state.organizations.find((organization) => organization.name === this.state.group.owner);
if (organization !== undefined) {
groups.push({id: organization.name, displayName: organization.displayName});
groups.push({name: organization.name, displayName: organization.displayName});
}
return groups.map((group) => ({label: group.displayName, value: group.id}));
return groups.map((group) => ({label: group.displayName, value: group.name}));
}
renderGroup() {
@ -136,7 +131,7 @@ class GroupEditPage extends React.Component {
{Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.group.name} onChange={e => {
<Input disabled={true} value={this.state.group.name} onChange={e => {
this.updateGroupField("name", e.target.value);
}} />
</Col>

2
web/src/GroupList.js
View File

@ -185,7 +185,7 @@ class GroupListPage extends BaseListPage {
{record.parentId}
</Link>;
}
const parentGroup = this.state.groups.find((group) => group.id === text);
const parentGroup = this.state.groups.find((group) => group.name === text);
if (parentGroup === undefined) {
return "";
}

25
web/src/GroupTreePage.js
View File

@ -30,7 +30,6 @@ class GroupTreePage extends React.Component {
owner: Setting.isAdminUser(this.props.account) ? "" : this.props.account.owner,
organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
groupName: this.props.match?.params.groupName,
groupId: undefined,
treeData: [],
selectedKeys: [this.props.match?.params.groupName],
};
@ -55,7 +54,6 @@ class GroupTreePage extends React.Component {
if (res.status === "ok") {
this.setState({
treeData: res.data,
groupId: this.findNodeId({children: res.data}, this.state.groupName),
});
} else {
Setting.showMessage("error", res.msg);
@ -63,26 +61,10 @@ class GroupTreePage extends React.Component {
});
}
findNodeId(node, targetName) {
if (node.key === targetName) {
return node.id;
}
if (node.children) {
for (let i = 0; i < node.children.length; i++) {
const result = this.findNodeId(node.children[i], targetName);
if (result) {
return result;
}
}
}
return null;
}
setTreeTitle(treeData) {
const haveChildren = Array.isArray(treeData.children) && treeData.children.length > 0;
const isSelected = this.state.groupName === treeData.key;
return {
id: treeData.id,
key: treeData.key,
title: <Space>
{treeData.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />}
@ -201,7 +183,6 @@ class GroupTreePage extends React.Component {
this.setState({
selectedKeys: selectedKeys,
groupName: info.node.key,
groupId: info.node.id,
});
this.props.history.push(`/trees/${this.state.organizationName}/${info.node.key}`);
};
@ -257,7 +238,7 @@ class GroupTreePage extends React.Component {
updatedTime: moment().format(),
displayName: `New Group - ${randomName}`,
type: "Virtual",
parentId: isRoot ? this.state.organizationName : this.state.groupId,
parentId: isRoot ? this.state.organizationName : this.state.groupName,
isTopGroup: isRoot,
isEnabled: true,
};
@ -300,8 +281,7 @@ class GroupTreePage extends React.Component {
onClick={() => {
this.setState({
selectedKeys: [],
groupName: null,
groupId: undefined,
groupName: undefined,
});
this.props.history.push(`/trees/${this.state.organizationName}`);
}}
@ -323,7 +303,6 @@ class GroupTreePage extends React.Component {
<UserListPage
organizationName={this.state.organizationName}
groupName={this.state.groupName}
groupId={this.state.groupId}
{...this.props}
/>
</Col>

4
web/src/UserEditPage.js
View File

@ -309,7 +309,7 @@ class UserEditPage extends React.Component {
</Col>
<Col span={22} >
<Select virtual={false} mode="multiple" style={{width: "100%"}} disabled={disabled} value={this.state.user.groups ?? []} onChange={(value => {
if (this.state.groups?.filter(group => value.includes(group.id))
if (this.state.groups?.filter(group => value.includes(group.name))
.filter(group => group.type === "Physical").length > 1) {
Setting.showMessage("error", i18next.t("general:You can only select one physical group"));
return;
@ -319,7 +319,7 @@ class UserEditPage extends React.Component {
})}
>
{
this.state.groups?.map((group) => <Option key={group.id} value={group.id}>
this.state.groups?.map((group) => <Option key={group.name} value={group.name}>
<Space>
{group.type === "Physical" ? <UsergroupAddOutlined /> : <HolderOutlined />}
{group.displayName}

10
web/src/UserListPage.js
View File

@ -75,7 +75,7 @@ class UserListPage extends BaseListPage {
phone: Setting.getRandomNumber(),
countryCode: this.state.organization.countryCodes?.length > 0 ? this.state.organization.countryCodes[0] : "",
address: [],
groups: this.props.groupId ? [this.props.groupId] : [],
groups: this.props.groupName ? [this.props.groupName] : [],
affiliation: "Example Inc.",
tag: "staff",
region: "",
@ -126,8 +126,8 @@ class UserListPage extends BaseListPage {
removeUserFromGroup(i) {
const user = this.state.data[i];
const group = this.props.groupId;
UserBackend.removeUserFromGroup({groupId: group, owner: user.owner, name: user.name})
const group = this.props.groupName;
UserBackend.removeUserFromGroup({groupName: group, owner: user.owner, name: user.name})
.then((res) => {
if (res.status === "ok") {
Setting.showMessage("success", i18next.t("general:Successfully removed"));
@ -396,7 +396,7 @@ class UserListPage extends BaseListPage {
width: "190px",
fixed: (Setting.isMobile()) ? "false" : "right",
render: (text, record, index) => {
const isTreePage = this.props.groupId !== undefined;
const isTreePage = this.props.groupName !== undefined;
const disabled = (record.owner === this.props.account.owner && record.name === this.props.account.name) || (record.owner === "built-in" && record.name === "admin");
return (
<Space>
@ -483,7 +483,7 @@ class UserListPage extends BaseListPage {
});
} else {
(this.props.groupName ?
UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder, `${this.state.organizationName}/${this.props.groupName}`) :
UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder, this.props.groupName) :
UserBackend.getUsers(this.state.organizationName, params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder))
.then((res) => {
this.setState({

8
web/src/backend/UserBackend.js
View File

@ -25,8 +25,8 @@ export function getGlobalUsers(page, pageSize, field = "", value = "", sortField
}).then(res => res.json());
}
export function getUsers(owner, page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "", groupId = "") {
return fetch(`${Setting.ServerUrl}/api/get-users?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}&groupId=${groupId}`, {
export function getUsers(owner, page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "", groupName = "") {
return fetch(`${Setting.ServerUrl}/api/get-users?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}&groupName=${groupName}`, {
method: "GET",
credentials: "include",
headers: {
@ -223,11 +223,11 @@ export function checkUserPassword(values) {
}).then(res => res.json());
}
export function removeUserFromGroup({owner, name, groupId}) {
export function removeUserFromGroup({owner, name, groupName}) {
const formData = new FormData();
formData.append("owner", owner);
formData.append("name", name);
formData.append("groupId", groupId);
formData.append("groupName", groupName);
return fetch(`${Setting.ServerUrl}/api/remove-user-from-group`, {
method: "POST",
credentials: "include",