From 367fa05a21be91a242df610eefeb66f3ff85628b Mon Sep 17 00:00:00 2001
From: Michael An <2331806369@qq.com>
Date: Wed, 19 Feb 2025 11:49:16 +0800
Subject: [PATCH] fix system admin department link (#7484)

---
 .../logs-page/share-permission-logs.js        | 24 +-------
 .../src/pages/sys-admin/users/user-groups.js  |  7 +--
 .../src/pages/sys-admin/users/user-nav.js     |  2 +-
 .../sys-admin/users/user-shared-repos.js      | 58 +++++++++----------
 4 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/frontend/src/pages/sys-admin/logs-page/share-permission-logs.js b/frontend/src/pages/sys-admin/logs-page/share-permission-logs.js
index 86f04ca62e..a6be3a3f33 100644
--- a/frontend/src/pages/sys-admin/logs-page/share-permission-logs.js
+++ b/frontend/src/pages/sys-admin/logs-page/share-permission-logs.js
@@ -93,25 +93,6 @@ Content.propTypes = {
 
 class Item extends Component {
 
-  constructor(props) {
-    super(props);
-    this.state = {
-      isOpIconShown: false,
-    };
-  }
-
-  handleMouseOver = () => {
-    this.setState({
-      isOpIconShown: true
-    });
-  };
-
-  handleMouseOut = () => {
-    this.setState({
-      isOpIconShown: false
-    });
-  };
-
   getActionTextByEType = (etype) => {
     if (etype.indexOf('add') != -1) {
       return gettext('Add');
@@ -129,9 +110,8 @@ class Item extends Component {
       case 'user':
         return <UserLink email={item.to_user_email} name={item.to_user_name} />;
       case 'group':
-        return <Link to={`${siteRoot}sys/groups/${item.to_group_id}/libraries/`}>{item.to_group_name}</Link>;
       case 'department':
-        return <Link to={`${siteRoot}sys/departments/${item.to_group_id}/`}>{item.to_group_name}</Link>;
+        return <Link to={`${siteRoot}sys/groups/${item.to_group_id}/libraries/`}>{item.to_group_name}</Link>;
       case 'all':
         return <Link to={`${siteRoot}org/`}>{gettext('All')}</Link>;
       default:
@@ -142,7 +122,7 @@ class Item extends Component {
   render() {
     let { item } = this.props;
     return (
-      <tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut}>
+      <tr>
         <td><UserLink email={item.from_user_email} name={item.from_user_name} /></td>
         <td>{this.getShareTo(item)}</td>
         <td>{this.getActionTextByEType(item.etype)}</td>
diff --git a/frontend/src/pages/sys-admin/users/user-groups.js b/frontend/src/pages/sys-admin/users/user-groups.js
index 746a4bced6..593cadcd03 100644
--- a/frontend/src/pages/sys-admin/users/user-groups.js
+++ b/frontend/src/pages/sys-admin/users/user-groups.js
@@ -79,7 +79,6 @@ class Item extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      isOpIconShown: false,
       highlight: false,
     };
   }
@@ -87,7 +86,6 @@ class Item extends Component {
   handleMouseEnter = () => {
     if (!this.props.isItemFreezed) {
       this.setState({
-        isOpIconShown: true,
         highlight: true
       });
     }
@@ -96,7 +94,6 @@ class Item extends Component {
   handleMouseLeave = () => {
     if (!this.props.isItemFreezed) {
       this.setState({
-        isOpIconShown: false,
         highlight: false
       });
     }
@@ -129,9 +126,7 @@ class Item extends Component {
 
   render() {
     const { item } = this.props;
-    const url = item.parent_group_id == 0 ?
-      `${siteRoot}sys/groups/${item.id}/libraries/` :
-      `${siteRoot}sys/departments/${item.id}/`;
+    const url = `${siteRoot}sys/groups/${item.id}/libraries/`;
     return (
       <Fragment>
         <tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
diff --git a/frontend/src/pages/sys-admin/users/user-nav.js b/frontend/src/pages/sys-admin/users/user-nav.js
index d44e344c55..ec5835e640 100644
--- a/frontend/src/pages/sys-admin/users/user-nav.js
+++ b/frontend/src/pages/sys-admin/users/user-nav.js
@@ -5,7 +5,7 @@ import { siteRoot, gettext } from '../../../utils/constants';
 
 const propTypes = {
   email: PropTypes.string,
-  userName: PropTypes.string.isRequired,
+  userName: PropTypes.string,
   currentItem: PropTypes.string.isRequired
 };
 
diff --git a/frontend/src/pages/sys-admin/users/user-shared-repos.js b/frontend/src/pages/sys-admin/users/user-shared-repos.js
index f1d9800275..dca877305f 100644
--- a/frontend/src/pages/sys-admin/users/user-shared-repos.js
+++ b/frontend/src/pages/sys-admin/users/user-shared-repos.js
@@ -24,27 +24,25 @@ class Content extends Component {
       return <p className="error text-center mt-4">{errorMsg}</p>;
     } else {
       const table = (
-        <Fragment>
-          <table className="table-hover">
-            <thead>
-              <tr>
-                <th width="5%"></th>
-                <th width="35%">{gettext('Name')}</th>
-                <th width="20%">{gettext('Share From')}</th>
-                <th width="20%">{gettext('Size')}</th>
-                <th width="20%">{gettext('Last Update')}</th>
-              </tr>
-            </thead>
-            <tbody>
-              {items.map((item, index) => {
-                return (<Item
-                  key={index}
-                  item={item}
-                />);
-              })}
-            </tbody>
-          </table>
-        </Fragment>
+        <table className="table-hover">
+          <thead>
+            <tr>
+              <th width="5%"></th>
+              <th width="35%">{gettext('Name')}</th>
+              <th width="20%">{gettext('Share From')}</th>
+              <th width="20%">{gettext('Size')}</th>
+              <th width="20%">{gettext('Last Update')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {items.map((item, index) => {
+              return (<Item
+                key={index}
+                item={item}
+              />);
+            })}
+          </tbody>
+        </table>
       );
       return items.length ? table : <EmptyTip text={gettext('No libraries')} />;
     }
@@ -82,7 +80,7 @@ class Item extends Component {
       link = <UserLink email={item.owner_email} name={item.owner_name} />;
     } else {
       const groupID = item.owner_email.substring(0, index);
-      link = <Link to={`${siteRoot}sys/departments/${groupID}/`}>{item.owner_name}</Link>;
+      link = <Link to={`${siteRoot}sys/groups/${groupID}/libraries/`}>{item.owner_name}</Link>;
     }
     return link;
   };
@@ -92,15 +90,13 @@ class Item extends Component {
     const iconUrl = Utils.getLibIconUrl(item);
     const iconTitle = Utils.getLibIconTitle(item);
     return (
-      <Fragment>
-        <tr>
-          <td><img src={iconUrl} title={iconTitle} alt={iconTitle} width="24" /></td>
-          <td>{this.renderRepoName()}</td>
-          <td>{this.getOwnerLink()}</td>
-          <td>{Utils.bytesToSize(item.size)}</td>
-          <td>{dayjs(item.last_modify).fromNow()}</td>
-        </tr>
-      </Fragment>
+      <tr>
+        <td><img src={iconUrl} title={iconTitle} alt={iconTitle} width="24" /></td>
+        <td>{this.renderRepoName()}</td>
+        <td>{this.getOwnerLink()}</td>
+        <td>{Utils.bytesToSize(item.size)}</td>
+        <td>{dayjs(item.last_modify).fromNow()}</td>
+      </tr>
     );
   }
 }