Skip to content

Feature: Display the verbose name for metrics within Charts and legend. #3437

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

Closed
fabianmenges wants to merge 1 commit into from
Closed

Feature: Display the verbose name for metrics within Charts and legend. #3437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions superset/viz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,15 @@ def __init__(self, datasource, form_data):
'token', 'token_' + uuid.uuid4().hex[:8])
self.metrics = self.form_data.get('metrics') or []
self.groupby = self.form_data.get('groupby') or []
self.verbose_metrics = [self.get_name(n) for n in self.metrics]
self.verbose_groupby = [self.get_name(n) for n in self.groupby]

self.status = None
self.error_message = None

def get_name(self, name):
return self.datasource.data.get('verbose_map', dict()).get(name, name)

def get_df(self, query_obj=None):
"""Returns a pandas dataframe based on the query object"""
if not query_obj:
Expand Down Expand Up @@ -103,6 +108,10 @@ def get_df(self, query_obj=None):
df[DTTM_ALIAS] += timedelta(hours=self.datasource.offset)
df.replace([np.inf, -np.inf], np.nan)
df = df.fillna(0)
df.rename(
index=str,
columns={n: self.get_name(n) for n in df.columns},
inplace=True)
return df

def get_extra_filters(self):
Expand Down Expand Up @@ -164,8 +173,10 @@ def query_obj(self):
extras = {
'where': form_data.get("where", ''),
'having': form_data.get("having", ''),
'having_druid': form_data.get('having_filters') \
if 'having_filters' in form_data else [],
'having_druid':
form_data.get('having_filters')
if 'having_filters' in form_data
else [],
'time_grain_sqla': form_data.get("time_grain_sqla", ''),
'druid_time_origin': form_data.get("druid_time_origin", ''),
}
Expand Down Expand Up @@ -408,7 +419,7 @@ def get_data(self, df):
df = df.pivot_table(
index=self.form_data.get('groupby'),
columns=self.form_data.get('columns'),
values=self.form_data.get('metrics'),
values=self.verbose_metrics,
aggfunc=self.form_data.get('pandas_aggfunc'),
margins=self.form_data.get('pivot_margins'),
)
Expand Down Expand Up @@ -863,8 +874,8 @@ def process_data(self, df):

df = df.pivot_table(
index=DTTM_ALIAS,
columns=fd.get('groupby'),
values=fd.get('metrics'))
columns=self.verbose_groupby,
values=self.verbose_metrics)

fm = fd.get("resample_fillmethod")
if not fm:
Expand Down