fix : User type and Company information are missing from the detailed…

… user profile view [CPCN-111] (#336) * fix : User type and Company information are missing from the detailed user profile view [CPCN-111] * fix linr
superdesk · Apr 13, 2023 · f954e0a · f954e0a
1 parent a6836e6
commit f954e0a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/assets/company-admin/components/CompanyAdminApp.jsx b/assets/company-admin/components/CompanyAdminApp.jsx
@@ -191,7 +191,7 @@ class CompanyAdminAppComponent extends React.Component {
                                     resendUserInvite={this.props.resendUserInvite}
                                     currentUser={this.props.user}
                                     products={this.props.products}
-                                    hideFields={['user_type', 'company']}
+                                    hideFields={['company']}
                                 />
                             )}
                         </div>

diff --git a/assets/users/components/EditUser.jsx b/assets/users/components/EditUser.jsx
@@ -46,6 +46,8 @@ function EditUserComponent({
     const isAdmin = isUserAdmin(currentUser);
     const isCompanyAdmin = isUserCompanyAdmin(currentUser);
 
+    let company = companies.map((value)=> value.name);
+
     return (
         <div className='list-item__preview' role={gettext('dialog')} aria-label={gettext('Edit User')}>
             <div className='list-item__preview-header'>
@@ -148,7 +150,12 @@ function EditUserComponent({
                                 readOnly={userTypeReadOnly(user, currentUser)}
                                 onChange={onChange}
                                 error={errors ? errors.user_type : null}/>)}
-                            {hideFields.includes('company') ? null : (<SelectInput
+                            {hideFields.includes('company') ? (<TextInput
+                                name='company'
+                                label={gettext('Company')}
+                                value={company[0]}
+                                onChange={onChange}
+                                error={errors ? errors.role : null} />) : (<SelectInput
                                 name='company'
                                 label={gettext('Company')}
                                 value={user.company}

diff --git a/assets/users/utils.js b/assets/users/utils.js
@@ -3,10 +3,10 @@ import {get} from 'lodash';
 
 export const userTypes = [
     {value: 'administrator', text: gettext('Administrator'), show_acc_mgr: false},
-    {value: 'internal', text: gettext('Internal'), show_acc_mgr: true},
+    {value: 'internal', text: gettext('Internal'), show_acc_mgr: false},
     {value: 'public', text: gettext('Public'), show_acc_mgr: true},
     {value: 'account_management', text: gettext('Account Management'), show_acc_mgr: false},
-    {value: 'company_admin', text: gettext('Company Admin'), show_acc_mgr: false},
+    {value: 'company_admin', text: gettext('Company Admin'), show_acc_mgr: true},
 ];
 
 export function getUserLabel(code) {