optimized-error-handle (#4366)

* optimized-error-handle

* update css

* optimized code

frontend/src/components/permission-denied-tip.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import { gettext, loginUrl } from '../utils/constants';
+
+function PermissionDeniedTip() {
+  return(
+    <span className="error">{gettext('Permission denied. Please try')}{' '}
+      <a className="action-link p-0" href={`${loginUrl}?next=${encodeURIComponent(location.href)}`}>{gettext('login again.')}</a>
+    </span>
+  );
+} 
+
+export default PermissionDeniedTip;

frontend/src/components/session-expired-tip.js

@@ -3,8 +3,8 @@ import { gettext, loginUrl } from '../utils/constants';
 
 function SessionExpiredTip() {
   return(
-    <span className="session-expired-tip">{gettext('You are logged out.')}{' '}
-      <a className="action-link session-expired-link" href={`${loginUrl}?next=${encodeURIComponent(location.href)}`}>{gettext('Login again.')}</a>
+    <span className="error">{gettext('You are logged out.')}{' '}
+      <a className="action-link p-0" href={`${loginUrl}?next=${encodeURIComponent(location.href)}`}>{gettext('Login again.')}</a>
     </span>
   );
 } 

frontend/src/utils/utils.js

@@ -3,7 +3,7 @@ import { strChineseFirstPY } from './pinyin-by-unicode';
 import TextTranslation from './text-translation';
 import React from 'react';
 import toaster from '../components/toast';
-import SessionExpiredTip from '../components/session-expired-tip';
+import PermissionDeniedTip from '../components/permission-denied-tip';
 
 export const Utils = {
 
@@ -972,15 +972,16 @@ export const Utils = {
   /*
    * only used in the 'catch' part of a seafileAPI request
    */
-  getErrorMsg: function(error, showLoginTipIf403) {
+  getErrorMsg: function(error, showPermissionDeniedTip) {
     let errorMsg = '';
     if (error.response) {
       if (error.response.status == 403) {
-        if (showLoginTipIf403) {
+        if (showPermissionDeniedTip) {
           toaster.danger(
-            <SessionExpiredTip />,
-            {id: 'session_expired', duration: 3600}
+            <PermissionDeniedTip />,
+            {id: 'permission_denied', duration: 3600}
           );
+          return;
         }
         errorMsg = gettext('Permission denied');
       } else if (error.response.data &&

media/css/seahub_react.css

@@ -1107,14 +1107,6 @@ a.table-sort-op:focus {
     color: red;
 }
 
-.session-expired-tip {
-    color: red;
-}
-
-.session-expired-link {
-    padding: 0;
-}
-
 /* file-tag */
 .tag-list {
     position: relative;