status-im/spiff-arena
2
0
Fork 0
mirror of https://github.com/status-im/spiff-arena.git synced 2025-02-05 14:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

added a formatter to change a date string into a formatted date in markdown w/ burnettk (#1296)

Browse Source 
Co-authored-by: jasquat <jasquat@users.noreply.github.com>
This commit is contained in:
jasquat 2024-03-28 19:58:35 +00:00 committed by GitHub
parent 13d7fa8968
commit 121f8d15ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
View File

@ -308,6 +308,13 @@ export default function ProcessInstanceListTable({
return titleizeString((value || '').replaceAll('_', ' '));
};
const formatDurationForDisplayForTable = (_row: any, value: any) => {
return DateAndTimeService.formatDurationForDisplay(value);
};
const formatDateTimeForTable = (_row: any, value: any) => {
return DateAndTimeService.formatDateTime(value);
};
const formatSecondsForDisplay = (_row: ProcessInstance, seconds: any) => {
return DateAndTimeService.convertSecondsToFormattedDateTime(seconds) || '-';
};
@ -330,8 +337,8 @@ export default function ProcessInstanceListTable({
last_milestone_bpmn_name: formatLastMilestone,
};
const displayTypeFormatters: Record<string, any> = {
date_time: DateAndTimeService.formatDateTime,
duration: DateAndTimeService.formatDurationForDisplay,
date_time: formatDateTimeForTable,
duration: formatDurationForDisplayForTable,
};
const columnAccessor = column.accessor as keyof ProcessInstance;
const formatter = column.display_type

18
spiffworkflow-frontend/src/services/DateAndTimeService.test.tsx
View File

@ -6,21 +6,17 @@ test('it can keep the correct date when converting seconds to date', () => {
expect(dateString).toEqual('2022-10-21');
});
test('it can properly format a duration', () => {
expect(DateAndTimeService.formatDurationForDisplay(null, '0')).toEqual('0s');
expect(DateAndTimeService.formatDurationForDisplay(null, '60')).toEqual('1m');
expect(DateAndTimeService.formatDurationForDisplay(null, '65')).toEqual(
'1m 5s'
);
expect(DateAndTimeService.formatDurationForDisplay(null, 65)).toEqual(
'1m 5s'
);
expect(DateAndTimeService.formatDurationForDisplay(null, 86500)).toEqual(
expect(DateAndTimeService.formatDurationForDisplay('0')).toEqual('0s');
expect(DateAndTimeService.formatDurationForDisplay('60')).toEqual('1m');
expect(DateAndTimeService.formatDurationForDisplay('65')).toEqual('1m 5s');
expect(DateAndTimeService.formatDurationForDisplay(65)).toEqual('1m 5s');
expect(DateAndTimeService.formatDurationForDisplay(86500)).toEqual(
'1d 1m 40s'
);
expect(DateAndTimeService.formatDurationForDisplay(null, 2629746)).toEqual(
expect(DateAndTimeService.formatDurationForDisplay(2629746)).toEqual(
'30d 10h 29m 6s'
);
expect(DateAndTimeService.formatDurationForDisplay(null, 31536765)).toEqual(
expect(DateAndTimeService.formatDurationForDisplay(31536765)).toEqual(
'365d 12m 45s'
);
});

4
spiffworkflow-frontend/src/services/DateAndTimeService.tsx
View File

@ -147,7 +147,7 @@ const secondsToDuration = (secNum: number) => {
return duration;
};
const formatDurationForDisplay = (_row: any, value: any) => {
const formatDurationForDisplay = (value: any) => {
if (value === undefined) {
return undefined;
}
@ -171,7 +171,7 @@ const formatDurationForDisplay = (_row: any, value: any) => {
return durationTimes.join(' ');
};
const formatDateTime = (_row: any, value: any) => {
const formatDateTime = (value: any) => {
if (value === undefined || value === null) {
return value;
}

26
spiffworkflow-frontend/src/services/FormattingService.test.tsx Normal file
View File

@ -0,0 +1,26 @@
import FormattingService from './FormattingService';
test('it can convert date string to date for display', () => {
const markdown =
'HEY SPIFF_FORMAT:::convert_date_to_date_for_display(2024-03-01)';
expect(FormattingService.checkForSpiffFormats(markdown)).toEqual(
'HEY 2024-03-01'
);
});
// timezones for the lose
// test('it can convert seconds to date time for display', () => {
// const markdown =
// 'HEY SPIFF_FORMAT:::convert_seconds_to_date_time_for_display(10000)';
// expect(FormattingService.checkForSpiffFormats(markdown)).toEqual(
// 'HEY 1969-12-31 21:46:40'
// );
// });
test('it can convert seconds to duration time for display', () => {
const markdown =
'HEY SPIFF_FORMAT:::convert_seconds_to_duration_for_display(10000)';
expect(FormattingService.checkForSpiffFormats(markdown)).toEqual(
'HEY 2h 46m 40s'
);
});

4
spiffworkflow-frontend/src/services/FormattingService.tsx
View File

@ -4,6 +4,8 @@ const spiffFormatFunctions: { [key: string]: Function } = {
convert_seconds_to_date_time_for_display: DateAndTimeService.formatDateTime,
convert_seconds_to_duration_for_display:
DateAndTimeService.formatDurationForDisplay,
convert_date_to_date_for_display:
DateAndTimeService.ymdDateStringToConfiguredFormat,
};
const checkForSpiffFormats = (markdown: string) => {
@ -13,7 +15,7 @@ const checkForSpiffFormats = (markdown: string) => {
originalValue: string
) => {
if (spiffFormat in spiffFormatFunctions) {
return spiffFormatFunctions[spiffFormat](undefined, originalValue);
return spiffFormatFunctions[spiffFormat](originalValue);
}
console.warn(
`attempted: ${match}, but ${spiffFormat} is not a valid conversion function`