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

Updates react to 16.6 (latest) #24707

Merged
merged 9 commits into from
Jan 23, 2019
Merged

Updates react to 16.6 (latest) #24707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41cdfc3
Updates react to 16.6 (latest)
jasonrhodes Oct 28, 2018
b1f14c3
Updated fragment-based snapshots for Kibana root unit tests
jasonrhodes Jan 3, 2019
ba7c1ab
Updated fragment-based snapshots for x-pack unit tests
jasonrhodes Jan 3, 2019
fb0b4d6
Removed xpack yarn.lock file bc it is no longer needed, it was reintr…
jasonrhodes Jan 10, 2019
7deb7da
React 16.6 snapshot updates, round 2 (mostly Fragment snapshot diffs)
jasonrhodes Jan 10, 2019
a5bfbcc
Updated last round of React 16.6 snapshots
jasonrhodes Jan 18, 2019
4893cba
Fixes query bar issue with 16.4 gDSFP lifecycle
jasonrhodes Jan 22, 2019
c83b12d
Updated yarn lock (arraybuffer.slice updated)
jasonrhodes Jan 23, 2019
0bf729e
Updates snapshots where executeQueryOptions prop appears
jasonrhodes Jan 23, 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
11 changes: 6 additions & 5 deletions package.json
View file
Open in desktop
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
84 changes: 41 additions & 43 deletions ...core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,50 +517,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
30 changes: 14 additions & 16 deletions src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
View file
Open in desktop
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
126 changes: 59 additions & 67 deletions ...y/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
View file
Open in desktop
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