fix: failing gh workflows from unresolved conflicts

techmatters · Dec 15, 2023 · b666365 · b666365
1 parent b8faa1a
commit b666365
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git 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 (
     <>
       <h1>Clients</h1>
-      <CLTable>
-        <CLTableRow>
-          <CLTableCell> Client</CLTableCell>
-          <CLTableCell> Identifier(s)</CLTableCell>
-          <CLTableCell> Status</CLTableCell>
-          <CLTableCell> Overview</CLTableCell>
-        </CLTableRow>
+      <StandardTable>
+        <DataTableRow>
+          <DataCell> Client</DataCell>
+          <DataCell> Identifier(s)</DataCell>
+          <DataCell> Status</DataCell>
+          <DataCell> Overview</DataCell>
+        </DataTableRow>
         {profileIds?.map(profileId => (
           <ProfileListRow key={profileId} profileId={profileId} />
         ))}
-      </CLTable>
+      </StandardTable>
     </>
   );
 };

diff --git 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 = {
@@ -37,12 +37,12 @@ const ProfileListRow: React.FC<Props> = ({ profileId, openProfileDetails }) => {
     openProfileDetails(profileId.toString());
   };
   return (
-    <CLTableRow onClick={handleViewProfile}>
-      <CLTableCell onClick={handleViewProfile}>{profile?.id}</CLTableCell>
-      <CLTableCell>id</CLTableCell>
-      <CLTableCell>blocked abusive</CLTableCell>
-      <CLTableCell>summary</CLTableCell>
-    </CLTableRow>
+    <DataTableRow onClick={handleViewProfile}>
+      <DataCell onClick={handleViewProfile}>{profile?.id}</DataCell>
+      <DataCell>id</DataCell>
+      <DataCell>blocked abusive</DataCell>
+      <DataCell>summary</DataCell>
+    </DataTableRow>
   );
 };