From eeb93d2ba66ae2283012d5a34ac1da6a9c3e05a4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 8 Jul 2020 12:55:08 +0530 Subject: [PATCH 1/4] feat: add reset settings option to desk --- frappe/core/page/workspace/workspace.js | 52 ++++++++++++++++--------- frappe/desk/desktop.py | 11 ++++++ 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/frappe/core/page/workspace/workspace.js b/frappe/core/page/workspace/workspace.js index 06a5a01d9d..7387d909dd 100644 --- a/frappe/core/page/workspace/workspace.js +++ b/frappe/core/page/workspace/workspace.js @@ -11,6 +11,10 @@ frappe.pages['workspace'].on_page_load = function(wrapper) { }); } +// REDESIGN-TODO: Route modules/Accounts, administration/Tools, domains/Healthcare +// REDESIGN-TODO: Fix sidebar item not de-selected bug +// REDESIGN-TODO: Customize button state + class Workspace { constructor(wrapper) { this.wrapper = $(wrapper); @@ -30,7 +34,7 @@ class Workspace { this.make_sidebar(); }) } - + show() { let page = this.get_page_to_show(); this.page.set_title(`${__(page)} Workspace`); @@ -43,13 +47,13 @@ class Workspace {
`).appendTo(this.wrapper.find(".layout-side-section")); this.sidebar = list_sidebar.find(".desk-sidebar"); - + this.body = this.wrapper.find(".layout-main-section"); } get_page_to_show() { let default_page; - + if (localStorage.current_workspace) { default_page = localStorage.current_workspace; } else if (this.desktop_settings) { @@ -59,9 +63,9 @@ class Workspace { } else { default_page = "Website"; } - + let page = frappe.get_route()[1] || default_page; - + return page; } @@ -97,14 +101,14 @@ class Workspace { build_sidebar_section(title, items) { let sidebar_section = $(`
`) - + // DO NOT REMOVE: Comment to load translation // __("Modules") __("Domains") __("Places") __("Administration") $(`
${__(title)}
`) .appendTo(sidebar_section); const get_sidebar_item = function(item) { - return $(` @@ -118,7 +122,7 @@ class Workspace { item.selected = true; this.current_page_name = item.name; } - + let $item = get_sidebar_item(item); $item.clone().appendTo(sidebar_section); @@ -141,7 +145,7 @@ class Workspace { } this.current_page_name = page; localStorage.current_desk_page = page; - + this.pages[page] ? this.pages[page].show() : this.make_page(page); this.current_page = this.pages[page]; this.setup_dropdown(); @@ -161,12 +165,13 @@ class Workspace { if (this.current_page && this.current_page.allow_customization) { this.page.clear_menu() this.current_page.customize(); - + this.page.set_primary_action( __("Save Customizations"), () => { this.current_page.save_customization(); this.page.clear_primary_action(); + this.page.clear_secondary_action(); this.setup_dropdown(); }, null, @@ -177,25 +182,25 @@ class Workspace { __("Discard"), () => { this.current_page.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info"}); + this.page.clear_primary_action(); this.page.clear_secondary_action(); this.setup_dropdown(); } ) } - } + } setup_dropdown() { this.page.clear_menu(); - + this.page.add_menu_item('Customize', () => { this.customize(); }, 1); - // this.page.add_menu_item('Reset', () => { - // }, 1); - - // this.page.add_menu_item('Hide Page', () => { - // }, 1) + this.page.add_menu_item('Reset Customizations', () => { + this.current_page.reset_customization(); + }, 1); } } @@ -298,15 +303,24 @@ class DesktopPage { config: config }).then(res => { if (res.message) { - frappe.msgprint({ message: __("Customizations Saved Successfully"), title: __("Success")}); + frappe.show_alert({ message: __("Customizations Saved Successfully"), indicator: "green"}); this.reload(); } else { - frappe.throw({message: __("Something went wrong while saving customizations"), title: __("Failed")}); + frappe.throw({message: __("Something went wrong while saving customizations"), indicator: "red"}); this.reload(); } }); } + reset_customization() { + frappe.call('frappe.desk.desktop.reset_customization', { + page: this.page_name + }).then(res => { + frappe.show_alert({ message: __("Removed page customizations"), indicator: "green"}); + this.reload(); + }) + } + make_onboarding() { this.onboarding_widget = frappe.widget.make_widget({ label: this.data.onboarding.label || __(`Let's Get Started`), diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 655c36c703..18a321e55f 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -532,3 +532,14 @@ def update_onboarding_step(name, field, value): """ frappe.db.set_value("Onboarding Step", name, field, value) + +@frappe.whitelist() +def reset_customization(page): + """Reset desk page customizations for a user + + Args: + page (string): Name of the page to be reset + """ + original_page = frappe.get_doc("Desk Page", page) + page_doc = get_custom_workspace_for_user(page) + page_doc.delete() From 4b440ac1a27d26097b24021379ef7f289a5db386 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 8 Jul 2020 12:55:25 +0530 Subject: [PATCH 2/4] fix: remove undefined function call --- frappe/public/js/frappe/ui/notifications/notifications.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js index c2bede6b72..19ee6c96c1 100644 --- a/frappe/public/js/frappe/ui/notifications/notifications.js +++ b/frappe/public/js/frappe/ui/notifications/notifications.js @@ -257,7 +257,6 @@ class NotificationsView extends BaseNotificaitonsView { this.get_notifications_list(this.max_length).then(list => { this.dropdown_items = list; this.render_notifications_dropdown(); - this.setup_events(); }); } From 0f3ce19b029e49019dc74feec51ca8db7af7be79 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 8 Jul 2020 12:55:41 +0530 Subject: [PATCH 3/4] feat: show shortcuts section if developer mode is on --- frappe/desk/doctype/desk_page/desk_page.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json index acb2a557cf..7e1812002c 100644 --- a/frappe/desk/doctype/desk_page/desk_page.json +++ b/frappe/desk/doctype/desk_page/desk_page.json @@ -53,7 +53,7 @@ "options": "Desk Chart" }, { - "depends_on": "eval:!doc.extends_another_page || !doc.is_standard", + "depends_on": "eval:!doc.extends_another_page || !doc.is_standard || frappe.boot.developer_mode", "fieldname": "shortcuts", "fieldtype": "Table", "label": "Shortcuts", @@ -206,7 +206,7 @@ } ], "links": [], - "modified": "2020-06-30 15:34:23.910922", + "modified": "2020-07-08 12:48:43.845930", "modified_by": "Administrator", "module": "Desk", "name": "Desk Page", From b3b8f68d01ec6e4bc947c7e677bf8fc58eea8d5d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 8 Jul 2020 12:55:59 +0530 Subject: [PATCH 4/4] feat: add icon to settings --- frappe/core/desk_page/settings/settings.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/core/desk_page/settings/settings.json b/frappe/core/desk_page/settings/settings.json index 53d3acd4d6..90c32adbb0 100644 --- a/frappe/core/desk_page/settings/settings.json +++ b/frappe/core/desk_page/settings/settings.json @@ -44,7 +44,7 @@ "idx": 0, "is_standard": 1, "label": "Settings", - "modified": "2020-06-30 18:35:16.114908", + "modified": "2020-07-08 12:46:52.264510", "modified_by": "Administrator", "module": "Core", "name": "Settings", @@ -53,19 +53,19 @@ "pin_to_top": 0, "shortcuts": [ { - "icon": "octicon octicon-settings", + "icon": "setting", "label": "System Settings", "link_to": "System Settings", "type": "DocType" }, { - "icon": "fa fa-print", + "icon": "printer", "label": "Print Settings", "link_to": "Print Settings", "type": "DocType" }, { - "icon": "fa fa-globe", + "icon": "website", "label": "Website Settings", "link_to": "Website Settings", "type": "DocType"