Skip to content

Commit

Permalink
consolidate transitions to single form
Browse files Browse the repository at this point in the history
  • Loading branch information
chibongho committed Feb 27, 2024
1 parent df8b953 commit 113993b
Show file tree
Hide file tree
Showing 14 changed files with 255 additions and 636 deletions.
20 changes: 2 additions & 18 deletions packages/esm-service-queues-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,8 @@ export const addProviderToRoomModal = getAsyncLifecycle(
},
);

export const transitionQueueEntryPriorityDialog = getAsyncLifecycle(
() => import('./queue-table/transitions/transition-priority-dialog.component'),
{
featureName: 'transition queue entry priority',
moduleName,
},
);

export const transitionQueueEntryStatusDialog = getAsyncLifecycle(
() => import('./queue-table/transitions/transition-status-dialog.component'),
{
featureName: 'transition queue entry status',
moduleName,
},
);

export const transferQueueModal = getAsyncLifecycle(
() => import('./queue-table/transitions/transfer-queue-dialog.component'),
export const transitionQueueEntryModal = getAsyncLifecycle(
() => import('./queue-table/transitions/transition-queue-entry-modal.component'),
{
featureName: 'transfer patient to a different queue',
moduleName,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { Button, OverflowMenu, OverflowMenuItem } from '@carbon/react';
import { showModal } from '@openmrs/esm-framework';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { type QueueTableCellComponentProps, type QueueTableColumn } from '../../types';

export function QueueTableTransitionCell({ queueEntry }: QueueTableCellComponentProps) {
const { t } = useTranslation();

return (
<div>
<Button
kind="ghost"
aria-label="Actions"
onClick={() => {
const dispose = showModal('transition-queue-entry-modal', {
closeModal: () => dispose(),
queueEntry,
});
}}>
{t('transition', 'Transition')}
</Button>
</div>
);
}

export const queueTableTransitionColumn: QueueTableColumn = {
headerI18nKey: '',
CellComponent: QueueTableTransitionCell,
};
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { queueTableStatusColumn } from './cells/queue-table-status-cell.componen
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 { queueTableActionsColumn } from './cells/queue-table-actions-cell.component';
import { queueTableTransitionColumn } from './cells/queue-table-transition-cell.component';

interface QueueTableByStatusProps {
selectedQueue: Queue; // the selected queue
Expand All @@ -33,7 +33,7 @@ export const defaultQueueTableConfig: QueueTableTabConfig = {
queueTablePriorityColumn,
queueTableStatusColumn,
queueTableWaitTimeColumn,
queueTableActionsColumn,
queueTableTransitionColumn,
],
};

Expand Down

This file was deleted.

Loading

0 comments on commit 113993b

Please sign in to comment.