diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index e7d97c705b..d52417b234 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -190,6 +190,48 @@ context("Workspace 2.0", () => { cy.get('.standard-actions .btn-primary[data-label="Save"]').click(); }); + it("Hide/Unhide Workspaces", () => { + // hide + cy.intercept({ + method: "POST", + url: "api/method/frappe.desk.doctype.workspace.workspace.hide_page", + }).as("hide_page"); + + cy.get(".codex-editor__redactor .ce-block"); + cy.get(".standard-actions .btn-secondary[data-label=Edit]").click(); + + cy.get('.sidebar-item-container[item-name="Duplicate Page"]') + .find(".sidebar-item-control .setting-btn") + .click(); + cy.get('.sidebar-item-container[item-name="Duplicate Page"]') + .find('.dropdown-item[title="Hide Workspace"]') + .click({ force: true }); + cy.wait(300); + cy.get('.standard-actions .btn-secondary[data-label="Discard"]').click(); + cy.get('.sidebar-item-container[item-name="Duplicate Page"]').should("not.be.visible"); + + cy.wait("@hide_page"); + + // unhide + cy.intercept({ + method: "POST", + url: "api/method/frappe.desk.doctype.workspace.workspace.unhide_page", + }).as("unhide_page"); + + cy.get(".codex-editor__redactor .ce-block"); + cy.get(".standard-actions .btn-secondary[data-label=Edit]").click(); + + cy.get('.sidebar-item-container[item-name="Duplicate Page"]') + .find('[title="Unhide Workspace"]') + .click({ force: true }); + cy.wait(300); + + cy.get('.standard-actions .btn-secondary[data-label="Discard"]').click(); + cy.get('.sidebar-item-container[item-name="Duplicate Page"]').should("be.visible"); + + cy.wait("@unhide_page"); + }); + it("Delete Duplicate Page", () => { cy.intercept({ method: "POST", diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index dfe7850349..f2243c2e56 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -379,7 +379,17 @@ def get_workspace_sidebar_items(): # pages sorted based on sequence id order_by = "sequence_id asc" - fields = ["name", "title", "for_user", "parent_page", "content", "public", "module", "icon"] + fields = [ + "name", + "title", + "for_user", + "parent_page", + "content", + "public", + "module", + "icon", + "is_hidden", + ] all_pages = frappe.get_all( "Workspace", fields=fields, filters=filters, order_by=order_by, ignore_permissions=True ) @@ -391,7 +401,7 @@ def get_workspace_sidebar_items(): try: workspace = Workspace(page, True) if has_access or workspace.is_permitted(): - if page.public: + if page.public and (has_access or not page.is_hidden): pages.append(page) elif page.for_user == frappe.session.user: private_pages.append(page) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 58a1f718fd..edd5c32e99 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -19,6 +19,7 @@ "restrict_to_domain", "hide_custom", "public", + "is_hidden", "content", "tab_break_2", "charts", @@ -174,11 +175,17 @@ "fieldtype": "Table", "label": "Quick Lists", "options": "Workspace Quick List" + }, + { + "default": "0", + "fieldname": "is_hidden", + "fieldtype": "Check", + "label": "Is Hidden" } ], "in_create": 1, "links": [], - "modified": "2023-01-07 17:02:48.278025", + "modified": "2023-01-07 19:37:39.512482", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index c4110f52a7..f7d9e8ac3e 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -247,6 +247,32 @@ def update_page(name, title, icon, parent, public): return {"name": title, "public": public, "label": new_name} +def hide_unhide_page(page_name: str, is_hidden: bool): + page = frappe.get_doc("Workspace", page_name) + + if page.get("public") and not is_workspace_manager(): + frappe.throw( + _("Need Workspace Manager role to hide/unhide public workspaces"), frappe.PermissionError + ) + + if not page.get("public") and page.get("for_user") != frappe.session.user: + frappe.throw(_("Cannot update private workspace of other users"), frappe.PermissionError) + + page.is_hidden = int(is_hidden) + page.save(ignore_permissions=True) + return True + + +@frappe.whitelist() +def hide_page(page_name: str): + return hide_unhide_page(page_name, 1) + + +@frappe.whitelist() +def unhide_page(page_name: str): + return hide_unhide_page(page_name, 0) + + @frappe.whitelist() def duplicate_page(page_name, new_page): if not loads(new_page): diff --git a/frappe/public/icons/timeless/icons.svg b/frappe/public/icons/timeless/icons.svg index 69e9e920e6..fed77e7df1 100644 --- a/frappe/public/icons/timeless/icons.svg +++ b/frappe/public/icons/timeless/icons.svg @@ -48,6 +48,16 @@ + + + + + + + + + + diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index cbcea38f38..ee5d2c92a0 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -78,9 +78,13 @@ frappe.views.Workspace = class Workspace { sidebar_item_container(item) { return $(` -
+
{ if (!this.editor || !this.editor.readOnly) return; this.is_read_only = false; + this.toggle_hidden_workspaces(true); await this.editor.readOnly.toggle(); this.editor.isReady.then(() => { this.initialize_editorjs_undo(); @@ -441,6 +446,7 @@ frappe.views.Workspace = class Workspace { this.page.set_secondary_action(__("Discard"), async () => { this.discard = true; this.clear_page_actions(); + this.toggle_hidden_workspaces(false); await this.editor.readOnly.toggle(); this.is_read_only = true; this.sidebar_pages = this.cached_pages; @@ -455,6 +461,10 @@ frappe.views.Workspace = class Workspace { } } + toggle_hidden_workspaces(show) { + $(".desk-sidebar").toggleClass("show-hidden-workspaces", show); + } + show_sidebar_actions() { this.sidebar.find(".standard-sidebar-section").addClass("show-control"); this.make_sidebar_sortable(); @@ -481,6 +491,15 @@ frappe.views.Workspace = class Workspace { null, sidebar_control ); + } else if (item.is_hidden) { + frappe.utils.add_custom_button( + frappe.utils.icon("unhide", "sm"), + (e) => this.unhide_workspace(item, e), + "unhide-workspace-btn", + __("Unhide Workspace"), + null, + sidebar_control + ); } else { frappe.utils.add_custom_button( frappe.utils.icon("drag", "xs"), @@ -720,6 +739,12 @@ frappe.views.Workspace = class Workspace { icon: frappe.utils.icon("duplicate", "sm"), action: () => this.duplicate_page(item), }, + { + label: __("Hide"), + title: __("Hide Workspace"), + icon: frappe.utils.icon("hide", "sm"), + action: (e) => this.hide_workspace(item, e), + }, ]; if (this.is_item_deletable(item)) { @@ -748,7 +773,7 @@ frappe.views.Workspace = class Workspace { html.click((event) => { event.stopPropagation(); - action && action(); + action && action(event); }); return html; @@ -910,6 +935,47 @@ frappe.views.Workspace = class Workspace { d.show(); } + hide_unhide_workspace(page, event, hide) { + page.is_hidden = hide; + + let sidebar_control = event.target.closest(".sidebar-item-control"); + let sidebar_item_container = sidebar_control.closest(".sidebar-item-container"); + $(sidebar_item_container).attr("item-is-hidden", hide); + + $(sidebar_control).empty(); + this.add_sidebar_actions(page, $(sidebar_control)); + + this.add_drop_icon(page, $(sidebar_control), $(sidebar_item_container)); + + let cached_page = this.cached_pages.pages.findIndex((p) => p.name === page.name); + if (cached_page !== -1) { + this.cached_pages.pages[cached_page].is_hidden = hide; + } + + let method = hide ? "hide_page" : "unhide_page"; + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace." + method, + args: { + page_name: page.name, + }, + callback: (r) => { + if (!r.message) return; + + let message = hide ? "{0} is hidden successfully" : "{0} is unhidden successfully"; + message = __(message, [page.title.bold()]); + frappe.show_alert({ message: message, indicator: "green" }); + }, + }); + } + + hide_workspace(page, event) { + this.hide_unhide_workspace(page, event, 1); + } + + unhide_workspace(page, event) { + this.hide_unhide_workspace(page, event, 0); + } + make_sidebar_sortable() { let me = this; $(".nested-container").each(function () { diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index b39514b67b..ee2e103ea7 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -1017,7 +1017,29 @@ body { .sidebar-item-container { position: relative; - .sidebar-item-container{ + + &[item-is-hidden="1"] { + display: none; + opacity: 0.4; + + &:hover { + opacity: 1; + } + } + + &[item-is-hidden="0"] { + .drop-icon { + display: none; + } + + &:has(.sidebar-item-container[item-is-hidden="0"]) { + .drop-icon { + display: inline-block; + } + } + } + + .sidebar-item-container { margin-left: 10px; .standard-sidebar-item { @@ -1026,31 +1048,64 @@ body { } } - .standard-sidebar-section.show-control { - .desk-sidebar-item.standard-sidebar-item { + .desk-sidebar { + &.show-hidden-workspaces { - &:hover, &.selected { - .drag-handle { - display: inline-block; - } - - .setting-btn, .duplicate-page { - display: inline-block; - margin-right: 8px; - } - - .drop-icon { - padding: 10px 8px 10px 2px; - margin-left: -8px; - } + .unhide-workspace-btn { + display: none; } - .block-click { - pointer-events:none; + .standard-sidebar-section { + display: block; + + .sidebar-item-container { + &[item-is-hidden="1"] { + display: block; + } + &[item-is-hidden="0"] { + .drop-icon { + display: inline-block; + } + } + } + } + } + + .standard-sidebar-section { + display: none; + + &:has(> [item-is-hidden="0"]) { + display: block; + } + } + + .standard-sidebar-section.show-control { + .desk-sidebar-item.standard-sidebar-item { + + &:hover, &.selected { + .drag-handle { + display: inline-block; + } + + .setting-btn, .duplicate-page, .unhide-workspace-btn { + display: inline-block; + margin-right: 8px; + } + + .drop-icon { + padding: 10px 8px 10px 2px; + margin-left: -8px; + } + } + + .block-click { + pointer-events:none; + } } } } + .codex-editor__loader { display: none !important; }