diff --git a/cypress/integration/workspace_blocks.js b/cypress/integration/workspace_blocks.js index 5b3167b3ac..774595b6b8 100644 --- a/cypress/integration/workspace_blocks.js +++ b/cypress/integration/workspace_blocks.js @@ -71,6 +71,7 @@ context("Workspace Blocks", () => { url: "api/method/frappe.desk.form.load.getdoctype", }).as("get_doctype"); + cy.visit("/app/tools"); cy.get(".codex-editor__redactor .ce-block"); cy.get(".standard-actions .btn-secondary[data-label=Edit]").click(); diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index c1c506ae3a..9282c50e67 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"DocType\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Workspace\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Report\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Elements\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Modules\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Models\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Views\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Scripting\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Packages\",\"col\":4}}]", + "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"DocType\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Workspace\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Report\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Elements\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Modules\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Models\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Views\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Scripting\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Packages\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"System Logs\",\"col\":4}}]", "creation": "2021-01-02 10:51:16.579957", "docstatus": 0, "doctype": "Workspace", @@ -13,7 +13,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "Modules", + "label": "Models", "link_count": 0, "link_type": "DocType", "onboard": 0, @@ -23,9 +23,9 @@ { "hidden": 0, "is_query_report": 0, - "label": "Module Def", + "label": "DocType", "link_count": 0, - "link_to": "Module Def", + "link_to": "DocType", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -34,9 +34,9 @@ { "hidden": 0, "is_query_report": 0, - "label": "Workspace", + "label": "Workflow", "link_count": 0, - "link_to": "Workspace", + "link_to": "Workflow", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -45,9 +45,19 @@ { "hidden": 0, "is_query_report": 0, - "label": "Module Onboarding", + "label": "Scripting", "link_count": 0, - "link_to": "Module Onboarding", + "link_type": "DocType", + "onboard": 0, + "only_for": "", + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Server Script", + "link_count": 0, + "link_to": "Server Script", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -56,9 +66,9 @@ { "hidden": 0, "is_query_report": 0, - "label": "Block Module", + "label": "Client Script", "link_count": 0, - "link_to": "Block Module", + "link_to": "Client Script", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -67,30 +77,56 @@ { "hidden": 0, "is_query_report": 0, - "label": "Models", + "label": "Scheduled Job Type", "link_count": 0, + "link_to": "Scheduled Job Type", "link_type": "DocType", "onboard": 0, "only_for": "", + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Packages", + "link_count": 2, + "onboard": 0, "type": "Card Break" }, { "hidden": 0, "is_query_report": 0, - "label": "DocType", + "label": "Package", "link_count": 0, - "link_to": "DocType", + "link_to": "Package", "link_type": "DocType", "onboard": 0, - "only_for": "", "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Workflow", + "label": "Package Import", "link_count": 0, - "link_to": "Workflow", + "link_to": "Package Import", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Modules", + "link_count": 3, + "onboard": 0, + "type": "Card Break" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Module Def", + "link_count": 0, + "link_to": "Module Def", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -99,11 +135,30 @@ { "hidden": 0, "is_query_report": 0, - "label": "Views", + "label": "Module Onboarding", "link_count": 0, + "link_to": "Module Onboarding", "link_type": "DocType", "onboard": 0, "only_for": "", + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Module Profile", + "link_count": 0, + "link_to": "Module Profile", + "link_type": "DocType", + "onboard": 0, + "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Views", + "link_count": 4, + "onboard": 0, "type": "Card Break" }, { @@ -131,9 +186,9 @@ { "hidden": 0, "is_query_report": 0, - "label": "Workspace", + "label": "Dashboard", "link_count": 0, - "link_to": "Workspace", + "link_to": "Dashboard", "link_type": "DocType", "onboard": 0, "only_for": "", @@ -142,71 +197,67 @@ { "hidden": 0, "is_query_report": 0, - "label": "Dashboard", + "label": "Workspace", "link_count": 0, - "link_to": "Dashboard", + "link_to": "Workspace", "link_type": "DocType", "onboard": 0, - "only_for": "", "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Scripting", - "link_count": 0, - "link_type": "DocType", + "label": "System Logs", + "link_count": 6, "onboard": 0, - "only_for": "", "type": "Card Break" }, { "hidden": 0, "is_query_report": 0, - "label": "Server Script", + "label": "Background Jobs", "link_count": 0, - "link_to": "Server Script", - "link_type": "DocType", + "link_to": "background_jobs", + "link_type": "Page", "onboard": 0, - "only_for": "", "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Client Script", + "label": "Scheduled Jobs Logs", "link_count": 0, - "link_to": "Client Script", + "link_to": "Scheduled Job Log", "link_type": "DocType", "onboard": 0, - "only_for": "", "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Scheduled Job Type", + "label": "Error Logs", "link_count": 0, - "link_to": "Scheduled Job Type", + "link_to": "Error Log", "link_type": "DocType", "onboard": 0, - "only_for": "", "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Packages", - "link_count": 2, + "label": "Error Snapshot", + "link_count": 0, + "link_to": "Error Snapshot", + "link_type": "DocType", "onboard": 0, - "type": "Card Break" + "type": "Link" }, { "hidden": 0, "is_query_report": 0, - "label": "Package", + "label": "Communication Logs", "link_count": 0, - "link_to": "Package", + "link_to": "Communication", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -214,21 +265,22 @@ { "hidden": 0, "is_query_report": 0, - "label": "Package Import", + "label": "Activity Log", "link_count": 0, - "link_to": "Package Import", + "link_to": "Activity Log", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2022-01-13 17:26:02.736366", + "modified": "2022-09-02 01:48:28.029135", "modified_by": "Administrator", "module": "Core", "name": "Build", "owner": "Administrator", "parent_page": "", "public": 1, + "quick_lists": [], "restrict_to_domain": "", "roles": [], "sequence_id": 5.0, diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index 5aadbc42d5..1469892bd8 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Settings\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"System Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Website Settings\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Data\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Email / Notifications\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Website\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Core\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Printing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Workflow\",\"col\":4}}]", + "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Settings\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"System Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Print Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Website Settings\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Data\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Email / Notifications\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Website\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Core\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Printing\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Workflow\",\"col\":4}}]", "creation": "2020-03-02 15:09:40.527211", "docstatus": 0, "doctype": "Workspace", @@ -224,7 +224,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "Core", + "label": "Printing", "link_count": 0, "onboard": 0, "type": "Card Break" @@ -233,10 +233,10 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "System Settings", + "label": "Print Format Builder", "link_count": 0, - "link_to": "System Settings", - "link_type": "DocType", + "link_to": "print-format-builder", + "link_type": "Page", "onboard": 0, "type": "Link" }, @@ -244,9 +244,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Error Log", + "label": "Print Settings", "link_count": 0, - "link_to": "Error Log", + "link_to": "Print Settings", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -255,9 +255,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Error Snapshot", + "label": "Print Format", "link_count": 0, - "link_to": "Error Snapshot", + "link_to": "Print Format", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -266,9 +266,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Domain Settings", + "label": "Print Style", "link_count": 0, - "link_to": "Domain Settings", + "link_to": "Print Style", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -276,7 +276,7 @@ { "hidden": 0, "is_query_report": 0, - "label": "Printing", + "label": "Workflow", "link_count": 0, "onboard": 0, "type": "Card Break" @@ -285,20 +285,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Print Format Builder", - "link_count": 0, - "link_to": "print-format-builder", - "link_type": "Page", - "onboard": 0, - "type": "Link" - }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Print Settings", + "label": "Workflow", "link_count": 0, - "link_to": "Print Settings", + "link_to": "Workflow", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -307,9 +296,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Print Format", + "label": "Workflow State", "link_count": 0, - "link_to": "Print Format", + "link_to": "Workflow State", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -318,9 +307,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Print Style", + "label": "Workflow Action", "link_count": 0, - "link_to": "Print Style", + "link_to": "Workflow Action", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -328,8 +317,8 @@ { "hidden": 0, "is_query_report": 0, - "label": "Workflow", - "link_count": 0, + "label": "Core", + "link_count": 2, "onboard": 0, "type": "Card Break" }, @@ -337,20 +326,9 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Workflow", - "link_count": 0, - "link_to": "Workflow", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Workflow State", + "label": "System Settings", "link_count": 0, - "link_to": "Workflow State", + "link_to": "System Settings", "link_type": "DocType", "onboard": 0, "type": "Link" @@ -359,21 +337,22 @@ "dependencies": "", "hidden": 0, "is_query_report": 0, - "label": "Workflow Action", + "label": "Domain Settings", "link_count": 0, - "link_to": "Workflow Action", + "link_to": "Domain Settings", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2022-01-13 17:49:59.586909", + "modified": "2022-08-28 21:41:28.065190", "modified_by": "Administrator", "module": "Core", "name": "Settings", "owner": "Administrator", "parent_page": "", "public": 1, + "quick_lists": [], "restrict_to_domain": "", "roles": [], "sequence_id": 29.0, diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index 1756abcb1d..8985bf54ed 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Customization\",\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customize Form\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Custom Role\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Client Script\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Script\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Dashboards\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Form Customization\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other\",\"col\":4}}]", + "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Customization\",\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customize Form\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Custom Role\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Client Script\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Script\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Dashboards\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Form Customization\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Other\",\"col\":4}}]", "creation": "2020-03-02 15:15:03.839594", "docstatus": 0, "doctype": "Workspace", @@ -107,7 +107,7 @@ "hidden": 0, "is_query_report": 0, "label": "Other", - "link_count": 0, + "link_count": 2, "onboard": 0, "type": "Card Break" }, @@ -121,15 +121,26 @@ "link_type": "DocType", "onboard": 0, "type": "Link" + }, + { + "hidden": 0, + "is_query_report": 0, + "label": "Navbar Settings", + "link_count": 0, + "link_to": "Navbar Settings", + "link_type": "DocType", + "onboard": 0, + "type": "Link" } ], - "modified": "2022-01-13 17:28:08.345794", + "modified": "2022-08-28 20:56:24.980719", "modified_by": "Administrator", "module": "Custom", "name": "Customization", "owner": "Administrator", "parent_page": "", "public": 1, + "quick_lists": [], "restrict_to_domain": "", "roles": [], "sequence_id": 8.0, diff --git a/frappe/utils/install.py b/frappe/utils/install.py index fcf8f9d436..a5f46dc555 100644 --- a/frappe/utils/install.py +++ b/frappe/utils/install.py @@ -289,12 +289,10 @@ def add_standard_navbar_items(): "is_standard": 1, }, { - "item_label": "Background Jobs", - "item_type": "Route", - "route": "/app/background_jobs", + "item_type": "Separator", "is_standard": 1, + "item_label": "", }, - {"item_type": "Separator", "is_standard": 1}, { "item_label": "Log out", "item_type": "Action",