X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fdash%2Fapp%2Fpal%2Ftrending%2Flayout.py;h=ddc39dc4435f94a6838e4436d88aca2c7d9e9a4e;hp=c12d64a2138cdbd59332c9f99621eb4a24ceea16;hb=65421a4ebc81c4e163b3cb38dd6d095b8e99f2d4;hpb=eefc901a89aa755ba41a2ec615da7610c57fe971 diff --git a/resources/tools/dash/app/pal/trending/layout.py b/resources/tools/dash/app/pal/trending/layout.py index c12d64a213..ddc39dc443 100644 --- a/resources/tools/dash/app/pal/trending/layout.py +++ b/resources/tools/dash/app/pal/trending/layout.py @@ -35,20 +35,22 @@ class Layout: """ """ - NO_GRAPH = {"data": [], "layout": {}, "frames": []} + STYLE_DISABLED = {"display": "none"} + STYLE_ENABLED = {"display": "inherit"} CL_ALL_DISABLED = [{ "label": "All", "value": "all", "disabled": True }] - CL_ALL_ENABLED = [{ "label": "All", "value": "all", "disabled": False }] + PLACEHOLDER = html.Nobr("") + def __init__(self, app, html_layout_file, spec_file, graph_layout_file, data_spec_file): """ @@ -233,31 +235,21 @@ class Layout: id="row-graph-tput", class_name="g-0 p-2", children=[ - dcc.Loading( - dcc.Graph(id="graph-tput") - ) + self.PLACEHOLDER ] ), dbc.Row( # Latency id="row-graph-lat", class_name="g-0 p-2", children=[ - dcc.Loading( - dcc.Graph(id="graph-latency") - ) + self.PLACEHOLDER ] ), dbc.Row( # Download - id="div-download", - class_name="g-0", + id="row-btn-download", + class_name="g-0 p-2", children=[ - dcc.Loading(children=[ - dbc.Button( - id="btn-download-data", - children=["Download Data"] - ), - dcc.Download(id="download-data") - ]) + self.PLACEHOLDER ] ) ], @@ -439,30 +431,29 @@ class Layout: ] ), dbc.Row( + id="row-card-sel-tests", class_name="gy-1", + style=self.STYLE_DISABLED, children=[ - dbc.Card( - class_name="p-0", - children=[ - dbc.Label( - "Selected tests", - class_name="p-0" - ), - dbc.Checklist( - id="cl-selected", - options=[], - inline=False - ) - ], - color="light", - outline=True + dbc.Label( + "Selected tests", + class_name="p-0" + ), + dbc.Checklist( + class_name="overflow-auto", + id="cl-selected", + options=[], + inline=False, + style={"max-height": "12em"}, ) - ] + ], ), dbc.Row( + id="row-btns-sel-tests", + style=self.STYLE_DISABLED, children=[ dbc.ButtonGroup( - [ + children=[ dbc.Button( id="btn-sel-remove-all", children="Remove All", @@ -486,7 +477,7 @@ class Layout: ) ], size="md", - ), + ) ] ), ] @@ -576,11 +567,54 @@ class Layout: def callbacks(self, app): + def _generate_plotting_arrea(args: tuple) -> tuple: + """ + """ + + (fig_tput, fig_lat) = args + + row_fig_tput = self.PLACEHOLDER + row_fig_lat = self.PLACEHOLDER + row_btn_dwnld = self.PLACEHOLDER + + if fig_tput: + row_fig_tput = [ + dcc.Loading( + dcc.Graph( + id="graph-tput", + figure=fig_tput + ) + ), + ] + row_btn_dwnld = [ + dcc.Loading(children=[ + dbc.Button( + id="btn-download-data", + children=["Download Data"] + ), + dcc.Download(id="download-data") + ]), + ] + if fig_lat: + row_fig_lat = [ + dcc.Loading( + dcc.Graph( + id="graph-latency", + figure=fig_lat + ) + ) + ] + + return row_fig_tput, row_fig_lat, row_btn_dwnld + @app.callback( Output("control-panel", "data"), # Store Output("selected-tests", "data"), # Store - Output("graph-tput", "figure"), - Output("graph-latency", "figure"), + Output("row-graph-tput", "children"), + Output("row-graph-lat", "children"), + Output("row-btn-download", "children"), + Output("row-card-sel-tests", "style"), + Output("row-btns-sel-tests", "style"), Output("dd-ctrl-phy", "value"), Output("dd-ctrl-area", "options"), Output("dd-ctrl-area", "disabled"), @@ -634,8 +668,11 @@ class Layout: int(d_start[8:10])) d_end = datetime(int(d_end[0:4]), int(d_end[5:7]), int(d_end[8:10])) - fig_tput = no_update - fig_lat = no_update + row_fig_tput = no_update + row_fig_lat = no_update + row_btn_dwnld = no_update + row_card_sel_tests = no_update + row_btns_sel_tests = no_update ctrl_panel = self.ControlPanel(cp_data) @@ -836,21 +873,27 @@ class Layout: "core": core.lower(), "testtype": ttype.lower() }) + row_card_sel_tests = self.STYLE_ENABLED + row_btns_sel_tests = self.STYLE_ENABLED ctrl_panel.set(ctrl_panel.defaults) ctrl_panel.set({ "cl-selected-options": self._list_tests(store_sel) }) elif trigger_id in ("btn-sel-display", "dpr-period"): _ = btn_display - fig_tput, fig_lat = graph_trending( - self.data, store_sel, self.layout, d_start, d_end - ) - fig_tput = fig_tput if fig_tput else self.NO_GRAPH - fig_lat = fig_lat if fig_lat else self.NO_GRAPH + row_fig_tput, row_fig_lat, row_btn_dwnld = \ + _generate_plotting_arrea( + graph_trending( + self.data, store_sel, self.layout, d_start, d_end + ) + ) elif trigger_id == "btn-sel-remove-all": _ = btn_remove_all - fig_tput = self.NO_GRAPH - fig_lat = self.NO_GRAPH + row_fig_tput = self.PLACEHOLDER + row_fig_lat = self.PLACEHOLDER + row_btn_dwnld = self.PLACEHOLDER + row_card_sel_tests = self.STYLE_DISABLED + row_btns_sel_tests = self.STYLE_DISABLED store_sel = list() ctrl_panel.set({ "cl-selected-options": list() @@ -864,23 +907,31 @@ class Layout: new_store_sel.append(item) store_sel = new_store_sel if store_sel: - fig_tput, fig_lat = graph_trending( - self.data, store_sel, self.layout, d_start, d_end + row_fig_tput, row_fig_lat, row_btn_dwnld = \ + _generate_plotting_arrea( + graph_trending( + self.data, store_sel, self.layout, d_start, d_end + ) ) - fig_tput = fig_tput if fig_tput else self.NO_GRAPH - fig_lat = fig_lat if fig_lat else self.NO_GRAPH ctrl_panel.set({ "cl-selected-options": self._list_tests(store_sel) }) else: - fig_tput = self.NO_GRAPH - fig_lat = self.NO_GRAPH + row_fig_tput = self.PLACEHOLDER + row_fig_lat = self.PLACEHOLDER + row_btn_dwnld = self.PLACEHOLDER + row_card_sel_tests = self.STYLE_DISABLED + row_btns_sel_tests = self.STYLE_DISABLED store_sel = list() ctrl_panel.set({ "cl-selected-options": list() }) - ret_val = [ctrl_panel.panel, store_sel, fig_tput, fig_lat] + ret_val = [ + ctrl_panel.panel, store_sel, + row_fig_tput, row_fig_lat, row_btn_dwnld, + row_card_sel_tests, row_btns_sel_tests + ] ret_val.extend(ctrl_panel.values()) return ret_val @@ -910,11 +961,20 @@ class Layout: txt = lat_data["points"][0]["text"].replace("
", "\n") hdrh_data = lat_data["points"][0].get("customdata", None) if hdrh_data: - graph = [dcc.Graph( - id="hdrh-latency-graph", - figure=graph_hdrh_latency(hdrh_data, self.layout) - ), ] - + graph = [dbc.Card( + class_name="g-0", + children=[ + dbc.CardHeader(hdrh_data.pop("name")), + dbc.CardBody(children=[ + dcc.Graph( + id="hdrh-latency-graph", + figure=graph_hdrh_latency( + hdrh_data, self.layout + ) + ) + ]) + ]) + ] metadata = [ dbc.Card( class_name="g-0", @@ -950,6 +1010,9 @@ class Layout: if not n_clicks: raise PreventUpdate + if not store_sel: + raise PreventUpdate + df = pd.DataFrame() for itm in store_sel: sel_data = select_trending_data(self.data, itm)