fix: licenses management in org center (#4039)

erda-project · Mar 26, 2024 · 483a268 · 483a268
1 parent 81067da
commit 483a268
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/shell/app/modules/org/pages/setting/license-info.tsx b/shell/app/modules/org/pages/setting/license-info.tsx
@@ -37,7 +37,7 @@ const LicenseInfo = () => {
     setLoading(true);
     const res = await getLicense();
     if (res.success) {
-      setInfo(res.data.data);
+      setInfo(res.data);
       setLoading(false);
     }
   };

diff --git a/shell/app/modules/org/pages/setting/org-setting.tsx b/shell/app/modules/org/pages/setting/org-setting.tsx
@@ -28,6 +28,7 @@ import IssueFieldManage from '../projects/issue-field-manage';
 import IssueTypeManage from '../projects/issue-type-manage';
 import Announcement from 'org/pages/announcement';
 import permStore from 'user/stores/permission';
+import LicenseInfo from './license-info';
 
 import './org-setting.scss';
 import { replaceWithLink } from 'app/common/utils';
@@ -89,6 +90,11 @@ export const OrgSetting = () => {
             content: <Announcement />,
           },
         ]),
+        {
+          tabTitle: i18n.t('License'),
+          tabKey: 'license',
+          content: <LicenseInfo />,
+        },
       ],
     },
     {

diff --git a/shell/app/modules/org/services/license.ts b/shell/app/modules/org/services/license.ts
@@ -19,7 +19,7 @@ export interface License {
   features: string[];
 }
 
-export const getLicense = (): RAW_RESPONSE<{ data: License }> => {
+export const getLicense = (): RAW_RESPONSE<License> => {
   return agent
     .get('/api/licenses')
     .query({ scope: 'ORG' })