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=35668a475199b0e5c349a156e13dbca65d1962ab;hp=ddc39dc4435f94a6838e4436d88aca2c7d9e9a4e;hb=25c3aa43a0022d180fc9b31d68071790721c008b;hpb=65421a4ebc81c4e163b3cb38dd6d095b8e99f2d4
diff --git a/resources/tools/dash/app/pal/trending/layout.py b/resources/tools/dash/app/pal/trending/layout.py
index ddc39dc443..35668a4751 100644
--- a/resources/tools/dash/app/pal/trending/layout.py
+++ b/resources/tools/dash/app/pal/trending/layout.py
@@ -154,6 +154,7 @@ class Layout:
),
dcc.Loading(
dbc.Offcanvas(
+ class_name="w-50",
id="offcanvas-metadata",
title="Throughput And Latency",
placement="end",
@@ -420,6 +421,7 @@ class Layout:
children=[
dcc.DatePickerRange(
id="dpr-period",
+ className="d-flex justify-content-center",
min_date_allowed=\
datetime.utcnow()-timedelta(days=180),
max_date_allowed=datetime.utcnow(),
@@ -468,13 +470,6 @@ class Layout:
color="secondary",
disabled=False
),
- dbc.Button(
- id="btn-sel-display",
- children="Display",
- class_name="w-100",
- color="secondary",
- disabled=False
- )
],
size="md",
)
@@ -651,7 +646,6 @@ class Layout:
Input("btn-ctrl-add", "n_clicks"),
Input("dpr-period", "start_date"),
Input("dpr-period", "end_date"),
- Input("btn-sel-display", "n_clicks"),
Input("btn-sel-remove", "n_clicks"),
Input("btn-sel-remove-all", "n_clicks"),
)
@@ -659,7 +653,7 @@ class Layout:
dd_phy: str, dd_area: str, dd_test: str, cl_core: list,
cl_core_all: list, cl_framesize: list, cl_framesize_all: list,
cl_testtype: list, cl_testtype_all: list, btn_add: int,
- d_start: str, d_end: str, btn_display: int, btn_remove: int,
+ d_start: str, d_end: str, btn_remove: int,
btn_remove_all: int) -> tuple:
"""
"""
@@ -879,8 +873,13 @@ class Layout:
ctrl_panel.set({
"cl-selected-options": self._list_tests(store_sel)
})
- elif trigger_id in ("btn-sel-display", "dpr-period"):
- _ = btn_display
+ 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 == "dpr-period":
row_fig_tput, row_fig_lat, row_btn_dwnld = \
_generate_plotting_arrea(
graph_trending(
@@ -955,14 +954,24 @@ class Layout:
trigger_id = callback_context.triggered[0]["prop_id"].split(".")[0]
if trigger_id == "graph-tput":
title = "Throughput"
- txt = tput_data["points"][0]["text"].replace("
", "\n")
+ array = tput_data["points"][0]["text"].split("
")
+ children = [
+ dbc.ListGroupItem(
+ [dbc.Badge(x.split(":")[0]), x.split(": ")[1]]
+ ) for x in array
+ ]
elif trigger_id == "graph-latency":
title = "Latency"
- txt = lat_data["points"][0]["text"].replace("
", "\n")
+ array = lat_data["points"][0]["text"].split("
")
+ children = [
+ dbc.ListGroupItem(
+ [dbc.Badge(x.split(":")[0]), x.split(": ")[1]]
+ ) for x in array
+ ]
hdrh_data = lat_data["points"][0].get("customdata", None)
if hdrh_data:
graph = [dbc.Card(
- class_name="g-0",
+ class_name="gy-2 p-0",
children=[
dbc.CardHeader(hdrh_data.pop("name")),
dbc.CardBody(children=[
@@ -977,7 +986,7 @@ class Layout:
]
metadata = [
dbc.Card(
- class_name="g-0",
+ class_name="gy-2 p-0",
children=[
dbc.CardHeader(children=[
dcc.Clipboard(
@@ -989,7 +998,10 @@ class Layout:
]),
dbc.CardBody(
id="tput-lat-metadata",
- children=[txt]
+ class_name="p-0",
+ children=[
+ dbc.ListGroup(children, flush=True)
+ ]
)
]
)