Skip to content

Commit

Permalink
Merge branch 'master' into ddg-node-vis-interactions
Browse files Browse the repository at this point in the history
  • Loading branch information
everett980 authored Nov 14, 2019
2 parents 6b9e8d6 + 6e02cb0 commit ebf616e
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 6 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Releases

## v1.5.0 (November 4, 2019)

### Enhancements

- **Deep Dependency Graph:** Implement Service-Oriented Deep Dependency Graph (DDG) ([@tiffon](https://github.com/tiffon) and [@everett980](https://github.com/everett980) in [#481](https://github.com/jaegertracing/jaeger-ui/issues/481))

- **Deep Dependency Graph:** Derive DDG from search results ([@rubenvp8510](https://github.com/rubenvp8510) in [#445](https://github.com/jaegertracing/jaeger-ui/pull/445))

- **Configuration:** Allow ui-config.json to specify script tags which are added to UI body ([@everett980](https://github.com/everett980) in [#455](https://github.com/jaegertracing/jaeger-ui/pull/455))

- **Plexus:** Sequester zoom concerns to ZoomManager ([@tiffon](https://github.com/tiffon) in [#409](https://github.com/jaegertracing/jaeger-ui/pull/409))

- **Plexus:** Support multiple layers of nodes and edges ([@tiffon](https://github.com/tiffon) in [#482](https://github.com/jaegertracing/jaeger-ui/issues/482))

- **Google Analytics:** Track filter interactions on trace detail page ([@everett980](https://github.com/everett980) in [#470](https://github.com/jaegertracing/jaeger-ui/pull/470))

### Fixes

- **Google Analytics:** Fix tracking of clear filter & view keyboard shortcut modal ([@everett980](https://github.com/everett980) in [#470](https://github.com/jaegertracing/jaeger-ui/pull/470))

- **Codebase:** Fix codecov reporting ([@tiffon](https://github.com/tiffon) in [#418](https://github.com/jaegertracing/jaeger-ui/pull/418), [#417](https://github.com/jaegertracing/jaeger-ui/pull/417), and[#415](https://github.com/jaegertracing/jaeger-ui/pull/415))

## v1.4.0 (August 31, 2019)

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ yarn build

## UI Configuration

See the [deployment guide](https://www.jaegertracing.io/docs/latest/deployment/#ui-configuration) for details on configuring Google Analytics tracking and menu customizations.
See the [configuration guide](https://www.jaegertracing.io/docs/latest/frontend-ui/) for details on configuring Google Analytics tracking, menu customizations, and other aspects of UI behavior.

## License

Expand Down
2 changes: 1 addition & 1 deletion packages/jaeger-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "jaeger-ui",
"version": "1.4.0",
"version": "1.5.0",
"main": "src/index.js",
"license": "Apache-2.0",
"homepage": ".",
Expand Down
20 changes: 16 additions & 4 deletions scripts/get-changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,15 @@
// limitations under the License.

// This code will generate changelog entries

const { readFile } = require('fs');
// eslint-disable-next-line import/no-extraneous-dependencies
const fetch = require('isomorphic-fetch');
// eslint-disable-next-line import/no-extraneous-dependencies
const jsdom = require('jsdom');
const { promisify } = require('util');

const readFilePromise = promisify(readFile);

const DOMAIN = 'https://github.com/';

Expand All @@ -28,7 +33,7 @@ function getData(elm) {
const title = elm.querySelector('[data-hovercard-type="pull_request"]').textContent;
const url = elm.querySelector('[data-hovercard-type="pull_request"]').href;
const pid = /#\d+/g.exec(elm.querySelector('.opened-by').textContent)[0];
const user = elm.querySelector('[data-hovercard-type="user"]').textContent;
const user = elm.querySelector('a.muted-link').textContent;
const dateMerged = new Date(elm.querySelector('[datetime]').getAttribute('datetime'));
return { title, url, pid, user, dateMerged };
}
Expand Down Expand Up @@ -84,9 +89,16 @@ function getChangelog(pages) {
}

if (require.main === module) {
getChangelog(process.argv[2] || 1)
// eslint-disable-next-line no-console
.then(items => console.log(items.map(fmtPr).join('\n\n')))
Promise.all([getChangelog(process.argv[2] || 1), readFilePromise('./CHANGELOG.md', 'utf8')])
.then(([items, changelog]) =>
// eslint-disable-next-line no-console
console.log(
items
.filter(({ pid, url }) => changelog.indexOf(`[${pid}](${url})`) === -1)
.map(fmtPr)
.join('\n\n')
)
)
// eslint-disable-next-line no-console
.catch(error => console.error(error));
} else {
Expand Down

0 comments on commit ebf616e

Please sign in to comment.