Merge pull request #1014 from opensrp/585-fhir-user-management

585 fhir user management
onaio · May 23, 2022 · 1585013 · 1585013
2 parents b1d5515 + 25015b2
commit 1585013
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/fhir-care-team/src/components/ListView/index.tsx b/packages/fhir-care-team/src/components/ListView/index.tsx
@@ -143,7 +143,7 @@ export const CareTeamList: React.FC<CareTeamListPropTypes> = (props: CareTeamLis
       <Row className="list-view">
         <Col className="main-content">
           <div className="main-content__header">
-            <SearchForm {...searchFormProps} />
+            <SearchForm {...searchFormProps} disabled />
             <Link to={URL_CREATE_CARE_TEAM}>
               <Button type="primary">
                 <PlusOutlined />

diff --git a/packages/fhir-group-management/src/components/GroupList/index.tsx b/packages/fhir-group-management/src/components/GroupList/index.tsx
@@ -110,7 +110,7 @@ export const GroupList = (props: GroupListProps) => {
       <Row className="list-view">
         <Col className="main-content">
           <div className="main-content__header">
-            <SearchForm data-testid="search-form" {...searchFormProps} />
+            <SearchForm data-testid="search-form" {...searchFormProps} disabled />
             <Link to="#">
               <Button disabled type="primary">
                 <PlusOutlined />

diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx
@@ -31,7 +31,7 @@ export const getTableColumns = (
 ): Column<KeycloakUser>[] => {
   // eslint-disable-next-line @typescript-eslint/naming-convention
   const { user_id } = extraData;
-  const headerItems: string[] = ['Username', 'First name', 'Last name', 'Email'];
+  const headerItems: string[] = ['Email', 'First name', 'Last name', 'Username'];
   const dataElements: Column<KeycloakUser>[] = [];
   const fields: string[] = ['email', 'firstName', 'lastName', 'username'];
 

diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ViewDetails/index.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ViewDetails/index.tsx
@@ -107,14 +107,14 @@ export const ViewDetails = (props: ViewDetailsProps) => {
       ) : practitioner ? (
         renderObjectAsKeyvalue(practitionerKeyValues)
       ) : (
-        <Alert description="User does not have a linked practitioner" type="info"></Alert>
+        <Alert description="User does not have a linked practitioner" type="warning"></Alert>
       )}
       {careTeamsIsLoading ? (
         <Alert description="Fetching linked care teams" type="info"></Alert>
       ) : careTeams && careTeams.length > 0 ? (
         renderObjectAsKeyvalue(careTeamKeyValues)
       ) : (
-        <Alert description="Practitioner is not assigned to a care team" type="info"></Alert>
+        <Alert description="Practitioner is not assigned to a care team" type="warning"></Alert>
       )}
     </Space>
   );