Skip to content

Commit

Permalink
address PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
chibongho committed Feb 15, 2024
1 parent 9c38fe4 commit 320c15f
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,3 @@ html[dir='rtl'] {
}
}
}

.tabList {
padding-left: spacing.$spacing-05;
}
1 change: 0 additions & 1 deletion packages/esm-service-queues-app/src/config-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ export interface ConfigObject {
historicalObsConceptUuid: Array<string>;
};
contactAttributeType: Array<string>;
visitQueueNumberAttributeUuid: string;
vitals: VitalsConfigObject;
biometrics: BiometricsConfigObject;
showQueueTableTab: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { type QueueTableColumn, type QueueTableCellComponentProps } from '../../types';

const QueueTableComingFromCell = ({ queueEntry }: QueueTableCellComponentProps) => {
export const QueueTableComingFromCell = ({ queueEntry }: QueueTableCellComponentProps) => {
return <>{queueEntry.queueComingFrom?.display}</>;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import { type ConfigObject } from '../../config-schema';
import { type QueueTableColumn, type QueueTableCellComponentProps } from '../../types';

const QueueTableNameCell = ({ queueEntry }: QueueTableCellComponentProps) => {
export const QueueTableNameCell = ({ queueEntry }: QueueTableCellComponentProps) => {
const { customPatientChartUrl } = useConfig<ConfigObject>();
return (
<ConfigurableLink to={customPatientChartUrl} templateParams={{ patientUuid: queueEntry.patient.uuid }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import { type QueueTableColumn, type QueueTableCellComponentProps } from '../../types';

// TODO: color code the Tag based on priority
const QueueTablePriorityCell = ({ queueEntry }: QueueTableCellComponentProps) => {
export const QueueTablePriorityCell = ({ queueEntry }: QueueTableCellComponentProps) => {
return <Tag>{queueEntry.priority.display}</Tag>;
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { type QueueTableColumn, type QueueTableCellComponentProps } from '../../types';

const QueueTableStatusCell = ({ queueEntry }: QueueTableCellComponentProps) => {
export const QueueTableStatusCell = ({ queueEntry }: QueueTableCellComponentProps) => {
return <>{queueEntry.status.display}</>;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type QueueTableColumn, type QueueTableCellComponentProps } from '../../
import dayjs from 'dayjs';
import { useTranslation } from 'react-i18next';

const QueueTableWaitTimeCell = ({ queueEntry }: QueueTableCellComponentProps) => {
export const QueueTableWaitTimeCell = ({ queueEntry }: QueueTableCellComponentProps) => {
const { t } = useTranslation();
const [currentTime, setCurrentTime] = useState(dayjs());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { queueTablePriorityColumn } from './cells/queue-table-priority-cell.comp
import { queueTableStatusColumn } from './cells/queue-table-status-cell.component';
import { queueTableWaitTimeColumn } from './cells/queue-table-wait-time-cell.component';
import { QueueTableByStatusSkeleton } from './queue-table-by-status-skeleton.component';
import { QueueTable } from './queue-table.component';
import QueueTable from './queue-table.component';

interface QueueTableByStatusProps {
selectedQueue: Queue; // the selected queue
Expand All @@ -35,7 +35,7 @@ const defaultQueueTableConfig: QueueTableTabConfig = {
],
};

export const QueueTableByStatus: React.FC<QueueTableByStatusProps> = ({
const QueueTableByStatus: React.FC<QueueTableByStatusProps> = ({
selectedQueue,
selectedStatus,
configByStatus,
Expand Down Expand Up @@ -75,7 +75,7 @@ export const QueueTableByStatus: React.FC<QueueTableByStatusProps> = ({
return (
<div className={styles.container}>
<div className={styles.headerContainer}>
<div className={!isDesktop(layout) ? styles.tabletHeading : styles.desktopHeading}>
<div className={isDesktop(layout) ? styles.desktopHeading : styles.tabletHeading}>
<h3>{selectedQueue.display}</h3>
</div>
</div>
Expand Down Expand Up @@ -106,3 +106,5 @@ export const QueueTableByStatus: React.FC<QueueTableByStatusProps> = ({
</div>
);
};

export default QueueTableByStatus;
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interface QueueTableProps {
queueTableColumns: QueueTableColumn[];
}

export function QueueTable({ queueEntries, queueTableColumns }: QueueTableProps) {
function QueueTable({ queueEntries, queueTableColumns }: QueueTableProps) {
const { t } = useTranslation();
const [currentPageSize, setPageSize] = useState(10);
const pageSizes = [10, 20, 30, 40, 50];
Expand All @@ -43,9 +43,7 @@ export function QueueTable({ queueEntries, queueTableColumns }: QueueTableProps)
<DataTable rows={rowsData} headers={headers}>
{({ rows, headers, getTableProps, getHeaderProps, getRowProps, getToolbarProps, onInputChange }) => (
<TableContainer className={styles.tableContainer}>
<TableToolbar
{...getToolbarProps()}
style={{ position: 'static', height: '3rem', overflow: 'visible', backgroundColor: 'color' }}>
<TableToolbar {...getToolbarProps()}>
<TableToolbarContent className={styles.toolbarContent}>
<TableToolbarSearch
className={styles.search}
Expand Down Expand Up @@ -94,3 +92,5 @@ export function QueueTable({ queueEntries, queueTableColumns }: QueueTableProps)
</DataTable>
);
}

export default QueueTable;
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@
height: spacing.$spacing-07;
margin-bottom: spacing.$spacing-02;
}

:global(.cds--table-toolbar) {
position: static;
height: 3rem;
overflow: visible;
}
}

.tableToolbaer {
}

.queueTable tr:last-of-type {
Expand Down
3 changes: 1 addition & 2 deletions packages/esm-service-queues-app/src/root.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import AppointmentsTable from './queue-patient-linelists/scheduled-appointments-
import Home from './home.component';
import ServicesTable from './queue-patient-linelists/queue-services-table.component';
import QueueScreen from './queue-screen/queue-screen.component';
import { QueueTableByStatus } from './queue-table/queue-table-by-status.component';
import { QueueTableByStatusView } from './views/queue-table-by-status-view.component';
import QueueTableByStatusView from './views/queue-table-by-status-view.component';

const swrConfiguration = {
// Maximum number of retries when the backend returns an error
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import { useQueue } from '../hooks/useQueue';
import { QueueTableByStatus } from '../queue-table/queue-table-by-status.component';
import QueueTableByStatus from '../queue-table/queue-table-by-status.component';
import { QueueTableByStatusSkeleton } from '../queue-table/queue-table-by-status-skeleton.component';

export const QueueTableByStatusView: React.FC = () => {
const QueueTableByStatusView: React.FC = () => {
const { queueUuid, statusUuid } = useParams();
const { queue, isLoading } = useQueue(queueUuid);
const status = queue?.allowedStatuses.find((s) => s.uuid == statusUuid);
Expand All @@ -20,3 +20,5 @@ export const QueueTableByStatusView: React.FC = () => {
return <QueueTableByStatus selectedQueue={queue} selectedStatus={status} />;
}
};

export default QueueTableByStatusView;

0 comments on commit 320c15f

Please sign in to comment.