Skip to content

Commit

Permalink
Bump jquery from 3.4.1 to 3.5.0 (elastic#64884)
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/kbn-ui-shared-deps/package.json
#	src/plugins/dashboard/public/application/listing/dashboard_listing_ng_wrapper.html
#	src/plugins/visualize/public/application/editor/editor.html
#	x-pack/package.json
#	x-pack/plugins/graph/public/angular/templates/index.html
#	x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
#	x-pack/plugins/maps/public/angular/listing_ng_wrapper.html
#	x-pack/plugins/monitoring/public/directives/main/index.html
#	yarn.lock
  • Loading branch information
dependabot[bot] authored and jportner committed May 5, 2020
1 parent 8838091 commit 9379f71
Show file tree
Hide file tree
Showing 46 changed files with 674 additions and 110 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"https-proxy-agent": "^5.0.0",
"inert": "^5.1.0",
"joi": "^13.5.2",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"js-yaml": "3.13.1",
"json-stringify-pretty-compact": "1.0.4",
"json-stringify-safe": "5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"html": "1.0.0",
"html-loader": "^0.5.5",
"imports-loader": "^0.8.0",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"keymirror": "0.1.1",
"moment": "^2.20.1",
"node-sass": "^4.9.4",
Expand Down
42 changes: 42 additions & 0 deletions packages/kbn-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "@kbn/ui-shared-deps",
"version": "1.0.0",
"private": true,
"license": "Apache-2.0",
"scripts": {
"build": "node scripts/build",
"kbn:bootstrap": "node scripts/build --dev",
"kbn:watch": "node scripts/build --watch"
},
"dependencies": {
"@elastic/charts": "19.2.0",
"@elastic/eui": "22.3.0",
"@kbn/i18n": "1.0.0",
"abortcontroller-polyfill": "^1.4.0",
"angular": "^1.7.9",
"compression-webpack-plugin": "^3.1.0",
"core-js": "^3.6.4",
"custom-event-polyfill": "^0.3.0",
"elasticsearch-browser": "^16.7.0",
"jquery": "^3.5.0",
"moment": "^2.24.0",
"moment-timezone": "^0.5.27",
"monaco-editor": "~0.17.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-intl": "^2.8.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"regenerator-runtime": "^0.13.3",
"rxjs": "^6.5.3",
"symbol-observable": "^1.2.0",
"whatwg-fetch": "^3.0.0"
},
"devDependencies": {
"@kbn/babel-preset": "1.0.0",
"@kbn/dev-utils": "1.0.0",
"css-loader": "^3.4.2",
"del": "^5.1.0",
"webpack": "^4.41.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</li>
</ul>

<sense-history-viewer class="conHistory__viewer" req="history.viewingReq" />
<sense-history-viewer class="conHistory__viewer" req="history.viewingReq"></sense-history-viewer>
</div>

<div class="conHistory__footer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<span class="kuiButton__inner">
<span
class="kuiButton__icon kuiIcon fa-spinner fa-spin"
ng-class="isDisabled ? ['fa-spinner', 'fa-spin'] : [icon]"
/>
<span ng-transclude />
ng-class="isDisabled ? ['fa-spinner', 'fa-spin'] : [icon]"></span>
<span ng-transclude></span>
</span>
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
listing-limit="listingLimit"
hide-write-controls="hideWriteControls"
initial-filter="initialFilter"
/>
></dashboard-listing>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<home-app
directories="directories"
recently-accessed="recentlyAccessed"
/>
></home-app>
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</div>
</div>

<div class="visualize" ng-if="!chrome.getVisible()"/>
<div class="visualize" ng-if="!chrome.getVisible()"></div>

<visualization-editor
ng-if="chrome.getVisible()"
Expand All @@ -75,6 +75,6 @@
time-range="timeRange"
filters="globalFilters"
class="visEditor__content"
/>
></visualization-editor>

</visualize-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<dashboard-listing
core="core"
create-item="create"
get-view-url="getViewUrl"
edit-item="editItem"
find-items="find"
delete-items="delete"
listing-limit="listingLimit"
hide-write-controls="hideWriteControls"
initial-filter="initialFilter"
></dashboard-listing>
104 changes: 104 additions & 0 deletions src/plugins/visualize/public/application/editor/editor.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<visualize-app class="app-container visEditor visEditor--{{ vis.type.name }}">

<!--
Local nav.
Most visualizations have all search bar components enabled
Some visualizations have fewer options but all visualizations have a search bar
which is why show-search-baris set to "true".
All visualizaions also have least a timepicker \ autorefresh component, which is why
show-query-bar is set to "true".
-->
<kbn-top-nav
ng-if="isVisible"
app-name="'visualize'"
config="topNavMenu"
show-search-bar="true"
show-query-bar="true"
show-query-input="showQueryInput()"
show-filter-bar="showFilterBar() && isVisible"
show-date-picker="showQueryBarTimePicker()"
show-auto-refresh-only="!showQueryBarTimePicker()"
query="query"
saved-query="savedQuery"
screen-title="vis.title"
on-query-submit="updateQueryAndFetch"
index-patterns="[indexPattern]"
filters="filters"
on-filters-updated="onFiltersUpdated"
date-range-from="timeRange.from"
date-range-to="timeRange.to"
is-refresh-paused="refreshInterval.pause"
refresh-interval="refreshInterval.value"
on-refresh-change="onRefreshChange"
show-save-query="showSaveQuery"
on-saved="updateSavedQuery"
on-saved-query-updated="updateSavedQuery"
on-clear-saved-query="onClearSavedQuery"
>
</kbn-top-nav>

<!--
The top nav is hidden in embed mode but the filter bar must still be present so
we show the filter bar on its own here if the chrome is not visible.
-->
<kbn-top-nav
ng-if="showFilterBar() && !isVisible"

app-name="'visualize'"
show-search-bar="true"
show-filter-bar="true"
show-save-query="false"
show-date-picker="false"

filters="filters"
on-filters-updated="onFiltersUpdated"
index-patterns="[indexPattern]"
>
</kbn-top-nav>

<div
class="euiCallOut euiCallOut--primary euiCallOut--small hide-for-sharing"
ng-if="vis.type.shouldMarkAsExperimentalInUI()"
data-test-subj="experimentalVisInfo"
>
<div class="euiText">
<p ng-bind-html="getAdditionalMessage()"></p>
</div>
</div>

<visualization-embedded
ng-if="!isVisible"
class="visualize"
vis="vis"
embeddable-handler="embeddableHandler"
ui-state="uiState"
time-range="timeRange"
filters="filters"
query="query"
app-state="appState"
></visualization-embedded>

<h1
class="euiScreenReaderOnly"
i18n-id="visualize.pageHeading"
i18n-default-message="{chartName} {chartType} visualization"
i18n-values="{
chartName: savedVis.title,
chartType: vis.type.title
}"
>
</h1>
<visualization-editor
ng-if="isVisible"
vis="vis"
saved-search="savedSearch"
embeddable-handler="embeddableHandler"
event-emitter="eventEmitter"
ui-state="uiState"
time-range="timeRange"
filters="filters"
query="query"
class="visEditor__content"
></visualization-editor>

</visualize-app>
4 changes: 2 additions & 2 deletions src/ui/public/vis/editors/default/default.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="visEditor--default">
<div class="collapsible-sidebar visEditor__collapsibleSidebar" ng-class="::getSidebarClass()">
<vis-editor-sidebar class="visEditor__sidebar" />
<vis-editor-sidebar class="visEditor__sidebar"></vis-editor-sidebar>
<vis-editor-resizer
class="visEditor__resizer"
tabindex="0"
Expand All @@ -16,6 +16,6 @@
render-complete
data-title="{{vis.title}}"
data-description="{{vis.description}}"
/>
></div>

</div>
2 changes: 1 addition & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"intl": "^1.2.5",
"io-ts": "^1.4.2",
"joi": "^13.5.2",
"jquery": "^3.4.1",
"jquery": "^3.5.0",
"json-stable-stringify": "^1.0.1",
"jsonwebtoken": "^8.3.0",
"jstimezonedetect": "1.0.5",
Expand Down
Loading

0 comments on commit 9379f71

Please sign in to comment.