Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MF-635: Enable useZebraStyles striping for widget datatables #377

Merged
merged 1 commit into from
Sep 13, 2021
Merged

MF-635: Enable useZebraStyles striping for widget datatables #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/esm-patient-allergies-app/src/allergies/allergies-detailed-summary.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const AllergiesDetailedSummary: React.FC<AllergiesDetailedSummaryProps> = ({ pat
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true}>
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-allergies-app/src/allergies/allergies-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const AllergiesOverview: React.FC<AllergiesOverviewProps> = ({ patient, showAddA
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
6 changes: 0 additions & 6 deletions packages/esm-patient-allergies-app/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"allergen": "Allergen",
"allergenAndReaction": "Allergen and Reactions",
"allergies": "Allergies",
"allergy": "Allergy",
"allergyIntolerances": "allergy intolerances",
"allergySaved": "Allergy saved successfully",
"allergySaveError": "Error saving allergy",
Expand All @@ -18,23 +17,18 @@
"invalidComment": "Invalid comment, try again",
"items": "items",
"lastUpdated": "Last updated",
"lastUpdatedBy": "Last updated by",
"lastUpdatedLocation": "Last updated location",
"mild": "Mild",
"moderate": "Moderate",
"name": "Name",
"onsetDate": "Onset Date",
"otherAllergenInvalidText": "Other allergen is required",
"otherReactionInvalidText": "Other reaction is required",
"pleaseSpecifyOtherReaction": "Please specify other reaction",
"reaction": "Reaction",
"reactions": "Reactions",
"saveAndClose": "Save and Close",
"seeAll": "See all",
"selectTheAllergens": "Select the allergens",
"selectTheReactions": "Select the reactions",
"severe": "Severe",
"severity": "Severity",
"severityAndDateOfOnset": "Severity and date of onset",
"severityandReaction": "Severity & Reaction",
"severityOfWorstReaction": "Severity of worst reaction",
Expand Down
4 changes: 2 additions & 2 deletions packages/esm-patient-appointments-app/src/appointments/appointments-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const AppointmentsOverview: React.FC<AppointmentOverviewProps> = ({ patientUuid
const rows = getRowItems(appointments);
return (
<div>
<div className={styles.allergiesHeader}>
<div className={styles.appointmentsHeader}>
<h4 className={`${styles.productiveHeading03} ${styles.text02}`}>{headerTitle}</h4>
<Button kind="ghost" renderIcon={Add16} iconDescription="Add appointments" onClick={launchAppointmentsForm}>
{t('add', 'Add')}
Expand All @@ -89,7 +89,7 @@ const AppointmentsOverview: React.FC<AppointmentOverviewProps> = ({ patientUuid
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
9 changes: 9 additions & 0 deletions packages/esm-patient-appointments-app/src/appointments/appointments-overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,12 @@
padding: $spacing-04 0 $spacing-04 $spacing-05;
background-color: $ui-background;
}

.appointmentsHeader > h4:after {
content: "";
display: block;
width: 2rem;
padding-top: 0.188rem;
border-bottom: 0.375rem solid $brand-teal-01;
}

8 changes: 0 additions & 8 deletions packages/esm-patient-biometrics-app/src/biometrics/biometrics-overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,3 @@
.toggle:last-of-type {
border-radius: 0 $spacing-02 $spacing-02 0;
}

.customTable tr:nth-child(odd) td {
background-color: #fff;
}

.customTable tbody tr:nth-child(even) td {
background-color: #f4f4f4;
}
2 changes: 1 addition & 1 deletion packages/esm-patient-biometrics-app/src/biometrics/biometricsPagination.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const BiometricsPagination: React.FC<FormsProps> = ({ tableRows, pageSize, pageU
<TableContainer>
<DataTable rows={results} headers={tableHeaders} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()} className={styles.customTable}>
<Table {...getTableProps()}>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-chart-app/src/visit/past-visit-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const PastVisitOverview: React.FC<PastVisitOverviewProps> = ({ patientUuid }) =>
<DataTable headers={headerData} rows={rowData}>
{({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
<TableContainer title={t('pastVisit', 'Past Visit')}>
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion ...ent-chart-app/src/visit/visits-widget/past-visits-components/encounter-list.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const EncounterListDataTable: React.FC<EncounterListProps> = ({ encounters, visi
{({ rows, headers, getHeaderProps, getRowProps, getTableProps }) => {
return (
<TableContainer>
<Table className={styles.customTable} {...getTableProps()} size={!isDesktop ? 'normal' : 'short'}>
<Table {...getTableProps()} size={!isDesktop ? 'normal' : 'short'} useZebraStyles>
<TableHead>
<TableRow>
<TableExpandHeader />
Expand Down
8 changes: 0 additions & 8 deletions packages/esm-patient-chart-app/src/visit/visits-widget/visit-detail-overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@
border-radius: 0 $spacing-02 $spacing-02 0;
}

.customTable tr[data-parent-row]:nth-child(odd) td {
background-color: #fff;
}

.customTable tbody tr[data-parent-row]:nth-child(even) td {
background-color: #f4f4f4;
}

.encounterEmptyState {
text-align: center;
margin: 0 1rem 1rem 1rem;
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-conditions-app/src/conditions/conditions-detailed-summary.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const ConditionsDetailedSummary: React.FC = () => {
<TableContainer>
<DataTable rows={tableRows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-conditions-app/src/conditions/conditions-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const ConditionsOverview: React.FC<ConditionsOverviewProps> = ({ patient }) => {
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-forms-app/src/forms/form-view.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const FormView: React.FC<FormViewProps> = ({ forms, patientUuid, patient, pageSi
<TableContainer className={styles.tableContainer}>
<DataTable rows={tableRows} headers={tableHeaders} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion ...ages/esm-patient-immunizations-app/src/immunizations/immunizations-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const ImmunizationsOverview: React.FC<ImmunizationsOverviewProps> = ({ patient,
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const MedicationsDetailsTable = connect<
<DataTable headers={tableHeaders} rows={tableRows} isSortable={true} sortRow={sortRow}>
{({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
<TableContainer className={styles.tableHeader} zebra>
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-notes-app/src/notes/notesPagination.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const NotesPagination: React.FC<FormsProps> = ({ notes, pageSize, pageUrl, urlLa
<TableContainer>
<DataTable rows={getRowItems(results)} headers={headers} isSortable={true} size="short" useZebraStyles>
{({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-programs-app/src/programs/programs-detailed-summary.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const ProgramsDetailedSummary: React.FC<ProgramsDetailedSummaryProps> = () => {
<TableContainer>
<DataTable rows={tableRows} headers={tableHeader} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-programs-app/src/programs/programs-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const ProgramsOverview: React.FC<ProgramsOverviewProps> = ({ patientUuid }) => {
<TableContainer>
<DataTable rows={rows} headers={headers} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-vitals-app/src/vitals/vitals-overview.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const VitalsOverview: React.FC<VitalsOverviewProps> = ({ patientUuid, showAddVit
return (
<div className={styles.vitalsWidgetContainer}>
<div className={styles.vitalsHeaderContainer}>
<h4 className={`${styles.productiveHeading03} ${styles.text02}`}>{headerTitle}</h4>
<h4>{headerTitle}</h4>
<div className={styles.toggleButtons}>
<Button
className={styles.toggle}
Expand Down
13 changes: 5 additions & 8 deletions packages/esm-patient-vitals-app/src/vitals/vitals-overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
padding: $spacing-04 0 $spacing-04 $spacing-05;
}

.vitalsHeaderContainer h4 {
@include carbon--type-style('productive-heading-03');
color: $text-02;
}

.vitalsHeaderContainer > h4:after {
content: "";
display: block;
Expand All @@ -38,11 +43,3 @@
background-color: $ui-background;
position: relative;
}

.customTable tr:nth-child(odd) td {
background-color: #fff;
}

.customTable tbody tr:nth-child(even) td {
background-color: #f4f4f4;
}
2 changes: 1 addition & 1 deletion packages/esm-patient-vitals-app/src/vitals/vitalsPagination.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const VitalsPagination: React.FC<VitalsPaginationProps> = ({
<TableContainer>
<DataTable rows={results} headers={tableHeaders} isSortable={true} size="short">
{({ rows, headers, getHeaderProps, getTableProps }) => (
<Table {...getTableProps()} className={styles.customTable}>
<Table {...getTableProps()} useZebraStyles>
<TableHead>
<TableRow>
{headers.map((header) => (
Expand Down