Merge branch 'master' into issue-840

Signed-off-by: vvvprabhakar <[email protected]>
jaegertracing · Nov 1, 2021 · 9565b7f · 9565b7f
2 parents f158c93 + 56c2911
commit 9565b7f
Show file tree

Hide file tree

Showing 46 changed files with 1,146 additions and 247 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/issue_template.md b/.github/issue_template.md
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2.1.5
+      - uses: actions/setup-node@v2.4.1
         with:
           node-version: '10'
       - name: install yarn

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ build
 # reports
 coverage
 .nyc_output
+junit.xml
 
 # misc
 .DS_Store

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,40 @@
 # Releases
 
-## Next (unreleased)
+## v1.17.0 (Oct 6, 2021)
 
 ### Enhancements
 
+- Enable regexes and functions in link patterns ([@yoave23](https://github.com/yoave23) in [#817](https://github.com/jaegertracing/jaeger-ui/pull/817))
+
+## v1.16.0 (Sep 6, 2021)
+
+### Enhancements
+
+- Add Table View for a trace ([@vvvprabhakar](https://github.com/vvvprabhakar) in [#781](https://github.com/jaegertracing/jaeger-ui/pull/781))
+
+### Fixes
+
+- Fix trace detail page's back button disappeared ((@shwin0901)[https://github.com/shwin0901] in [#805](https://github.com/jaegertracing/jaeger-ui/pull/805))
+- Various dependency upgrades by `dependabot`
+
+## v1.15.0 (Aug 4, 2021)
+
 ### Fixes
 
+- Make favicon background transparent ([@MaxTaggart](https://github.com/MaxTaggart) in [#786](https://github.com/jaegertracing/jaeger-ui/pull/786))
+- Fix deep dependency header overlap in page header ([@stardotcode](https://github.com/stardotcode) in [#731](https://github.com/jaegertracing/jaeger-ui/pull/731) [#782](https://github.com/jaegertracing/jaeger-ui/pull/782))
+
+## v1.14.0 (June 4, 2021)
+
+### Enhancements
+
+- Make search panel more compact, button more visible ([@meenal06](https://github.com/meenal06) in [#724](https://github.com/jaegertracing/jaeger-ui/pull/724))
+
+### Fixes
+
+- Add null check for span.logs in search/filter-spans ([@achesin](https://github.com/achesin) in [#734](https://github.com/jaegertracing/jaeger-ui/pull/734))
+- Several updates to dependencies.
+
 ## v1.13.0 (February 20, 2021)
 
 ### Enhancements

diff --git a/RELEASE.md b/RELEASE.md
@@ -5,7 +5,7 @@
      - Review all changes since the last release to determine how, if at all, any externally facing APIs are impacted. This includes, but is not limited to, the UI config and URL routes such as deep-linking and configuring the embedded mode.
    - Preface the version with a "v", e.g. `v1.0.0`.
 1. Create and merge, per approval, a PR which preps the release.
-   1. The PR title should match the format "Preparing release vX.Y.Z".
+   1. The PR title should match the format "Prepare release vX.Y.Z".
    1. CHANGELOG.md
       - Change the version of the current release from "Next (unreleased)" to "vX.Y.Z (Month D, YYYY)" where "vX.Y.Z" is the semver for this release.
       - Make sure all relevant changes made since the last release are present and listed under the current release. [`scripts/get-changelog.js`](https://github.com/jaegertracing/jaeger-ui/blob/52780c897f21131472de9b81c96ebd63853917ee/scripts/get-changelog.js) might be useful.

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "name": "jaeger-ui-monorepo",
+  "version": "0.0.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -31,7 +32,7 @@
   "resolutions": {
     "**/cheerio/parse5": "4.0.0",
     "**/fstream": "1.0.12",
-    "**/handlebars": "4.1.2",
+    "**/handlebars": "4.7.7",
     "**/js-yaml": "3.13.1",
     "**/lodash": "4.17.21",
     "**/node-gyp/tar": "2.2.2",

diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "jaeger-ui",
-  "version": "1.13.0",
+  "version": "1.17.0",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "homepage": ".",
@@ -25,6 +25,7 @@
     "enzyme-adapter-react-16": "^1.2.0",
     "enzyme-to-json": "^3.3.0",
     "http-proxy-middleware": "^0.19.1",
+    "jest-junit": "^10.0.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
     "less-vars-to-js": "^1.2.1",
@@ -86,7 +87,7 @@
     "react-icons": "2.2.7",
     "react-metrics": "^2.3.2",
     "react-redux": "^5.0.6",
-    "react-router-dom": "^4.3.1",
+    "react-router-dom": "^5.2.0",
     "react-router-redux": "5.0.0-alpha.6",
     "react-virtualized-select": "^3.1.0",
     "react-vis": "^1.7.2",
@@ -121,6 +122,10 @@
       "!src/utils/test/**/*.js",
       "!src/demo/**/*.js",
       "!src/types/*"
+    ],
+    "reporters": [
+      "default",
+      "jest-junit"
     ]
   },
   "browserslist": [

diff --git a/packages/jaeger-ui/public/favicon.ico b/packages/jaeger-ui/public/favicon.ico
diff --git a/packages/jaeger-ui/src/components/App/Page.css b/packages/jaeger-ui/src/components/App/Page.css
@@ -19,7 +19,7 @@ limitations under the License.
   padding: 0;
   position: fixed;
   width: 100%;
-  z-index: 3;
+  z-index: 11;
 }
 
 .Page--content {
@@ -29,5 +29,8 @@ limitations under the License.
   min-height: calc(100% - var(--nav-height));
   position: absolute;
   right: 0;
+}
+
+.Page--content--no-embedded {
   top: var(--nav-height);
 }
diff --git a/packages/jaeger-ui/src/components/App/Page.tsx b/packages/jaeger-ui/src/components/App/Page.tsx
@@ -52,7 +52,7 @@ export class PageImpl extends React.Component<TProps> {
 
   render() {
     const { embedded } = this.props;
-    const contentCls = cx({ 'Page--content': !embedded });
+    const contentCls = cx({ 'Page--content': true, 'Page--content--no-embedded': !embedded });
     return (
       <div>
         <Helmet title="Jaeger UI" />

diff --git a/packages/jaeger-ui/src/components/App/TopNav.test.js b/packages/jaeger-ui/src/components/App/TopNav.test.js
@@ -72,17 +72,16 @@ describe('<TopNav>', () => {
 
   describe('renders the default menu options', () => {
     it('renders the "JAEGER UI" link', () => {
-      const items = wrapper.find(Link).findWhere(link => /JAEGER UI/.test(link.text()));
+      const items = wrapper.find(Link).findWhere(link => link.prop('to') === '/');
       expect(items.length).toBe(1);
     });
-
     it('renders the "Search" button', () => {
-      const items = wrapper.find(Link).findWhere(link => /Search/.test(link.text()));
+      const items = wrapper.find(Link).findWhere(link => link.prop('to') === '/search');
       expect(items.length).toBe(1);
     });
 
     it('renders the "System Architecture" button', () => {
-      const items = wrapper.find(Link).findWhere(link => /System Architecture/.test(link.text()));
+      const items = wrapper.find(Link).findWhere(link => link.prop('to') === '/dependencies');
       expect(items.length).toBe(1);
     });
   });

diff --git a/packages/jaeger-ui/src/components/App/__snapshots__/index.test.js.snap b/packages/jaeger-ui/src/components/App/__snapshots__/index.test.js.snap
@@ -63,19 +63,16 @@ exports[`JaegerUIApp does not explode 1`] = `
         <Redirect
           exact={true}
           path="/"
-          push={false}
           to="/search"
         />
         <Redirect
           exact={true}
           path=""
-          push={false}
           to="/search"
         />
         <Redirect
           exact={true}
           path="/"
-          push={false}
           to="/search"
         />
         <Route

diff --git a/packages/jaeger-ui/src/components/DeepDependencies/url.test.js b/packages/jaeger-ui/src/components/DeepDependencies/url.test.js
@@ -17,6 +17,10 @@ import * as reactRouterDom from 'react-router-dom';
 
 import { ROUTE_PATH, matches, getUrl, getUrlState, sanitizeUrlState } from './url';
 
+jest.mock('react-router-dom', () => ({
+  matchPath: jest.fn(),
+}));
+
 describe('DeepDependencyGraph/url', () => {
   describe('matches', () => {
     const path = 'path argument';

diff --git a/packages/jaeger-ui/src/components/QualityMetrics/url.test.js b/packages/jaeger-ui/src/components/QualityMetrics/url.test.js
@@ -16,6 +16,10 @@ import * as reactRouterDom from 'react-router-dom';
 
 import { ROUTE_PATH, matches, getUrl, getUrlState } from './url';
 
+jest.mock('react-router-dom', () => ({
+  matchPath: jest.fn(),
+}));
+
 describe('TraceDiff/url', () => {
   const lookback = 42;
   const service = 'test-service';

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.css b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.css
@@ -35,6 +35,12 @@ limitations under the License.
   margin-top: 0.5em;
 }
 
+.SearchForm--submit {
+  background-color: #11939a;
+  color: white;
+  float: right;
+}
+
 .SearchForm--tagsHintInfo {
   padding-left: 1.7em;
 }

diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import * as React from 'react';
-import { Form, Input, Button, Popover, Select } from 'antd';
+import { Form, Input, Button, Popover, Select, Row, Col } from 'antd';
 import _get from 'lodash/get';
 import logfmtParser from 'logfmt/lib/logfmt_parser';
 import { stringify as logfmtStringify } from 'logfmt/lib/stringify';
@@ -377,14 +377,21 @@ export class SearchFormImpl extends React.PureComponent {
               </div>
             }
           >
-            <Field
-              name="startDate"
-              type="date"
-              component={AdaptedInput}
-              placeholder="Start Date"
-              props={{ disabled }}
-            />
-            <Field name="startDateTime" type="time" component={AdaptedInput} props={{ disabled }} />
+            <Row gutter={16}>
+              <Col className="gutter-row" span={12}>
+                <Field
+                  name="startDate"
+                  type="date"
+                  component={AdaptedInput}
+                  placeholder="Start Date"
+                  props={{ disabled }}
+                />
+              </Col>
+
+              <Col className="gutter-row" span={12}>
+                <Field name="startDateTime" type="time" component={AdaptedInput} props={{ disabled }} />
+              </Col>
+            </Row>
           </FormItem>,
 
           <FormItem
@@ -406,36 +413,49 @@ export class SearchFormImpl extends React.PureComponent {
               </div>
             }
           >
-            <Field
-              name="endDate"
-              type="date"
-              component={AdaptedInput}
-              placeholder="End Date"
-              props={{ disabled }}
-            />
-            <Field name="endDateTime" type="time" component={AdaptedInput} props={{ disabled }} />
+            <Row gutter={16}>
+              <Col className="gutter-row" span={12}>
+                <Field
+                  name="endDate"
+                  type="date"
+                  component={AdaptedInput}
+                  placeholder="End Date"
+                  props={{ disabled }}
+                />
+              </Col>
+
+              <Col className="gutter-row" span={12}>
+                <Field name="endDateTime" type="time" component={AdaptedInput} props={{ disabled }} />
+              </Col>
+            </Row>
           </FormItem>,
         ]}
 
-        <FormItem label="Min Duration">
-          <Field
-            name="minDuration"
-            component={ValidatedAdaptedInput}
-            placeholder={placeholderDurationFields}
-            props={{ disabled }}
-            validate={validateDurationFields}
-          />
-        </FormItem>
-
-        <FormItem label="Max Duration">
-          <Field
-            name="maxDuration"
-            component={ValidatedAdaptedInput}
-            placeholder={placeholderDurationFields}
-            props={{ disabled }}
-            validate={validateDurationFields}
-          />
-        </FormItem>
+        <Row gutter={16}>
+          <Col className="gutter-row" span={12}>
+            <FormItem label="Max Duration">
+              <Field
+                name="maxDuration"
+                component={ValidatedAdaptedInput}
+                placeholder={placeholderDurationFields}
+                props={{ disabled }}
+                validate={validateDurationFields}
+              />
+            </FormItem>
+          </Col>
+
+          <Col className="gutter-row" span={12}>
+            <FormItem label="Min Duration">
+              <Field
+                name="minDuration"
+                component={ValidatedAdaptedInput}
+                placeholder={placeholderDurationFields}
+                props={{ disabled }}
+                validate={validateDurationFields}
+              />
+            </FormItem>
+          </Col>
+        </Row>
 
         <FormItem label="Limit Results">
           <Field
@@ -449,6 +469,7 @@ export class SearchFormImpl extends React.PureComponent {
 
         <Button
           htmlType="submit"
+          className="SearchForm--submit"
           disabled={disabled || noSelectedService || invalid}
           data-test={markers.SUBMIT_BTN}
         >