From 95d9568a803cdfd5ac2031207bb82ed40016c859 Mon Sep 17 00:00:00 2001 From: Sagar Vora <16315650+sagarvora@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:46:01 +0530 Subject: [PATCH] chore: revert workspace settings --- frappe/desk/desktop.py | 14 ---- .../doctype/workspace_settings/__init__.py | 0 .../test_workspace_settings.py | 9 --- .../workspace_settings/workspace_settings.js | 37 ----------- .../workspace_settings.json | 66 ------------------- .../workspace_settings/workspace_settings.py | 41 ------------ frappe/patches.txt | 1 - frappe/tests/ui_test_helpers.py | 2 - 8 files changed, 170 deletions(-) delete mode 100644 frappe/desk/doctype/workspace_settings/__init__.py delete mode 100644 frappe/desk/doctype/workspace_settings/test_workspace_settings.py delete mode 100644 frappe/desk/doctype/workspace_settings/workspace_settings.js delete mode 100644 frappe/desk/doctype/workspace_settings/workspace_settings.json delete mode 100644 frappe/desk/doctype/workspace_settings/workspace_settings.py diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 95d1c92556..09d0c94afc 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -458,14 +458,6 @@ def get_workspace_sidebar_items(): pages = [] private_pages = [] - # get additional settings from Work Settings - try: - workspace_visibilty = loads( - frappe.db.get_single_value("Workspace Settings", "workspace_visibility_json") or "{}" - ) - except JSONDecodeError: - workspace_visibilty = {} - # Filter Page based on Permission for page in all_pages: try: @@ -477,9 +469,6 @@ def get_workspace_sidebar_items(): private_pages.append(page) page["label"] = _(page.get("name")) - if page["name"] in workspace_visibilty: - page["visibility"] = workspace_visibilty[page["name"]] - if not page["app"] and page["module"]: page["app"] = frappe.db.get_value("Module Def", page["module"], "app_name") or get_module_app( page["module"] @@ -502,9 +491,6 @@ def get_workspace_sidebar_items(): pages.append(next((x for x in all_pages if x["title"] == "Welcome Workspace"), None)) return { - "workspace_setup_completed": frappe.db.get_single_value( - "Workspace Settings", "workspace_setup_completed" - ), "pages": pages, "has_access": has_access, "has_create_access": frappe.has_permission(doctype="Workspace", ptype="create"), diff --git a/frappe/desk/doctype/workspace_settings/__init__.py b/frappe/desk/doctype/workspace_settings/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/doctype/workspace_settings/test_workspace_settings.py b/frappe/desk/doctype/workspace_settings/test_workspace_settings.py deleted file mode 100644 index 219ba291c7..0000000000 --- a/frappe/desk/doctype/workspace_settings/test_workspace_settings.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2024, Frappe Technologies and Contributors -# See license.txt - -# import frappe -from frappe.tests import IntegrationTestCase - - -class TestWorkspaceSettings(IntegrationTestCase): - pass diff --git a/frappe/desk/doctype/workspace_settings/workspace_settings.js b/frappe/desk/doctype/workspace_settings/workspace_settings.js deleted file mode 100644 index 100743fbe0..0000000000 --- a/frappe/desk/doctype/workspace_settings/workspace_settings.js +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2024, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Workspace Settings", { - setup(frm) { - frm.hide_full_form_button = true; - frm.docfields = []; - frm.workspace_map = {}; - let workspace_visibilty = JSON.parse(frm.doc.workspace_visibility_json || "{}"); - - // build fields from workspaces - let cnt = 0, - column_added = false; - for (let page of frappe.boot.allowed_workspaces) { - if (page.public) { - frm.workspace_map[page.name] = page; - cnt++; - frm.docfields.push({ - fieldtype: "Check", - fieldname: page.name, - label: page.title + (page.parent_page ? ` (${page.parent_page})` : ""), - initial_value: workspace_visibilty[page.name] !== 0, // not set is also visible - }); - } - } - - frappe.temp = frm; - }, - validate(frm) { - frm.doc.workspace_visibility_json = JSON.stringify(frm.dialog.get_values()); - frm.doc.workspace_setup_completed = 1; - }, - after_save(frm) { - // reload page to show latest sidebar - frappe.app.sidebar.reload(); - }, -}); diff --git a/frappe/desk/doctype/workspace_settings/workspace_settings.json b/frappe/desk/doctype/workspace_settings/workspace_settings.json deleted file mode 100644 index 0bc478d9c0..0000000000 --- a/frappe/desk/doctype/workspace_settings/workspace_settings.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "actions": [], - "allow_rename": 1, - "creation": "2024-08-02 14:20:30.177818", - "doctype": "DocType", - "engine": "InnoDB", - "field_order": [ - "select_workspaces_section", - "workspace_visibility_json", - "workspace_setup_completed" - ], - "fields": [ - { - "fieldname": "select_workspaces_section", - "fieldtype": "Section Break", - "label": "Select Workspaces" - }, - { - "fieldname": "workspace_visibility_json", - "fieldtype": "JSON", - "in_list_view": 1, - "label": "Workspace Visibility", - "reqd": 1 - }, - { - "default": "0", - "fieldname": "workspace_setup_completed", - "fieldtype": "Check", - "label": "Workspace Setup Completed" - } - ], - "index_web_pages_for_search": 1, - "issingle": 1, - "links": [], - "modified": "2024-09-03 21:29:54.127014", - "modified_by": "Administrator", - "module": "Desk", - "name": "Workspace Settings", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "Workspace Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "sort_field": "creation", - "sort_order": "DESC", - "states": [] -} \ No newline at end of file diff --git a/frappe/desk/doctype/workspace_settings/workspace_settings.py b/frappe/desk/doctype/workspace_settings/workspace_settings.py deleted file mode 100644 index 5197b6bc60..0000000000 --- a/frappe/desk/doctype/workspace_settings/workspace_settings.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2024, Frappe Technologies and contributors -# For license information, please see license.txt - -import json - -import frappe -from frappe.model.document import Document - - -class WorkspaceSettings(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - workspace_setup_completed: DF.Check - workspace_visibility_json: DF.JSON - # end: auto-generated types - - pass - - def on_update(self): - frappe.clear_cache() - - -@frappe.whitelist() -def set_sequence(sidebar_items): - if not WorkspaceSettings("Workspace Settings").has_permission(): - frappe.throw_permission_error() - - cnt = 1 - for item in json.loads(sidebar_items): - frappe.db.set_value("Workspace", item.get("name"), "sequence_id", cnt) - frappe.db.set_value("Workspace", item.get("name"), "parent_page", item.get("parent") or "") - cnt += 1 - - frappe.clear_cache() - frappe.toast(frappe._("Updated")) diff --git a/frappe/patches.txt b/frappe/patches.txt index 6927692b4c..5d32252e25 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -239,7 +239,6 @@ frappe.patches.v15_0.migrate_session_data frappe.custom.doctype.property_setter.patches.remove_invalid_fetch_from_expressions frappe.patches.v16_0.switch_default_sort_order frappe.integrations.doctype.oauth_client.patches.set_default_allowed_role_in_oauth_client -execute:frappe.db.set_single_value("Workspace Settings", "workspace_setup_completed", 1) frappe.patches.v16_0.add_app_launcher_in_navbar_settings frappe.desk.doctype.workspace.patches.update_app frappe.patches.v16_0.move_role_desk_settings_to_user diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index c89328c588..d9ce9f9ed2 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -449,8 +449,6 @@ def create_test_user(username=None): user.save() - frappe.db.set_single_value("Workspace Settings", "workspace_setup_completed", 1) - @whitelist_for_tests() def setup_tree_doctype():