Skip to content

Commit 46505e0

Browse files
committed
2423: Redirection to scheduleTask form
1 parent 028a822 commit 46505e0

File tree

6 files changed

+29
-4
lines changed

6 files changed

+29
-4
lines changed

packages/orchestrator-ui-components/src/components/WfoPageTemplate/paths.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ export const PATH_METADATA_RESOURCE_TYPES = '/metadata/resource-types';
1010
export const PATH_METADATA_WORKFLOWS = '/metadata/workflows';
1111
export const PATH_METADATA_TASKS = '/metadata/tasks';
1212
export const PATH_METADATA_SCHEDULED_TASKS = '/metadata/scheduled-tasks';
13+
export const PATH_METADATA_ADD_SCHEDULED_TASK_FORM =
14+
'/metadata/scheduled-tasks-form';
1315
export const PATH_TASKS = '/tasks';
1416
export const PATH_SETTINGS = '/settings';

packages/orchestrator-ui-components/src/components/WfoTable/WfoAdvancedTable/WfoAdvancedTable.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export type WfoAdvancedTableProps<T extends object> = Omit<
5151
onUpdateQueryString: (queryString: string) => void;
5252
onExportData?: () => void;
5353
disableSearch?: boolean;
54+
extraButtons?: React.ReactNode;
5455
};
5556

5657
export const WfoAdvancedTable = <T extends object>({
@@ -65,6 +66,7 @@ export const WfoAdvancedTable = <T extends object>({
6566
onUpdateQueryString,
6667
onExportData,
6768
disableSearch = false,
69+
extraButtons,
6870
...tableProps
6971
}: WfoAdvancedTableProps<T>) => {
7072
const { theme } = useOrchestratorTheme();
@@ -189,6 +191,7 @@ export const WfoAdvancedTable = <T extends object>({
189191
{t('export')}
190192
</EuiButton>
191193
)}
194+
{extraButtons}
192195
</EuiFlexGroup>
193196
{error && <WfoErrorWithMessage error={error} />}
194197
<EuiSpacer size="m" />

packages/orchestrator-ui-components/src/messages/en-GB.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
"schedule": "Schedule",
211211
"interval": "Interval",
212212
"ariaLabelDeleteButton": "Delete task schedule",
213-
"deleteConfirmationQuestion": "Confirm deleting this schedule task"
213+
"deleteConfirmationQuestion": "Confirm deleting this schedule task",
214+
"addSchedule": "Schedule task"
214215
}
215216
},
216217
"processes": {

packages/orchestrator-ui-components/src/messages/nl-NL.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@
209209
"schedule": "Schedule",
210210
"interval": "Interval",
211211
"ariaLabelDeleteButton": "Schema verwijderen",
212-
"deleteConfirmationQuestion": "Bevestig de verwijdering van het schema"
212+
"deleteConfirmationQuestion": "Bevestig de verwijdering van het schema",
213+
"addSchedule": "Plan een taak"
213214
}
214215
},
215216
"processes": {

packages/orchestrator-ui-components/src/pages/metadata/WfoScheduledTasksPage.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import React, { useEffect, useState } from 'react';
22

33
import { useTranslations } from 'next-intl';
4+
import { useRouter } from 'next/router';
45

5-
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
6+
import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
67

78
import {
89
WfoButtonWithConfirm,
@@ -20,6 +21,7 @@ import {
2021
getDataSortHandler,
2122
getQueryStringHandler,
2223
} from '@/components';
24+
import { PATH_METADATA_ADD_SCHEDULED_TASK_FORM } from '@/components';
2325
import { WfoAdvancedTable } from '@/components/WfoTable/WfoAdvancedTable';
2426
import { WfoAdvancedTableColumnConfig } from '@/components/WfoTable/WfoAdvancedTable/types';
2527
import { ColumnType, Pagination } from '@/components/WfoTable/WfoTable';
@@ -72,6 +74,7 @@ export const WfoScheduledTasksPage = () => {
7274
const t = useTranslations('metadata.scheduledTasks');
7375
const tError = useTranslations('errors');
7476
const { showToastMessage } = useShowToastMessage();
77+
const router = useRouter();
7578
const [tableDefaults, setTableDefaults] =
7679
useState<StoredTableConfig<ScheduledTaskDefinition>>();
7780
const [deleteScheduledTask, mutationState] =
@@ -245,6 +248,15 @@ export const WfoScheduledTasksPage = () => {
245248
)}
246249
exportDataIsLoading={isFetchingCsv}
247250
disableSearch={true}
251+
extraButtons={
252+
<EuiButton
253+
onClick={() => {
254+
router.push(PATH_METADATA_ADD_SCHEDULED_TASK_FORM);
255+
}}
256+
>
257+
{t('addSchedule')}
258+
</EuiButton>
259+
}
248260
/>
249261
</WfoMetadataPageLayout>
250262
);

packages/orchestrator-ui-components/src/pages/metadata/WfoTasksPage.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useEffect, useState } from 'react';
22

33
import { useTranslations } from 'next-intl';
4+
import { useRouter } from 'next/router';
45

56
import { EuiBadgeGroup, EuiButtonIcon, EuiContextMenuItem } from '@elastic/eui';
67

@@ -22,6 +23,7 @@ import {
2223
WfoProductBlockBadge,
2324
} from '@/components';
2425
import { getDataSortHandler, getQueryStringHandler } from '@/components';
26+
import { PATH_METADATA_ADD_SCHEDULED_TASK_FORM } from '@/components';
2527
import { WfoDateTime } from '@/components/WfoDateTime/WfoDateTime';
2628
import { WfoMetadataDescriptionField } from '@/components/WfoMetadata/WfoMetadataDescriptionField';
2729
import { WfoAdvancedTable } from '@/components/WfoTable/WfoAdvancedTable';
@@ -122,6 +124,7 @@ const SetScheduleButton = ({
122124
closePopover: () => void;
123125
}) => {
124126
const t = useTranslations('metadata.tasks');
127+
const router = useRouter();
125128
return (
126129
<EuiContextMenuItem
127130
icon="gear"
@@ -130,7 +133,9 @@ const SetScheduleButton = ({
130133
}}
131134
onClick={() => {
132135
closePopover();
133-
console.error(workflowId);
136+
router.push(
137+
`${PATH_METADATA_ADD_SCHEDULED_TASK_FORM}/${workflowId}`,
138+
);
134139
}}
135140
>
136141
{t('addSchedule')}
@@ -142,6 +147,7 @@ export const WfoTasksPage = () => {
142147
const t = useTranslations('metadata.tasks');
143148
const tError = useTranslations('errors');
144149
const { showToastMessage } = useShowToastMessage();
150+
145151
const [tableDefaults, setTableDefaults] =
146152
useState<StoredTableConfig<TaskListItem>>();
147153
const getStoredTableConfig = useStoredTableConfig<TaskListItem>(

0 commit comments

Comments
 (0)