merge master

haiwen · May 20, 2024 · 48814ff · 48814ff
2 parents 96b01de + 0d4e975
commit 48814ff
Show file tree

Hide file tree

Showing 68 changed files with 3,123 additions and 877 deletions.
diff --git a/frontend/config/webpack.entry.js b/frontend/config/webpack.entry.js
@@ -39,6 +39,8 @@ const entryFiles = {
   sysAdmin: '/pages/sys-admin',
   search: '/pages/search',
   uploadLink: '/pages/upload-link',
+  subscription: '/subscription.js',
+  institutionAdmin: '/pages/institution-admin/index.js'
 };
 
 const getEntries = (isEnvDevelopment) => {

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,7 +9,7 @@
     "@gatsbyjs/reach-router": "1.3.9",
     "@seafile/react-image-lightbox": "2.0.2",
     "@seafile/resumablejs": "1.1.16",
-    "@seafile/sdoc-editor": "0.5.57",
+    "@seafile/sdoc-editor": "0.5.60",
     "@seafile/seafile-calendar": "0.0.12",
     "@seafile/seafile-editor": "1.0.82",
     "@uiw/codemirror-extensions-langs": "^4.19.4",

diff --git a/frontend/src/assets/icons/currency.svg b/frontend/src/assets/icons/currency.svg
diff --git a/frontend/src/components/common/account.js b/frontend/src/components/common/account.js
@@ -6,6 +6,10 @@ import { seafileAPI } from '../../utils/seafile-api';
 import { siteRoot, gettext, appAvatarURL, enableSSOToThirdpartWebsite } from '../../utils/constants';
 import toaster from '../toast';
 
+const {
+  isOrgContext,
+} = window.app.pageOptions;
+
 const propTypes = {
   isAdminPanel: PropTypes.bool,
 };
@@ -22,6 +26,7 @@ class Account extends Component {
       isStaff: false,
       isOrgStaff: false,
       usageRate: '',
+      enableSubscription: false,
     };
     this.isFirstMounted = true;
   }
@@ -81,6 +86,7 @@ class Account extends Component {
           isInstAdmin: resp.data.is_inst_admin,
           isOrgStaff: resp.data.is_org_staff === 1 ? true : false,
           showInfo: !this.state.showInfo,
+          enableSubscription: resp.data.enable_subscription,
         });
       }).catch(error => {
         let errMessage = Utils.getErrorMsg(error);
@@ -163,6 +169,7 @@ class Account extends Component {
               </div>
             </div>
             <a href={siteRoot + 'profile/'} className="item">{gettext('Settings')}</a>
+            {(this.state.enableSubscription && !isOrgContext) && <a href={siteRoot + 'subscription/'} className="item">{'付费管理'}</a>}
             {this.renderMenu()}
             {enableSSOToThirdpartWebsite && <a href={siteRoot + 'sso-to-thirdpart/'} className="item">{gettext('Customer Portal')}</a>}
             <a href={siteRoot + 'accounts/logout/'} className="item">{gettext('Log out')}</a>