Skip to content
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

Shift plexus to TypeScript (from flowtypes) #331

Merged
merged 14 commits into from
Mar 8, 2019
Merged

Shift plexus to TypeScript (from flowtypes) #331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a8a9175
Shift plexus to TypeScript (from flowtypes)
tiffon Feb 16, 2019
dda5e5c
Typo from renaming
tiffon Feb 16, 2019
e523600
Merge branch 'master' into plexus-to-ts
Feb 22, 2019
ccf11d1
Add linting for plexus TypeScript
tiffon Feb 24, 2019
bfd29f2
Fix a few issues from merging master
tiffon Feb 24, 2019
774a7e7
Better linting for plexus / TypeScript
tiffon Feb 25, 2019
7014c68
Merge branch 'master' into plexus-to-ts
tiffon Feb 25, 2019
483d7b1
Fix lint error from merging master
tiffon Feb 25, 2019
5de93e0
TypeScript type cleanup
tiffon Feb 25, 2019
cfeb421
Build docs for root and plexus, revive plexus demo
tiffon Mar 7, 2019
82788a0
Merge branch 'master' into plexus-to-ts
Mar 7, 2019
b349003
Update changelog
tiffon Mar 7, 2019
cf3dd60
Misc cleanup and add GitHub tickets to build docs
tiffon Mar 8, 2019
d346860
Add license to package.json for publishing
tiffon Mar 8, 2019
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
Prev Previous commit
Next Next commit
Fix a few issues from merging master 
Signed-off-by: Joe Farro <[email protected]>
  • Loading branch information
@tiffon
tiffon committed Feb 24, 2019
commit bfd29f250e982f850b4f61adb1087ab3d89f7abe
3 changes: 2 additions & 1 deletion packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanBar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ describe('<SpanBar>', () => {
// Log entries
if (s === 10) {
return { start: 0.1, end: 0.1 };
} else if (s === 20) {
}
if (s === 20) {
return { start: 0.2, end: 0.2 };
}
return { error: 'error' };
Expand Down
2 changes: 1 addition & 1 deletion ...s/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/AccordianKeyValues.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type AccordianKeyValuesProps = {
isOpen: boolean,
label: string,
linksGetter: ?(KeyValuePair[], number) => Link[],
onToggle: null | (() => void),
onToggle?: null | (() => void),
};

// export for tests
Expand Down