Add filtering options to views; add options for filtering out system containers & unconnected containers. #420
Conversation
| @@ -354,3 +356,62 @@ func (f Filter) Render(rpt report.Report) RenderableNodes { | |||
| } | |||
| return output | |||
| } | |||
|
|
|||
| // FilterSystem is a Renderer which filters out system nodes. | |||
| func FilterSystem(r Renderer) Renderer { | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
Not using the DSL for this? |
It turned out mapping between report.Topology (what the DSL expects) and RenderableNodes (what the rendering pipeline outputs, and what the UI needs) was quite a bit of work, some of which was subtle. In the interest of pushing the feature, I went with this approach instead. It will be simpler to have a full-expression renderer, i.e. only dumping to RenderableNodes at the end. That's what I'm targeting for the Kubernetes integration. |
peterbourgon
force-pushed
the
without-system-containers
branch
from
7b927f8 to
a39ec0a
Compare
peterbourgon
changed the title
|
@peterbourgon what happened to using labels instead of hardcoding the container names? |
|
@tomwilkie we are using labels (see here) just not exclusively, as current weave master still doesn't put system labels on weave components. |
It should do (I made that change!) - what version are you running? |
tomwilkie
force-pushed
the
without-system-containers
branch
from
814b141 to
2d722ea
Compare
tomwilkie
changed the title
| @@ -156,6 +172,14 @@ const AppStore = assign({}, EventEmitter.prototype, { | |||
| AppStore.registeredCallback = function(payload) { | |||
| switch (payload.type) { | |||
|
|
|||
| case ActionTypes.CHANGE_TOPOLOGY_OPTION: | |||
| if (activeTopologyOptions[payload.option] !== payload.value) { | |||
| nodes = {}; | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
Not getting any errors anymore. |
|
Thanks; I'm just adding some tests but this is feeling really close now. |
tomwilkie
force-pushed
the
without-system-containers
branch
from
ba37eb7 to
132cffa
Compare
|
Okay I'm done; its looking good. One issue: I don't think the UI is selecting the default filter - I've changed the default to filter system containers, but I'm still seeing them in the UI. David, can you fix? |
…state - fix nodes reset after topology option change - set topology on click - explicitly set default topology options - set default topo options when topos are received - prevent JS error on too many nodes layout abort
tomwilkie
force-pushed
the
without-system-containers
branch
from
20d5abe to
27caf0a
Compare
|
LGTM! |
Add filtering options to views; add options for filtering out system containers & unconnected containers.
Me and @davkal