Bladeren bron

show UserGroupUserModal

kaori 3 jaren geleden
bovenliggende
commit
dbddf2e950

+ 5 - 5
packages/app/src/client/services/AdminUserGroupDetailContainer.js

@@ -31,15 +31,15 @@ export default class AdminUserGroupDetailContainer extends Container {
 
     this.appContainer = appContainer;
 
-    const rootElem = document.getElementById('admin-user-group-detail');
+    // const rootElem = document.getElementById('admin-user-group-detail');
 
-    if (rootElem == null) {
-      return;
-    }
+    // if (rootElem == null) {
+    //   return;
+    // }
 
     this.state = {
       // TODO: [SPA] get userGroup from props
-      userGroup: JSON.parse(rootElem.getAttribute('data-user-group')),
+      // userGroup: JSON.parse(rootElem.getAttribute('data-user-group')),
       userGroupRelations: [], // For user list
 
       // TODO 85062: /_api/v3/user-groups/children?include_grand_child=boolean

+ 2 - 3
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -22,7 +22,7 @@ import {
 } from '~/stores/user-group';
 
 // import UserGroupPageList from './UserGroupPageList';
-// import UserGroupUserModal from './UserGroupUserModal';
+const UserGroupUserModal = dynamic(() => import('./UserGroupUserModal'), { ssr: false });
 const UserGroupUserTable = dynamic(() => import('./UserGroupUserTable'), { ssr: false });
 
 const UserGroupDeleteModal = dynamic(() => import('../UserGroup/UserGroupDeleteModal').then(mod => mod.UserGroupDeleteModal), { ssr: false });
@@ -343,8 +343,7 @@ const UserGroupDetailPage = (props: Props) => {
       </div>
       <h2 className="admin-setting-header mt-4">{t('admin:user_group_management.user_list')}</h2>
       <UserGroupUserTable />
-      {/* <UserGroupUserModal /> */}
-      UserGroupUserModal
+      <UserGroupUserModal isOpen={true}/>
 
       <h2 className="admin-setting-header mt-4">{t('admin:user_group_management.child_group_list')}</h2>
       <UserGroupDropdown