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

Jump to bottom

[Maps] Blended layer that switches between documents and clusters #57879

Merged
merged 38 commits into from
Mar 18, 2020
Merged

[Maps] Blended layer that switches between documents and clusters #57879

merged 38 commits into from
Mar 18, 2020

Commits on Feb 13, 2020

  1. [Maps] Blended layer that switches between documents and clusters

    @nreese
    nreese committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    b369b1a View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. change layer type when scalingType changes

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    a1d170d View commit details
    Browse the repository at this point in the history

  2. getSource

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    9eb460a View commit details
    Browse the repository at this point in the history

  3. use cluster source when count exceeds value

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    3e5010d View commit details
    Browse the repository at this point in the history

  4. ensure doc source stays in editor

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    ca06b90 View commit details
    Browse the repository at this point in the history

  5. start creating cluster style

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    433d693 View commit details
    Browse the repository at this point in the history

  6. pass all parts of style descriptor

    @nreese
    nreese committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    6a3b194 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2020

  1. get toggling between sources working

    @nreese
    nreese committed Feb 15, 2020
    Configuration menu
    Copy the full SHA
    536e060 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. merge with master

    @nreese
    nreese committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    3c8e9bb View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. derive cluster style from document style

    @nreese
    nreese committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    9a2b4d0 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Merge branch 'master' of github.com:elastic/kibana into scaling_type

    @nreese
    nreese committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    554631c View commit details
    Browse the repository at this point in the history

  2. remove references to METRIC_TYPE

    @nreese
    nreese committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    1eb31f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. merge with master

    @nreese
    nreese committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    18360b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. fix import

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    5eec22b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:elastic/kibana into scaling_type

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    c215ef4 View commit details
    Browse the repository at this point in the history

  3. start typescripting blended_vector_layer

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    e18c9dd View commit details
    Browse the repository at this point in the history

  4. more typescript work

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    4d5e928 View commit details
    Browse the repository at this point in the history

  5. last of the TS errors

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    8a0e24f View commit details
    Browse the repository at this point in the history

  6. merge with master

    @nreese
    nreese committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    b1650f4 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Merge branch 'master' of github.com:elastic/kibana into scaling_type

    @nreese
    nreese committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    4ab5e57 View commit details
    Browse the repository at this point in the history

  2. add migration to convert useTopTerm to scalingType

    @nreese
    nreese committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    8db2894 View commit details
    Browse the repository at this point in the history

  3. clean up

    @nreese
    nreese committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    9d6faa9 View commit details
    Browse the repository at this point in the history

  4. remove MapSavedObject work since its in a seperate PR now

    @nreese
    nreese committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    ff8129b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. fix EsSearchSource update editor jest test

    @nreese
    nreese committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    08b0fb4 View commit details
    Browse the repository at this point in the history

  2. fix map_selector jest test

    @nreese
    nreese committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    56ef685 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into scaling_type

    @elasticmachine
    elasticmachine committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    b62cdd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Merge branch 'master' into scaling_type

    @elasticmachine
    elasticmachine committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    b55c67d View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge branch 'master' of github.com:elastic/kibana into scaling_type

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    f70c0ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'scaling_type' of github.com:nreese/kibana into scaling_… 

    …type
    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    9dcb5eb View commit details
    Browse the repository at this point in the history

  3. move mutable state out of BlendedVectorLayer

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    11615d0 View commit details
    Browse the repository at this point in the history

  4. one more change for removing mutable BlendedVectorLayer state

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    7c5fa30 View commit details
    Browse the repository at this point in the history

  5. integrate newly merged MapSavedObjectAttributes type

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    6e70f51 View commit details
    Browse the repository at this point in the history

  6. review feedback

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    deca3c3 View commit details
    Browse the repository at this point in the history

  7. use data request for fetching feature count

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    1207873 View commit details
    Browse the repository at this point in the history

  8. add functional test

    @nreese
    nreese committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    41a4bff View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. fix functional test

    @nreese
    nreese committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    fe3499f View commit details
    Browse the repository at this point in the history

  2. review feedback

    @nreese
    nreese committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    5f3236c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:elastic/kibana into scaling_type

    @nreese
    nreese committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    7d0dc6b View commit details
    Browse the repository at this point in the history