From 87805031915bcd77bd75375ade260b65dad3d647 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 28 Feb 2023 10:49:17 +0530 Subject: [PATCH] chore: code reformatting --- frappe/desk/desktop.py | 45 +++++++++---------- .../js/frappe/views/workspace/blocks/index.js | 4 +- .../js/frappe/views/workspace/workspace.js | 2 +- .../public/js/frappe/widgets/widget_dialog.js | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 824e144272..de5113ac3e 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -157,12 +157,12 @@ class Workspace: return False def build_workspace(self): - self.number_cards = {"items": self.get_number_cards()} self.cards = {"items": self.get_links()} self.charts = {"items": self.get_charts()} self.shortcuts = {"items": self.get_shortcuts()} self.onboardings = {"items": self.get_onboardings()} self.quick_lists = {"items": self.get_quick_lists()} + self.number_cards = {"items": self.get_number_cards()} def _doctype_contains_a_record(self, name): exists = self.table_counts.get(name, False) @@ -201,22 +201,6 @@ class Workspace: return item - @handle_not_exist - def get_number_cards(self): - all_number_cards = [] - if frappe.has_permission("Number Card", throw=False): - number_cards = self.doc.number_cards - for number_card in number_cards: - if frappe.has_permission("Number Card", doc=number_card.number_card_name): - # Translate label - number_card.label = ( - _(number_card.label) if number_card.label else _(number_card.number_card_name) - ) - - all_number_cards.append(number_card) - - return all_number_cards - @handle_not_exist def get_links(self): cards = self.doc.get_link_groups() @@ -345,6 +329,21 @@ class Workspace: return steps + @handle_not_exist + def get_number_cards(self): + all_number_cards = [] + if frappe.has_permission("Number Card", throw=False): + number_cards = self.doc.number_cards + for number_card in number_cards: + if frappe.has_permission("Number Card", doc=number_card.number_card_name): + # Translate label + number_card.label = ( + _(number_card.label) if number_card.label else _(number_card.number_card_name) + ) + all_number_cards.append(number_card) + + return all_number_cards + @frappe.whitelist() @frappe.read_only() @@ -362,12 +361,12 @@ def get_desktop_page(page): workspace = Workspace(loads(page)) workspace.build_workspace() return { - "number_cards": workspace.number_cards, "charts": workspace.charts, "shortcuts": workspace.shortcuts, "cards": workspace.cards, "onboardings": workspace.onboardings, "quick_lists": workspace.quick_lists, + "number_cards": workspace.number_cards, } except DoesNotExistError: frappe.log_error("Workspace Missing") @@ -490,16 +489,16 @@ def save_new_widget(doc, page, blocks, new_widgets): if loads(new_widgets): widgets = _dict(loads(new_widgets)) - if widgets.number_card: - doc.number_cards.extend( - new_widget(widgets.number_card, "Workspace Number Card", "number_cards") - ) if widgets.chart: doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.quick_list: doc.quick_lists.extend(new_widget(widgets.quick_list, "Workspace Quick List", "quick_lists")) + if widgets.number_card: + doc.number_cards.extend( + new_widget(widgets.number_card, "Workspace Number Card", "number_cards") + ) if widgets.card: doc.build_links_table_from_card(widgets.card) @@ -529,7 +528,7 @@ def save_new_widget(doc, page, blocks, new_widgets): def clean_up(original_page, blocks): page_widgets = {} - for wid in ["number_card", "shortcut", "card", "chart", "quick_list"]: + for wid in ["shortcut", "card", "chart", "quick_list", "number_card"]: # get list of widget's name from blocks page_widgets[wid] = [x["data"][wid + "_name"] for x in loads(blocks) if x["type"] == wid] diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js index afee5ab98a..9533919620 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/index.js +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -1,13 +1,13 @@ // import blocks import Header from "./header"; import Paragraph from "./paragraph"; -import NumberCard from "./number_card"; import Card from "./card"; import Chart from "./chart"; import Shortcut from "./shortcut"; import Spacer from "./spacer"; import Onboarding from "./onboarding"; import QuickList from "./quick_list"; +import NumberCard from "./number_card"; // import tunes import HeaderSize from "./header_size"; @@ -17,13 +17,13 @@ frappe.provide("frappe.workspace_block"); frappe.workspace_block.blocks = { header: Header, paragraph: Paragraph, - number_card: NumberCard, card: Card, chart: Chart, shortcut: Shortcut, spacer: Spacer, onboarding: Onboarding, quick_list: QuickList, + number_card: NumberCard, }; frappe.workspace_block.tunes = { diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index fca6f35786..040c99c120 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -387,10 +387,10 @@ frappe.views.Workspace = class Workspace { this.editor.isReady.then(() => { this.editor.configuration.tools.chart.config.page_data = this.page_data; this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.number_card.config.page_data = this.page_data; this.editor.configuration.tools.card.config.page_data = this.page_data; this.editor.configuration.tools.onboarding.config.page_data = this.page_data; this.editor.configuration.tools.quick_list.config.page_data = this.page_data; + this.editor.configuration.tools.number_card.config.page_data = this.page_data; this.editor.render({ blocks: this.content || [] }); }); } else { diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 56234071e3..9462feac2f 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -652,10 +652,10 @@ export default function get_dialog_constructor(type) { const widget_map = { chart: ChartDialog, shortcut: ShortcutDialog, - number_card: NumberCardDialog, links: CardDialog, onboarding: OnboardingDialog, quick_list: QuickListDialog, + number_card: NumberCardDialog, }; return widget_map[type] || WidgetDialog;