Skip to content

Commit

Permalink
Updates React et al to 16.6 (#24707)
Browse files Browse the repository at this point in the history
* Updates react to 16.6 (latest)

* Updated fragment-based snapshots for Kibana root unit tests

* Updated fragment-based snapshots for x-pack unit tests

* Removed xpack yarn.lock file bc it is no longer needed, it was reintroduced by accident during a rebase in this branch

* React 16.6 snapshot updates, round 2 (mostly Fragment snapshot diffs)

* Updated last round of React 16.6 snapshots

* Fixes query bar issue with 16.4 gDSFP lifecycle

* Updated yarn lock (arraybuffer.slice updated)

* Updates snapshots where executeQueryOptions prop appears
  • Loading branch information
jasonrhodes authored Jan 23, 2019
1 parent 09f8904 commit a11e471
Show file tree
Hide file tree
Showing 72 changed files with 3,734 additions and 3,444 deletions.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@
"pug": "^2.0.3",
"querystring-browser": "1.0.4",
"raw-loader": "0.5.1",
"react": "^16.3.0",
"react": "^16.6.0",
"react-addons-shallow-compare": "15.6.2",
"react-anything-sortable": "^1.7.4",
"react-color": "^2.13.8",
"react-dom": "^16.3.0",
"react-dom": "^16.6.0",
"react-grid-layout": "^0.16.2",
"react-input-range": "^1.3.0",
"react-markdown": "^3.1.4",
Expand Down Expand Up @@ -324,9 +324,10 @@
"classnames": "2.2.5",
"dedent": "^0.7.0",
"delete-empty": "^2.0.0",
"enzyme": "3.2.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme-to-json": "3.3.1",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"enzyme-adapter-utils": "^1.8.1",
"enzyme-to-json": "^3.3.4",
"eslint": "^5.6.0",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-babel": "^5.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,50 +524,48 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `
<EuiSpacer
size="m"
/>
<React.Fragment>
<EuiCallOut
color="warning"
iconType="help"
size="m"
title={
<FormattedMessage
defaultMessage="Listing limit exceeded"
id="kbn.dashboard.listing.listingLimitExceededTitle"
values={Object {}}
/>
}
>
<p>
<FormattedMessage
defaultMessage="You have {totalDashboards} dashboards, but your {listingLimitText} setting prevents the table below from displaying more than {listingLimitValue}. You can change this setting under {advancedSettingsLink}."
id="kbn.dashboard.listing.listingLimitExceededDescription"
values={
Object {
"advancedSettingsLink": <EuiLink
color="primary"
href="#/management/kibana/settings"
type="button"
>
<FormattedMessage
defaultMessage="Advanced Settings"
id="kbn.dashboard.listing.listingLimitExceeded.advancedSettingsLinkText"
values={Object {}}
/>
</EuiLink>,
"listingLimitText": <strong>
listingLimit
</strong>,
"listingLimitValue": 1,
"totalDashboards": 2,
}
<EuiCallOut
color="warning"
iconType="help"
size="m"
title={
<FormattedMessage
defaultMessage="Listing limit exceeded"
id="kbn.dashboard.listing.listingLimitExceededTitle"
values={Object {}}
/>
}
>
<p>
<FormattedMessage
defaultMessage="You have {totalDashboards} dashboards, but your {listingLimitText} setting prevents the table below from displaying more than {listingLimitValue}. You can change this setting under {advancedSettingsLink}."
id="kbn.dashboard.listing.listingLimitExceededDescription"
values={
Object {
"advancedSettingsLink": <EuiLink
color="primary"
href="#/management/kibana/settings"
type="button"
>
<FormattedMessage
defaultMessage="Advanced Settings"
id="kbn.dashboard.listing.listingLimitExceeded.advancedSettingsLinkText"
values={Object {}}
/>
</EuiLink>,
"listingLimitText": <strong>
listingLimit
</strong>,
"listingLimitValue": 1,
"totalDashboards": 2,
}
/>
</p>
</EuiCallOut>
<EuiSpacer
size="m"
/>
</React.Fragment>
}
/>
</p>
</EuiCallOut>
<EuiSpacer
size="m"
/>
<EuiFlexGroup
alignItems="stretch"
component="div"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1012,22 +1012,20 @@ exports[`home should render home component 1`] = `
<EuiPageBody
restrictWidth={false}
>
<React.Fragment>
<RecentlyAccessed
recentlyAccessed={
Array [
Object {
"id": "1",
"label": "my vis",
"link": "link_to_my_vis",
},
]
}
/>
<EuiSpacer
size="l"
/>
</React.Fragment>
<RecentlyAccessed
recentlyAccessed={
Array [
Object {
"id": "1",
"label": "my vis",
"link": "link_to_my_vis",
},
]
}
/>
<EuiSpacer
size="l"
/>
<InjectIntl(AddDataUi)
apmUiEnabled={true}
isNewKibanaInstance={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,82 +49,74 @@ exports[`render 1`] = `
responsive={true}
wrap={false}
>
<React.Fragment
key="0"
>
<EuiFlexItem
className="homRecentlyAccessed__item"
component="div"
grow={false}
style={
Object {
"minWidth": "3.9000000000000004em",
}
<EuiFlexItem
className="homRecentlyAccessed__item"
component="div"
grow={false}
style={
Object {
"minWidth": "3.9000000000000004em",
}
}
>
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label0"
delay="regular"
position="bottom"
>
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label0"
delay="regular"
position="bottom"
<EuiLink
className="homRecentlyAccessed__longLink"
color="primary"
href="link0"
type="button"
>
<EuiLink
className="homRecentlyAccessed__longLink"
color="primary"
href="link0"
type="button"
>
label0
</EuiLink>
</EuiToolTip>
</EuiFlexItem>
</React.Fragment>
<React.Fragment
key="1"
label0
</EuiLink>
</EuiToolTip>
</EuiFlexItem>
<EuiFlexItem
className="homRecentlyAccessed__separator"
component="div"
grow={false}
>
<EuiFlexItem
className="homRecentlyAccessed__separator"
component="div"
grow={false}
<EuiText
grow={true}
size="m"
>
<EuiText
grow={true}
<EuiIcon
color="subdued"
size="m"
>
<EuiIcon
color="subdued"
size="m"
type="dot"
/>
</EuiText>
</EuiFlexItem>
<EuiFlexItem
className="homRecentlyAccessed__item"
component="div"
grow={false}
style={
Object {
"minWidth": "3.9000000000000004em",
}
type="dot"
/>
</EuiText>
</EuiFlexItem>
<EuiFlexItem
className="homRecentlyAccessed__item"
component="div"
grow={false}
style={
Object {
"minWidth": "3.9000000000000004em",
}
}
>
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label1"
delay="regular"
position="bottom"
>
<EuiToolTip
anchorClassName="homRecentlyAccessed__anchor"
content="label1"
delay="regular"
position="bottom"
<EuiLink
className="homRecentlyAccessed__longLink"
color="primary"
href="link1"
type="button"
>
<EuiLink
className="homRecentlyAccessed__longLink"
color="primary"
href="link1"
type="button"
>
label1
</EuiLink>
</EuiToolTip>
</EuiFlexItem>
</React.Fragment>
label1
</EuiLink>
</EuiToolTip>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem
Expand Down
Loading

0 comments on commit a11e471

Please sign in to comment.