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

Allow pivot table creation without labels #158

Merged
merged 1 commit into from
Jan 6, 2025
+26 −16
Merged

Allow pivot table creation without labels #158

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
42 changes: 26 additions & 16 deletions src/spaceone/dashboard/manager/data_table_manager/data_transformation_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def pivot_data_table(
origin_vo = self.data_table_vos[0]
field_options = self.options["fields"]
labels, column, data = (
field_options["labels"],
field_options.get("labels"),
field_options["column"],
field_options["data"],
)
Expand Down Expand Up @@ -709,12 +709,13 @@ def _check_columns(
df: pd.DataFrame, label_fields: list, column_field: str, data_field: str
) -> None:
df_columns = set(df.columns)
for label_field in label_fields:
if label_field not in df_columns:
raise ERROR_INVALID_PARAMETER(
key=f"options.PIVOT.labels",
reason=f"Invalid key: {label_field}, columns={list(df_columns)}",
)
if label_fields:
for label_field in label_fields:
if label_field not in df_columns:
raise ERROR_INVALID_PARAMETER(
key=f"options.PIVOT.labels",
reason=f"Invalid key: {label_field}, columns={list(df_columns)}",
)

if column_field not in df_columns:
raise ERROR_INVALID_PARAMETER(
Expand All @@ -736,18 +737,27 @@ def _set_fill_value_from_df(df: pd.DataFrame, data_field: str) -> Union[int, str

@staticmethod
def _set_new_column_names(pivot_table: pd.DataFrame) -> pd.DataFrame:
new_columns = [
lower_col if lower_col else upper_col
for upper_col, lower_col in pivot_table.columns
]
pivot_table.columns = new_columns
if pivot_table.columns[0] == "index":
pivot_table = pivot_table.iloc[:, 1:]
else:
new_columns = [
lower_col if lower_col else upper_col
for upper_col, lower_col in pivot_table.columns
]
pivot_table.columns = new_columns
return pivot_table

def _set_keys(self, columns: list) -> None:
self.label_keys = [
upper_col for upper_col, lower_col in columns if not lower_col
]
self.data_keys = [lower_col for upper_col, lower_col in columns if lower_col]
if columns[0] == "index":
self.label_keys = []
self.data_keys = [col for col in columns if col != "index"]
else:
self.label_keys = [
upper_col for upper_col, lower_col in columns if not lower_col
]
self.data_keys = [
lower_col for upper_col, lower_col in columns if lower_col
]

@staticmethod
def _validate_select_fields(
Expand Down
Loading