Skip to content

Fix Expression mishandles day formats and extends the ability of datetime formating #1593

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

Merged
cosmicshuai merged 10 commits into from
Feb 4, 2020
Merged

Fix Expression mishandles day formats and extends the ability of datetime formating #1593

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad29967
fix datetime converter
Jan 19, 2020
c0f9a0a
add test cases
Jan 19, 2020
1bcb664
fix issues
Jan 20, 2020
21d3110
add a new test
Jan 20, 2020
971a115
fix formatDateTime test cases
Jan 20, 2020
92e0f53
add convert for standard datetime format
Jan 21, 2020
ec4a348
Merge branch 'master' into shuwan/fixDatetimeFormat
Feb 3, 2020
82fa635
fix comments and add more tests
Feb 3, 2020
aa44123
Merge branch 'shuwan/fixDatetimeFormat' of https://github.com/microso…
Feb 3, 2020
7f52d37
add a test
Feb 4, 2020
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
10 changes: 9 additions & 1 deletion libraries/botframework-expressions/src/builtInFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { EvaluateExpressionDelegate, ExpressionEvaluator, ValidateExpressionDele
import { ExpressionType } from './expressionType';
import { Extensions } from './extensions';
import { TimeZoneConverter } from './timeZoneConverter';
import { convertCSharpDateTimeToMomentJS } from './formatConverter';
import { MemoryInterface, SimpleObjectMemory, ComposedMemory } from './memory';

/**
Expand Down Expand Up @@ -620,7 +621,14 @@ export class BuiltInFunctions {
}

public static timestampFormatter(formatter: string): string {
return formatter.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY').replace(/d/g, 'D').replace(/y/g, 'Y');
let result = formatter;
try {
result = convertCSharpDateTimeToMomentJS(formatter);
} catch(e) {
// do nothing
}

return result;
}

public static timeUnitTransformer(duration: number, cSharpStr: string): { duration: number; tsStr: string } {
Expand Down
Loading