From f0c7fb17cfc0b9db31dabcb45da064316a46e4d8 Mon Sep 17 00:00:00 2001 From: Mythily Mudunuru <102122005+mythilytm@users.noreply.github.com> Date: Fri, 15 Dec 2023 19:21:42 -0500 Subject: [PATCH] Fix failing workflows from unresolved conflicts (#1950) * fix: failing gh workflows from unresolved conflicts * minor cleanup --- .../ProfileListPage/ProfileListPage.tsx | 18 +++++++++--------- .../ProfileListPage/ProfileListRow.tsx | 19 ++++++++----------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListPage.tsx b/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListPage.tsx index 0ec7b3b04f..94d7860f04 100644 --- a/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListPage.tsx +++ b/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListPage.tsx @@ -16,7 +16,7 @@ import React from 'react'; -import { CLTable, CLTableRow, CLTableCell } from '../../../styles/caseList'; +import { StandardTable, DataTableRow, DataCell } from '../../../styles/table'; import { useProfileListLoader } from '../../../states/profile/hooks/useProfileListLoader'; import { useProfileList } from '../../../states/profile/hooks/useProfileList'; import ProfileListRow from './ProfileListRow'; @@ -32,17 +32,17 @@ const ProfileListPage: React.FC = () => { return ( <>

Clients

- - - Client - Identifier(s) - Status - Overview - + + + Client + Identifier(s) + Status + Overview + {profileIds?.map(profileId => ( ))} - + ); }; diff --git a/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListRow.tsx b/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListRow.tsx index 6cc6f29c98..e8b0f838a1 100644 --- a/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListRow.tsx +++ b/plugin-hrm-form/src/components/profile/ProfileListPage/ProfileListRow.tsx @@ -19,7 +19,7 @@ import { connect } from 'react-redux'; import { useProfile } from '../../../states/profile/hooks/useProfile'; import { Profile } from '../../../states/profile/types'; -import { CLTableRow, CLTableCell } from '../../../styles/caseList'; +import { DataTableRow, DataCell } from '../../../styles/table'; import { newOpenModalAction } from '../../../states/routing/actions'; type OwnProps = { @@ -32,17 +32,14 @@ type Props = OwnProps & { const ProfileListRow: React.FC = ({ profileId, openProfileDetails }) => { const { profile } = useProfile({ profileId }); - console.log('>>> profile', profile); - const handleViewProfile = () => { - openProfileDetails(profileId.toString()); - }; + return ( - - {profile?.id} - id - blocked abusive - summary - + + {profile?.id} + id + blocked abusive + summary + ); };