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.

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

[Vis: Default editor] EUIficate order_agg param editor #36984

Merged
merged 16 commits into from
May 29, 2019

Conversation

sulemanof
Copy link
Contributor

@sulemanof sulemanof commented May 23, 2019

Summary

Waiting for merge #37064.

Part of #30922.
EUIfication of order_agg control for Terms aggregation parameter.

order_agg

Technically the PR only contains the EUIficated Order by param editor. The order_agg still remains in angularjs template and will be done as a part of vis-editor-agg-params Euification:

euificate

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

For maintainers

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@sulemanof sulemanof force-pushed the EUIfication/order_agg branch from 5a8f942 to d952546 Compare May 24, 2019 09:06
@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💔 Build Failed

@sulemanof sulemanof requested a review from maryia-lapata May 24, 2019 14:27
return aggFilter.includes(`!${agg.type.name}`);
};

$scope.$watch('agg.params.field.type', (type) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This watcher was moved to the missing_bucket.tsx useEffect function

@@ -174,24 +149,11 @@ export const termsBucketAgg = new BucketAggType({
const orderBy = params.orderBy;
const paramDef = agg.type.params.byName.orderAgg;

// setup the initial value of orderBy
if (!orderBy && prevOrderBy === INIT) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic was moved to order_agg.tsx useEffect function (initialization step)

@@ -17,29 +17,23 @@
* under the License.
*/

import _ from 'lodash';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just get rid of lodash

Copy link
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general the changes looks good, but please address the comments below

src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
src/legacy/ui/public/agg_types/buckets/terms.js Outdated Show resolved Hide resolved
src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
@sulemanof sulemanof requested a review from cchaos May 28, 2019 09:42
@timroes timroes mentioned this pull request May 28, 2019
29 tasks
@sulemanof sulemanof added Team:Visualizations Visualization editors, elastic-charts and infrastructure Feature:Vis Editor Visualization editor issues release_note:skip Skip the PR/issue when compiling release notes v7.3.0 v8.0.0 labels May 28, 2019
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-app

@sulemanof sulemanof requested a review from maryia-lapata May 28, 2019 09:45
@elasticmachine
Copy link
Contributor

💔 Build Failed

@sulemanof sulemanof marked this pull request as ready for review May 28, 2019 12:56
Copy link
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, tested on Chrome 74.0, it works fine.

Co-Authored-By: Maryia Lapata <[email protected]>
@elasticmachine
Copy link
Contributor

💔 Build Failed

Copy link
Contributor

@cchaos cchaos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UI replacement LGTM. Just one capitalization change.

src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@wylieconlon wylieconlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes themselves look good to me, tested locally. Please do not merge until #37064 is merged.

src/legacy/ui/public/agg_types/controls/order_agg.tsx Outdated Show resolved Hide resolved
package.json Outdated
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.9.0",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.13.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw you have another PR out for upgrading these, but the PRs have some slight differences. I'd like to get the other PR merged before this one, so the right people can review that dependency upgrade.

test/functional/page_objects/visualize_page.js Outdated Show resolved Hide resolved
@maryia-lapata maryia-lapata requested a review from dmlemeshko May 29, 2019 10:33
Copy link
Member

@dmlemeshko dmlemeshko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functional tests changes look good.

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@maryia-lapata maryia-lapata merged commit a2542d3 into elastic:master May 29, 2019
maryia-lapata pushed a commit to maryia-lapata/kibana that referenced this pull request May 29, 2019
* EUIficate order_agg param editor

* Update browser tests

* Add types

* Update enzyme version in x-pack

* Fix functional tests

* Changes due to comments

* Update_terms_helper.tsx

Co-Authored-By: Maryia Lapata <[email protected]>

* Fix code review comments

* Update yarn.lock
@elasticmachine
Copy link
Contributor

💔 Build Failed

maryia-lapata added a commit that referenced this pull request May 29, 2019
* EUIficate order_agg param editor

* Update browser tests

* Add types

* Update enzyme version in x-pack

* Fix functional tests

* Changes due to comments

* Update_terms_helper.tsx

Co-Authored-By: Maryia Lapata <[email protected]>

* Fix code review comments

* Update yarn.lock
jkakavas pushed a commit to jkakavas/kibana that referenced this pull request May 30, 2019
* EUIficate order_agg param editor

* Update browser tests

* Add types

* Update enzyme version in x-pack

* Fix functional tests

* Changes due to comments

* Update_terms_helper.tsx

Co-Authored-By: Maryia Lapata <[email protected]>

* Fix code review comments

* Update yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported Feature:Vis Editor Visualization editor issues release_note:skip Skip the PR/issue when compiling release notes Team:Visualizations Visualization editors, elastic-charts and infrastructure v7.3.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants