Skip to content

Refactor public folder and dashboard services for improved readability and performance #184

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

Merged
merged 1 commit into from
Apr 18, 2025
Merged

Refactor public folder and dashboard services for improved readability and performance #184

Show file tree
Hide file tree
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
76 changes: 36 additions & 40 deletions src/spaceone/dashboard/service/public_dashboard_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,27 +356,25 @@ def share_dashboard(self, params_dict: dict) -> dict:
updated_params, pub_dashboard_vo
)

# if pub_dashboard_vo.resource_group in ["DOMAIN", "WORKSPACE"]:
if pub_dashboard_vo.resource_group == "DOMAIN":
# Cascade update for widgets
pub_widget_mgr = PublicWidgetManager()
pub_widget_vos = pub_widget_mgr.filter_public_widgets(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_widget_vo in pub_widget_vos:
pub_widget_mgr.update_public_widget_by_vo(updated_params, pub_widget_vo)

# Cascade update for data tables
pub_data_table_mgr = PublicDataTableManager()
pub_data_table_vos = pub_data_table_mgr.filter_public_data_tables(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
# Cascade update for widgets
pub_widget_mgr = PublicWidgetManager()
pub_widget_vos = pub_widget_mgr.filter_public_widgets(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_widget_vo in pub_widget_vos:
pub_widget_mgr.update_public_widget_by_vo(updated_params, pub_widget_vo)

# Cascade update for data tables
pub_data_table_mgr = PublicDataTableManager()
pub_data_table_vos = pub_data_table_mgr.filter_public_data_tables(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_data_table_vo in pub_data_table_vos:
pub_data_table_mgr.update_public_data_table_by_vo(
updated_params, pub_data_table_vo
)
for pub_data_table_vo in pub_data_table_vos:
pub_data_table_mgr.update_public_data_table_by_vo(
updated_params, pub_data_table_vo
)

return pub_dashboard_vo.to_dict()

Expand Down Expand Up @@ -441,27 +439,25 @@ def unshare_dashboard(self, params_dict: dict) -> dict:
updated_params, pub_dashboard_vo
)

# if pub_dashboard_vo.resource_group in ["DOMAIN", "WORKSPACE"]:
if pub_dashboard_vo.resource_group == "DOMAIN":
# Cascade update for widgets
pub_widget_mgr = PublicWidgetManager()
pub_widget_vos = pub_widget_mgr.filter_public_widgets(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_widget_vo in pub_widget_vos:
pub_widget_mgr.update_public_widget_by_vo(updated_params, pub_widget_vo)

# Cascade update for data tables
pub_data_table_mgr = PublicDataTableManager()
pub_data_table_vos = pub_data_table_mgr.filter_public_data_tables(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
# Cascade update for widgets
pub_widget_mgr = PublicWidgetManager()
pub_widget_vos = pub_widget_mgr.filter_public_widgets(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_widget_vo in pub_widget_vos:
pub_widget_mgr.update_public_widget_by_vo(updated_params, pub_widget_vo)

# Cascade update for data tables
pub_data_table_mgr = PublicDataTableManager()
pub_data_table_vos = pub_data_table_mgr.filter_public_data_tables(
dashboard_id=pub_dashboard_vo.dashboard_id,
domain_id=pub_dashboard_vo.domain_id,
)
for pub_data_table_vo in pub_data_table_vos:
pub_data_table_mgr.update_public_data_table_by_vo(
updated_params, pub_data_table_vo
)
for pub_data_table_vo in pub_data_table_vos:
pub_data_table_mgr.update_public_data_table_by_vo(
updated_params, pub_data_table_vo
)

return pub_dashboard_vo.to_dict()

Expand Down
64 changes: 31 additions & 33 deletions src/spaceone/dashboard/service/public_folder_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,24 +164,23 @@ def share(
updated_params, pub_folder_vo
)

if pub_folder_vo.resource_group == "DOMAIN":
pub_dashboard_svc = PublicDashboardService()
pub_dashboard_mgr = PublicDashboardManager()
pub_dashboard_vos = pub_dashboard_mgr.filter_public_dashboards(
folder_id=pub_folder_vo.folder_id, domain_id=pub_folder_vo.domain_id
)
pub_dashboard_svc = PublicDashboardService()
pub_dashboard_mgr = PublicDashboardManager()
pub_dashboard_vos = pub_dashboard_mgr.filter_public_dashboards(
folder_id=pub_folder_vo.folder_id, domain_id=pub_folder_vo.domain_id
)

for pub_dashboard_vo in pub_dashboard_vos:
pub_dashboard_svc.share_dashboard(
{
"dashboard_id": pub_dashboard_vo.dashboard_id,
"scope": params.scope,
"domain_id": params.domain_id,
"workspace_id": params.workspace_id,
"user_projects": params.user_projects,
"cascade": True,
}
)
for pub_dashboard_vo in pub_dashboard_vos:
pub_dashboard_svc.share_dashboard(
{
"dashboard_id": pub_dashboard_vo.dashboard_id,
"scope": params.scope,
"domain_id": params.domain_id,
"workspace_id": params.workspace_id,
"user_projects": params.user_projects,
"cascade": True,
}
)

return PublicFolderResponse(**pub_folder_vo.to_dict())

Expand Down Expand Up @@ -232,23 +231,22 @@ def unshare(
updated_params, pub_folder_vo
)

if pub_folder_vo.resource_group == "DOMAIN":
pub_dashboard_svc = PublicDashboardService()
pub_dashboard_mgr = PublicDashboardManager()
pub_dashboard_vos = pub_dashboard_mgr.filter_public_dashboards(
folder_id=pub_folder_vo.folder_id, domain_id=pub_folder_vo.domain_id
)
pub_dashboard_svc = PublicDashboardService()
pub_dashboard_mgr = PublicDashboardManager()
pub_dashboard_vos = pub_dashboard_mgr.filter_public_dashboards(
folder_id=pub_folder_vo.folder_id, domain_id=pub_folder_vo.domain_id
)

for pub_dashboard_vo in pub_dashboard_vos:
pub_dashboard_svc.unshare_dashboard(
{
"dashboard_id": pub_dashboard_vo.dashboard_id,
"domain_id": params.domain_id,
"workspace_id": params.workspace_id,
"user_projects": params.user_projects,
"cascade": True,
}
)
for pub_dashboard_vo in pub_dashboard_vos:
pub_dashboard_svc.unshare_dashboard(
{
"dashboard_id": pub_dashboard_vo.dashboard_id,
"domain_id": params.domain_id,
"workspace_id": params.workspace_id,
"user_projects": params.user_projects,
"cascade": True,
}
)

return PublicFolderResponse(**pub_folder_vo.to_dict())

Expand Down
Loading