From 48382fdca0adf7842120ec79585236c242cb4bdc Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:15:36 +0530 Subject: [PATCH 01/10] refactor: rename onboarding to module onboarding --- frappe/desk/desktop.py | 4 ++-- frappe/desk/doctype/desk_page/desk_page.json | 4 ++-- .../doctype/{onboarding => module_onboarding}/__init__.py | 0 .../module_onboarding.js} | 2 +- .../module_onboarding.json} | 2 +- .../module_onboarding.py} | 8 ++++---- .../test_module_onboarding.py} | 2 +- frappe/model/sync.py | 4 ++-- frappe/modules/import_file.py | 2 +- frappe/website/onboarding/website/website.json | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename frappe/desk/doctype/{onboarding => module_onboarding}/__init__.py (100%) rename frappe/desk/doctype/{onboarding/onboarding.js => module_onboarding/module_onboarding.js} (92%) rename frappe/desk/doctype/{onboarding/onboarding.json => module_onboarding/module_onboarding.json} (98%) rename frappe/desk/doctype/{onboarding/onboarding.py => module_onboarding/module_onboarding.py} (73%) rename frappe/desk/doctype/{onboarding/test_onboarding.py => module_onboarding/test_module_onboarding.py} (79%) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index f2047003fa..a912ca341c 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -61,10 +61,10 @@ class Workspace: if not self.doc.onboarding: return None - if frappe.db.get_value("Onboarding", self.doc.onboarding, "is_complete"): + if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"): return None - doc = frappe.get_doc("Onboarding", self.doc.onboarding) + doc = frappe.get_doc("Module Onboarding", self.doc.onboarding) # Check if user is allowed allowed_roles = set(doc.get_allowed_roles()) diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json index cb106c5dd4..0064d7bd28 100644 --- a/frappe/desk/doctype/desk_page/desk_page.json +++ b/frappe/desk/doctype/desk_page/desk_page.json @@ -188,11 +188,11 @@ "fieldname": "onboarding", "fieldtype": "Link", "label": "Onboarding", - "options": "Onboarding" + "options": "Module Onboarding" } ], "links": [], - "modified": "2020-04-26 12:21:46.205079", + "modified": "2020-05-12 16:12:20.708394", "modified_by": "Administrator", "module": "Desk", "name": "Desk Page", diff --git a/frappe/desk/doctype/onboarding/__init__.py b/frappe/desk/doctype/module_onboarding/__init__.py similarity index 100% rename from frappe/desk/doctype/onboarding/__init__.py rename to frappe/desk/doctype/module_onboarding/__init__.py diff --git a/frappe/desk/doctype/onboarding/onboarding.js b/frappe/desk/doctype/module_onboarding/module_onboarding.js similarity index 92% rename from frappe/desk/doctype/onboarding/onboarding.js rename to frappe/desk/doctype/module_onboarding/module_onboarding.js index bed7dbd5de..48ab047c5e 100644 --- a/frappe/desk/doctype/onboarding/onboarding.js +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on("Onboarding", { +frappe.ui.form.on("Module ModuleOnboarding", { refresh: function(frm) { frappe.boot.developer_mode && frm.set_intro( diff --git a/frappe/desk/doctype/onboarding/onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json similarity index 98% rename from frappe/desk/doctype/onboarding/onboarding.json rename to frappe/desk/doctype/module_onboarding/module_onboarding.json index b1d563a9dc..9810e7a15f 100644 --- a/frappe/desk/doctype/onboarding/onboarding.json +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json @@ -93,7 +93,7 @@ "modified": "2020-05-01 19:37:21.492405", "modified_by": "Administrator", "module": "Desk", - "name": "Onboarding", + "name": "Module Onboarding", "owner": "Administrator", "permissions": [ { diff --git a/frappe/desk/doctype/onboarding/onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py similarity index 73% rename from frappe/desk/doctype/onboarding/onboarding.py rename to frappe/desk/doctype/module_onboarding/module_onboarding.py index c8527d22b6..a723953a11 100644 --- a/frappe/desk/doctype/onboarding/onboarding.py +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py @@ -8,16 +8,16 @@ from frappe.model.document import Document from frappe.modules.export_file import export_to_files -class Onboarding(Document): +class ModuleOnboarding(Document): def on_update(self): if frappe.conf.developer_mode: - export_to_files(record_list=[['Onboarding', self.name]], record_module=self.module) + export_to_files(record_list=[['Module ModuleOnboarding', self.name]], record_module=self.module) for step in self.steps: - export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module) + export_to_files(record_list=[['Module ModuleOnboarding Step', step.step]], record_module=self.module) def get_steps(self): - return [frappe.get_doc("Onboarding Step", step.step) for step in self.steps] + return [frappe.get_doc("Module ModuleOnboarding Step", step.step) for step in self.steps] def get_allowed_roles(self): all_roles = [role.role for role in self.allow_roles] diff --git a/frappe/desk/doctype/onboarding/test_onboarding.py b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py similarity index 79% rename from frappe/desk/doctype/onboarding/test_onboarding.py rename to frappe/desk/doctype/module_onboarding/test_module_onboarding.py index 8a9e346fd9..ef305667b1 100644 --- a/frappe/desk/doctype/onboarding/test_onboarding.py +++ b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe import unittest -class TestOnboarding(unittest.TestCase): +class TestModuleOnboarding(unittest.TestCase): pass diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 320cc24677..b7d9d4d548 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -51,7 +51,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe ("desk", "onboarding_permission"), ("desk", "onboarding_step"), ("desk", "onboarding_step_map"), - ("desk", "onboarding"), + ("desk", "module_onboarding"), ("desk", "desk_card"), ("desk", "desk_chart"), ("desk", "desk_shortcut"), @@ -85,7 +85,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'web_template', 'notification', 'print_style', 'data_migration_mapping', 'data_migration_plan', 'desk_page', - 'onboarding_step', 'onboarding'] + 'onboarding_step', 'module_onboarding'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index cddef4f910..27649b8da9 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -13,7 +13,7 @@ ignore_values = { "Print Format": ["disabled"], "Notification": ["enabled"], "Print Style": ["disabled"], - "Onboarding": ['is_complete'], + "Module Onboarding": ['is_complete'], "Onboarding Step": ['is_complete', 'is_skipped'] } diff --git a/frappe/website/onboarding/website/website.json b/frappe/website/onboarding/website/website.json index ee4403557b..b849a809ed 100644 --- a/frappe/website/onboarding/website/website.json +++ b/frappe/website/onboarding/website/website.json @@ -6,7 +6,7 @@ ], "creation": "2020-04-26 13:03:30.405135", "docstatus": 0, - "doctype": "Onboarding", + "doctype": "Module Onboarding", "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website", "idx": 0, "is_complete": 0, From ef0c99c922e0b058e86712c65afe6f6ca779a120 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:24:59 +0530 Subject: [PATCH 02/10] refactor: rename folder for website onboarding --- .../{onboarding => module_onboarding}/website/website.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frappe/website/{onboarding => module_onboarding}/website/website.json (100%) diff --git a/frappe/website/onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json similarity index 100% rename from frappe/website/onboarding/website/website.json rename to frappe/website/module_onboarding/website/website.json From 963483cb0e29a7aa1baa1bda7c2e519714776d61 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:28:54 +0530 Subject: [PATCH 03/10] feat: add patch to rename Onboarding --- frappe/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches.txt b/frappe/patches.txt index a086fa6f4a..ef9e9fe4bb 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -278,3 +278,4 @@ frappe.patches.v13_0.set_path_for_homepage_in_web_page_view frappe.patches.v13_0.migrate_translation_column_data frappe.patches.v13_0.set_read_times frappe.patches.v13_0.remove_web_view +execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding") From bcf20a8a5c69f3735905f8fee49ad482030e9376 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:41:48 +0530 Subject: [PATCH 04/10] fix: controller methods --- frappe/desk/doctype/module_onboarding/module_onboarding.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py index a723953a11..2be427749c 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.py +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py @@ -11,13 +11,13 @@ from frappe.modules.export_file import export_to_files class ModuleOnboarding(Document): def on_update(self): if frappe.conf.developer_mode: - export_to_files(record_list=[['Module ModuleOnboarding', self.name]], record_module=self.module) + export_to_files(record_list=[['ModuleOnboarding', self.name]], record_module=self.module) for step in self.steps: - export_to_files(record_list=[['Module ModuleOnboarding Step', step.step]], record_module=self.module) + export_to_files(record_list=[['ModuleOnboarding Step', step.step]], record_module=self.module) def get_steps(self): - return [frappe.get_doc("Module ModuleOnboarding Step", step.step) for step in self.steps] + return [frappe.get_doc("ModuleOnboarding Step", step.step) for step in self.steps] def get_allowed_roles(self): all_roles = [role.role for role in self.allow_roles] From dd1e3bbf7a5a1fa62b4f42adb7dea2dd89a88e02 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:41:58 +0530 Subject: [PATCH 05/10] feat: add ignore flag in patch --- frappe/patches.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index ec0c515907..118d42ba16 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -279,4 +279,4 @@ frappe.patches.v13_0.migrate_translation_column_data frappe.patches.v13_0.set_read_times frappe.patches.v13_0.remove_web_view frappe.patches.v13_0.remove_tailwind_from_page_builder -execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding") +execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True) From 22f59b7e6a46cd73202a65c3398d780a44580818 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:42:59 +0530 Subject: [PATCH 06/10] fix: onboarding step name in query --- frappe/desk/doctype/module_onboarding/module_onboarding.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py index 2be427749c..89160a60f0 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.py +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py @@ -11,13 +11,13 @@ from frappe.modules.export_file import export_to_files class ModuleOnboarding(Document): def on_update(self): if frappe.conf.developer_mode: - export_to_files(record_list=[['ModuleOnboarding', self.name]], record_module=self.module) + export_to_files(record_list=[['Module Onboarding', self.name]], record_module=self.module) for step in self.steps: - export_to_files(record_list=[['ModuleOnboarding Step', step.step]], record_module=self.module) + export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module) def get_steps(self): - return [frappe.get_doc("ModuleOnboarding Step", step.step) for step in self.steps] + return [frappe.get_doc("Onboarding Step", step.step) for step in self.steps] def get_allowed_roles(self): all_roles = [role.role for role in self.allow_roles] From 759db9f3241e11b6ac52c4a857eb3aa7e7aec908 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 16:55:22 +0530 Subject: [PATCH 07/10] refactor: add check to onboarding rename patch --- frappe/patches.txt | 2 +- frappe/patches/v13_0/rename_onboarding.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 frappe/patches/v13_0/rename_onboarding.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 118d42ba16..86491b32b4 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -279,4 +279,4 @@ frappe.patches.v13_0.migrate_translation_column_data frappe.patches.v13_0.set_read_times frappe.patches.v13_0.remove_web_view frappe.patches.v13_0.remove_tailwind_from_page_builder -execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True) +frappe.patches.v13_0.rename_onboarding diff --git a/frappe/patches/v13_0/rename_onboarding.py b/frappe/patches/v13_0/rename_onboarding.py new file mode 100644 index 0000000000..9b3add0620 --- /dev/null +++ b/frappe/patches/v13_0/rename_onboarding.py @@ -0,0 +1,10 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Onboarding"): + execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True) + From 502fb92904253f20d9a30b912cdaf6d4b271169c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 17:51:18 +0530 Subject: [PATCH 08/10] fix: js controller name for module_onboarding --- frappe/desk/doctype/module_onboarding/module_onboarding.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.js b/frappe/desk/doctype/module_onboarding/module_onboarding.js index 48ab047c5e..d95920e2ca 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.js +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on("Module ModuleOnboarding", { +frappe.ui.form.on("Module Onboarding", { refresh: function(frm) { frappe.boot.developer_mode && frm.set_intro( From f2cd5f691131976ab1b11d94898844ec25ec81ca Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 19:14:30 +0530 Subject: [PATCH 09/10] fix (test): run invalid login test before successful test --- cypress/integration/login.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cypress/integration/login.js b/cypress/integration/login.js index 3f13130b58..904b9e0721 100644 --- a/cypress/integration/login.js +++ b/cypress/integration/login.js @@ -21,15 +21,6 @@ context('Login', () => { cy.location('pathname').should('eq', '/login'); }); - it('logs in using correct credentials', () => { - cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type(Cypress.config('adminPassword')); - - cy.get('.btn-login').click(); - cy.location('pathname').should('eq', '/desk'); - cy.window().its('frappe.session.user').should('eq', 'Administrator'); - }); - it('shows invalid login if incorrect credentials', () => { cy.get('#login_email').type('Administrator'); cy.get('#login_password').type('qwer'); @@ -38,4 +29,13 @@ context('Login', () => { cy.get('.page-card-head').contains('Invalid Login. Try again.'); cy.location('pathname').should('eq', '/login'); }); + + it('logs in using correct credentials', () => { + cy.get('#login_email').type('Administrator'); + cy.get('#login_password').type(Cypress.config('adminPassword')); + + cy.get('.btn-login').click(); + cy.location('pathname').should('eq', '/desk'); + cy.window().its('frappe.session.user').should('eq', 'Administrator'); + }); }); From ac53c4fd9adc2340ade5645c4beb4b7cb7473e99 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 12 May 2020 21:00:58 +0530 Subject: [PATCH 10/10] fix: update patch --- frappe/patches/v13_0/rename_onboarding.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v13_0/rename_onboarding.py b/frappe/patches/v13_0/rename_onboarding.py index 9b3add0620..c506c6076e 100644 --- a/frappe/patches/v13_0/rename_onboarding.py +++ b/frappe/patches/v13_0/rename_onboarding.py @@ -6,5 +6,5 @@ import frappe def execute(): if frappe.db.exists("DocType", "Onboarding"): - execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True) + frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)