From d38757f5029d396ce620586d817e70a5812deb55 Mon Sep 17 00:00:00 2001 From: devketanpro <73937490+devketanpro@users.noreply.github.com> Date: Thu, 13 Apr 2023 09:28:07 +0530 Subject: [PATCH] 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 --- assets/company-admin/components/CompanyAdminApp.jsx | 2 +- assets/users/components/EditUser.jsx | 9 ++++++++- assets/users/utils.js | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/assets/company-admin/components/CompanyAdminApp.jsx b/assets/company-admin/components/CompanyAdminApp.jsx index d6868b669..4ff6c5288 100644 --- 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']} /> )} diff --git a/assets/users/components/EditUser.jsx b/assets/users/components/EditUser.jsx index f41370a5e..4b10df851 100644 --- 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 (
@@ -148,7 +150,12 @@ function EditUserComponent({ readOnly={userTypeReadOnly(user, currentUser)} onChange={onChange} error={errors ? errors.user_type : null}/>)} - {hideFields.includes('company') ? null : () : (