haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity

change sys admin user path (#8112)

Browse Source
This commit is contained in:
Michael An
2025-08-06 14:45:17 +08:00
committed by GitHub
parent d2d1a1e182
commit 0e0f3a6be3
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/pages/sys-admin/index.js
View File

@@ -249,8 +249,9 @@ class SysAdmin extends React.Component {
<AdminLoginLogs path="login" /> <AdminLoginLogs path="login" />
</AdminLogs> </AdminLogs>
<UsersLayout path={`${siteRoot}sys/users/*`} {...commonProps} /> <UsersLayout path={`${siteRoot}sys/users/*`} {...commonProps} />
<UsersLayout path={`${siteRoot}sys/users/admins`} {...commonProps} />
<SearchUsers path={siteRoot + 'sys/search-users'} {...commonProps} /> <SearchUsers path={siteRoot + 'sys/search-users'} {...commonProps} />
<UserLayout path={`${siteRoot}sys/user/:email/`} {...commonProps} > <UserLayout path={`${siteRoot}sys/users/:email/`} {...commonProps} >
<User path="/" /> <User path="/" />
<UserOwnedRepos path="owned-libraries" /> <UserOwnedRepos path="owned-libraries" />
<UserSharedRepos path="shared-libraries" /> <UserSharedRepos path="shared-libraries" />

2
frontend/src/pages/sys-admin/user-link.js
View File

@@ -11,7 +11,7 @@ const propTypes = {
class UserLink extends Component { class UserLink extends Component {
render() { render() {
return <Link to={`${siteRoot}sys/user/${encodeURIComponent(this.props.email)}/`}>{this.props.name}</Link>; return <Link to={`${siteRoot}sys/users/${encodeURIComponent(this.props.email)}/`}>{this.props.name}</Link>;
} }
} }

3
frontend/src/pages/sys-admin/users/index.css Normal file
View File

@@ -0,0 +1,3 @@
.sys-admin-user-layout>div {
width: 100%;
}

18
frontend/src/pages/sys-admin/users/index.js
View File

@@ -10,9 +10,14 @@ import AdminUsers from './admin-users';
import LDAPImportedUsers from './ldap-imported-users'; import LDAPImportedUsers from './ldap-imported-users';
import LDAPUsers from './ldap-users'; import LDAPUsers from './ldap-users';
import UserNav from './user-nav'; import UserNav from './user-nav';
import toaster from '../../../components/toast';
import { Utils } from '../../../utils/utils';
import { systemAdminAPI } from '../../../utils/system-admin-api';
import { eventBus } from '../../../components/common/event-bus'; import { eventBus } from '../../../components/common/event-bus';
import { EVENT_BUS_TYPE } from '../../../components/common/event-bus-type'; import { EVENT_BUS_TYPE } from '../../../components/common/event-bus-type';
import './index.css';
const UsersLayout = ({ ...commonProps }) => { const UsersLayout = ({ ...commonProps }) => {
const [sortBy, setSortBy] = useState(''); const [sortBy, setSortBy] = useState('');
const [sortOrder, setSortOrder] = useState('asc'); const [sortOrder, setSortOrder] = useState('asc');
@@ -169,6 +174,17 @@ const UserLayout = ({ email, children, ...commonProps }) => {
curTab = 'groups'; curTab = 'groups';
} }
useEffect(() => {
if (curTab !== 'info' && username === '') {
systemAdminAPI.sysAdminGetUser(decodeURIComponent(email)).then((res) => {
setUsername(res.data.name);
}).catch((error) => {
toaster.danger(Utils.getErrorMsg(error, true));
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
useEffect(() => { useEffect(() => {
const unsubscribeUsername = eventBus.subscribe(EVENT_BUS_TYPE.SYNC_USERNAME, (username) => { const unsubscribeUsername = eventBus.subscribe(EVENT_BUS_TYPE.SYNC_USERNAME, (username) => {
setUsername(username); setUsername(username);
@@ -183,7 +199,7 @@ const UserLayout = ({ email, children, ...commonProps }) => {
<> <>
<MainPanelTopbar {...commonProps} /> <MainPanelTopbar {...commonProps} />
<UserNav currentItem={curTab} email={email} userName={username} /> <UserNav currentItem={curTab} email={email} userName={username} />
<div className="w-100 h-100 d-flex overflow-auto">{children}</div> <div className="sys-admin-user-layout w-100 h-100 d-flex overflow-auto">{children}</div>
</> </>
); );
}; };

2
frontend/src/pages/sys-admin/users/user-nav.js
View File

@@ -53,7 +53,7 @@ class Nav extends React.Component {
key={index} key={index}
ref={el => this.itemRefs[index] = el} ref={el => this.itemRefs[index] = el}
> >
<Link to={`${siteRoot}sys/user/${encodeURIComponent(email)}/${item.urlPart}`} className={`nav-link m-0 ${currentItem == item.name ? ' active' : ''}`}>{item.text}</Link> <Link to={`${siteRoot}sys/users/${encodeURIComponent(email)}/${item.urlPart}`} className={`nav-link m-0 ${currentItem == item.name ? ' active' : ''}`}>{item.text}</Link>
</li> </li>
); );
})} })}