From 855492ab594f1ab1049ac10f5af2ca079269b9ef Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 20 Oct 2021 16:54:41 +0530 Subject: [PATCH 001/101] fix: Added new icons for each wspace blocks --- frappe/public/icons/timeless/symbol-defs.svg | 68 +++++++++++++++++++ .../js/frappe/views/workspace/blocks/card.js | 2 +- .../js/frappe/views/workspace/blocks/chart.js | 2 +- .../frappe/views/workspace/blocks/header.js | 2 +- .../views/workspace/blocks/onboarding.js | 2 +- .../views/workspace/blocks/paragraph.js | 4 +- .../frappe/views/workspace/blocks/shortcut.js | 2 +- .../frappe/views/workspace/blocks/spacer.js | 2 +- frappe/public/scss/desk/desktop.scss | 14 ++-- 9 files changed, 86 insertions(+), 12 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index b878f713e9..8bfb40a0ad 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -712,4 +712,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 9b4a2ed14f..f51f5803a9 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -3,7 +3,7 @@ export default class Card extends Block { static get toolbox() { return { title: 'Card', - icon: '' + icon: frappe.utils.icon('card', 'md') }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index 02e6a66e6f..d4f7f1fd9e 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -3,7 +3,7 @@ export default class Chart extends Block { static get toolbox() { return { title: 'Chart', - icon: '' + icon: frappe.utils.icon('chart', 'md') }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index d88bc42af9..e1d24aee76 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -332,8 +332,8 @@ export default class Header extends Block { static get toolbox() { return { - icon: '', title: 'Heading', + icon: frappe.utils.icon('header', 'md') }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 7176b7726d..5a1c78d5c1 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -4,7 +4,7 @@ export default class Onboarding extends Block { static get toolbox() { return { title: 'Onboarding', - icon: '' + icon: frappe.utils.icon('onboarding', 'md') }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 9e5dfb68ff..96a283e9b2 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -188,8 +188,8 @@ export default class Paragraph extends Block { static get toolbox() { return { - icon: '', - title: 'Text' + title: 'Text', + icon: frappe.utils.icon('text', 'md') }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 96b8f47484..0d75b2e42d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -3,7 +3,7 @@ export default class Shortcut extends Block { static get toolbox() { return { title: 'Shortcut', - icon: '' + icon: frappe.utils.icon('shortcut', 'md') }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 3309cad4a4..6e1b47f1d3 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -3,7 +3,7 @@ export default class Spacer extends Block { static get toolbox() { return { title: 'Spacer', - icon: '' + icon: frappe.utils.icon('spacer', 'md') }; } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 6ab01a744c..2947d5e677 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -793,8 +793,8 @@ body { } .block-menu-item-icon svg{ - width: 12px; - height: 12px; + width: 18px; + height: 18px; margin-right: 5px; } @@ -984,8 +984,10 @@ body { .icon { stroke: none; - width: fit-content; - height: fit-content; + + &.icon--plus { + width: 14px; + } } .ce-settings { @@ -993,6 +995,10 @@ body { .ce-settings__button, .cdx-settings-button { color: #707684; + + .icon { + width: 14px; + } } .cdx-settings-button--active { From 4884b360e7b285a0a8eca9dfbf4e5f5d63d3ac70 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Nov 2021 12:04:26 +0530 Subject: [PATCH 002/101] feat: Drag to resize blocks --- .../js/frappe/views/workspace/blocks/block.js | 113 ++++++++++++++++++ .../js/frappe/views/workspace/blocks/card.js | 4 +- .../js/frappe/views/workspace/blocks/chart.js | 4 +- .../frappe/views/workspace/blocks/header.js | 6 +- .../views/workspace/blocks/onboarding.js | 5 +- .../views/workspace/blocks/paragraph.js | 4 +- .../frappe/views/workspace/blocks/shortcut.js | 4 +- frappe/public/scss/desk/desktop.scss | 19 +++ 8 files changed, 146 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index aed3c2f727..04a8f15f86 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -29,10 +29,123 @@ export default class Block { } rendered() { + !this.readOnly && this.resizer(); var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.get_col()); } + resizer(wrapper) { + if (wrapper) this.wrapper = wrapper; + this.wrapper.className = this.wrapper.className + ' resizable'; + var resizer = document.createElement('div'); + resizer.className = 'resizer'; + this.wrapper.parentElement.appendChild(resizer); + resizer.addEventListener('mousedown', init_drag, false); + let me = this; + var startX, startWidth; + + function init_drag(e) { + startX = e.clientX; + startWidth = this.parentElement.offsetWidth; + document.documentElement.addEventListener('mousemove', do_drag, false); + document.documentElement.addEventListener('mouseup', stop_drag, false); + } + + function do_drag(e) { + $(this).css("cursor", "col-resize"); + $('.widget').css("pointer-events", "none"); + un_focus(); + if ((startWidth + e.clientX - startX) - startWidth > 60) { + startX = e.clientX; + me.increase_width(); + } else if ((startWidth + e.clientX - startX) - startWidth < -60) { + startX = e.clientX; + me.decrease_width(); + } + } + + // disable text selection on mousedown (on drag) + function un_focus() { + if (document.selection) { + document.selection.empty() + } else { + window.getSelection().removeAllRanges() + } + } + + function stop_drag(e) { + $(this).css("cursor", "default"); + $('.widget').css("pointer-events", "auto"); + + document.documentElement.removeEventListener('mousemove', do_drag, false); + document.documentElement.removeEventListener('mouseup', stop_drag, false); + } + } + + decrease_width() { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + let currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock) { + return; + } + + let currentBlockElement = currentBlock.holder; + + let className = 'col-12'; + let colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if (cn.match(colClass)) { + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if (width >= 4) { + currentBlockElement.classList.remove('col-'+width); + width = width - 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + + increase_width() { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock) { + return; + } + + const currentBlockElement = currentBlock.holder; + + let className = 'col-12'; + const colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if (cn.match(colClass)) { + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if (width <= 11) { + currentBlockElement.classList.remove('col-'+width); + width = width + 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + new(block, widget_type = block) { const dialog_class = get_dialog_constructor(widget_type); let block_name = block+'_name'; diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index f51f5803a9..1dc237507b 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -49,9 +49,9 @@ export default class Card extends Block { return true; } - save(blockContent) { + save() { return { - card_name: blockContent.getAttribute('card_name'), + card_name: this.wrapper.getAttribute('card_name'), col: this.get_col(), new: this.new_block_widget }; diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index d4f7f1fd9e..c544cf3af2 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -49,9 +49,9 @@ export default class Chart extends Block { return true; } - save(blockContent) { + save() { return { - chart_name: blockContent.getAttribute('chart_name'), + chart_name: this.wrapper.getAttribute('chart_name'), col: this.get_col(), new: this.new_block_widget }; diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index e1d24aee76..4ee9a0c7dc 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -36,7 +36,6 @@ export default class Header extends Block { render() { this.wrapper = document.createElement('div'); - this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { let $widget_head = $(`
`); let $widget_control = $(`
`); @@ -146,16 +145,17 @@ export default class Header extends Block { return blockData.text.trim() !== ''; } - save(toolsContent) { + save() { this.wrapper = this._element; return { - text: toolsContent.innerText, + text: this.wrapper.innerText, level: this.currentLevel.number, col: this.get_col() }; } rendered() { + !this.readOnly && this.resizer(this._element); var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 5a1c78d5c1..70287ab088 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -30,6 +30,7 @@ export default class Onboarding extends Block { if (this.readOnly && !$(this.wrapper).find('.onboarding-widget-box').is(':visible')) { $(e).hide(); } + !this.readOnly && this.resizer(); e.classList.add("col-" + this.get_col()); } @@ -119,9 +120,9 @@ export default class Onboarding extends Block { return true; } - save(blockContent) { + save() { return { - onboarding_name: blockContent.getAttribute('onboarding_name'), + onboarding_name: this.wrapper.getAttribute('onboarding_name'), col: this.get_col(), new: this.new_block_widget }; diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 96a283e9b2..4f9a325fb7 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -54,7 +54,6 @@ export default class Paragraph extends Block { render() { this.wrapper = document.createElement('div'); - this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { let $para_control = $(`
`); @@ -62,7 +61,7 @@ export default class Paragraph extends Block { this._element.classList.remove('widget'); $para_control.appendTo(this.wrapper); - this.wrapper.classList.add('widget'); + this.wrapper.classList.add('widget', 'paragraph'); frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), @@ -132,6 +131,7 @@ export default class Paragraph extends Block { } rendered() { + !this.readOnly && this.resizer(this._element); var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.get_col()); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 0d75b2e42d..6e4f187d1b 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -47,9 +47,9 @@ export default class Shortcut extends Block { return true; } - save(blockContent) { + save() { return { - shortcut_name: blockContent.getAttribute('shortcut_name'), + shortcut_name: this.wrapper.getAttribute('shortcut_name'), col: this.get_col(), new: this.new_block_widget }; diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 2947d5e677..2ccdd9fd31 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -143,6 +143,7 @@ body { font-weight: 500; line-height: 1.3em; color: var(--heading-color); + cursor: default; svg { flex: none; @@ -923,10 +924,23 @@ body { pointer-events: none; } + .resizer { + width: 10px; + height: 100%; + position:absolute; + right: 0; + bottom: 0; + cursor: col-resize; + } + .ce-header { padding: 0 !important; margin-bottom: 0 !important; flex: 1; + + &:focus { + outline: none; + } } .widget{ @@ -940,6 +954,7 @@ body { box-shadow: none; background-color: var(--control-bg); color: var(--text-muted); + cursor: text; } &:focus { @@ -954,6 +969,10 @@ body { display: block; } + &.paragraph { + cursor: text; + } + .paragraph-control { display: flex; flex-direction: row-reverse; From 77dd5951cd3f2cbeb00208adb0ab72bb6fb32366 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 21 Oct 2021 14:15:18 +0530 Subject: [PATCH 003/101] fix: Rearranged and fixed icons --- frappe/public/icons/timeless/symbol-defs.svg | 978 +++++++++++-------- frappe/public/scss/desk/desktop.scss | 4 +- 2 files changed, 546 insertions(+), 436 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 8bfb40a0ad..cb9437321f 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -1,217 +1,262 @@ diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 2ccdd9fd31..daedbe1877 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -632,8 +632,8 @@ body { width: 18px; .icon-xs { - width: 8px; - height: 7px; + width: 10px; + height: 10px; } } From 1769b86352c32cd7fb2106c80b8f39fd0456d7bd Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Nov 2021 12:07:12 +0530 Subject: [PATCH 004/101] fix: Header Size Inline Tool --- frappe/public/icons/timeless/symbol-defs.svg | 54 +++- .../js/frappe/views/workspace/blocks/block.js | 214 +++++++++++----- .../js/frappe/views/workspace/blocks/card.js | 2 +- .../js/frappe/views/workspace/blocks/chart.js | 2 +- .../frappe/views/workspace/blocks/header.js | 234 ++---------------- .../views/workspace/blocks/header_size.js | 117 +++++++++ .../js/frappe/views/workspace/blocks/index.js | 4 +- .../views/workspace/blocks/onboarding.js | 4 +- .../views/workspace/blocks/paragraph.js | 72 +++--- .../frappe/views/workspace/blocks/shortcut.js | 2 +- .../frappe/views/workspace/blocks/spacer.js | 55 ++-- .../js/frappe/views/workspace/workspace.js | 11 +- .../public/js/frappe/widgets/base_widget.js | 18 +- frappe/public/scss/desk/desktop.scss | 66 +++++ 14 files changed, 484 insertions(+), 371 deletions(-) create mode 100644 frappe/public/js/frappe/views/workspace/blocks/header_size.js diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index cb9437321f..1b3a945ecb 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -265,6 +265,14 @@ + + + + + + + + @@ -765,14 +773,6 @@ - - - - - - - - @@ -814,6 +814,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - if (cn.match(colClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let width = parseInt(parts[1]); - if (width >= 4) { - currentBlockElement.classList.remove('col-'+width); - width = width - 1; - currentBlockElement.classList.add('col-'+width); - } - } - } - - increase_width() { - const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - - if (currentBlockIndex < 0) { - return; - } - - const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock) { - return; - } - - const currentBlockElement = currentBlock.holder; - - let className = 'col-12'; - const colClass = new RegExp(/\bcol-.+?\b/, 'g'); - if (currentBlockElement.className.match(colClass)) { - currentBlockElement.classList.forEach( cn => { - if (cn.match(colClass)) { - className = cn; - } - }); - let parts = className.split('-'); - let width = parseInt(parts[1]); - if (width <= 11) { - currentBlockElement.classList.remove('col-'+width); - width = width + 1; - currentBlockElement.classList.add('col-'+width); - } - } - } - new(block, widget_type = block) { const dialog_class = get_dialog_constructor(widget_type); let block_name = block+'_name'; @@ -167,7 +103,7 @@ export default class Block { this.block_widget.customize(this.options); this.wrapper.setAttribute(block_name, this.block_widget.label); this.new_block_widget = this.block_widget.get_config(); - this.add_tune_button(); + this.add_settings_button(); }, }); @@ -187,6 +123,84 @@ export default class Block { this.new_block_widget = block_obj.get_config(); } + add_settings_button() { + this.dropdown_list = [ + { + label: 'Delete', + title: 'Delete Block', + icon: frappe.utils.icon('delete-active', 'sm'), + action: () => this.api.blocks.delete() + }, + { + label: 'Move Up', + title: 'Move Up', + icon: frappe.utils.icon('up-arrow', 'sm'), + action: () => this.move_block('up') + }, + { + label: 'Move Down', + title: 'Move Down', + icon: frappe.utils.icon('down-arrow', 'sm'), + action: () => this.move_block('down') + }, + { + label: 'Expand', + title: 'Expand Block', + icon: frappe.utils.icon('expand-alt', 'sm'), + action: () => this.increase_width() + }, + { + label: 'Shrink', + title: 'Shrink Block', + icon: frappe.utils.icon('shrink', 'sm'), + action: () => this.decrease_width() + } + ] + + let $widget_control = $(this.wrapper).find('.widget-control'); + + let $button = $(` +
+ + +
+ `); + + + let dropdown_item = function(label, title, icon, action) { + let html = $(` +
+ ${icon} + ${label} +
+ `); + + html.click(event => { + event.stopPropagation(); + action && action(); + }); + + return html; + } + + $button.click(event => { + event.stopPropagation(); + $button.find('.dropdown-list').toggleClass('hidden'); + }); + + $(document).click(event => { + $button.find('.dropdown-list').addClass('hidden'); + }) + + $widget_control.prepend($button); + + this.dropdown_list.forEach((item) => { + $button.find('.dropdown-list').append(dropdown_item(item.label, item.title, item.icon, item.action)); + }) + } + add_tune_button() { let $widget_control = $(this.wrapper).find('.widget-control'); frappe.utils.add_custom_button( @@ -225,4 +239,74 @@ export default class Block { } return col; } + + decrease_width() { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + let currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock) { + return; + } + + let currentBlockElement = currentBlock.holder; + + let className = 'col-12'; + let colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if (cn.match(colClass)) { + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if (width >= 4) { + currentBlockElement.classList.remove('col-'+width); + width = width - 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + + increase_width() { + const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); + + if (currentBlockIndex < 0) { + return; + } + + const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); + if (!currentBlock) { + return; + } + + const currentBlockElement = currentBlock.holder; + + let className = 'col-12'; + const colClass = new RegExp(/\bcol-.+?\b/, 'g'); + if (currentBlockElement.className.match(colClass)) { + currentBlockElement.classList.forEach( cn => { + if (cn.match(colClass)) { + className = cn; + } + }); + let parts = className.split('-'); + let width = parseInt(parts[1]); + if (width <= 11) { + currentBlockElement.classList.remove('col-'+width); + width = width + 1; + currentBlockElement.classList.add('col-'+width); + } + } + } + + move_block(direction) { + let current_index = this.api.blocks.getCurrentBlockIndex(); + let new_index = current_index + (direction == 'down' ? 1 : -1); + this.api.blocks.move(new_index, current_index); + } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 1dc237507b..7e67c3fb0c 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -35,7 +35,7 @@ export default class Card extends Block { } if (!this.readOnly) { - this.add_tune_button(); + this.add_settings_button(); } return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index c544cf3af2..8d9bb89825 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -35,7 +35,7 @@ export default class Chart extends Block { } if (!this.readOnly) { - this.add_tune_button(); + this.add_settings_button(); } return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 4ee9a0c7dc..dacd3e6a7d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -4,16 +4,8 @@ export default class Header extends Block { constructor({ data, config, api, readOnly }) { super({ config, api, readOnly }); - this._CSS = { - block: this.api.styles.block, - settingsButton: this.api.styles.settingsButton, - settingsButtonActive: this.api.styles.settingsButtonActive, - wrapper: 'ce-header', - }; - this._settings = this.config; this._data = this.normalizeData(data); - this.settingsButtons = []; this._element = this.getTag(); this.data = data; @@ -27,8 +19,7 @@ export default class Header extends Block { data = {}; } - newData.text = (data.text && __(data.text.replace(/(\n|\t)/gm, ""))) || ''; - newData.level = parseInt(data.level) || this.defaultLevel.number; + newData.text = data.text || ''; newData.col = parseInt(data.col) || 12; return newData; @@ -46,25 +37,7 @@ export default class Header extends Block { this.wrapper.classList.add('widget', 'header'); - frappe.utils.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this.add_settings_button(); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -75,67 +48,14 @@ export default class Header extends Block { $widget_control ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-header", - `${__('Delete')}`, - null, - $widget_control - ); - return this.wrapper; } return this._element; } - renderSettings() { - const holder = document.createElement('DIV'); - - if (this.levels.length <= 1) { - return holder; - } - - this.levels.forEach(level => { - const selectTypeButton = document.createElement('SPAN'); - - selectTypeButton.classList.add(this._CSS.settingsButton); - - if (this.currentLevel.number === level.number) { - selectTypeButton.classList.add(this._CSS.settingsButtonActive); - } - - selectTypeButton.innerHTML = level.svg; - - selectTypeButton.dataset.level = level.number; - - selectTypeButton.addEventListener('click', () => { - this.setLevel(level.number); - }); - - holder.appendChild(selectTypeButton); - - this.settingsButtons.push(selectTypeButton); - }); - - return holder; - } - - setLevel(level) { - this.data = { - level: level, - text: this.data.text, - }; - - this.settingsButtons.forEach(button => { - button.classList.toggle(this._CSS.settingsButtonActive, parseInt(button.dataset.level) === level); - }); - } - merge(data) { const newData = { - text: this.data.text + data.text, - level: this.data.level, + text: this.data.text + data.text }; this.data = newData; @@ -148,8 +68,7 @@ export default class Header extends Block { save() { this.wrapper = this._element; return { - text: this.wrapper.innerText, - level: this.currentLevel.number, + text: this.wrapper.innerHTML.replace(/ /gi,''), col: this.get_col() }; } @@ -160,17 +79,16 @@ export default class Header extends Block { e.classList.add("col-" + this.get_col()); } - static get conversionConfig() { - return { - export: 'text', // use 'text' property for other blocks - import: 'text', // fill 'text' property from other block's export string - }; - } - static get sanitize() { return { level: false, - text: {}, + text: { + br: true, + b: true, + i: true, + a: true, + span: true + }, }; } @@ -180,7 +98,6 @@ export default class Header extends Block { get data() { this._data.text = this._element.innerHTML; - this._data.level = this.currentLevel.number; return this._data; } @@ -188,15 +105,11 @@ export default class Header extends Block { set data(data) { this._data = this.normalizeData(data); - if (data.level !== undefined && this._element.parentNode) { - const newHeader = this.getTag(); - newHeader.innerHTML = this._element.innerHTML; - this._element.parentNode.replaceChild(newHeader, this._element); - this._element = newHeader; - } - if (data.text !== undefined) { - this._element.innerHTML = this._data.text || ''; + let text = this._data.text || ''; + const contains_html_tag = /<[a-z][\s\S]*>/i.test(text); + this._element.innerHTML = contains_html_tag ? + text : `${text}`; } if (!this.readOnly && this.wrapper) { @@ -205,11 +118,12 @@ export default class Header extends Block { } getTag() { - const tag = document.createElement(this.currentLevel.tag); + const tag = document.createElement('DIV'); - tag.innerHTML = this._data.text || ''; + let text = this._data.text || ' '; + tag.innerHTML = `${text}`; - tag.classList.add(this._CSS.wrapper); + tag.classList.add('ce-header'); if (!this.readOnly) { tag.contentEditable = true; @@ -220,116 +134,6 @@ export default class Header extends Block { return tag; } - get currentLevel() { - let level = this.levels.find(levelItem => levelItem.number === this._data.level); - - if (!level) { - level = this.defaultLevel; - } - - return level; - } - - get defaultLevel() { - if (this._settings.defaultLevel) { - const userSpecified = this.levels.find(levelItem => { - return levelItem.number === this._settings.defaultLevel; - }); - - if (userSpecified) { - return userSpecified; - } else { - // console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); - } - } - - return this.levels[1]; - } - - get levels() { - const availableLevels = [ - { - number: 1, - tag: 'H1', - svg: '', - }, - { - number: 2, - tag: 'H2', - svg: '', - }, - { - number: 3, - tag: 'H3', - svg: '', - }, - { - number: 4, - tag: 'H4', - svg: '', - }, - { - number: 5, - tag: 'H5', - svg: '', - }, - { - number: 6, - tag: 'H6', - svg: '', - }, - ]; - - return this._settings.levels ? availableLevels.filter( - l => this._settings.levels.includes(l.number) - ) : availableLevels; - } - - onPaste(event) { - const content = event.detail.data; - - let level = this.defaultLevel.number; - - switch (content.tagName) { - case 'H1': - level = 1; - break; - case 'H2': - level = 2; - break; - case 'H3': - level = 3; - break; - case 'H4': - level = 4; - break; - case 'H5': - level = 5; - break; - case 'H6': - level = 6; - break; - } - - if (this._settings.levels) { - // Fallback to nearest level when specified not available - level = this._settings.levels.reduce((prevLevel, currLevel) => { - return Math.abs(currLevel - level) < Math.abs(prevLevel - level) ? currLevel : prevLevel; - }); - } - - this.data = { - level, - text: content.innerHTML, - }; - } - - static get pasteConfig() { - return { - tags: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'], - }; - } - static get toolbox() { return { title: 'Heading', diff --git a/frappe/public/js/frappe/views/workspace/blocks/header_size.js b/frappe/public/js/frappe/views/workspace/blocks/header_size.js new file mode 100644 index 0000000000..3d5612c046 --- /dev/null +++ b/frappe/public/js/frappe/views/workspace/blocks/header_size.js @@ -0,0 +1,117 @@ +export default class HeaderSize { + + static get isInline() { + return true; + } + + get state() { + return this._state; + } + + set state(state) { + this._state = state; + } + + get title() { + return 'Header Size'; + } + + constructor({api}) { + this.api = api; + this.button = null; + this._state = true; + this.selectedText = null; + this.range = null; + this.headerLevels = []; + } + + render() { + this.button = document.createElement('button'); + this.button.type = 'button'; + this.button.innerHTML = `${frappe.utils.icon('header', 'sm')}${frappe.utils.icon('small-down', 'xs')}`; + this.button.classList = 'header-inline-tool'; + + return this.button; + } + + checkState(selection) { + let termWrapper = this.api.selection.findParentTag('SPAN'); + + for (const h of ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']) { + if (termWrapper && termWrapper.classList.contains(h)) { + let num = h.match(/\d+/)[0]; + $('.header-inline-tool svg:first-child').replaceWith(frappe.utils.icon(`header-${num}`, 'md')); + } + } + + const text = selection.anchorNode; + if (!text) return; + } + + change_size(range, size) { + if (!range) return + + let span = document.createElement('SPAN'); + + span.classList.add(`h${size}`); + span.innerText = range.toString(); + + this.remove_parent_tag(range, range.commonAncestorContainer, span); + + range.extractContents(); + range.insertNode(span); + this.api.inlineToolbar.close(); + } + + remove_parent_tag(range, parent_node, span) { + let diff = range.startContainer.data; + let selected_text = span.innerText; + let parent_tag = parent_node.parentElement; + + if(diff !== selected_text) { + parent_tag = parent_node; + } + + if(parent_tag.innerText == selected_text) { + if (!parent_tag.classList.contains('ce-header') && !parent_tag.classList.contains('ce-paragraph')) { + this.remove_parent_tag(range, parent_node.parentElement, span); + parent_tag.remove(); + } + } + } + + surround(range) { + this.selectedText = range.cloneContents(); + this.actions.hidden = !this.actions.hidden; + this.range = !this.actions.hidden ? range : null; + this.state = !this.actions.hidden; + } + + renderActions() { + this.actions = document.createElement('div'); + this.actions.classList = 'header-level-select'; + + this.headerLevels = new Array(6).fill().map((_, idx) => { + const $header_level = document.createElement('div'); + $header_level.classList.add(`h${idx+1}`, 'header-level'); + $header_level.innerText = `Header ${idx+1}`; + return $header_level; + }); + + for (const [i, headerLevel] of this.headerLevels.entries()) { + this.actions.appendChild(headerLevel); + this.api.listeners.on(headerLevel, 'click', () => { + this.change_size(this.range, i+1); + }); + } + + this.actions.hidden = true; + return this.actions; + } + + destroy() { + for (const headerLevel of this.headerLevels) { + this.api.listeners.off(headerLevel, 'click'); + } + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js index 00a9b8c83a..4a9604840f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/index.js +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -9,6 +9,7 @@ import Onboarding from "./onboarding"; // import tunes import SpacingTune from "./spacing_tune"; +import HeaderSize from "./header_size"; frappe.provide("frappe.wspace_block"); @@ -23,5 +24,6 @@ frappe.wspace_block.blocks = { }; frappe.wspace_block.tunes = { - spacing_tune: SpacingTune + spacing_tune: SpacingTune, + header_size: HeaderSize, }; \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 70287ab088..dd4abd7a5f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -56,7 +56,7 @@ export default class Onboarding extends Block { this.block_widget.customize(this.options); this.wrapper.setAttribute(block_name, this.block_widget.label || this.block_widget.onboarding_name); this.new_block_widget = this.block_widget.get_config(); - this.add_tune_button(); + this.add_settings_button(); }, }); @@ -106,7 +106,7 @@ export default class Onboarding extends Block { } if (!this.readOnly) { - this.add_tune_button(); + // this.add_tune_button(); } $(this.wrapper).css("padding-bottom", "20px"); return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 4f9a325fb7..4b143e6e88 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -55,7 +55,7 @@ export default class Paragraph extends Block { render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { - let $para_control = $(`
`); + let $para_control = $(`
`); this.wrapper.appendChild(this._element); this._element.classList.remove('widget'); @@ -63,25 +63,26 @@ export default class Paragraph extends Block { this.wrapper.classList.add('widget', 'paragraph'); - frappe.utils.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $para_control - ); + this.add_settings_button(); + // frappe.utils.add_custom_button( + // frappe.utils.icon('dot-horizontal', 'xs'), + // (event) => { + // let evn = event; + // !$('.ce-settings.ce-settings--opened').length && + // setTimeout(() => { + // this.api.toolbar.toggleBlockSettings(); + // var position = $(evn.target).offset(); + // $('.ce-settings.ce-settings--opened').offset({ + // top: position.top + 25, + // left: position.left - 77 + // }); + // }, 50); + // }, + // "tune-btn", + // `${__('Tune')}`, + // null, + // $para_control + // ); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -92,14 +93,14 @@ export default class Paragraph extends Block { $para_control ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-paragraph", - `${__('Delete')}`, - null, - $para_control - ); + // frappe.utils.add_custom_button( + // frappe.utils.icon('delete-active', 'xs'), + // () => this.api.blocks.delete(), + // "delete-paragraph", + // `${__('Delete')}`, + // null, + // $para_control + // ); return this.wrapper; } @@ -144,12 +145,12 @@ export default class Paragraph extends Block { this.data = data; } - static get conversionConfig() { - return { - export: 'text', // to convert Paragraph to other block, use 'text' property of saved data - import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data - }; - } + // static get conversionConfig() { + // return { + // export: 'text', // to convert Paragraph to other block, use 'text' property of saved data + // import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data + // }; + // } static get sanitize() { return { @@ -157,7 +158,8 @@ export default class Paragraph extends Block { br: true, b: true, i: true, - a: true + a: true, + span: true } }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 6e4f187d1b..4dbc194fdf 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -34,7 +34,7 @@ export default class Shortcut extends Block { } if (!this.readOnly) { - this.add_tune_button(); + this.add_settings_button(); } return this.wrapper; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 6e1b47f1d3..940f62ffdd 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -33,25 +33,26 @@ export default class Spacer extends Block { let $widget_control = $spacer.find('.widget-control'); - frappe.utils.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this.add_settings_button(); + // frappe.utils.add_custom_button( + // frappe.utils.icon('dot-horizontal', 'xs'), + // (event) => { + // let evn = event; + // !$('.ce-settings.ce-settings--opened').length && + // setTimeout(() => { + // this.api.toolbar.toggleBlockSettings(); + // var position = $(evn.target).offset(); + // $('.ce-settings.ce-settings--opened').offset({ + // top: position.top + 25, + // left: position.left - 77 + // }); + // }, 50); + // }, + // "tune-btn", + // `${__('Tune')}`, + // null, + // $widget_control + // ); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -62,14 +63,14 @@ export default class Spacer extends Block { $widget_control ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-spacer", - `${__('Delete')}`, - null, - $widget_control - ); + // frappe.utils.add_custom_button( + // frappe.utils.icon('delete-active', 'xs'), + // () => this.api.blocks.delete(), + // "delete-spacer", + // `${__('Delete')}`, + // null, + // $widget_control + // ); } return this.wrapper; } diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index e6248f66cf..72430f8754 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -433,7 +433,7 @@ frappe.views.Workspace = class Workspace { sidebar_control ); frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), + frappe.utils.icon('delete-active', 'xs'), () => this.delete_page(item), "delete-page", `${__('Delete')}`, @@ -643,14 +643,14 @@ frappe.views.Workspace = class Workspace { this.tools = { header: { class: this.blocks['header'], - inlineToolbar: true, + inlineToolbar: ['HeaderSize', 'bold', 'italic', 'link'], config: { - defaultLevel: 4 + default_size: 4 } }, paragraph: { class: this.blocks['paragraph'], - inlineToolbar: true + inlineToolbar: ['HeaderSize', 'bold', 'italic', 'link'] }, chart: { class: this.blocks['chart'], @@ -677,7 +677,7 @@ frappe.views.Workspace = class Workspace { } }, spacer: this.blocks['spacer'], - spacingTune: frappe.wspace_block.tunes['spacing_tune'], + HeaderSize: frappe.wspace_block.tunes['header_size'], }; this.editor = new EditorJS({ data: { @@ -685,7 +685,6 @@ frappe.views.Workspace = class Workspace { }, tools: this.tools, autofocus: false, - tunes: ['spacingTune'], readOnly: true, logLevel: 'ERROR' }); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index e6ae64d9dc..4950ea21b5 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -34,15 +34,15 @@ export default class Widget { this.action_area ); - options.allow_delete && - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.delete(), - "", - `${__('Delete')}`, - null, - this.action_area - ); + // options.allow_delete && + // frappe.utils.add_custom_button( + // frappe.utils.icon('delete-active', 'xs'), + // () => this.delete(), + // "", + // `${__('Delete')}`, + // null, + // this.action_area + // ); if (options.allow_hiding) { if (this.hidden) { diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index daedbe1877..7da24ce031 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -905,6 +905,10 @@ body { padding-left: 0; padding-right: 0; + b span { + font-weight: 700 !important; + } + &.ce-block--selected { .ce-block__content { background-color: inherit; @@ -1049,6 +1053,10 @@ body { .icon { fill: currentColor; } + + svg { + stroke: none; + } } @media (min-width: 1199px) { @@ -1083,4 +1091,62 @@ body { } } + + .cdx-marker { + background: rgba(245,235,111,0.29); + padding: 3px 0; + } + + .header-inline-tool { + border: none; + background-color: transparent; + margin-bottom: 2px; + } + + .header-level-select { + display: flex; + flex-direction: column; + padding: 6px; + } + + .header-level-select .header-level { + border: none; + background-color: transparent; + border-radius: var(--border-radius-sm); + padding: 6px; + margin: 2px 0px; + + &:hover { + background-color: var(--fg-hover-color); + } + } + + .dropdown-btn { + position: relative; + } + + .dropdown-list { + position: absolute; + background-color: white; + box-shadow: var(--shadow-base); + border-radius: var(--border-radius-sm); + padding: 6px; + top: 30px; + right: 0; + width: 150px; + z-index: 1; + } + + .dropdown-list .dropdown-item { + cursor: pointer; + padding: 6px 10px; + font-size: small; + border-radius: var(--border-radius-sm); + margin: 1px 0px; + } + + .dropdown-item-icon { + margin-right: 5px; + } + } From 20aac01874fc952220d9f7a4f8c2d643dc385e09 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Nov 2021 11:58:25 +0530 Subject: [PATCH 005/101] feat: Add new block new design --- frappe/public/icons/timeless/symbol-defs.svg | 13 +++ .../js/frappe/views/workspace/blocks/block.js | 41 ++++++--- .../js/frappe/views/workspace/blocks/card.js | 3 +- .../js/frappe/views/workspace/blocks/chart.js | 3 +- .../frappe/views/workspace/blocks/header.js | 3 +- .../views/workspace/blocks/onboarding.js | 5 +- .../views/workspace/blocks/paragraph.js | 86 ++++++++++-------- .../frappe/views/workspace/blocks/shortcut.js | 3 +- .../frappe/views/workspace/blocks/spacer.js | 33 +------ .../js/frappe/views/workspace/workspace.js | 17 +--- .../public/js/frappe/widgets/base_widget.js | 2 +- frappe/public/scss/desk/desktop.scss | 88 ++++++++++++++++++- 12 files changed, 195 insertions(+), 102 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 1b3a945ecb..f2977e3016 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -858,6 +858,18 @@ fill="#70818F" stroke="none"> + + + + + + + + + + + + @@ -928,4 +940,5 @@ + diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index c0f0243224..e2424eb1fb 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -54,6 +54,7 @@ export default class Block { function do_drag(e) { $(this).css("cursor", "col-resize"); $('.widget').css("pointer-events", "none"); + $(me.wrapper.parentElement).find('.resizer').css("border-right", "3px solid lightgray"); un_focus(); if ((startWidth + e.clientX - startX) - startWidth > 60) { startX = e.clientX; @@ -76,6 +77,7 @@ export default class Block { function stop_drag(e) { $(this).css("cursor", "default"); $('.widget').css("pointer-events", "auto"); + $(me.wrapper.parentElement).find('.resizer').css("border-right", "0px solid transparent"); document.documentElement.removeEventListener('mousemove', do_drag, false); document.documentElement.removeEventListener('mouseup', stop_drag, false); @@ -123,6 +125,21 @@ export default class Block { this.new_block_widget = block_obj.get_config(); } + add_new_block_button() { + let $new_button = $(` +
${frappe.utils.icon('add-round', 'lg')}
+ `); + + $new_button.appendTo(this.wrapper); + + $new_button.click(event => { + event.stopPropagation(); + let index = this.api.blocks.getCurrentBlockIndex(); + this.api.blocks.insert('paragraph', {}, {}, index); + this.api.caret.setToBlock(index); + }); + } + add_settings_button() { this.dropdown_list = [ { @@ -131,18 +148,6 @@ export default class Block { icon: frappe.utils.icon('delete-active', 'sm'), action: () => this.api.blocks.delete() }, - { - label: 'Move Up', - title: 'Move Up', - icon: frappe.utils.icon('up-arrow', 'sm'), - action: () => this.move_block('up') - }, - { - label: 'Move Down', - title: 'Move Down', - icon: frappe.utils.icon('down-arrow', 'sm'), - action: () => this.move_block('down') - }, { label: 'Expand', title: 'Expand Block', @@ -154,6 +159,18 @@ export default class Block { title: 'Shrink Block', icon: frappe.utils.icon('shrink', 'sm'), action: () => this.decrease_width() + }, + { + label: 'Move Up', + title: 'Move Up', + icon: frappe.utils.icon('up-arrow', 'sm'), + action: () => this.move_block('up') + }, + { + label: 'Move Down', + title: 'Move Down', + icon: frappe.utils.icon('down-arrow', 'sm'), + action: () => this.move_block('down') } ] diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index 7e67c3fb0c..d179eb42e6 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -3,7 +3,7 @@ export default class Card extends Block { static get toolbox() { return { title: 'Card', - icon: frappe.utils.icon('card', 'md') + icon: frappe.utils.icon('card', 'sm') }; } @@ -36,6 +36,7 @@ export default class Card extends Block { if (!this.readOnly) { this.add_settings_button(); + this.add_new_block_button(); } return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index 8d9bb89825..956020fc62 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -3,7 +3,7 @@ export default class Chart extends Block { static get toolbox() { return { title: 'Chart', - icon: frappe.utils.icon('chart', 'md') + icon: frappe.utils.icon('chart', 'sm') }; } @@ -36,6 +36,7 @@ export default class Chart extends Block { if (!this.readOnly) { this.add_settings_button(); + this.add_new_block_button(); } return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index dacd3e6a7d..69f5eea0a2 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -38,6 +38,7 @@ export default class Header extends Block { this.wrapper.classList.add('widget', 'header'); this.add_settings_button(); + this.add_new_block_button(); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -137,7 +138,7 @@ export default class Header extends Block { static get toolbox() { return { title: 'Heading', - icon: frappe.utils.icon('header', 'md') + icon: frappe.utils.icon('header', 'sm') }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index dd4abd7a5f..7a9c6b7752 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -4,7 +4,7 @@ export default class Onboarding extends Block { static get toolbox() { return { title: 'Onboarding', - icon: frappe.utils.icon('onboarding', 'md') + icon: frappe.utils.icon('onboarding', 'sm') }; } @@ -106,7 +106,8 @@ export default class Onboarding extends Block { } if (!this.readOnly) { - // this.add_tune_button(); + this.add_settings_button(); + this.add_new_block_button(); } $(this.wrapper).css("padding-bottom", "20px"); return this.wrapper; diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 4b143e6e88..d7fe4c5023 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -27,6 +27,7 @@ export default class Paragraph extends Block { } onKeyUp(e) { + $(this.wrapper.parentElement).find('.block-list-container.dropdown-list').hide(); if (e.code !== 'Backspace' && e.code !== 'Delete') { return; } @@ -34,6 +35,7 @@ export default class Paragraph extends Block { const {textContent} = this._element; if (textContent === '') { + $(this.wrapper.parentElement).find('.block-list-container.dropdown-list').show(); this._element.innerHTML = ''; } } @@ -43,15 +45,58 @@ export default class Paragraph extends Block { div.classList.add(this._CSS.wrapper, this._CSS.block, 'widget'); div.contentEditable = false; - div.dataset.placeholder = this.api.i18n.t(this._placeholder); if (!this.readOnly) { div.contentEditable = true; + div.addEventListener('focus', () => { + const {textContent} = this._element; + if (textContent !== '') return; + let $wrapper = $(this.wrapper).hasClass('ce-paragraph') ? $(this.wrapper.parentElement) : $(this.wrapper); + let $block_list_container = $wrapper.find('.block-list-container.dropdown-list'); + $block_list_container.show(); + }); + div.addEventListener('blur', () => { + let $block_list_container = $(this.wrapper.parentElement).find('.block-list-container.dropdown-list'); + setTimeout(() => $block_list_container.hide(), 1); + }); + div.dataset.placeholder = this.api.i18n.t(this._placeholder); div.addEventListener('keyup', this.onKeyUp); } return div; } + open_block_list() { + let dropdown_title = 'Templates'; + let $block_list_container = $(` +
+
${dropdown_title.toUpperCase()}
+
+ `); + + let all_blocks = frappe.wspace_block.blocks; + Object.keys(all_blocks).forEach(key => { + let $block_list_item = $(` +
+ ${all_blocks[key].toolbox.icon} + ${__(all_blocks[key].toolbox.title)} +
+ `); + + $block_list_item.click(event => { + event.stopPropagation(); + const index = this.api.blocks.getCurrentBlockIndex(); + this.api.blocks.delete(); + this.api.blocks.insert(key, {}, {}, index); + this.api.caret.setToBlock(index); + }); + + $block_list_container.append($block_list_item); + }); + + $block_list_container.hide(); + $block_list_container.appendTo(this.wrapper); + } + render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { @@ -63,26 +108,9 @@ export default class Paragraph extends Block { this.wrapper.classList.add('widget', 'paragraph'); + this.open_block_list(); + this.add_new_block_button(); this.add_settings_button(); - // frappe.utils.add_custom_button( - // frappe.utils.icon('dot-horizontal', 'xs'), - // (event) => { - // let evn = event; - // !$('.ce-settings.ce-settings--opened').length && - // setTimeout(() => { - // this.api.toolbar.toggleBlockSettings(); - // var position = $(evn.target).offset(); - // $('.ce-settings.ce-settings--opened').offset({ - // top: position.top + 25, - // left: position.left - 77 - // }); - // }, 50); - // }, - // "tune-btn", - // `${__('Tune')}`, - // null, - // $para_control - // ); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -93,15 +121,6 @@ export default class Paragraph extends Block { $para_control ); - // frappe.utils.add_custom_button( - // frappe.utils.icon('delete-active', 'xs'), - // () => this.api.blocks.delete(), - // "delete-paragraph", - // `${__('Delete')}`, - // null, - // $para_control - // ); - return this.wrapper; } return this._element; @@ -145,13 +164,6 @@ export default class Paragraph extends Block { this.data = data; } - // static get conversionConfig() { - // return { - // export: 'text', // to convert Paragraph to other block, use 'text' property of saved data - // import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data - // }; - // } - static get sanitize() { return { text: { @@ -191,7 +203,7 @@ export default class Paragraph extends Block { static get toolbox() { return { title: 'Text', - icon: frappe.utils.icon('text', 'md') + icon: frappe.utils.icon('text', 'sm') }; } } \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 4dbc194fdf..8b1a059eed 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -3,7 +3,7 @@ export default class Shortcut extends Block { static get toolbox() { return { title: 'Shortcut', - icon: frappe.utils.icon('shortcut', 'md') + icon: frappe.utils.icon('shortcut', 'sm') }; } @@ -35,6 +35,7 @@ export default class Shortcut extends Block { if (!this.readOnly) { this.add_settings_button(); + this.add_new_block_button(); } return this.wrapper; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 940f62ffdd..4eff42080f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -3,7 +3,7 @@ export default class Spacer extends Block { static get toolbox() { return { title: 'Spacer', - icon: frappe.utils.icon('spacer', 'md') + icon: frappe.utils.icon('spacer', 'sm') }; } @@ -21,7 +21,7 @@ export default class Spacer extends Block { if (!this.readOnly) { let $spacer = $(`
-
+
Spacer
@@ -34,25 +34,7 @@ export default class Spacer extends Block { let $widget_control = $spacer.find('.widget-control'); this.add_settings_button(); - // frappe.utils.add_custom_button( - // frappe.utils.icon('dot-horizontal', 'xs'), - // (event) => { - // let evn = event; - // !$('.ce-settings.ce-settings--opened').length && - // setTimeout(() => { - // this.api.toolbar.toggleBlockSettings(); - // var position = $(evn.target).offset(); - // $('.ce-settings.ce-settings--opened').offset({ - // top: position.top + 25, - // left: position.left - 77 - // }); - // }, 50); - // }, - // "tune-btn", - // `${__('Tune')}`, - // null, - // $widget_control - // ); + this.add_new_block_button(); frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -62,15 +44,6 @@ export default class Spacer extends Block { null, $widget_control ); - - // frappe.utils.add_custom_button( - // frappe.utils.icon('delete-active', 'xs'), - // () => this.api.blocks.delete(), - // "delete-spacer", - // `${__('Delete')}`, - // null, - // $widget_control - // ); } return this.wrapper; } diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 72430f8754..e439ad5e24 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -395,18 +395,6 @@ frappe.views.Workspace = class Workspace { page.name && this.page.add_inner_button(__("Settings"), () => { frappe.set_route(`workspace/${page.name}`); }); - - Object.keys(this.blocks).forEach(key => { - this.page.add_inner_button(` - ${this.blocks[key].toolbox.icon} - ${__(this.blocks[key].toolbox.title)} - `, function() { - const index = me.editor.blocks.getBlocksCount() + 1; - me.editor.blocks.insert(key, {}, {}, index, true); - me.editor.caret.setToLastBlock('start', 0); - $('.ce-block:last-child')[0].scrollIntoView(); - }, __('Add Block')); - }); } show_sidebar_actions() { @@ -650,7 +638,10 @@ frappe.views.Workspace = class Workspace { }, paragraph: { class: this.blocks['paragraph'], - inlineToolbar: ['HeaderSize', 'bold', 'italic', 'link'] + inlineToolbar: ['HeaderSize', 'bold', 'italic', 'link'], + config: { + placeholder: 'Choose a block or continue typing' + } }, chart: { class: this.blocks['chart'], diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 4950ea21b5..3fc4dac935 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -71,7 +71,7 @@ export default class Widget { frappe.utils.add_custom_button( frappe.utils.icon("edit", "xs"), () => this.edit(), - null, + "edit-button", `${__('Edit')}`, null, this.action_area diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 7da24ce031..ee32b88822 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -783,8 +783,8 @@ body { } } - .layout-side-section { - margin-right: 20px; + .layout-main-section-wrapper { + padding-left: 35px; } .desk-sidebar { @@ -909,6 +909,36 @@ body { font-weight: 700 !important; } + .new-block-button { + position: absolute; + top: 7px; + left: -22px; + cursor: pointer; + visibility: hidden; + opacity: 0; + transition: visibility 0s, opacity 0.5s ease-in-out; + } + + .widget-control > *, .paragraph-control > * { + visibility: hidden; + opacity: 0; + transition: visibility 0s, opacity 0.5s ease-in-out; + } + + &:hover { + .widget-control > *, .new-block-button { + visibility: visible; + opacity: 1; + } + } + + &.ce-block--focused { + .widget-control > * { + visibility: visible; + opacity: 1; + } + } + &.ce-block--selected { .ce-block__content { background-color: inherit; @@ -934,7 +964,13 @@ body { position:absolute; right: 0; bottom: 0; - cursor: col-resize; + cursor: col-resize; + border-color: transparent; + transition: border-color 0.3s ease-in-out; + + &:hover { + border-right: 3px solid lightgray !important; + } } .ce-header { @@ -947,6 +983,22 @@ body { } } + .block-list-container { + left: 20px; + top: 55px !important; + width: 200px !important; + } + + .dropdown-title { + padding: 6px 10px; + font-size: smaller; + cursor: default; + } + + .ce-paragraph[data-placeholder]:empty::before { + opacity: 1; + } + .widget{ &.header { display: flex; @@ -967,6 +1019,10 @@ body { &.new-widget { align-items: inherit; + + .spacer-left { + min-width: 74px; + } } &.ce-paragraph { @@ -1001,6 +1057,11 @@ body { } .ce-toolbar { + + &.ce-toolbar--opened { + display: none; + } + svg { fill: currentColor; } @@ -1077,6 +1138,27 @@ body { } } + @media (max-width: 995px) { + .ce-block.col-3 { + flex: 0 0 100%; + max-width: 33.33%; + } + } + + @media (max-width: 750px) { + .ce-block.col-3 { + flex: 0 0 50%; + max-width: 50%; + } + } + + @media (max-width: 550px) { + .ce-block.col-3 { + flex: 0 0 100%; + max-width: 100%; + } + } + @media (max-width: 750px) { .ce-block.col-4 { flex: 0 0 100%; From 279d30b3212b24837971d3921465dd0d32647bbd Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 12:01:58 +0530 Subject: [PATCH 006/101] feat: single card design --- .../js/frappe/views/workspace/blocks/block.js | 3 +- .../js/frappe/views/workspace/blocks/card.js | 1 + .../js/frappe/views/workspace/blocks/chart.js | 1 + .../frappe/views/workspace/blocks/header.js | 2 +- .../views/workspace/blocks/onboarding.js | 2 + .../views/workspace/blocks/paragraph.js | 2 +- .../frappe/views/workspace/blocks/shortcut.js | 8 +- .../frappe/views/workspace/blocks/spacer.js | 4 +- .../public/js/frappe/widgets/base_widget.js | 10 +- frappe/public/scss/desk/desktop.scss | 155 ++++++++++++++---- 10 files changed, 143 insertions(+), 45 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index e2424eb1fb..e7a6240340 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -104,6 +104,7 @@ export default class Block { }); this.block_widget.customize(this.options); this.wrapper.setAttribute(block_name, this.block_widget.label); + $(this.wrapper).find('.widget').addClass(`${widget_type} edit-mode`); this.new_block_widget = this.block_widget.get_config(); this.add_settings_button(); }, @@ -134,7 +135,7 @@ export default class Block { $new_button.click(event => { event.stopPropagation(); - let index = this.api.blocks.getCurrentBlockIndex(); + let index = this.api.blocks.getCurrentBlockIndex() + 1; this.api.blocks.insert('paragraph', {}, {}, index); this.api.caret.setToBlock(index); }); diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index d179eb42e6..cfcf530fc3 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -35,6 +35,7 @@ export default class Card extends Block { } if (!this.readOnly) { + $(this.wrapper).find('.widget').addClass('links edit-mode'); this.add_settings_button(); this.add_new_block_button(); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index 956020fc62..c132b7e5ec 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -35,6 +35,7 @@ export default class Chart extends Block { } if (!this.readOnly) { + $(this.wrapper).find('.widget').addClass('chart edit-mode'); this.add_settings_button(); this.add_new_block_button(); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 69f5eea0a2..634ab2f45c 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -35,7 +35,7 @@ export default class Header extends Block { $widget_control.appendTo($widget_head); $widget_head.appendTo(this.wrapper); - this.wrapper.classList.add('widget', 'header'); + this.wrapper.classList.add('widget', 'header', 'edit-mode'); this.add_settings_button(); this.add_new_block_button(); diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 7a9c6b7752..54b6421048 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -55,6 +55,7 @@ export default class Onboarding extends Block { }); this.block_widget.customize(this.options); this.wrapper.setAttribute(block_name, this.block_widget.label || this.block_widget.onboarding_name); + $(this.wrapper).find('.widget').addClass(`${widget_type} edit-mode`); this.new_block_widget = this.block_widget.get_config(); this.add_settings_button(); }, @@ -106,6 +107,7 @@ export default class Onboarding extends Block { } if (!this.readOnly) { + $(this.wrapper).find('.widget').addClass('onboarding edit-mode'); this.add_settings_button(); this.add_new_block_button(); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index d7fe4c5023..be6ba94c24 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -106,7 +106,7 @@ export default class Paragraph extends Block { this._element.classList.remove('widget'); $para_control.appendTo(this.wrapper); - this.wrapper.classList.add('widget', 'paragraph'); + this.wrapper.classList.add('widget', 'paragraph', 'edit-mode'); this.open_block_list(); this.add_new_block_button(); diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 8b1a059eed..ff2b99d8f0 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -13,7 +13,7 @@ export default class Shortcut extends Block { constructor({ data, api, config, readOnly, block }) { super({ data, api, config, readOnly, block }); - this.col = this.data.col ? this.data.col : "4"; + this.col = this.data.col ? this.data.col : "3"; this.allow_customization = !this.readOnly; this.options = { allow_sorting: this.allow_customization, @@ -34,8 +34,14 @@ export default class Shortcut extends Block { } if (!this.readOnly) { + $(this.wrapper).find('.widget').addClass('shortcut edit-mode'); this.add_settings_button(); this.add_new_block_button(); + } else { + let $shortcut_icon = frappe.utils.icon('arrow-up-right', 'sm', '', 'stroke: grey'); + $(this.wrapper).find('.widget .widget-title').append($shortcut_icon); + + $(this.wrapper).append($(`
`)); } return this.wrapper; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 4eff42080f..7f4fa2e5b5 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -28,8 +28,8 @@ export default class Spacer extends Block { `); $spacer.appendTo(this.wrapper); - this.wrapper.classList.add('widget', 'new-widget'); - this.wrapper.style.minHeight = 50 + 'px'; + this.wrapper.classList.add('widget', 'spacer', 'edit-mode'); + this.wrapper.style.minHeight = 40 + 'px'; let $widget_control = $spacer.find('.widget-control'); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 3fc4dac935..7376ecb89b 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -100,9 +100,7 @@ export default class Widget { } make_widget() { - this.widget = $(`
+ this.widget = $(`
@@ -110,10 +108,8 @@ export default class Widget {
-
-
-
-
+
+
`); this.title_field = this.widget.find(".widget-title"); diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index ee32b88822..57c0a56a59 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -107,13 +107,20 @@ body { } } +.divider { + height: 30%; + position: absolute; + top: 18px; + right: 0; + border-right: 1px solid lightgrey; +} + .widget { @include flex(flex, null, null, column); min-height: 1px; - padding: 15px; + padding: 7px; border-radius: var(--border-radius-md); height: 100%; - box-shadow: var(--card-shadow); background-color: var(--card-bg); .btn { @@ -333,6 +340,26 @@ body { margin-top: var(--margin-xs); margin-bottom: var(--margin-2xl); padding: var(--padding-lg); + background-color: var(--bg-light-gray); + + &.edit-mode:hover { + background-color: white; + + .onboarding-step { + &.active, + &:hover { + background-color: var(--bg-light-gray); + + .step-index.step-pending { + background-color: var(--fg-color); + } + } + + .step-index { + background-color: var(--bg-light-gray); + } + } + } .widget-head { display: flex; @@ -391,12 +418,6 @@ body { .step-index.step-pending { display: flex; } - - &.active { - .step-index.step-pending { - background-color: var(--fg-color); - } - } } &.complete { @@ -419,7 +440,11 @@ body { &.active, &:hover { - background-color: var(--bg-light-gray); + background-color: white; + + .step-index { + background-color: var(--bg-light-gray); + } .step-skip { visibility: visible; @@ -435,7 +460,7 @@ body { height: 20px; width: 20px; color: var(--text-on-light-gray); - background-color: var(--bg-light-gray); + background-color: white; margin-right: var(--margin-sm); border-radius: var(--border-radius-full); @@ -514,9 +539,18 @@ body { &.shortcut-widget-box { cursor: pointer; - .widget-head { - margin-top: var(--margin-xs); - margin-bottom: 5px; + &:hover { + .widget-title { + color: var(--blue-500) !important; + } + + svg.icon-sm { + stroke: var(--blue-500) !important; + } + } + + .widget-title { + gap: 10px; } .indicator-pill { @@ -765,7 +799,6 @@ body { .layout-side-section, .layout-main-section-wrapper { height: 100%; overflow-y: auto; - padding-right: 25px; scrollbar-color: var(--gray-200) transparent; [data-theme="dark"] & { scrollbar-color: var(--gray-800) transparent; @@ -783,8 +816,11 @@ body { } } - .layout-main-section-wrapper { - padding-left: 35px; + .layout-main-section { + background-color: white; + border-radius: var(--border-radius-md); + padding: var(--padding-sm) var(--padding-md); + margin-bottom: var(--margin-sm); } .desk-sidebar { @@ -911,7 +947,7 @@ body { .new-block-button { position: absolute; - top: 7px; + top: 16px; left: -22px; cursor: pointer; visibility: hidden; @@ -919,23 +955,55 @@ body { transition: visibility 0s, opacity 0.5s ease-in-out; } - .widget-control > *, .paragraph-control > * { - visibility: hidden; - opacity: 0; - transition: visibility 0s, opacity 0.5s ease-in-out; + .edit-mode { + .widget-control > *, .paragraph-control > * { + width: 0px; + visibility: hidden; + opacity: 0; + transition: visibility 0s, opacity 0.5s ease-in-out; + } } &:hover { .widget-control > *, .new-block-button { + width: auto; visibility: visible; opacity: 1; } } &.ce-block--focused { - .widget-control > * { - visibility: visible; - opacity: 1; + .widget { + box-shadow: var(--card-shadow) !important; + + .widget-control > * { + width: auto; + visibility: visible; + opacity: 1; + } + + &.shortcut, &.header { + background-color: var(--fg-color) !important; + } + + &.onboarding { + background-color: white; + + .onboarding-step { + &.active, + &:hover { + background-color: var(--bg-light-gray); + + .step-index.step-pending { + background-color: var(--fg-color); + } + } + + .step-index { + background-color: var(--bg-light-gray); + } + } + } } } @@ -974,7 +1042,7 @@ body { } .ce-header { - padding: 0 !important; + padding-left: 7px !important; margin-bottom: 0 !important; flex: 1; @@ -1000,31 +1068,54 @@ body { } .widget{ + + &.edit-mode:hover { + box-shadow: var(--shadow-base); + } + &.header { display: flex; justify-content: center; flex: 1; - padding-left: 15px !important; - padding-right: 15px !important; - min-height: 50px; + padding-left: 0px !important; + min-height: 40px; box-shadow: none; background-color: var(--control-bg); color: var(--text-muted); cursor: text; - } - &:focus { - outline: none; + &.edit-mode:hover { + background-color: var(--fg-color); + } } - &.new-widget { + &.spacer { align-items: inherit; + color: var(--text-muted); + border: 1px dashed var(--gray-400); + cursor: pointer; + + .widget-control > * { + width: auto; + } .spacer-left { min-width: 74px; } } + &.shortcut { + background-color: var(--control-bg); + + &:hover { + background-color: var(--fg-color); + } + } + + &:focus { + outline: none; + } + &.ce-paragraph { display: block; } From 2f19c572c4fd5d87d71f08026ab563919d71c3a1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 16:00:38 +0530 Subject: [PATCH 007/101] fix: removed unused code from container.js --- frappe/public/js/frappe/views/container.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frappe/public/js/frappe/views/container.js b/frappe/public/js/frappe/views/container.js index cf1d6c9466..4a40452b35 100644 --- a/frappe/public/js/frappe/views/container.js +++ b/frappe/public/js/frappe/views/container.js @@ -39,12 +39,6 @@ frappe.views.Container = class Container { return page; } change_to(label) { - cur_page = this; - if(this.page && this.page.label === label) { - $(this.page).trigger('show'); - } - - var me = this; if(label.tagName) { // if sent the div, get the table var page = label; From 6c364e937c8c2caccce11ba3c3fc155a54b765f8 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 16:01:58 +0530 Subject: [PATCH 008/101] fix: validate_link error while updating shortcut --- frappe/public/js/frappe/widgets/widget_dialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 9262627f02..53ab1b97d8 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -9,6 +9,7 @@ class WidgetDialog { this.setup_dialog_events(); this.dialog.show(); + window.cur_dialog = this.dialog; this.editing && this.set_default_values(); } From 171c93078cb2391aa52a66c2939d0e23b8a98f86 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 16:03:18 +0530 Subject: [PATCH 009/101] fix: added title on card links --- frappe/public/js/frappe/widgets/links_widget.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index cc771b96b5..3320e88bfb 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -80,7 +80,9 @@ export default class LinksWidget extends Widget { return $(` + } ${disabled_dependent(item)}" type="${item.type}" title="${ + item.label ? item.label : item.name + }"> ${get_link_for_item(item)} `); From 75fc42db6bdc75dd121fa3160ec8a659de076bb6 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 16:04:14 +0530 Subject: [PATCH 010/101] fix: small fixes --- .../frappe/views/workspace/blocks/header.js | 2 +- .../frappe/views/workspace/blocks/shortcut.js | 2 +- .../frappe/views/workspace/blocks/spacer.js | 3 +- frappe/public/scss/desk/desktop.scss | 42 ++++++++++++------- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 634ab2f45c..6c11a0bb28 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -122,7 +122,7 @@ export default class Header extends Block { const tag = document.createElement('DIV'); let text = this._data.text || ' '; - tag.innerHTML = `${text}`; + tag.innerHTML = `${text}`; tag.classList.add('ce-header'); diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index ff2b99d8f0..6a6704152f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -38,7 +38,7 @@ export default class Shortcut extends Block { this.add_settings_button(); this.add_new_block_button(); } else { - let $shortcut_icon = frappe.utils.icon('arrow-up-right', 'sm', '', 'stroke: grey'); + let $shortcut_icon = frappe.utils.icon('arrow-up-right', 'xs', '', 'stroke: grey', 'ml-2'); $(this.wrapper).find('.widget .widget-title').append($shortcut_icon); $(this.wrapper).append($(`
`)); diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index 7f4fa2e5b5..a2cc144885 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -18,6 +18,7 @@ export default class Spacer extends Block { render() { this.wrapper = document.createElement('div'); + this.wrapper.classList.add('widget','spacer'); if (!this.readOnly) { let $spacer = $(`
@@ -28,7 +29,7 @@ export default class Spacer extends Block { `); $spacer.appendTo(this.wrapper); - this.wrapper.classList.add('widget', 'spacer', 'edit-mode'); + this.wrapper.classList.add('edit-mode'); this.wrapper.style.minHeight = 40 + 'px'; let $widget_control = $spacer.find('.widget-control'); diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 57c0a56a59..3d39b647cf 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -544,13 +544,13 @@ body { color: var(--blue-500) !important; } - svg.icon-sm { + svg.icon-xs { stroke: var(--blue-500) !important; } } .widget-title { - gap: 10px; + cursor: pointer !important; } .indicator-pill { @@ -816,6 +816,10 @@ body { } } + .layout-side-section { + padding-right: 15px; + } + .layout-main-section { background-color: white; border-radius: var(--border-radius-md); @@ -941,13 +945,13 @@ body { padding-left: 0; padding-right: 0; - b span { - font-weight: 700 !important; + .ce-header b { + font-weight: 600 !important; } .new-block-button { position: absolute; - top: 16px; + top: 14px; left: -22px; cursor: pointer; visibility: hidden; @@ -1090,17 +1094,19 @@ body { } &.spacer { - align-items: inherit; - color: var(--text-muted); - border: 1px dashed var(--gray-400); - cursor: pointer; - - .widget-control > * { - width: auto; - } + &.edit-mode { + align-items: inherit; + color: var(--text-muted); + border: 1px dashed var(--gray-400); + cursor: pointer; + + .widget-control > * { + width: auto; + } - .spacer-left { - min-width: 74px; + .spacer-left { + min-width: 74px; + } } } @@ -1122,6 +1128,12 @@ body { &.paragraph { cursor: text; + + &.edit-mode { + .ce-paragraph { + padding: 2px; + } + } } .paragraph-control { From 6c0234dcad363f574ba0fa1e279221853081f9a1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 30 Nov 2021 17:49:33 +0530 Subject: [PATCH 011/101] fix: Handled dark mode --- .../js/frappe/views/workspace/blocks/block.js | 2 +- frappe/public/scss/common/buttons.scss | 2 +- frappe/public/scss/desk/dark.scss | 2 + frappe/public/scss/desk/desktop.scss | 112 +++++++++--------- 4 files changed, 58 insertions(+), 60 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index e7a6240340..6c1a0307cc 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -54,7 +54,7 @@ export default class Block { function do_drag(e) { $(this).css("cursor", "col-resize"); $('.widget').css("pointer-events", "none"); - $(me.wrapper.parentElement).find('.resizer').css("border-right", "3px solid lightgray"); + $(me.wrapper.parentElement).find('.resizer').css("border-right", "3px solid var(--gray-400)"); un_focus(); if ((startWidth + e.clientX - startX) - startWidth > 60) { startX = e.clientX; diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss index de3a4cfc20..ca9a872496 100644 --- a/frappe/public/scss/common/buttons.scss +++ b/frappe/public/scss/common/buttons.scss @@ -62,7 +62,7 @@ background-color: var(--control-bg); color: var(--text-color); &:hover, &:active { - background-color: var(--gray-300); + background-color: var(--gray-500); color: var(--text-color); } } diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index f894704ca2..36b1d2e45b 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -77,6 +77,8 @@ --highlight-shadow: 1px 1px 10px var(--blue-900), 0px 0px 4px var(--blue-500); + --shadow-base: 0px 4px 8px rgba(114, 176, 233, 0.06), 0px 0px 4px rgba(112, 172, 228, 0.12); + // input --input-disabled-bg: none; diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 3d39b647cf..50f387ac0b 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -112,7 +112,7 @@ body { position: absolute; top: 18px; right: 0; - border-right: 1px solid lightgrey; + border-right: 1px solid var(--gray-400); } .widget { @@ -343,7 +343,7 @@ body { background-color: var(--bg-light-gray); &.edit-mode:hover { - background-color: white; + background-color: var(--fg-color); .onboarding-step { &.active, @@ -440,7 +440,7 @@ body { &.active, &:hover { - background-color: white; + background-color: var(--fg-color); .step-index { background-color: var(--bg-light-gray); @@ -460,7 +460,7 @@ body { height: 20px; width: 20px; color: var(--text-on-light-gray); - background-color: white; + background-color: var(--fg-color); margin-right: var(--margin-sm); border-radius: var(--border-radius-full); @@ -473,7 +473,7 @@ body { display: none; background-color: var(--primary); .icon use { - stroke: var(--white); + stroke: var(--var(--fg-color)); } } @@ -821,7 +821,7 @@ body { } .layout-main-section { - background-color: white; + background-color: var(--fg-color); border-radius: var(--border-radius-md); padding: var(--padding-sm) var(--padding-md); margin-bottom: var(--margin-sm); @@ -978,7 +978,7 @@ body { &.ce-block--focused { .widget { - box-shadow: var(--card-shadow) !important; + box-shadow: var(--shadow-base) !important; .widget-control > * { width: auto; @@ -991,7 +991,7 @@ body { } &.onboarding { - background-color: white; + background-color: var(--fg-color); .onboarding-step { &.active, @@ -1041,7 +1041,7 @@ body { transition: border-color 0.3s ease-in-out; &:hover { - border-right: 3px solid lightgray !important; + border-right: 3px solid var(--gray-400) !important; } } @@ -1071,57 +1071,31 @@ body { opacity: 1; } - .widget{ - - &.edit-mode:hover { - box-shadow: var(--shadow-base); - } - - &.header { - display: flex; - justify-content: center; - flex: 1; - padding-left: 0px !important; - min-height: 40px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - cursor: text; + .widget { + &.edit-mode { + padding: 7px 12px; - &.edit-mode:hover { + &:hover { + box-shadow: var(--shadow-base); background-color: var(--fg-color); } - } - &.spacer { - &.edit-mode { + &.spacer { align-items: inherit; color: var(--text-muted); border: 1px dashed var(--gray-400); cursor: pointer; - + .widget-control > * { width: auto; } - + .spacer-left { min-width: 74px; } } } - &.shortcut { - background-color: var(--control-bg); - - &:hover { - background-color: var(--fg-color); - } - } - - &:focus { - outline: none; - } - &.ce-paragraph { display: block; } @@ -1129,27 +1103,49 @@ body { &.paragraph { cursor: text; - &.edit-mode { - .ce-paragraph { - padding: 2px; + .ce-paragraph { + padding: 2px; + } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: grabbing; } } } - .paragraph-control { + &.header { display: flex; - flex-direction: row-reverse; - position: absolute; - right: 20px; - gap: 5px; - background-color: var(--card-bg); - padding-left: 5px; - - .drag-handle { - cursor: all-scroll; - cursor: grabbing; + justify-content: center; + flex: 1; + padding-left: 0px !important; + min-height: 40px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + cursor: text; + + .ce-header { + padding-left: 14px !important; } } + + &.shortcut { + background-color: var(--control-bg); + } + + &:focus { + outline: none; + } } } } @@ -1312,7 +1308,7 @@ body { .dropdown-list { position: absolute; - background-color: white; + background-color: var(--fg-color); box-shadow: var(--shadow-base); border-radius: var(--border-radius-sm); padding: 6px; From 973de86879fd72efbe3df7674f97a44200b21fb2 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 14 Dec 2021 20:53:21 +0530 Subject: [PATCH 012/101] feat: Edit page title, icon, etc from sidebar --- frappe/desk/doctype/workspace/workspace.json | 3 +- frappe/desk/doctype/workspace/workspace.py | 61 ++- frappe/public/js/desk.bundle.js | 1 + .../workspace_sidebar_loading_skeleton.html | 22 + .../js/frappe/views/workspace/workspace.js | 484 ++++++++++++++---- frappe/public/scss/common/buttons.scss | 2 +- frappe/public/scss/desk/desktop.scss | 57 ++- 7 files changed, 513 insertions(+), 117 deletions(-) create mode 100644 frappe/public/js/frappe/ui/workspace_sidebar_loading_skeleton.html diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 04975c69e3..c90db0c87d 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "field:label", "beta": 1, "creation": "2020-01-23 13:45:59.470592", @@ -158,7 +159,7 @@ ], "in_create": 1, "links": [], - "modified": "2021-09-16 12:01:06.450622", + "modified": "2021-11-30 21:16:46.160413", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 94114e3918..9f91ef63d4 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -6,6 +6,7 @@ import frappe from frappe import _ from frappe.modules.export_file import export_to_files from frappe.model.document import Document +from frappe.model.rename_doc import rename_doc from frappe.desk.desktop import save_new_widget from frappe.desk.utils import validate_route_conflict @@ -123,7 +124,7 @@ def get_report_type(report): @frappe.whitelist() -def save_page(title, icon, parent, public, sb_public_items, sb_private_items, deleted_pages, new_widgets, blocks, save): +def save_page(title, icon, parent, public, sb_public_items, sb_private_items, new_widgets, blocks, save): save = frappe.parse_json(save) public = frappe.parse_json(public) if save: @@ -164,20 +165,58 @@ def save_page(title, icon, parent, public, sb_public_items, sb_private_items, de if loads(sb_public_items) or loads(sb_private_items): sort_pages(loads(sb_public_items), loads(sb_private_items)) - if loads(deleted_pages): - return delete_pages(loads(deleted_pages)) - return {"name": title, "public": public, "label": doc.label} -def delete_pages(deleted_pages): - for page in deleted_pages: - if page.get("public") and not is_workspace_manager(): - return {"name": page.get("title"), "public": 1, "label": page.get("label")} +@frappe.whitelist() +def update_page(name, title, icon, parent, public): + public = frappe.parse_json(public) + + doc = frappe.get_doc("Workspace", name) + + filters = { + 'parent_page': doc.title, + 'public': doc.public + } + child_docs = frappe.get_list("Workspace", filters=filters) + + if doc: + doc.title = title + doc.icon = icon + doc.parent_page = parent + if doc.public != public: + doc.sequence_id = frappe.db.count('Workspace', {'public':public}, cache=True) + doc.public = public + doc.for_user = '' if public else doc.for_user or frappe.session.user + doc.label = '{0}-{1}'.format(title, doc.for_user) if doc.for_user else title + doc.save(ignore_permissions=True) + + if name != doc.label: + rename_doc("Workspace", name, doc.label, force=True, ignore_permissions=True) + + # update new name and public in child pages + if child_docs: + for child in child_docs: + child_doc = frappe.get_doc("Workspace", child.name) + child_doc.parent_page = doc.title + child_doc.public = doc.public + child_doc.save(ignore_permissions=True) + + return {"name": doc.title, "public": doc.public, "label": doc.label} + +@frappe.whitelist() +def delete_page(page): + if not loads(page): + return + + page = loads(page) + + if page.get("public") and not is_workspace_manager(): + return - if frappe.db.exists("Workspace", page.get("name")): - frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) + if frappe.db.exists("Workspace", page.get("name")): + frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) - return {"name": "Home", "public": 1, "label": "Home"} + return {"name": page.get("name"), "public": page.get("public"), "title": page.get("title")} def sort_pages(sb_public_items, sb_private_items): wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 677b012efe..6333618977 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -95,6 +95,7 @@ import "./frappe/ui/sort_selector.js"; import "./frappe/change_log.html"; import "./frappe/ui/workspace_loading_skeleton.html"; +import "./frappe/ui/workspace_sidebar_loading_skeleton.html"; import "./frappe/desk.js"; import "./frappe/query_string.js"; diff --git a/frappe/public/js/frappe/ui/workspace_sidebar_loading_skeleton.html b/frappe/public/js/frappe/ui/workspace_sidebar_loading_skeleton.html new file mode 100644 index 0000000000..4f20e3c21c --- /dev/null +++ b/frappe/public/js/frappe/ui/workspace_sidebar_loading_skeleton.html @@ -0,0 +1,22 @@ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index e439ad5e24..4ea43b8374 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -26,7 +26,6 @@ frappe.views.Workspace = class Workspace { this.pages = {}; this.sorted_public_items = []; this.sorted_private_items = []; - this.deleted_sidebar_items = []; this.current_page = {}; this.sidebar_items = { 'public': {}, @@ -52,6 +51,8 @@ frappe.views.Workspace = class Workspace { } async setup_pages(reload) { + this.create_page_skeleton(); + this.create_sidebar_skeleton(); this.sidebar_pages = !this.discard ? await this.get_pages() : this.sidebar_pages; this.all_pages = this.sidebar_pages.pages; this.has_access = this.sidebar_pages.has_access; @@ -70,13 +71,16 @@ frappe.views.Workspace = class Workspace { } if (this.new_page && this.new_page.name) { if (!frappe.workspaces[frappe.router.slug(this.new_page.label)]) { - this.new_page = { name: this.all_pages[0].title, public: this.all_pages[0].public }; - } - if (this.new_page.public) { - frappe.set_route(`${frappe.router.slug(this.new_page.name)}`); - } else { - frappe.set_route(`private/${frappe.router.slug(this.new_page.name)}`); + this.new_page = { + name: this.all_pages[0].title, + public: this.all_pages[0].public + }; } + + let pre_url = this.new_page.public ? '' : 'private/'; + let route = pre_url + frappe.router.slug(this.new_page.name); + frappe.set_route(route); + this.new_page = null; } this.make_sidebar(); @@ -101,6 +105,7 @@ frappe.views.Workspace = class Workspace {
+
`); } @@ -119,8 +124,10 @@ frappe.views.Workspace = class Workspace { }); // Scroll sidebar to selected page if it is not in viewport. - !frappe.dom.is_element_in_viewport(this.sidebar.find('.selected')) + this.sidebar.find('.selected').length && !frappe.dom.is_element_in_viewport(this.sidebar.find('.selected')) && this.sidebar.find('.selected')[0].scrollIntoView(); + + this.remove_sidebar_skeleton(); } build_sidebar_section(title, root_pages) { @@ -164,7 +171,8 @@ frappe.views.Workspace = class Workspace { let child_items = pages.filter(page => page.parent_page == item.title); if (child_items.length > 0) { - let child_container = $(``); + let child_container = $item_container.find('.sidebar-child-item'); + child_container.addClass('hidden'); this.prepare_sidebar(child_items, child_container, $item_container); } @@ -179,8 +187,13 @@ frappe.views.Workspace = class Workspace { } add_drop_icon(item, sidebar_control, item_container) { + let drop_icon = 'small-down'; + if (item_container.find(`[item-name="${this.current_page.name}"]`).length) { + drop_icon = 'small-up'; + } + let $child_item_section = item_container.find('.sidebar-child-item'); - let $drop_icon = $(``) + let $drop_icon = $(``) .appendTo(sidebar_control); let pages = item.public ? this.public_pages : this.private_pages; if (pages.some(e => e.parent_page == item.title)) { @@ -203,9 +216,37 @@ frappe.views.Workspace = class Workspace { let page = this.get_page_to_show(); this.page.set_title(`${__(page.name)}`); + this.update_selected_sidebar(this.current_page, false); //remove selected from old page + this.update_selected_sidebar(page, true); //add selected on new page + this.show_page(page); } + update_selected_sidebar(page, add) { + let section = page.public ? 'public' : 'private'; + if (this.sidebar && this.sidebar_items[section] && this.sidebar_items[section][page.name]) { + let $sidebar = this.sidebar_items[section][page.name]; + let pages = page.public ? this.public_pages : this.private_pages; + let sidebar_page = pages.find(p => p.title == page.name); + + if (add) { + $sidebar[0].firstElementChild.classList.add("selected"); + if (sidebar_page) sidebar_page.selected = true; + + // open child sidebar section if closed + $sidebar.parent().hasClass('hidden') && + $sidebar.parent().removeClass('hidden'); + + this.current_page = { name: page.name, public: page.public }; + localStorage.current_page = page.name; + localStorage.is_current_page_public = page.public; + } else { + $sidebar[0].firstElementChild.classList.remove("selected"); + if (sidebar_page) sidebar_page.selected = false; + } + } + } + get_data(page) { return frappe.xcall("frappe.desk.desktop.get_desktop_page", { page: page @@ -249,49 +290,32 @@ frappe.views.Workspace = class Workspace { } async show_page(page) { - let section = this.current_page.public ? 'public' : 'private'; - if (this.sidebar_items && this.sidebar_items[section] && this.sidebar_items[section][this.current_page.name]) { - this.sidebar_items[section][this.current_page.name][0].firstElementChild.classList.remove("selected"); - this.sidebar_items[page.public ? 'public':'private'][page.name][0].firstElementChild.classList.add("selected"); - - if (this.sidebar_items[page.public ? 'public':'private'][page.name].parents('.sidebar-item-container')[0]) { - this.sidebar_items[page.public ? 'public':'private'][page.name] - .parents('.sidebar-item-container') - .find('.drop-icon use') - .attr("href", "#icon-small-up"); - } - } - - this.current_page = { name: page.name, public: page.public }; - localStorage.current_page = page.name; - localStorage.is_current_page_public = page.public; - if (!this.body.find('#editorjs')[0]) { this.$page = $(`
`).appendTo(this.body); } - this.create_skeleton(); if (this.all_pages) { + this.create_page_skeleton(); let pages = page.public ? this.public_pages : this.private_pages; - let this_page = pages.filter(p => p.title == page.name)[0]; + let current_page = pages.filter(p => p.title == page.name)[0]; this.setup_actions(page); - this.content = this_page && JSON.parse(this_page.content); + this.content = current_page && JSON.parse(current_page.content); this.add_custom_cards_in_content(); $('.item-anchor').addClass('disable-click'); - if (this.pages && this.pages[this_page.name]) { - this.page_data = this.pages[this_page.name]; + if (this.pages && this.pages[current_page.name]) { + this.page_data = this.pages[current_page.name]; } else { - await this.get_data(this_page); + await this.get_data(current_page); } this.prepare_editorjs(); $('.item-anchor').removeClass('disable-click'); - this.remove_skeleton(); + this.remove_page_skeleton(); } } @@ -329,9 +353,7 @@ frappe.views.Workspace = class Workspace { return; } - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); + this.clear_page_actions(); current_page.is_editable && this.page.set_secondary_action(__("Edit"), async () => { if (!this.editor || !this.editor.readOnly) return; @@ -357,18 +379,19 @@ frappe.views.Workspace = class Workspace { this.undo.readOnly = false; } - setup_customization_buttons(page) { - let me = this; + clear_page_actions() { this.page.clear_primary_action(); this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); + } + + setup_customization_buttons(page) { + this.clear_page_actions(); page.is_editable && this.page.set_primary_action( __("Save Customizations"), () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); + this.clear_page_actions(); this.undo.readOnly = true; this.save_page(); this.editor.readOnly.toggle(); @@ -382,9 +405,7 @@ frappe.views.Workspace = class Workspace { __("Discard"), async () => { this.discard = true; - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); + this.clear_page_actions(); await this.editor.readOnly.toggle(); this.is_read_only = true; this.reload(); @@ -420,21 +441,277 @@ frappe.views.Workspace = class Workspace { null, sidebar_control ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete-active', 'xs'), - () => this.delete_page(item), - "delete-page", - `${__('Delete')}`, - null, - sidebar_control - ); + + this.add_settings_button(item, sidebar_control); + } + } + + edit_page(item) { + this.public_parent_pages = ['', ...this.public_pages.filter(page => !page.parent_page).map(page => page.title)]; + this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; + var me = this; + let old_item = item; + const d = new frappe.ui.Dialog({ + title: __('Update Details'), + fields: [ + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title', + reqd: 1, + default: item.title + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: item.public ? this.public_parent_pages : this.private_parent_pages, + default: item.parent_page + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'is_public', + depends_on: `eval:${this.has_access}`, + default: item.public, + onchange: function() { + d.set_df_property('parent', 'options', + this.get_value() ? me.public_parent_pages : me.private_parent_pages); + } + }, + { + fieldtype: 'Column Break' + }, + { + label: __('Icon'), + fieldtype: 'Icon', + fieldname: 'icon', + default: item.icon + }, + ], + primary_action_label: __('Update'), + primary_action: (values) => { + let is_title_changed = values.title != old_item.title; + let is_section_changed = values.is_public != old_item.public; + if ((is_title_changed || is_section_changed) && !this.validate_page(values, old_item)) return; + d.hide(); + + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.update_page", + args: { + name: old_item.name, + title: values.title, + icon: values.icon || '', + parent: values.parent || '', + public: values.is_public || 0, + } + }); + + this.update_sidebar(old_item, values); + + if (this.make_page_selected) { + let pre_url = values.is_public ? '' : 'private/'; + let route = pre_url + frappe.router.slug(values.title); + frappe.set_route(route); + + this.make_page_selected = false; + } + + this.make_sidebar(); + this.show_sidebar_actions(); + } + }); + d.show(); + } + + update_sidebar(old_item, new_item) { + let is_section_changed = old_item.public != (new_item.is_public || 0); + let is_title_changed = old_item.title != new_item.title; + let new_updated_item = {...old_item}; + + let pages = old_item.public ? this.public_pages : this.private_pages; + + let child_items = pages.filter(page => page.parent_page == old_item.title); + + this.make_page_selected = old_item.selected; + + new_updated_item.title = new_item.title; + new_updated_item.icon = new_item.icon; + new_updated_item.parent_page = new_item.parent || ""; + new_updated_item.public = new_item.is_public; + + if (is_title_changed || is_section_changed){ + if (new_item.is_public) { + new_updated_item.name = new_item.title; + new_updated_item.label = new_item.title; + new_updated_item.for_user = ""; + } else { + let user = frappe.session.user; + new_updated_item.name = `${new_item.title}-${user}`; + new_updated_item.label = `${new_item.title}-${user}`; + new_updated_item.for_user = user; + } + + this.update_cached_values(old_item, new_updated_item); + } + + if (child_items.length) { + child_items.forEach(child => { + child.parent_page = new_item.title; + is_section_changed && this.update_child_sidebar(child, new_item); + }); + } + } + + update_child_sidebar(child, new_item) { + let old_child = {...child}; + this.make_page_selected = child.selected; + + child.public = new_item.is_public; + if (new_item.is_public) { + child.name = child.title; + child.label = child.title; + child.for_user = ""; + } else { + let user = frappe.session.user; + child.name = `${child.title}-${user}`; + child.label = `${child.title}-${user}`; + child.for_user = user; + } + + this.update_cached_values(old_child, child); + } + + update_cached_values(old_item, new_item) { + let [from_pages, to_pages] = old_item.public ? + [this.public_pages, this.private_pages] : [this.private_pages, this.public_pages]; + + let old_item_index = from_pages.findIndex(page => page.title == old_item.title); + + // update frappe.workspaces + if (frappe.workspaces[frappe.router.slug(old_item.name)]) { + delete frappe.workspaces[frappe.router.slug(old_item.name)]; + if (new_item) { + frappe.workspaces[frappe.router.slug(new_item.name)] = {'title': new_item.title}; + } + } + + // update page block data + if (this.pages && this.pages[old_item.name]) { + if (new_item) { + this.pages[new_item.name] = this.pages[old_item.name]; + } + delete this.pages[old_item.name]; + } + + // update public and private pages + if (new_item) { + let is_section_changed = old_item.public != (new_item.is_public || new_item.public || 0); + + if (is_section_changed) { + from_pages.splice(old_item_index, 1); + to_pages.push(new_item); + } else { + from_pages.splice(old_item_index, 1, new_item); + } + } else { + from_pages.splice(old_item_index, 1); + } + + this.sidebar_pages.pages = [...this.public_pages, ...this.private_pages]; + } + + add_settings_button(item, sidebar_control) { + this.dropdown_list = [ + { + label: 'Edit', + title: 'Edit Workspace', + icon: frappe.utils.icon('edit', 'sm'), + action: () => this.edit_page(item) + }, + { + label: 'Delete', + title: 'Delete Workspace', + icon: frappe.utils.icon('delete-active', 'sm'), + action: () => this.delete_page(item) + }, + { + label: 'Duplicate', + title: 'Duplicate Workspace', + icon: frappe.utils.icon('duplicate', 'sm'), + action: () => this.duplicate_page(item) + }, + { + label: 'Settings', + title: 'Settings', + icon: frappe.utils.icon('setting-gear', 'sm'), + action: () => frappe.set_route(`workspace/${item.name}`) + }, + ] + + let $button = $(` +
+ ${frappe.utils.icon('dot-horizontal', 'xs')} +
+ + `); + + let dropdown_item = function(label, title, icon, action) { + let html = $(` +
+ ${icon} + ${label} +
+ `); + + html.click(event => { + event.stopPropagation(); + action && action(); + }); + + return html; } + + $button.filter('.dropdown-btn').click(event => { + event.stopPropagation(); + if ($button.filter('.dropdown-list.hidden').length) { + $('.dropdown-list:not(.hidden)').addClass('hidden'); + } + $button.filter('.dropdown-list').toggleClass('hidden'); + }); + + $(document).click(event => { + event.stopPropagation(); + $('.dropdown-list:not(.hidden)').addClass('hidden'); + }) + + sidebar_control.append($button); + + this.dropdown_list.forEach((i) => { + $button.filter('.dropdown-list').append(dropdown_item(i.label, i.title, i.icon, i.action)); + }) } - delete_page(item) { - frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { - this.deleted_sidebar_items.push(item); - this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"][item-public="${item.public}"]`).addClass('hidden'); + delete_page(page) { + frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title]), () => { + let me = this; + this.sidebar + .find(`.standard-sidebar-section [item-name="${page.title}"][item-public="${page.public}"]`) + .addClass('hidden'); + + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.delete_page", + args: { + page: page + }, + callback: function(res) { + res.message && me.update_cached_values(res.message); + } + }); + + if (this.current_page.name == page.title && this.current_page.public == page.public) { + frappe.set_route('/'); + } }); } @@ -500,7 +777,7 @@ frappe.views.Workspace = class Workspace { this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; var me = this; const d = new frappe.ui.Dialog({ - title: __('Set Title'), + title: __('New Workspace'), fields: [ { label: __('Title'), @@ -544,15 +821,10 @@ frappe.views.Workspace = class Workspace { this.parent = values.parent; this.public = values.is_public; this.editor.render({ - blocks: [ - { - type: "header", - data: { - text: this.title, - level: 4 - } - } - ] + blocks: [{ + type: "header", + data: { text: this.title } + }] }).then(async () => { if (this.editor.configuration.readOnly) { this.is_read_only = false; @@ -563,24 +835,43 @@ frappe.views.Workspace = class Workspace { this.make_sidebar_sortable(); this.make_blocks_sortable(); this.prepare_sorted_sidebar(values.is_public); + + this.update_selected_sidebar(this.current_page, false); //remove selected from old page }); } }); d.show(); } - validate_page(values) { + validate_page(new_page, old_page) { let message = ""; - let pages = values.is_public ? this.public_pages : this.private_pages; + let [from_pages, to_pages] = new_page.is_public ? + [this.private_pages, this.public_pages] : [this.public_pages, this.private_pages]; - if (pages && pages.filter(p => p.title == values.title)[0]) { - message = "Page with title '{0}' already exist."; - } else if (frappe.router.doctype_route_exist(frappe.router.slug(values.title))) { + let section = this.sidebar_categories[new_page.is_public]; + + if (to_pages && to_pages.filter(p => p.title == new_page.title)[0]) { + message = `Page with title ${new_page.title} already exist.`; + } + + if (frappe.router.doctype_route_exist(frappe.router.slug(new_page.title))) { message = "Doctype with same route already exist. Please choose different title."; } + let child_pages = old_page && from_pages.filter(p => p.parent_page == old_page.title); + if (child_pages) { + child_pages.every(child_page => { + if(to_pages && to_pages.find(p => p.title == child_page.title)) { + message = `One of the child page with name ${child_page.title} already exist in ${section} Section. Please update the name of the child page first before moving`; + cur_dialog.hide(); + return false; + } + return true; + }); + } + if (message) { - frappe.throw(__(message, [__(values.title)])); + frappe.throw(__(message)); return false; } return true; @@ -592,7 +883,8 @@ frappe.views.Workspace = class Workspace { title: title, icon: icon, parent_page: parent, - public: is_public + public: is_public, + selected: true }; let $sidebar_item = this.sidebar_item_container(item); $sidebar_item.addClass('is-draggable'); @@ -605,6 +897,7 @@ frappe.views.Workspace = class Workspace { null, $sidebar_item.find('.sidebar-item-control') ); + $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); let $sidebar_section = is_public ? $sidebar[1] : $sidebar[0]; @@ -683,19 +976,21 @@ frappe.views.Workspace = class Workspace { save_page() { frappe.dom.freeze(); - this.create_skeleton(); + this.create_page_skeleton(); + let me = this; let save = true; + if (!this.title && this.current_page) { - let pages = this.current_page.public ? this.public_pages : this.private_pages; this.title = this.current_page.name; - this.public = pages.filter(p => p.title == this.title)[0].public; + this.public = this.current_page.public; save = false; } else { this.current_page = { name: this.title, public: this.public }; } - let me = this; + this.editor.save().then((outputData) => { let new_widgets = {}; + outputData.blocks.forEach(item => { if (item.data.new) { if (!new_widgets[item.type]) { @@ -708,8 +1003,8 @@ frappe.views.Workspace = class Workspace { let blocks = outputData.blocks.filter( item => item.type != 'card' || - (item.data.card_name !== 'Custom Documents' && - item.data.card_name !== 'Custom Reports') + (item.data.card_name !== 'Custom Documents' && + item.data.card_name !== 'Custom Reports') ); frappe.call({ @@ -721,7 +1016,6 @@ frappe.views.Workspace = class Workspace { public: me.public || 0, sb_public_items: me.sorted_public_items, sb_private_items: me.sorted_private_items, - deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, blocks: JSON.stringify(blocks), save: save @@ -749,20 +1043,32 @@ frappe.views.Workspace = class Workspace { this.public = false; this.sorted_public_items = []; this.sorted_private_items = []; - this.deleted_sidebar_items = []; - this.create_skeleton(); this.setup_pages(true); this.discard = false; this.undo.readOnly = true; } - create_skeleton() { - this.$page.prepend(frappe.render_template('workspace_loading_skeleton')); - this.$page.find('.codex-editor').addClass('hidden'); + create_page_skeleton() { + if ($('.layout-main-section').find('.workspace-skeleton').length) return; + + $('.layout-main-section').prepend(frappe.render_template('workspace_loading_skeleton')); + $('.layout-main-section').find('.codex-editor').addClass('hidden'); + } + + remove_page_skeleton() { + $('.layout-main-section').find('.codex-editor').removeClass('hidden'); + $('.layout-main-section').find('.workspace-skeleton').remove(); + } + + create_sidebar_skeleton() { + if ($('.list-sidebar').find('.workspace-sidebar-skeleton').length) return; + + $('.list-sidebar').prepend(frappe.render_template('workspace_sidebar_loading_skeleton')); + $('.desk-sidebar').addClass('hidden'); } - remove_skeleton() { - this.$page.find('.codex-editor').removeClass('hidden'); - this.$page.find('.workspace-skeleton').remove(); + remove_sidebar_skeleton() { + $('.desk-sidebar').removeClass('hidden'); + $('.list-sidebar').find('.workspace-sidebar-skeleton').remove(); } }; diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss index ca9a872496..62479e7a7a 100644 --- a/frappe/public/scss/common/buttons.scss +++ b/frappe/public/scss/common/buttons.scss @@ -62,7 +62,7 @@ background-color: var(--control-bg); color: var(--text-color); &:hover, &:active { - background-color: var(--gray-500); + background-color: var(--gray-400); color: var(--text-color); } } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 50f387ac0b..878d51d790 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -337,10 +337,9 @@ body { } &.onboarding-widget-box { - margin-top: var(--margin-xs); margin-bottom: var(--margin-2xl); - padding: var(--padding-lg); - background-color: var(--bg-light-gray); + padding: var(--padding-lg) !important; + background-color: var(--bg-color); &.edit-mode:hover { background-color: var(--fg-color); @@ -348,7 +347,7 @@ body { .onboarding-step { &.active, &:hover { - background-color: var(--bg-light-gray); + background-color: var(--bg-color); .step-index.step-pending { background-color: var(--fg-color); @@ -356,7 +355,7 @@ body { } .step-index { - background-color: var(--bg-light-gray); + background-color: var(--bg-color); } } } @@ -443,7 +442,7 @@ body { background-color: var(--fg-color); .step-index { - background-color: var(--bg-light-gray); + background-color: var(--bg-color); } .step-skip { @@ -551,6 +550,7 @@ body { .widget-title { cursor: pointer !important; + font-size: var(--text-base) !important; } .indicator-pill { @@ -792,6 +792,25 @@ body { } } +.workspace-sidebar-skeleton { + transition: ease; + .sidebar-box { + height: 40px; + margin-bottom: 10px; + margin-left: 10px; + background-color: var(--skeleton-bg); + + &.child { + margin-left: 30px; + } + + &.section { + height: 25px; + margin-left: 0px; + } + } +} + [data-page-route="Workspaces"] { @media (min-width: map-get($grid-breakpoints, "lg")) { .layout-main { @@ -822,8 +841,8 @@ body { .layout-main-section { background-color: var(--fg-color); - border-radius: var(--border-radius-md); - padding: var(--padding-sm) var(--padding-md); + border-radius: var(--border-radius-lg); + padding: var(--padding-md); margin-bottom: var(--margin-sm); } @@ -844,7 +863,6 @@ body { padding: 0px; .sidebar-item-control { - > * { align-self: center; margin-left: 3px; @@ -857,7 +875,7 @@ body { display: none; } - .delete-page { + .setting-btn { display: none; } @@ -872,6 +890,10 @@ body { svg { margin-right: 0; } + + .dropdown-list { + top: 42px; + } } .sidebar-item-label { @@ -887,6 +909,7 @@ body { } .sidebar-item-container { + position: relative; .sidebar-item-container{ margin-left: 10px; @@ -904,7 +927,7 @@ body { display: inline-block; } - .delete-page { + .setting-btn { display: inline-block; margin-right: 8px; } @@ -916,7 +939,7 @@ body { .drop-icon { padding: 10px 8px 10px 2px; - margin-left: -4px; + margin-left: -8px; } } @@ -996,7 +1019,7 @@ body { .onboarding-step { &.active, &:hover { - background-color: var(--bg-light-gray); + background-color: var(--bg-color); .step-index.step-pending { background-color: var(--fg-color); @@ -1004,7 +1027,7 @@ body { } .step-index { - background-color: var(--bg-light-gray); + background-color: var(--bg-color); } } } @@ -1096,6 +1119,10 @@ body { } } + &.spacer { + height: 18px !important; + } + &.ce-paragraph { display: block; } @@ -1309,7 +1336,7 @@ body { .dropdown-list { position: absolute; background-color: var(--fg-color); - box-shadow: var(--shadow-base); + box-shadow: var(--shadow-base) !important; border-radius: var(--border-radius-sm); padding: 6px; top: 30px; From 706ee4c3c545ef76665263718b9c19a6af226837 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 15 Dec 2021 20:03:52 +0530 Subject: [PATCH 013/101] feat: Duplicate Page from sidebar --- frappe/desk/doctype/workspace/workspace.json | 4 +- frappe/desk/doctype/workspace/workspace.py | 46 ++++- .../js/frappe/views/workspace/workspace.js | 188 ++++++++++++------ 3 files changed, 167 insertions(+), 71 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index c90db0c87d..211029dfcf 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -142,7 +142,7 @@ }, { "fieldname": "sequence_id", - "fieldtype": "Int", + "fieldtype": "Float", "label": "Sequence Id" }, { @@ -159,7 +159,7 @@ ], "in_create": 1, "links": [], - "modified": "2021-11-30 21:16:46.160413", + "modified": "2021-12-15 19:33:00.805265", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 9f91ef63d4..a46b91ec0c 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -133,21 +133,20 @@ def save_page(title, icon, parent, public, sb_public_items, sb_private_items, ne doc.icon = icon doc.content = blocks doc.parent_page = parent - - if public: - doc.label = title - doc.public = 1 - else: + doc.label = title + doc.for_user = '' + doc.public = 1 + if not public: doc.label = title + "-" + frappe.session.user doc.for_user = frappe.session.user + doc.public = 0 doc.save(ignore_permissions=True) else: - if public: - filters = { - 'public': public, - 'label': title - } - else: + filters = { + 'public': public, + 'label': title + } + if not public: filters = { 'for_user': frappe.session.user, 'label': title + "-" + frappe.session.user @@ -203,6 +202,31 @@ def update_page(name, title, icon, parent, public): return {"name": doc.title, "public": doc.public, "label": doc.label} +@frappe.whitelist() +def duplicate_page(page_name, new_page): + if not loads(new_page): + return + + new_page = loads(new_page) + + if new_page.get("is_public") and not is_workspace_manager(): + return + + old_doc = frappe.get_doc("Workspace", page_name) + doc = frappe.copy_doc(old_doc) + doc.title = new_page.get('title') + doc.icon = new_page.get('icon') + doc.parent_page = new_page.get('parent') or '' + doc.public = new_page.get('is_public') + doc.for_user = '' + doc.label = doc.title + if not doc.public: + doc.for_user = doc.for_user or frappe.session.user + doc.label = '{0}-{1}'.format(doc.title, doc.for_user) + doc.name = doc.label + doc.sequence_id += 0.1 + doc.insert(ignore_permissions=True) + @frappe.whitelist() def delete_page(page): if not loads(page): diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 4ea43b8374..c85da6f386 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -198,12 +198,12 @@ frappe.views.Workspace = class Workspace { let pages = item.public ? this.public_pages : this.private_pages; if (pages.some(e => e.parent_page == item.title)) { $drop_icon.removeClass('hidden'); - $drop_icon.on('click', () => { - let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; - $drop_icon.find("use").attr("href", icon); - $child_item_section.toggleClass("hidden"); - }); } + $drop_icon.on('click', () => { + let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $drop_icon.find("use").attr("href", icon); + $child_item_section.toggleClass("hidden"); + }); } show() { @@ -248,17 +248,16 @@ frappe.views.Workspace = class Workspace { } get_data(page) { - return frappe.xcall("frappe.desk.desktop.get_desktop_page", { + return frappe.call("frappe.desk.desktop.get_desktop_page", { page: page }).then(data => { - this.page_data = data; + this.page_data = data.message; // caching page data this.pages[page.name] && delete this.pages[page.name]; - this.pages[page.name] = data; + this.pages[page.name] = data.message; if (!this.page_data || Object.keys(this.page_data).length === 0) return; - if (this.page_data.charts && this.page_data.charts.items.length === 0) return; return frappe.dashboard_utils.get_dashboard_settings().then(settings => { @@ -298,11 +297,12 @@ frappe.views.Workspace = class Workspace { if (this.all_pages) { this.create_page_skeleton(); + let pages = page.public ? this.public_pages : this.private_pages; let current_page = pages.filter(p => p.title == page.name)[0]; - this.setup_actions(page); this.content = current_page && JSON.parse(current_page.content); + this.setup_actions(page); this.add_custom_cards_in_content(); $('.item-anchor').addClass('disable-click'); @@ -310,11 +310,12 @@ frappe.views.Workspace = class Workspace { if (this.pages && this.pages[current_page.name]) { this.page_data = this.pages[current_page.name]; } else { - await this.get_data(current_page); + await frappe.after_ajax(() => this.get_data(current_page)); } this.prepare_editorjs(); $('.item-anchor').removeClass('disable-click'); + this.remove_page_skeleton(); } } @@ -363,7 +364,6 @@ frappe.views.Workspace = class Workspace { this.initialize_editorjs_undo(); this.setup_customization_buttons(current_page); this.show_sidebar_actions(); - this.make_sidebar_sortable(); this.make_blocks_sortable(); }); }); @@ -420,9 +420,10 @@ frappe.views.Workspace = class Workspace { show_sidebar_actions() { this.sidebar.find('.standard-sidebar-section').addClass('show-control'); + this.make_sidebar_sortable(); } - add_sidebar_actions(item, sidebar_control) { + add_sidebar_actions(item, sidebar_control, is_new) { if (!item.is_editable) { $(`${frappe.utils.icon("lock", "sm")}`) .appendTo(sidebar_control); @@ -442,15 +443,19 @@ frappe.views.Workspace = class Workspace { sidebar_control ); - this.add_settings_button(item, sidebar_control); + !is_new && this.add_settings_button(item, sidebar_control); } } - edit_page(item) { + get_parent_pages() { this.public_parent_pages = ['', ...this.public_pages.filter(page => !page.parent_page).map(page => page.title)]; this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; + } + + edit_page(item) { var me = this; let old_item = item; + this.get_parent_pages(); const d = new frappe.ui.Dialog({ title: __('Update Details'), fields: [ @@ -551,9 +556,8 @@ frappe.views.Workspace = class Workspace { new_updated_item.label = `${new_item.title}-${user}`; new_updated_item.for_user = user; } - - this.update_cached_values(old_item, new_updated_item); } + this.update_cached_values(old_item, new_updated_item); if (child_items.length) { child_items.forEach(child => { @@ -582,15 +586,16 @@ frappe.views.Workspace = class Workspace { this.update_cached_values(old_child, child); } - update_cached_values(old_item, new_item) { + update_cached_values(old_item, new_item, duplicate) { let [from_pages, to_pages] = old_item.public ? [this.public_pages, this.private_pages] : [this.private_pages, this.public_pages]; let old_item_index = from_pages.findIndex(page => page.title == old_item.title); + duplicate && old_item_index++; // update frappe.workspaces if (frappe.workspaces[frappe.router.slug(old_item.name)]) { - delete frappe.workspaces[frappe.router.slug(old_item.name)]; + !duplicate && delete frappe.workspaces[frappe.router.slug(old_item.name)]; if (new_item) { frappe.workspaces[frappe.router.slug(new_item.name)] = {'title': new_item.title}; } @@ -601,7 +606,7 @@ frappe.views.Workspace = class Workspace { if (new_item) { this.pages[new_item.name] = this.pages[old_item.name]; } - delete this.pages[old_item.name]; + !duplicate && delete this.pages[old_item.name]; } // update public and private pages @@ -609,10 +614,10 @@ frappe.views.Workspace = class Workspace { let is_section_changed = old_item.public != (new_item.is_public || new_item.public || 0); if (is_section_changed) { - from_pages.splice(old_item_index, 1); + !duplicate && from_pages.splice(old_item_index, 1); to_pages.push(new_item); } else { - from_pages.splice(old_item_index, 1, new_item); + from_pages.splice(old_item_index, duplicate ? 0 : 1, new_item); } } else { from_pages.splice(old_item_index, 1); @@ -694,25 +699,98 @@ frappe.views.Workspace = class Workspace { delete_page(page) { frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title]), () => { - let me = this; - this.sidebar - .find(`.standard-sidebar-section [item-name="${page.title}"][item-public="${page.public}"]`) - .addClass('hidden'); - frappe.call({ method: "frappe.desk.doctype.workspace.workspace.delete_page", - args: { - page: page - }, - callback: function(res) { - res.message && me.update_cached_values(res.message); - } + args: { page: page } }); + this.update_cached_values(page); + if (this.current_page.name == page.title && this.current_page.public == page.public) { frappe.set_route('/'); } + + this.make_sidebar(); + this.show_sidebar_actions(); + }); + } + + duplicate_page(page) { + var me = this; + this.get_parent_pages(); + const d = new frappe.ui.Dialog({ + title: __('Create Duplicate'), + fields: [ + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title', + reqd: 1 + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: page.public ? this.public_parent_pages : this.private_parent_pages, + default: page.parent_page + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'is_public', + depends_on: `eval:${this.has_access}`, + default: page.public, + onchange: function() { + d.set_df_property('parent', 'options', + this.get_value() ? me.public_parent_pages : me.private_parent_pages); + } + }, + { + fieldtype: 'Column Break' + }, + { + label: __('Icon'), + fieldtype: 'Icon', + fieldname: 'icon', + default: page.icon + }, + ], + primary_action_label: __('Duplicate'), + primary_action: (values) => { + if (!this.validate_page(values)) return; + d.hide(); + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.duplicate_page", + args: { + page_name: page.name, + new_page: values + } + }); + + let new_page = {...page}; + + new_page.title = values.title; + new_page.name = values.title; + new_page.public = values.is_public; + new_page.parent_page = values.parent || ''; + new_page.for_user = ''; + if (!values.is_public) { + new_page.name += '-' + frappe.session.user; + new_page.for_user = frappe.session.user; + } + new_page.label = new_page.name; + + this.update_cached_values(page, new_page, true); + + let pre_url = values.is_public ? '' : 'private/'; + let route = pre_url + frappe.router.slug(values.title); + frappe.set_route(route); + + me.make_sidebar(); + me.show_sidebar_actions(); + } }); + d.show(); } make_sidebar_sortable() { @@ -773,9 +851,8 @@ frappe.views.Workspace = class Workspace { } initialize_new_page() { - this.public_parent_pages = ['', ...this.public_pages.filter(page => !page.parent_page).map(page => page.title)]; - this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; var me = this; + this.get_parent_pages(); const d = new frappe.ui.Dialog({ title: __('New Workspace'), fields: [ @@ -832,7 +909,6 @@ frappe.views.Workspace = class Workspace { } this.add_page_to_sidebar(values); this.show_sidebar_actions(); - this.make_sidebar_sortable(); this.make_blocks_sortable(); this.prepare_sorted_sidebar(values.is_public); @@ -877,36 +953,26 @@ frappe.views.Workspace = class Workspace { return true; } - add_page_to_sidebar({title, icon, parent, is_public}) { + add_page_to_sidebar(page) { let $sidebar = $('.standard-sidebar-section'); - let item = { - title: title, - icon: icon, - parent_page: parent, - public: is_public, - selected: true - }; + let item = {...page}; + + item.selected = true; + item.is_editable = true; + let $sidebar_item = this.sidebar_item_container(item); - $sidebar_item.addClass('is-draggable'); - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - $sidebar_item.find('.sidebar-item-control') - ); + this.add_sidebar_actions(item, $sidebar_item.find('.sidebar-item-control'), true); $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); - let $sidebar_section = is_public ? $sidebar[1] : $sidebar[0]; + let sidebar_section = item.is_public ? $sidebar[1] : $sidebar[0]; - if (!parent) { - !is_public && $sidebar.first().removeClass('hidden'); - $sidebar_item.appendTo($sidebar_section); + if (!item.parent) { + !item.is_public && $sidebar.first().removeClass('hidden'); + $sidebar_item.appendTo(sidebar_section); } else { - let $item_container = $($sidebar_section).find(`[item-name="${parent}"]`); + let $item_container = $(sidebar_section).find(`[item-name="${item.parent}"]`); let $child_section = $item_container.find('.sidebar-child-item'); let $drop_icon = $item_container.find('.drop-icon'); if (!$child_section[0]) { @@ -916,8 +982,14 @@ frappe.views.Workspace = class Workspace { } $sidebar_item.appendTo($child_section); $child_section.removeClass('hidden'); + $item_container.find('.drop-icon.hidden').removeClass('hidden'); $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); } + + let section = item.is_public ? 'public' : 'private'; + if (this.sidebar_items && this.sidebar_items[section] && !this.sidebar_items[section][item.title]) { + this.sidebar_items[section][item.title] = $sidebar_item; + } } initialize_editorjs(blocks) { From 0063c917a932ea1bc4c5c831cf05c76f627a247c Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 15 Dec 2021 20:55:43 +0530 Subject: [PATCH 014/101] fix: minor paragraph block fix --- .../js/frappe/views/workspace/blocks/paragraph.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index be6ba94c24..c2f3aee6ad 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -27,7 +27,10 @@ export default class Paragraph extends Block { } onKeyUp(e) { - $(this.wrapper.parentElement).find('.block-list-container.dropdown-list').hide(); + if (!this.wrapper) return; + let $block_list_container = $(this.wrapper.parentElement).find('.block-list-container.dropdown-list'); + + $block_list_container.addClass('hidden'); if (e.code !== 'Backspace' && e.code !== 'Delete') { return; } @@ -35,7 +38,7 @@ export default class Paragraph extends Block { const {textContent} = this._element; if (textContent === '') { - $(this.wrapper.parentElement).find('.block-list-container.dropdown-list').show(); + $block_list_container .removeClass('hidden'); this._element.innerHTML = ''; } } @@ -53,11 +56,11 @@ export default class Paragraph extends Block { if (textContent !== '') return; let $wrapper = $(this.wrapper).hasClass('ce-paragraph') ? $(this.wrapper.parentElement) : $(this.wrapper); let $block_list_container = $wrapper.find('.block-list-container.dropdown-list'); - $block_list_container.show(); + $block_list_container.removeClass('hidden'); }); div.addEventListener('blur', () => { let $block_list_container = $(this.wrapper.parentElement).find('.block-list-container.dropdown-list'); - setTimeout(() => $block_list_container.hide(), 1); + setTimeout(() => $block_list_container.addClass('hidden'), 1); }); div.dataset.placeholder = this.api.i18n.t(this._placeholder); div.addEventListener('keyup', this.onKeyUp); @@ -93,7 +96,7 @@ export default class Paragraph extends Block { $block_list_container.append($block_list_item); }); - $block_list_container.hide(); + $block_list_container.addClass('hidden'); $block_list_container.appendTo(this.wrapper); } From eb37ac45b797ae953db521916a286d4b9ce298f1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 16 Dec 2021 13:05:23 +0530 Subject: [PATCH 015/101] fix: sider fix --- .../js/frappe/views/workspace/blocks/block.js | 16 ++++++++-------- .../js/frappe/views/workspace/blocks/header.js | 2 +- .../frappe/views/workspace/blocks/header_size.js | 6 +++--- .../js/frappe/views/workspace/blocks/spacer.js | 2 +- .../js/frappe/views/workspace/workspace.js | 12 ++++++------ frappe/public/js/frappe/widgets/base_widget.js | 10 ---------- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index 6c1a0307cc..b85b75a625 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -68,13 +68,13 @@ export default class Block { // disable text selection on mousedown (on drag) function un_focus() { if (document.selection) { - document.selection.empty() + document.selection.empty(); } else { - window.getSelection().removeAllRanges() + window.getSelection().removeAllRanges(); } } - function stop_drag(e) { + function stop_drag() { $(this).css("cursor", "default"); $('.widget').css("pointer-events", "auto"); $(me.wrapper.parentElement).find('.resizer').css("border-right", "0px solid transparent"); @@ -173,7 +173,7 @@ export default class Block { icon: frappe.utils.icon('down-arrow', 'sm'), action: () => this.move_block('down') } - ] + ]; let $widget_control = $(this.wrapper).find('.widget-control'); @@ -201,22 +201,22 @@ export default class Block { }); return html; - } + }; $button.click(event => { event.stopPropagation(); $button.find('.dropdown-list').toggleClass('hidden'); }); - $(document).click(event => { + $(document).click(() => { $button.find('.dropdown-list').addClass('hidden'); - }) + }); $widget_control.prepend($button); this.dropdown_list.forEach((item) => { $button.find('.dropdown-list').append(dropdown_item(item.label, item.title, item.icon, item.action)); - }) + }); } add_tune_button() { diff --git a/frappe/public/js/frappe/views/workspace/blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js index 6c11a0bb28..d47b1f5cff 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header.js @@ -69,7 +69,7 @@ export default class Header extends Block { save() { this.wrapper = this._element; return { - text: this.wrapper.innerHTML.replace(/ /gi,''), + text: this.wrapper.innerHTML.replace(/ /gi, ''), col: this.get_col() }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/header_size.js b/frappe/public/js/frappe/views/workspace/blocks/header_size.js index 3d5612c046..3694b8799b 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/header_size.js +++ b/frappe/public/js/frappe/views/workspace/blocks/header_size.js @@ -49,7 +49,7 @@ export default class HeaderSize { } change_size(range, size) { - if (!range) return + if (!range) return; let span = document.createElement('SPAN'); @@ -68,11 +68,11 @@ export default class HeaderSize { let selected_text = span.innerText; let parent_tag = parent_node.parentElement; - if(diff !== selected_text) { + if (diff !== selected_text) { parent_tag = parent_node; } - if(parent_tag.innerText == selected_text) { + if (parent_tag.innerText == selected_text) { if (!parent_tag.classList.contains('ce-header') && !parent_tag.classList.contains('ce-paragraph')) { this.remove_parent_tag(range, parent_node.parentElement, span); parent_tag.remove(); diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index a2cc144885..bb75cea873 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -18,7 +18,7 @@ export default class Spacer extends Block { render() { this.wrapper = document.createElement('div'); - this.wrapper.classList.add('widget','spacer'); + this.wrapper.classList.add('widget', 'spacer'); if (!this.readOnly) { let $spacer = $(`
diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index c85da6f386..aa5ba148b5 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -545,7 +545,7 @@ frappe.views.Workspace = class Workspace { new_updated_item.parent_page = new_item.parent || ""; new_updated_item.public = new_item.is_public; - if (is_title_changed || is_section_changed){ + if (is_title_changed || is_section_changed) { if (new_item.is_public) { new_updated_item.name = new_item.title; new_updated_item.label = new_item.title; @@ -652,7 +652,7 @@ frappe.views.Workspace = class Workspace { icon: frappe.utils.icon('setting-gear', 'sm'), action: () => frappe.set_route(`workspace/${item.name}`) }, - ] + ]; let $button = $(`
@@ -675,7 +675,7 @@ frappe.views.Workspace = class Workspace { }); return html; - } + }; $button.filter('.dropdown-btn').click(event => { event.stopPropagation(); @@ -688,13 +688,13 @@ frappe.views.Workspace = class Workspace { $(document).click(event => { event.stopPropagation(); $('.dropdown-list:not(.hidden)').addClass('hidden'); - }) + }); sidebar_control.append($button); this.dropdown_list.forEach((i) => { $button.filter('.dropdown-list').append(dropdown_item(i.label, i.title, i.icon, i.action)); - }) + }); } delete_page(page) { @@ -937,7 +937,7 @@ frappe.views.Workspace = class Workspace { let child_pages = old_page && from_pages.filter(p => p.parent_page == old_page.title); if (child_pages) { child_pages.every(child_page => { - if(to_pages && to_pages.find(p => p.title == child_page.title)) { + if (to_pages && to_pages.find(p => p.title == child_page.title)) { message = `One of the child page with name ${child_page.title} already exist in ${section} Section. Please update the name of the child page first before moving`; cur_dialog.hide(); return false; diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 7376ecb89b..218f6469e7 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -34,16 +34,6 @@ export default class Widget { this.action_area ); - // options.allow_delete && - // frappe.utils.add_custom_button( - // frappe.utils.icon('delete-active', 'xs'), - // () => this.delete(), - // "", - // `${__('Delete')}`, - // null, - // this.action_area - // ); - if (options.allow_hiding) { if (this.hidden) { this.widget.removeClass("hidden"); From d819029974bd9b9f48f8d147b88ad99760e05352 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 16 Dec 2021 13:35:18 +0530 Subject: [PATCH 016/101] fix: add new block glitch because of blur event --- frappe/public/js/frappe/views/workspace/blocks/paragraph.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index c2f3aee6ad..c1d394bec8 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -58,10 +58,6 @@ export default class Paragraph extends Block { let $block_list_container = $wrapper.find('.block-list-container.dropdown-list'); $block_list_container.removeClass('hidden'); }); - div.addEventListener('blur', () => { - let $block_list_container = $(this.wrapper.parentElement).find('.block-list-container.dropdown-list'); - setTimeout(() => $block_list_container.addClass('hidden'), 1); - }); div.dataset.placeholder = this.api.i18n.t(this._placeholder); div.addEventListener('keyup', this.onKeyUp); } From 73c19608c90de596e01d21b8650d83c0d7cedd73 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 16 Dec 2021 13:48:04 +0530 Subject: [PATCH 017/101] fix: while duplicating was not updating icon --- frappe/public/js/frappe/views/workspace/workspace.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index aa5ba148b5..7b670a4ff2 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -771,6 +771,7 @@ frappe.views.Workspace = class Workspace { new_page.title = values.title; new_page.name = values.title; + new_page.icon = values.icon; new_page.public = values.is_public; new_page.parent_page = values.parent || ''; new_page.for_user = ''; From 0b1821b10a5a7053c8c9a807835e9d6d8fab50d5 Mon Sep 17 00:00:00 2001 From: Don-Leopardo Date: Wed, 22 Dec 2021 13:10:22 -0300 Subject: [PATCH 018/101] fix: Module path for external print formats --- frappe/www/printview.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 569ebe27d6..e9be76373f 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -2,7 +2,7 @@ # License: MIT. See LICENSE import frappe, os, copy, json, re -from frappe import _ +from frappe import _, get_module_path from frappe.modules import get_doc_path from frappe.core.doctype.access_log.access_log import make_access_log @@ -251,8 +251,9 @@ def get_print_format(doctype, print_format): frappe.DoesNotExistError) # server, find template - path = os.path.join(get_doc_path(frappe.db.get_value("DocType", doctype, "module"), - "Print Format", print_format.name), frappe.scrub(print_format.name) + ".html") + module = print_format.module or frappe.db.get_value("DocType", doctype, "module") + path = os.path.join(get_module_path(module, "Print Format",print_format.name), + frappe.scrub(print_format.name) + ".html") if os.path.exists(path): with open(path, "r") as pffile: From c9ce941554fccfcafc7d07501c587993a1c0d7b5 Mon Sep 17 00:00:00 2001 From: Don-Leopardo Date: Wed, 22 Dec 2021 14:19:08 -0300 Subject: [PATCH 019/101] fix: Unused imports --- frappe/www/printview.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/www/printview.py b/frappe/www/printview.py index e9be76373f..088c9dc403 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -4,7 +4,6 @@ import frappe, os, copy, json, re from frappe import _, get_module_path -from frappe.modules import get_doc_path from frappe.core.doctype.access_log.access_log import make_access_log from frappe.utils import cint, sanitize_html, strip_html from frappe.utils.jinja_globals import is_rtl From db3870151aa34cb042e899c2ff42bed0021bd7a3 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 4 Jan 2022 15:35:57 +0530 Subject: [PATCH 020/101] fix: Workspace Sidebar, Edit, New Page Fixes Bugs: - Clicking on + button multiple time opens multiple block list - Resizing Onboarding block breaks design - In edit mode links should not be clickable - While creating new page we cannot revisit it from sidebar - While adding multiple links in card getting error Refactor: - All Sidebar actions happens while you do it, no need to click Save Customization button - Updating Sidebar, Creating New Page, Duplicating every action is much faster - Most of the actions are happening in background while rending page using cached data --- frappe/desk/desktop.py | 21 +- frappe/desk/doctype/workspace/workspace.py | 96 +++++--- .../js/frappe/form/controls/dynamic_link.js | 2 +- .../js/frappe/views/workspace/blocks/block.js | 8 +- .../js/frappe/views/workspace/blocks/card.js | 1 + .../js/frappe/views/workspace/blocks/chart.js | 4 +- .../views/workspace/blocks/onboarding.js | 4 +- .../views/workspace/blocks/paragraph.js | 20 +- .../frappe/views/workspace/blocks/shortcut.js | 3 +- .../js/frappe/views/workspace/workspace.js | 205 +++++++++++------- .../public/js/frappe/widgets/base_widget.js | 16 -- .../public/js/frappe/widgets/chart_widget.js | 2 +- .../public/js/frappe/widgets/widget_dialog.js | 17 +- frappe/public/scss/desk/desktop.scss | 17 +- 14 files changed, 239 insertions(+), 177 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index e1789852f1..1f5152dd65 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -453,25 +453,24 @@ def get_custom_report_list(module): return out def save_new_widget(doc, page, blocks, new_widgets): + if loads(new_widgets): + widgets = _dict(loads(new_widgets)) - widgets = _dict(loads(new_widgets)) - - if widgets.chart: - doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) - if widgets.shortcut: - doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) - if widgets.card: - doc.build_links_table_from_card(widgets.card) + if widgets.chart: + doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) + if widgets.shortcut: + doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + if widgets.card: + doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - if widgets: - clean_up(doc, blocks) + clean_up(doc, blocks) try: doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: # Create a json string to log - json_config = dumps(widgets, sort_keys=True, indent=4) + json_config = widgets and dumps(widgets, sort_keys=True, indent=4) # Error log body log = \ diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index a46b91ec0c..452e1794a1 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -122,47 +122,68 @@ def get_report_type(report): report_type = frappe.get_value("Report", report, "report_type") return report_type in ["Query Report", "Script Report", "Custom Report"] +@frappe.whitelist() +def new_page(new_page): + if not loads(new_page): + return + + page = loads(new_page) + + if page.get("public") and not is_workspace_manager(): + return + + doc = frappe.new_doc('Workspace') + doc.title = page.get('title') + doc.icon = page.get('icon') + doc.content = page.get('content') + doc.parent_page = page.get('parent_page') + doc.label = page.get('label') + doc.for_user = page.get('for_user') + doc.public = page.get('public') + doc.sequence_id = last_sequence_id(doc) + 1 + doc.save(ignore_permissions=True) + +def last_sequence_id(doc): + doc_exists = frappe.db.exists({ + 'doctype': 'Workspace', + 'public': doc.public, + 'for_user': doc.for_user + }) + + if not doc_exists: + return 0 + + return frappe.db.get_list('Workspace', + fields=['sequence_id'], + filters={ + 'public': doc.public, + 'for_user': doc.for_user + }, + order_by="sequence_id desc" + )[0].sequence_id @frappe.whitelist() -def save_page(title, icon, parent, public, sb_public_items, sb_private_items, new_widgets, blocks, save): - save = frappe.parse_json(save) +def save_page(title, public, new_widgets, blocks): public = frappe.parse_json(public) - if save: - doc = frappe.new_doc('Workspace') - doc.title = title - doc.icon = icon - doc.content = blocks - doc.parent_page = parent - doc.label = title - doc.for_user = '' - doc.public = 1 - if not public: - doc.label = title + "-" + frappe.session.user - doc.for_user = frappe.session.user - doc.public = 0 - doc.save(ignore_permissions=True) - else: + + filters = { + 'public': public, + 'label': title + } + + if not public: filters = { - 'public': public, - 'label': title + 'for_user': frappe.session.user, + 'label': title + "-" + frappe.session.user } - if not public: - filters = { - 'for_user': frappe.session.user, - 'label': title + "-" + frappe.session.user - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - doc = frappe.get_doc("Workspace", pages[0]) - - doc.content = blocks - doc.save(ignore_permissions=True) + pages = frappe.get_list("Workspace", filters=filters) + if pages: + doc = frappe.get_doc("Workspace", pages[0]) - if loads(new_widgets): - save_new_widget(doc, title, blocks, new_widgets) + doc.content = blocks + doc.save(ignore_permissions=True) - if loads(sb_public_items) or loads(sb_private_items): - sort_pages(loads(sb_public_items), loads(sb_private_items)) + save_new_widget(doc, title, blocks, new_widgets) return {"name": title, "public": public, "label": doc.label} @@ -242,7 +263,14 @@ def delete_page(page): return {"name": page.get("name"), "public": page.get("public"), "title": page.get("title")} +@frappe.whitelist() def sort_pages(sb_public_items, sb_private_items): + if not loads(sb_public_items) and not loads(sb_private_items): + return + + sb_public_items = loads(sb_public_items) + sb_private_items = loads(sb_private_items) + wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js index 2c5661ca87..ea9ceb35f3 100644 --- a/frappe/public/js/frappe/form/controls/dynamic_link.js +++ b/frappe/public/js/frappe/form/controls/dynamic_link.js @@ -2,7 +2,7 @@ frappe.ui.form.ControlDynamicLink = class ControlDynamicLink extends frappe.ui.f get_options() { let options = ''; if (this.df.get_options) { - options = this.df.get_options(); + options = this.df.get_options(this); } else if (this.docname==null && cur_dialog) { //for dialog box options = cur_dialog.get_value(this.df.options); diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index b85b75a625..cc6e5a8a59 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -142,6 +142,7 @@ export default class Block { } add_settings_button() { + let me = this; this.dropdown_list = [ { label: 'Delete', @@ -215,6 +216,10 @@ export default class Block { $widget_control.prepend($button); this.dropdown_list.forEach((item) => { + if ((item.label == 'Expand' || item.label == 'Shrink') && + me.options && !me.options.allow_resize) { + return; + } $button.find('.dropdown-list').append(dropdown_item(item.label, item.title, item.icon, item.action)); }); } @@ -259,6 +264,7 @@ export default class Block { } decrease_width() { + let min_width = this.options && this.options.min_width || 3; const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -282,7 +288,7 @@ export default class Block { }); let parts = className.split('-'); let width = parseInt(parts[1]); - if (width >= 4) { + if (width > min_width) { currentBlockElement.classList.remove('col-'+width); width = width - 1; currentBlockElement.classList.add('col-'+width); diff --git a/frappe/public/js/frappe/views/workspace/blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js index cfcf530fc3..9ce6ce8b4d 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/card.js +++ b/frappe/public/js/frappe/views/workspace/blocks/card.js @@ -22,6 +22,7 @@ export default class Card extends Block { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: true, + allow_resize: true }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js index c132b7e5ec..ccef1fa15f 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/chart.js +++ b/frappe/public/js/frappe/views/workspace/blocks/chart.js @@ -21,7 +21,9 @@ export default class Chart extends Block { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: true, - max_widget_count: 2, + allow_resize: true, + min_width: 6, + max_widget_count: 2 }; } diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js index 54b6421048..6ea427df77 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -21,7 +21,8 @@ export default class Onboarding extends Block { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: true + allow_edit: true, + allow_resize: false }; } @@ -30,7 +31,6 @@ export default class Onboarding extends Block { if (this.readOnly && !$(this.wrapper).find('.onboarding-widget-box').is(':visible')) { $(e).hide(); } - !this.readOnly && this.resizer(); e.classList.add("col-" + this.get_col()); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index c1d394bec8..01e64d7f38 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -28,9 +28,7 @@ export default class Paragraph extends Block { onKeyUp(e) { if (!this.wrapper) return; - let $block_list_container = $(this.wrapper.parentElement).find('.block-list-container.dropdown-list'); - - $block_list_container.addClass('hidden'); + this.show_hide_block_list(true); if (e.code !== 'Backspace' && e.code !== 'Delete') { return; } @@ -38,11 +36,18 @@ export default class Paragraph extends Block { const {textContent} = this._element; if (textContent === '') { - $block_list_container .removeClass('hidden'); + this.show_hide_block_list(); this._element.innerHTML = ''; } } + show_hide_block_list(hide) { + let $wrapper = $(this.wrapper).hasClass('ce-paragraph') ? $(this.wrapper.parentElement) : $(this.wrapper); + let $block_list_container = $wrapper.find('.block-list-container.dropdown-list'); + $block_list_container.removeClass('hidden'); + hide && $block_list_container.addClass('hidden'); + } + drawView() { let div = document.createElement('DIV'); @@ -54,10 +59,11 @@ export default class Paragraph extends Block { div.addEventListener('focus', () => { const {textContent} = this._element; if (textContent !== '') return; - let $wrapper = $(this.wrapper).hasClass('ce-paragraph') ? $(this.wrapper.parentElement) : $(this.wrapper); - let $block_list_container = $wrapper.find('.block-list-container.dropdown-list'); - $block_list_container.removeClass('hidden'); + this.show_hide_block_list(); }); + div.addEventListener('blur', () => { + setTimeout(() => { this.show_hide_block_list(true) }, 10); + }) div.dataset.placeholder = this.api.i18n.t(this._placeholder); div.addEventListener('keyup', this.onKeyUp); } diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 6a6704152f..c74eba7f0a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -20,7 +20,8 @@ export default class Shortcut extends Block { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: true + allow_edit: true, + allow_resize: true }; } diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 7b670a4ff2..5b3e04f49e 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -22,7 +22,6 @@ frappe.views.Workspace = class Workspace { this.page = wrapper.page; this.blocks = frappe.wspace_block.blocks; this.is_read_only = true; - this.new_page = null; this.pages = {}; this.sorted_public_items = []; this.sorted_private_items = []; @@ -51,9 +50,10 @@ frappe.views.Workspace = class Workspace { } async setup_pages(reload) { - this.create_page_skeleton(); - this.create_sidebar_skeleton(); + !this.discard && this.create_page_skeleton(); + !this.discard && this.create_sidebar_skeleton(); this.sidebar_pages = !this.discard ? await this.get_pages() : this.sidebar_pages; + this.cached_pages = $.extend(true, {}, this.sidebar_pages); this.all_pages = this.sidebar_pages.pages; this.has_access = this.sidebar_pages.has_access; @@ -69,20 +69,6 @@ frappe.views.Workspace = class Workspace { for (let page of this.all_pages) { frappe.workspaces[frappe.router.slug(page.name)] = {title: page.title}; } - if (this.new_page && this.new_page.name) { - if (!frappe.workspaces[frappe.router.slug(this.new_page.label)]) { - this.new_page = { - name: this.all_pages[0].title, - public: this.all_pages[0].public - }; - } - - let pre_url = this.new_page.public ? '' : 'private/'; - let route = pre_url + frappe.router.slug(this.new_page.name); - frappe.set_route(route); - - this.new_page = null; - } this.make_sidebar(); reload && this.show(); } @@ -392,10 +378,12 @@ frappe.views.Workspace = class Workspace { __("Save Customizations"), () => { this.clear_page_actions(); - this.undo.readOnly = true; - this.save_page(); - this.editor.readOnly.toggle(); - this.is_read_only = true; + this.save_page(page).then((saved) => { + if (!saved) return; + this.undo.readOnly = true; + this.editor.readOnly.toggle(); + this.is_read_only = true; + }); }, null, __("Saving") @@ -408,6 +396,7 @@ frappe.views.Workspace = class Workspace { this.clear_page_actions(); await this.editor.readOnly.toggle(); this.is_read_only = true; + this.sidebar_pages = this.cached_pages; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } @@ -425,14 +414,21 @@ frappe.views.Workspace = class Workspace { add_sidebar_actions(item, sidebar_control, is_new) { if (!item.is_editable) { - $(`${frappe.utils.icon("lock", "sm")}`) - .appendTo(sidebar_control); sidebar_control.parent().click(() => { !this.is_read_only && frappe.show_alert({ message: __("Only Workspace Manager can sort or edit this page"), indicator: 'info' }, 5); }); + + frappe.utils.add_custom_button( + frappe.utils.icon('duplicate', 'sm'), + () => this.duplicate_page(item), + "duplicate-page", + `${__('Duplicate Workspace')}`, + null, + sidebar_control + ); } else { frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), @@ -586,7 +582,7 @@ frappe.views.Workspace = class Workspace { this.update_cached_values(old_child, child); } - update_cached_values(old_item, new_item, duplicate) { + update_cached_values(old_item, new_item, duplicate, new_page) { let [from_pages, to_pages] = old_item.public ? [this.public_pages, this.private_pages] : [this.private_pages, this.public_pages]; @@ -594,7 +590,7 @@ frappe.views.Workspace = class Workspace { duplicate && old_item_index++; // update frappe.workspaces - if (frappe.workspaces[frappe.router.slug(old_item.name)]) { + if (frappe.workspaces[frappe.router.slug(old_item.name)] || new_page) { !duplicate && delete frappe.workspaces[frappe.router.slug(old_item.name)]; if (new_item) { frappe.workspaces[frappe.router.slug(new_item.name)] = {'title': new_item.title}; @@ -602,9 +598,9 @@ frappe.views.Workspace = class Workspace { } // update page block data - if (this.pages && this.pages[old_item.name]) { + if (this.pages && this.pages[old_item.name] || new_page) { if (new_item) { - this.pages[new_item.name] = this.pages[old_item.name]; + this.pages[new_item.name] = this.pages[old_item.name] || {}; } !duplicate && delete this.pages[old_item.name]; } @@ -616,6 +612,8 @@ frappe.views.Workspace = class Workspace { if (is_section_changed) { !duplicate && from_pages.splice(old_item_index, 1); to_pages.push(new_item); + } else if (new_page) { + from_pages.push(new_item); } else { from_pages.splice(old_item_index, duplicate ? 0 : 1, new_item); } @@ -624,6 +622,7 @@ frappe.views.Workspace = class Workspace { } this.sidebar_pages.pages = [...this.public_pages, ...this.private_pages]; + this.cached_pages = this.sidebar_pages; } add_settings_button(item, sidebar_control) { @@ -770,16 +769,14 @@ frappe.views.Workspace = class Workspace { let new_page = {...page}; new_page.title = values.title; - new_page.name = values.title; + new_page.public = values.is_public || 0; + new_page.name = values.title + new_page.public ? '' : '-' + frappe.session.user; + new_page.label = new_page.name; new_page.icon = values.icon; - new_page.public = values.is_public; new_page.parent_page = values.parent || ''; - new_page.for_user = ''; - if (!values.is_public) { - new_page.name += '-' + frappe.session.user; - new_page.for_user = frappe.session.user; - } - new_page.label = new_page.name; + new_page.for_user = new_page.public ? '' : frappe.session.user; + new_page.is_editable = !new_page.public; + new_page.selected = true; this.update_cached_values(page, new_page, true); @@ -807,35 +804,69 @@ frappe.views.Workspace = class Workspace { onEnd: function (evt) { let is_public = $(evt.item).attr('item-public') == '1'; me.prepare_sorted_sidebar(is_public); + me.update_sorted_sidebar(); } }); }); } prepare_sorted_sidebar(is_public) { + let pages = is_public ? this.public_pages : this.private_pages; if (is_public) { - this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last()); + this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last(), pages); } else { - this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first()); + this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first(), pages); } + + this.sidebar_pages.pages = [...this.public_pages, ...this.private_pages]; + this.cached_pages = this.sidebar_pages; } - sort_sidebar($sidebar_section) { + sort_sidebar($sidebar_section, pages) { let sorted_items = []; - for (let page of $sidebar_section.find('.sidebar-item-container')) { + Array.from($sidebar_section.find('.sidebar-item-container')).forEach((page, i) => { let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { parent_page = page.parentElement.parentElement.attributes["item-name"].value; } + sorted_items.push({ title: page.attributes['item-name'].value, parent_page: parent_page, public: page.attributes['item-public'].value }); - } + + let $drop_icon = $(page).find('.sidebar-item-control .drop-icon').first(); + if ($(page).find('.sidebar-child-item > *').length != 0) { + $drop_icon.removeClass('hidden'); + } else { + $drop_icon.addClass('hidden'); + } + + let from_index = pages.findIndex(p => p.title == page.attributes['item-name'].value); + let element = pages[from_index]; + element.parent_page = parent_page; + if (from_index != i) { + pages.splice(from_index, 1); + pages.splice(i, 0, element); + } + }); return sorted_items; } + update_sorted_sidebar() { + if (this.sorted_public_items || this.sorted_private_items) { + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.sort_pages", + args: { + sb_public_items: this.sorted_public_items, + sb_private_items: this.sorted_private_items, + } + }); + } + } + make_blocks_sortable() { let me = this; this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { @@ -894,26 +925,49 @@ frappe.views.Workspace = class Workspace { d.hide(); this.initialize_editorjs_undo(); this.setup_customization_buttons({is_editable: true}); - this.title = values.title; - this.icon = values.icon; - this.parent = values.parent; - this.public = values.is_public; + + let name = values.title + (values.is_public ? '' : '-' + frappe.session.user); + let blocks = [{ + type: "header", + data: { text: values.title } + }] + + let new_page = { + content: JSON.stringify(blocks), + name: name, + label: name, + title: values.title, + public: values.is_public || 0, + for_user: values.is_public ? '' : frappe.session.user, + icon: values.icon, + parent_page: values.parent || '', + is_editable: true, + selected: true + } + this.editor.render({ - blocks: [{ - type: "header", - data: { text: this.title } - }] + blocks: blocks }).then(async () => { if (this.editor.configuration.readOnly) { this.is_read_only = false; await this.editor.readOnly.toggle(); } - this.add_page_to_sidebar(values); - this.show_sidebar_actions(); - this.make_blocks_sortable(); - this.prepare_sorted_sidebar(values.is_public); - this.update_selected_sidebar(this.current_page, false); //remove selected from old page + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.new_page", + args: { + new_page: new_page + } + }); + + this.update_cached_values(new_page, new_page, true, true); + + let pre_url = new_page.public ? '' : 'private/'; + let route = pre_url + frappe.router.slug(new_page.title); + frappe.set_route(route); + + this.make_sidebar(); + this.show_sidebar_actions(); }); } }); @@ -1047,21 +1101,11 @@ frappe.views.Workspace = class Workspace { }); } - save_page() { - frappe.dom.freeze(); - this.create_page_skeleton(); + save_page(page) { let me = this; - let save = true; + this.current_page = { name: page.title, public: page.public }; - if (!this.title && this.current_page) { - this.title = this.current_page.name; - this.public = this.current_page.public; - save = false; - } else { - this.current_page = { name: this.title, public: this.public }; - } - - this.editor.save().then((outputData) => { + return this.editor.save().then((outputData) => { let new_widgets = {}; outputData.blocks.forEach(item => { @@ -1080,29 +1124,32 @@ frappe.views.Workspace = class Workspace { item.data.card_name !== 'Custom Reports') ); + if (page.content == JSON.stringify(blocks)) { + this.setup_customization_buttons(page); + frappe.show_alert({ message: __("No changes made on the page"), indicator: "warning" }); + return false; + } + + this.create_page_skeleton(); + page.content = JSON.stringify(blocks); frappe.call({ method: "frappe.desk.doctype.workspace.workspace.save_page", args: { - title: me.title, - icon: me.icon || '', - parent: me.parent || '', - public: me.public || 0, - sb_public_items: me.sorted_public_items, - sb_private_items: me.sorted_private_items, + title: page.title, + public: page.public || 0, new_widgets: new_widgets, - blocks: JSON.stringify(blocks), - save: save + blocks: JSON.stringify(blocks) }, callback: function(res) { - frappe.dom.unfreeze(); if (res.message) { - me.new_page = res.message; - me.pages[res.message.label] && delete me.pages[res.message.label]; + me.discard = true; + me.update_cached_values(page, page); me.reload(); frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); } } }); + return true; }).catch((error) => { error; // console.log('Saving failed: ', error); @@ -1110,10 +1157,6 @@ frappe.views.Workspace = class Workspace { } reload() { - this.title = ''; - this.icon = ''; - this.parent = ''; - this.public = false; this.sorted_public_items = []; this.sorted_private_items = []; this.setup_pages(true); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 218f6469e7..aabb3526b0 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -66,22 +66,6 @@ export default class Widget { null, this.action_area ); - - if (options.allow_resize) { - const title = this.width == 'Full'? `${__('Collapse')}` : `${__('Expand')}`; - frappe.utils.add_custom_button( - '', - () => this.toggle_width(), - "resize-button", - title, - null, - this.action_area - ); - - this.resize_button = this.action_area.find( - ".resize-button" - ); - } } make() { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index ec602b8522..6c34fac45a 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -28,7 +28,7 @@ export default class ChartWidget extends Widget { } set_chart_title() { - const max_chars = this.widget.width() < 600 ? 20 : 60; + const max_chars = this.widget.width() < 600 ? 40 : 60; this.set_title(max_chars); } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 4d1635bc3f..01d41a0cf9 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -182,19 +182,16 @@ class CardDialog extends WidgetDialog { fieldtype: "Select", in_list_view: 1, label: "Link Type", - options: ["DocType", "Page", "Report"], - onchange: (e) => { - me.link_to = e.currentTarget.value; - } + options: ["DocType", "Page", "Report"] }, { fieldname: "link_to", fieldtype: "Dynamic Link", in_list_view: 1, label: "Link To", - options: "link_type", - get_options: () => { - return me.link_to; + get_options: (df) => { + return df.doc.link_type; + } }, { @@ -507,7 +504,7 @@ class NumberCardDialog extends WidgetDialog { setup_dialog_events() { if (!this.document_type) { - if (this.default_values['doctype']) { + if (this.default_values && this.default_values['doctype']) { this.document_type = this.default_values['doctype']; this.setup_filter(this.default_values['doctype']); this.set_aggregate_function_fields(); @@ -519,7 +516,7 @@ class NumberCardDialog extends WidgetDialog { set_aggregate_function_fields() { let aggregate_function_fields = []; - if (this.document_type) { + if (this.document_type && frappe.get_meta(this.document_type)) { frappe.get_meta(this.document_type).fields.map(df => { if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { if (df.fieldtype == 'Currency') { @@ -538,7 +535,7 @@ class NumberCardDialog extends WidgetDialog { if (data.new_or_existing == 'Existing Card') { data.name = data.card; } - data.stats_filter = JSON.stringify(this.filter_group.get_filters()); + data.stats_filter = this.filter_group && JSON.stringify(this.filter_group.get_filters()); data.document_type = this.document_type; return data; diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 878d51d790..b90ea5553d 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -875,7 +875,7 @@ body { display: none; } - .setting-btn { + .setting-btn, .duplicate-page { display: none; } @@ -883,10 +883,6 @@ body { padding: 10px 12px 10px 2px; } - .sidebar-info { - display: none; - } - svg { margin-right: 0; } @@ -927,12 +923,7 @@ body { display: inline-block; } - .setting-btn { - display: inline-block; - margin-right: 8px; - } - - .sidebar-info { + .setting-btn, .duplicate-page { display: inline-block; margin-right: 8px; } @@ -989,6 +980,10 @@ body { opacity: 0; transition: visibility 0s, opacity 0.5s ease-in-out; } + + .link-item { + pointer-events: none; + } } &:hover { From 8daa3e457a86f3b244602cb4cc0f2253f1675b00 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 4 Jan 2022 15:44:35 +0530 Subject: [PATCH 021/101] fix: sider fix --- frappe/public/js/frappe/views/workspace/blocks/paragraph.js | 4 ++-- frappe/public/js/frappe/views/workspace/workspace.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 01e64d7f38..e8e30bcfae 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -62,8 +62,8 @@ export default class Paragraph extends Block { this.show_hide_block_list(); }); div.addEventListener('blur', () => { - setTimeout(() => { this.show_hide_block_list(true) }, 10); - }) + setTimeout(() => this.show_hide_block_list(true), 10); + }); div.dataset.placeholder = this.api.i18n.t(this._placeholder); div.addEventListener('keyup', this.onKeyUp); } diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 5b3e04f49e..a5f88cc606 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -930,7 +930,7 @@ frappe.views.Workspace = class Workspace { let blocks = [{ type: "header", data: { text: values.title } - }] + }]; let new_page = { content: JSON.stringify(blocks), @@ -943,7 +943,7 @@ frappe.views.Workspace = class Workspace { parent_page: values.parent || '', is_editable: true, selected: true - } + }; this.editor.render({ blocks: blocks From 97edb8f267794253c20216951e75d49102cf7814 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Mon, 10 Jan 2022 10:40:58 +0530 Subject: [PATCH 022/101] fix: delete translation only if label is empty --- .../doctype/customize_form/customize_form.py | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 24a5d1358b..e0dcd2d04c 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -107,20 +107,25 @@ class CustomizeForm(Document): def set_name_translation(self): '''Create, update custom translation for this doctype''' current = self.get_name_translation() - if current: - if self.label and current.translated_text != self.label: - frappe.db.set_value('Translation', current.name, 'translated_text', self.label) - frappe.translate.clear_cache() - else: - # clear translation + if not self.label: + if current: frappe.delete_doc('Translation', current.name) + return - else: - if self.label: - frappe.get_doc(dict(doctype='Translation', - source_text=self.doc_type, - translated_text=self.label, - language_code=frappe.local.lang or 'en')).insert() + if not current: + frappe.get_doc( + { + "doctype": 'Translation', + "source_text": self.doc_type, + "translated_text": self.label, + "language_code": frappe.local.lang or 'en' + } + ).insert() + return + + if self.label != current.translated_text: + frappe.db.set_value('Translation', current.name, 'translated_text', self.label) + frappe.translate.clear_cache() def clear_existing_doc(self): doc_type = self.doc_type From 000625038cb204e2389edf8bc0248b4f6321860c Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Fri, 31 Dec 2021 15:15:00 +0530 Subject: [PATCH 023/101] fix: delete property setter --- frappe/custom/doctype/customize_form/customize_form.py | 2 +- frappe/custom/doctype/property_setter/property_setter.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 24a5d1358b..488c468025 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -377,7 +377,7 @@ class CustomizeForm(Document): def make_property_setter(self, prop, value, property_type, fieldname=None, apply_on=None, row_name = None): - delete_property_setter(self.doc_type, prop, fieldname) + delete_property_setter(self.doc_type, prop, fieldname, row_name) property_value = self.get_existing_property_value(prop, fieldname) diff --git a/frappe/custom/doctype/property_setter/property_setter.py b/frappe/custom/doctype/property_setter/property_setter.py index 7f40be9725..0a65aa6f5d 100644 --- a/frappe/custom/doctype/property_setter/property_setter.py +++ b/frappe/custom/doctype/property_setter/property_setter.py @@ -19,7 +19,7 @@ class PropertySetter(Document): def validate(self): self.validate_fieldtype_change() if self.is_new(): - delete_property_setter(self.doc_type, self.property, self.field_name) + delete_property_setter(self.doc_type, self.property, self.field_name, self.row_name) # clear cache frappe.clear_cache(doctype = self.doc_type) @@ -91,11 +91,13 @@ def make_property_setter(doctype, fieldname, property, value, property_type, for property_setter.insert() return property_setter -def delete_property_setter(doc_type, property, field_name=None): +def delete_property_setter(doc_type, property, field_name=None, row_name=None): """delete other property setters on this, if this is new""" - filters = dict(doc_type = doc_type, property=property) + filters = dict(doc_type=doc_type, property=property) if field_name: filters['field_name'] = field_name + if row_name: + filters["row_name"] = row_name frappe.db.delete('Property Setter', filters) From 01b61071482ef61ff9274eb1e34c1ae54071d336 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 11 Jan 2022 17:24:34 +0530 Subject: [PATCH 024/101] fix: set correct seq_id while duplicating page --- frappe/desk/doctype/workspace/workspace.py | 43 ++++++++++++---------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 452e1794a1..4ed55cbfd4 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -143,25 +143,6 @@ def new_page(new_page): doc.sequence_id = last_sequence_id(doc) + 1 doc.save(ignore_permissions=True) -def last_sequence_id(doc): - doc_exists = frappe.db.exists({ - 'doctype': 'Workspace', - 'public': doc.public, - 'for_user': doc.for_user - }) - - if not doc_exists: - return 0 - - return frappe.db.get_list('Workspace', - fields=['sequence_id'], - filters={ - 'public': doc.public, - 'for_user': doc.for_user - }, - order_by="sequence_id desc" - )[0].sequence_id - @frappe.whitelist() def save_page(title, public, new_widgets, blocks): public = frappe.parse_json(public) @@ -245,7 +226,10 @@ def duplicate_page(page_name, new_page): doc.for_user = doc.for_user or frappe.session.user doc.label = '{0}-{1}'.format(doc.title, doc.for_user) doc.name = doc.label - doc.sequence_id += 0.1 + if old_doc.public == doc.public: + doc.sequence_id += 0.1 + else: + doc.sequence_id = last_sequence_id(doc) + 1 doc.insert(ignore_permissions=True) @frappe.whitelist() @@ -290,6 +274,25 @@ def sort_page(wspace_pages, pages): doc.save(ignore_permissions=True) break +def last_sequence_id(doc): + doc_exists = frappe.db.exists({ + 'doctype': 'Workspace', + 'public': doc.public, + 'for_user': doc.for_user + }) + + if not doc_exists: + return 0 + + return frappe.db.get_list('Workspace', + fields=['sequence_id'], + filters={ + 'public': doc.public, + 'for_user': doc.for_user + }, + order_by="sequence_id desc" + )[0].sequence_id + def get_page_list(fields, filters): return frappe.get_list("Workspace", fields=fields, filters=filters, order_by='sequence_id asc') From 1d3c113396ddac40c4f6dc26f611f7ef6ab21c59 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 11 Jan 2022 17:26:35 +0530 Subject: [PATCH 025/101] fix: don't show current page in parent's field while editing page details --- .../js/frappe/views/workspace/workspace.js | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index a5f88cc606..3626a681e1 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -443,15 +443,21 @@ frappe.views.Workspace = class Workspace { } } - get_parent_pages() { - this.public_parent_pages = ['', ...this.public_pages.filter(page => !page.parent_page).map(page => page.title)]; - this.private_parent_pages = ['', ...this.private_pages.filter(page => !page.parent_page).map(page => page.title)]; + get_parent_pages(page) { + this.public_parent_pages = ['', ...this.public_pages.filter(p => !p.parent_page).map(p => p.title)]; + this.private_parent_pages = ['', ...this.private_pages.filter(p => !p.parent_page).map(p => p.title)]; + + if(page) { + return page.public ? this.public_parent_pages : this.private_parent_pages; + } } edit_page(item) { var me = this; let old_item = item; - this.get_parent_pages(); + let parent_pages = this.get_parent_pages(item); + let idx = parent_pages.findIndex(x => x == item.title); + if (idx !== -1) parent_pages.splice(idx, 1); const d = new frappe.ui.Dialog({ title: __('Update Details'), fields: [ @@ -466,7 +472,7 @@ frappe.views.Workspace = class Workspace { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', - options: item.public ? this.public_parent_pages : this.private_parent_pages, + options: parent_pages, default: item.parent_page }, { @@ -716,7 +722,7 @@ frappe.views.Workspace = class Workspace { duplicate_page(page) { var me = this; - this.get_parent_pages(); + let parent_pages = this.get_parent_pages(page); const d = new frappe.ui.Dialog({ title: __('Create Duplicate'), fields: [ @@ -730,7 +736,7 @@ frappe.views.Workspace = class Workspace { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', - options: page.public ? this.public_parent_pages : this.private_parent_pages, + options: parent_pages, default: page.parent_page }, { @@ -770,7 +776,7 @@ frappe.views.Workspace = class Workspace { new_page.title = values.title; new_page.public = values.is_public || 0; - new_page.name = values.title + new_page.public ? '' : '-' + frappe.session.user; + new_page.name = values.title + (new_page.public ? '' : '-' + frappe.session.user); new_page.label = new_page.name; new_page.icon = values.icon; new_page.parent_page = values.parent || ''; From b85d5bd48358d4b0d6ded9ffe1f697b213104bee Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 12 Jan 2022 16:21:14 +0530 Subject: [PATCH 026/101] chore: renamed wspace to workspace --- frappe/boot.py | 4 ++-- frappe/desk/desktop.py | 18 +++++++++--------- frappe/desk/doctype/workspace/workspace.py | 12 ++++++------ frappe/patches/v14_0/update_workspace2.py | 8 ++++---- frappe/public/js/frappe/router.js | 6 +++--- .../js/frappe/views/workspace/blocks/index.js | 6 +++--- .../frappe/views/workspace/blocks/paragraph.js | 2 +- .../js/frappe/views/workspace/workspace.js | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index e671d8b37d..0dafd391b0 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -107,8 +107,8 @@ def load_conf_settings(bootinfo): if key in conf: bootinfo[key] = conf.get(key) def load_desktop_data(bootinfo): - from frappe.desk.desktop import get_wspace_sidebar_items - bootinfo.allowed_workspaces = get_wspace_sidebar_items().get('pages') + from frappe.desk.desktop import get_workspace_sidebar_items + bootinfo.allowed_workspaces = get_workspace_sidebar_items().get('pages') bootinfo.module_page_map = get_controller("Workspace").get_module_page_map() bootinfo.dashboards = frappe.get_all("Dashboard") diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 1f5152dd65..49ca04abd4 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -346,20 +346,20 @@ def get_desktop_page(page): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - wspace = Workspace(loads(page)) - wspace.build_workspace() + workspace = Workspace(loads(page)) + workspace.build_workspace() return { - 'charts': wspace.charts, - 'shortcuts': wspace.shortcuts, - 'cards': wspace.cards, - 'onboardings': wspace.onboardings + 'charts': workspace.charts, + 'shortcuts': workspace.shortcuts, + 'cards': workspace.cards, + 'onboardings': workspace.onboardings } except DoesNotExistError: frappe.log_error(frappe.get_traceback()) return {} @frappe.whitelist() -def get_wspace_sidebar_items(): +def get_workspace_sidebar_items(): """Get list of sidebar items for desk""" has_access = "Workspace Manager" in frappe.get_roles() @@ -385,8 +385,8 @@ def get_wspace_sidebar_items(): # Filter Page based on Permission for page in all_pages: try: - wspace = Workspace(page, True) - if wspace.is_permitted() and wspace.is_page_allowed() or has_access: + workspace = Workspace(page, True) + if workspace.is_permitted() and workspace.is_page_allowed() or has_access: if page.public: pages.append(page) elif page.for_user == frappe.session.user: diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 4ed55cbfd4..015be7a6a9 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -255,18 +255,18 @@ def sort_pages(sb_public_items, sb_private_items): sb_public_items = loads(sb_public_items) sb_private_items = loads(sb_private_items) - wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) - wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) + workspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) + workspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) if sb_private_items: - sort_page(wspace_private_pages, sb_private_items) + sort_page(workspace_private_pages, sb_private_items) if sb_public_items and is_workspace_manager(): - sort_page(wspace_public_pages, sb_public_items) + sort_page(workspace_public_pages, sb_public_items) -def sort_page(wspace_pages, pages): +def sort_page(workspace_pages, pages): for seq, d in enumerate(pages): - for page in wspace_pages: + for page in workspace_pages: if page.title == d.get('title'): doc = frappe.get_doc('Workspace', page.name) doc.sequence_id = seq + 1 diff --git a/frappe/patches/v14_0/update_workspace2.py b/frappe/patches/v14_0/update_workspace2.py index 82076c4328..a4b057b989 100644 --- a/frappe/patches/v14_0/update_workspace2.py +++ b/frappe/patches/v14_0/update_workspace2.py @@ -5,10 +5,10 @@ from frappe import _ def execute(): frappe.reload_doc('desk', 'doctype', 'workspace', force=True) - for seq, wspace in enumerate(frappe.get_all('Workspace', order_by='name asc')): - doc = frappe.get_doc('Workspace', wspace.name) + for seq, workspace in enumerate(frappe.get_all('Workspace', order_by='name asc')): + doc = frappe.get_doc('Workspace', workspace.name) content = create_content(doc) - update_wspace(doc, seq, content) + update_workspace(doc, seq, content) frappe.db.commit() def create_content(doc): @@ -49,7 +49,7 @@ def create_content(doc): del doc.links[doc.links.index(l)] return content -def update_wspace(doc, seq, content): +def update_workspace(doc, seq, content): if not doc.title and not doc.content and not doc.is_standard and not doc.public: doc.sequence_id = seq + 1 doc.content = json.dumps(content) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 7874ffcdde..5256bbdec1 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -133,14 +133,14 @@ frappe.router = { // /app/user/user-001 = ["Form", "User", "user-001"] // /app/event/view/calendar/default = ["List", "Event", "Calendar", "Default"] - let private_wspace = route[1] && `${route[1]}-${frappe.user.name.toLowerCase()}`; + let private_workspace = route[1] && `${route[1]}-${frappe.user.name.toLowerCase()}`; if (frappe.workspaces[route[0]]) { // public workspace route = ['Workspaces', frappe.workspaces[route[0]].title]; - } else if (route[0] == 'private' && frappe.workspaces[private_wspace]) { + } else if (route[0] == 'private' && frappe.workspaces[private_workspace]) { // private workspace - route = ['Workspaces', 'private', frappe.workspaces[private_wspace].title]; + route = ['Workspaces', 'private', frappe.workspaces[private_workspace].title]; } else if (this.routes[route[0]]) { // route route = this.set_doctype_route(route); diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js index 4a9604840f..e484cc72e3 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/index.js +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -11,9 +11,9 @@ import Onboarding from "./onboarding"; import SpacingTune from "./spacing_tune"; import HeaderSize from "./header_size"; -frappe.provide("frappe.wspace_block"); +frappe.provide("frappe.workspace_block"); -frappe.wspace_block.blocks = { +frappe.workspace_block.blocks = { header: Header, paragraph: Paragraph, card: Card, @@ -23,7 +23,7 @@ frappe.wspace_block.blocks = { onboarding: Onboarding, }; -frappe.wspace_block.tunes = { +frappe.workspace_block.tunes = { spacing_tune: SpacingTune, header_size: HeaderSize, }; \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index e8e30bcfae..1f0b131947 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -78,7 +78,7 @@ export default class Paragraph extends Block {
`); - let all_blocks = frappe.wspace_block.blocks; + let all_blocks = frappe.workspace_block.blocks; Object.keys(all_blocks).forEach(key => { let $block_list_item = $(`
diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 3626a681e1..41886695f3 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -20,7 +20,7 @@ frappe.views.Workspace = class Workspace { constructor(wrapper) { this.wrapper = $(wrapper); this.page = wrapper.page; - this.blocks = frappe.wspace_block.blocks; + this.blocks = frappe.workspace_block.blocks; this.is_read_only = true; this.pages = {}; this.sorted_public_items = []; @@ -75,7 +75,7 @@ frappe.views.Workspace = class Workspace { } get_pages() { - return frappe.xcall("frappe.desk.desktop.get_wspace_sidebar_items"); + return frappe.xcall("frappe.desk.desktop.get_workspace_sidebar_items"); } sidebar_item_container(item) { @@ -447,7 +447,7 @@ frappe.views.Workspace = class Workspace { this.public_parent_pages = ['', ...this.public_pages.filter(p => !p.parent_page).map(p => p.title)]; this.private_parent_pages = ['', ...this.private_pages.filter(p => !p.parent_page).map(p => p.title)]; - if(page) { + if (page) { return page.public ? this.public_parent_pages : this.private_parent_pages; } } @@ -1094,7 +1094,7 @@ frappe.views.Workspace = class Workspace { } }, spacer: this.blocks['spacer'], - HeaderSize: frappe.wspace_block.tunes['header_size'], + HeaderSize: frappe.workspace_block.tunes['header_size'], }; this.editor = new EditorJS({ data: { From 8072eee5aed1bf2b99046f74c96efc77fef0e9b9 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 13 Jan 2022 12:56:26 +0530 Subject: [PATCH 027/101] fix: while deleting page save customization button should not be visible --- frappe/public/js/frappe/views/workspace/workspace.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 41886695f3..b77a8d4d25 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -288,7 +288,6 @@ frappe.views.Workspace = class Workspace { let current_page = pages.filter(p => p.title == page.name)[0]; this.content = current_page && JSON.parse(current_page.content); - this.setup_actions(page); this.add_custom_cards_in_content(); $('.item-anchor').addClass('disable-click'); @@ -299,6 +298,8 @@ frappe.views.Workspace = class Workspace { await frappe.after_ajax(() => this.get_data(current_page)); } + this.setup_actions(page); + this.prepare_editorjs(); $('.item-anchor').removeClass('disable-click'); @@ -709,6 +710,7 @@ frappe.views.Workspace = class Workspace { args: { page: page } }); + this.page.clear_primary_action(); this.update_cached_values(page); if (this.current_page.name == page.title && this.current_page.public == page.public) { From 759949aef43357c0684f64feaad88327ebb8f17e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 13 Jan 2022 12:57:02 +0530 Subject: [PATCH 028/101] test: Updated workspace test based on new design --- cypress/integration/workspace.js | 40 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/cypress/integration/workspace.js b/cypress/integration/workspace.js index 65586366e6..5fe64bc321 100644 --- a/cypress/integration/workspace.js +++ b/cypress/integration/workspace.js @@ -33,44 +33,39 @@ context('Workspace 2.0', () => { }); it('Add New Block', () => { - cy.get('.codex-editor__redactor .ce-block'); - cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); - cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Heading').click(); + cy.get('.ce-block').click().type('{enter}'); + cy.get('.block-list-container .block-list-item').contains('Heading').click(); cy.get(":focus").type('Header'); cy.get(".ce-block:last").find('.ce-header').should('exist'); - cy.get('.custom-actions .inner-group-button[data-label="Add%20Block"]').click(); - cy.get('.custom-actions .inner-group-button .dropdown-menu .block-menu-item-label').contains('Text').click(); + cy.get('.ce-block:last').click().type('{enter}'); + cy.get('.block-list-container .block-list-item').contains('Text').click(); cy.get(":focus").type('Paragraph text'); cy.get(".ce-block:last").find('.ce-paragraph').should('exist'); }); it('Delete A Block', () => { - cy.get(".ce-block:last").find('.delete-paragraph').click(); + cy.get(":focus").click(); + cy.get('.paragraph-control .setting-btn').click(); + cy.get('.paragraph-control .dropdown-item').contains('Delete').click(); cy.get(".ce-block:last").find('.ce-paragraph').should('not.exist'); }); it('Shrink and Expand A Block', () => { - cy.get(".ce-block:last").find('.tune-btn').click(); - cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get(":focus").click(); + cy.get('.ce-block:last .setting-btn').click(); + cy.get('.ce-block:last .dropdown-item').contains('Shrink').click(); cy.get(".ce-block:last").should('have.class', 'col-11'); - cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get('.ce-block:last .dropdown-item').contains('Shrink').click(); cy.get(".ce-block:last").should('have.class', 'col-10'); - cy.get('.ce-settings--opened .ce-shrink-button').click(); + cy.get('.ce-block:last .dropdown-item').contains('Shrink').click(); cy.get(".ce-block:last").should('have.class', 'col-9'); - cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get('.ce-block:last .dropdown-item').contains('Expand').click(); cy.get(".ce-block:last").should('have.class', 'col-10'); - cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get('.ce-block:last .dropdown-item').contains('Expand').click(); cy.get(".ce-block:last").should('have.class', 'col-11'); - cy.get('.ce-settings--opened .ce-expand-button').click(); + cy.get('.ce-block:last .dropdown-item').contains('Expand').click(); cy.get(".ce-block:last").should('have.class', 'col-12'); - }); - - it('Change Header Text Size', () => { - cy.get('.ce-settings--opened .cdx-settings-button[data-level="3"]').click(); - cy.get(".ce-block:last").find('.widget-head h3').should('exist'); - cy.get('.ce-settings--opened .cdx-settings-button[data-level="4"]').click(); - cy.get(".ce-block:last").find('.widget-head h4').should('exist'); cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); }); @@ -79,7 +74,10 @@ context('Workspace 2.0', () => { cy.get('.codex-editor__redactor .ce-block'); cy.get('.standard-actions .btn-secondary[data-label=Edit]').click(); - cy.get('.sidebar-item-container[item-name="Test Private Page"]').find('.sidebar-item-control .delete-page').click(); + cy.get('.sidebar-item-container[item-name="Test Private Page"]') + .find('.sidebar-item-control .setting-btn').click(); + cy.get('.sidebar-item-container[item-name="Test Private Page"]') + .find('.dropdown-item[title="Delete Workspace"]').click({force: true}); cy.wait(300); cy.get('.modal-footer > .standard-actions > .btn-modal-primary:visible').first().click(); cy.get('.standard-actions .btn-primary[data-label="Save Customizations"]').click(); From e0119cfb2ae874e5319e0d721f4ed61a53fa7d93 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 13 Jan 2022 17:10:06 +0530 Subject: [PATCH 029/101] fix: added notification for workspace creation, editing, duplicating and rearranging sidebar pages --- frappe/desk/doctype/workspace/workspace.py | 12 +++++-- .../js/frappe/views/workspace/workspace.js | 34 ++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 015be7a6a9..b40f517350 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -143,6 +143,8 @@ def new_page(new_page): doc.sequence_id = last_sequence_id(doc) + 1 doc.save(ignore_permissions=True) + return doc + @frappe.whitelist() def save_page(title, public, new_widgets, blocks): public = frappe.parse_json(public) @@ -232,6 +234,8 @@ def duplicate_page(page_name, new_page): doc.sequence_id = last_sequence_id(doc) + 1 doc.insert(ignore_permissions=True) + return doc + @frappe.whitelist() def delete_page(page): if not loads(page): @@ -259,10 +263,12 @@ def sort_pages(sb_public_items, sb_private_items): workspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) if sb_private_items: - sort_page(workspace_private_pages, sb_private_items) + return sort_page(workspace_private_pages, sb_private_items) if sb_public_items and is_workspace_manager(): - sort_page(workspace_public_pages, sb_public_items) + return sort_page(workspace_public_pages, sb_public_items) + + return False def sort_page(workspace_pages, pages): for seq, d in enumerate(pages): @@ -274,6 +280,8 @@ def sort_page(workspace_pages, pages): doc.save(ignore_permissions=True) break + return True + def last_sequence_id(doc): doc_exists = frappe.db.exists({ 'doctype': 'Workspace', diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index b77a8d4d25..13101973b3 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -512,6 +512,12 @@ frappe.views.Workspace = class Workspace { icon: values.icon || '', parent: values.parent || '', public: values.is_public || 0, + }, + callback: function(res) { + if (res.message) { + let message = `Workspace ${old_item.title} Edited Successfully`; + frappe.show_alert({ message: __(message), indicator: "green" }); + } } }); @@ -707,7 +713,14 @@ frappe.views.Workspace = class Workspace { frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title]), () => { frappe.call({ method: "frappe.desk.doctype.workspace.workspace.delete_page", - args: { page: page } + args: { page: page }, + callback: function(res) { + if (res.message) { + let page = res.message; + let message = `Workspace ${page.title} Deleted Successfully`; + frappe.show_alert({ message: __(message), indicator: "green" }); + } + } }); this.page.clear_primary_action(); @@ -771,6 +784,13 @@ frappe.views.Workspace = class Workspace { args: { page_name: page.name, new_page: values + }, + callback: function(res) { + if (res.message) { + let new_page = res.message; + let message = `Duplicate of ${page.title} named as ${new_page.title} is created successfully`; + frappe.show_alert({ message: __(message), indicator: "green" }); + } } }); @@ -870,6 +890,12 @@ frappe.views.Workspace = class Workspace { args: { sb_public_items: this.sorted_public_items, sb_private_items: this.sorted_private_items, + }, + callback: function(res) { + if (res.message) { + let message = `Sidebar Updated Successfully`; + frappe.show_alert({ message: __(message), indicator: "green" }); + } } }); } @@ -965,6 +991,12 @@ frappe.views.Workspace = class Workspace { method: "frappe.desk.doctype.workspace.workspace.new_page", args: { new_page: new_page + }, + callback: function(res) { + if (res.message) { + let message = `Workspace ${new_page.title} Created Successfully`; + frappe.show_alert({ message: __(message), indicator: "green" }); + } } }); From 94869e8e6934313d140bb3c52e7abd92af392f16 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 13 Jan 2022 18:40:36 +0530 Subject: [PATCH 030/101] fix: updated standard workspace json files --- frappe/automation/workspace/tools/tools.json | 6 +++--- frappe/core/workspace/build/build.json | 6 +++--- frappe/core/workspace/settings/settings.json | 6 +++--- frappe/core/workspace/users/users.json | 6 +++--- frappe/custom/workspace/customization/customization.json | 6 +++--- .../integrations/workspace/integrations/integrations.json | 6 +++--- frappe/website/workspace/website/website.json | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index fa2606dc43..40b265b34f 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4}}]", + "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"ToDo\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Note\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"File\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Assignment Rule\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Auto Repeat\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Tools\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Email\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Automation\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Event Streaming\",\"col\":4}}]", "creation": "2020-03-02 14:53:24.980279", "docstatus": 0, "doctype": "Workspace", @@ -208,7 +208,7 @@ "type": "Link" } ], - "modified": "2021-08-05 12:16:02.839181", + "modified": "2022-01-13 17:48:48.456763", "modified_by": "Administrator", "module": "Automation", "name": "Tools", @@ -217,7 +217,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 26, + "sequence_id": 26.0, "shortcuts": [ { "label": "ToDo", diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index aabb4f9d1c..c1c506ae3a 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\",\"level\":4,\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"DocType\",\"col\":4}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Workspace\",\"col\":4}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Report\",\"col\":4}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Elements\",\"level\":4,\"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}}]", "creation": "2021-01-02 10:51:16.579957", "docstatus": 0, "doctype": "Workspace", @@ -222,7 +222,7 @@ "type": "Link" } ], - "modified": "2021-09-05 21:14:52.384816", + "modified": "2022-01-13 17:26:02.736366", "modified_by": "Administrator", "module": "Core", "name": "Build", @@ -231,7 +231,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 5, + "sequence_id": 5.0, "shortcuts": [ { "doc_view": "", diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index 917ce2cbdc..5aadbc42d5 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\",\"level\": 4,\"col\": 12}}, {\"type\":\"shortcut\",\"data\": {\"shortcut_name\":\"System Settings\",\"col\": 4}}, {\"type\":\"shortcut\",\"data\": {\"shortcut_name\":\"Print Settings\",\"col\": 4}}, {\"type\":\"shortcut\",\"data\": {\"shortcut_name\":\"Website Settings\",\"col\": 4}}, {\"type\":\"spacer\",\"data\": {\"col\": 12}}, {\"type\":\"header\",\"data\": {\"text\":\"Reports & Masters\",\"level\": 4,\"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", @@ -367,7 +367,7 @@ "type": "Link" } ], - "modified": "2021-08-05 12:16:03.456174", + "modified": "2022-01-13 17:49:59.586909", "modified_by": "Administrator", "module": "Core", "name": "Settings", @@ -376,7 +376,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 29, + "sequence_id": 29.0, "shortcuts": [ { "icon": "setting", diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index 85c110151b..5741c54eeb 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4}}]", + "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Role\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Permission Manager\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Profile\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"User Type\",\"col\":3}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Users\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Logs\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Permissions\",\"col\":4}}]", "creation": "2020-03-02 15:12:16.754449", "docstatus": 0, "doctype": "Workspace", @@ -145,7 +145,7 @@ "type": "Link" } ], - "modified": "2021-08-05 12:16:03.010205", + "modified": "2022-01-13 17:49:08.912772", "modified_by": "Administrator", "module": "Core", "name": "Users", @@ -154,7 +154,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 27, + "sequence_id": 27.0, "shortcuts": [ { "label": "User", diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index 8938bdec9c..1756abcb1d 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\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\",\"level\":4,\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Customize Form\",\"col\":4}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Custom Role\",\"col\":4}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Client Script\",\"col\":4}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Script\",\"col\":4}},{\"type\":\"spacer\",\"data\":{\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\",\"level\":4,\"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", @@ -123,7 +123,7 @@ "type": "Link" } ], - "modified": "2021-11-24 16:20:03.500885", + "modified": "2022-01-13 17:28:08.345794", "modified_by": "Administrator", "module": "Custom", "name": "Customization", @@ -132,7 +132,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 8, + "sequence_id": 8.0, "shortcuts": [ { "label": "Customize Form", diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index b85056e3ef..bbd2e1199f 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4}}]", + "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Reports & Masters\",\"col\":12}},{\"type\":\"card\",\"data\":{\"card_name\":\"Backup\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Google Services\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Authentication\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Payments\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Settings\",\"col\":4}}]", "creation": "2020-03-02 15:16:18.714190", "docstatus": 0, "doctype": "Workspace", @@ -260,7 +260,7 @@ "type": "Link" } ], - "modified": "2021-08-05 12:16:00.355268", + "modified": "2022-01-13 17:39:01.292154", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", @@ -269,7 +269,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 15, + "sequence_id": 15.0, "shortcuts": [], "title": "Integrations" } \ No newline at end of file diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index bd06f0a131..a0d9a817d4 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Website\", \"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4}}]", + "content": "[{\"type\":\"onboarding\",\"data\":{\"onboarding_name\":\"Website\",\"col\":12}},{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Blog Post\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Blogger\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Web Page\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Web Form\",\"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\":\"Setup\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Blog\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Web Site\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Portal\",\"col\":4}},{\"type\":\"card\",\"data\":{\"card_name\":\"Knowledge Base\",\"col\":4}}]", "creation": "2020-03-02 14:13:51.089373", "docstatus": 0, "doctype": "Workspace", @@ -232,7 +232,7 @@ "type": "Link" } ], - "modified": "2021-08-05 12:16:03.154033", + "modified": "2022-01-13 17:49:41.527194", "modified_by": "Administrator", "module": "Website", "name": "Website", @@ -241,7 +241,7 @@ "public": 1, "restrict_to_domain": "", "roles": [], - "sequence_id": 28, + "sequence_id": 28.0, "shortcuts": [ { "color": "Green", From ca955d2054395780851d823e235e781ccb7f161e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 14 Jan 2022 12:23:35 +0530 Subject: [PATCH 031/101] fix: unescape html while making blocks --- frappe/public/js/frappe/utils/utils.js | 25 ++++++++++++++++--- .../js/frappe/views/workspace/blocks/block.js | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index a3a8f96b11..54d2240b8c 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -243,9 +243,28 @@ Object.assign(frappe.utils, { '=': '=' }; - return String(txt).replace(/[&<>"'`=/]/g, function(char) { - return escape_html_mapping[char]; - }); + return String(txt).replace( + /[&<>"'`=/]/g, + char => escape_html_mapping[char] || char + ); + }, + + unescape_html: function(txt) { + let unescape_html_mapping = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + ''': "'", + '/': '/', + '`': '`', + '=': '=' + } + + return String(txt).replace( + /&|<|>|"|'|/|`|=/g, + char => unescape_html_mapping[char] || char + ); }, html2text: function(html) { diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index cc6e5a8a59..23cb9dcb99 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -7,7 +7,7 @@ export default class Block { make(block, block_name, widget_type = block) { let block_data = this.config.page_data[block+'s'].items.find(obj => { - return obj.label == block_name; + return frappe.utils.unescape_html(obj.label) == frappe.utils.unescape_html(block_name); }); if (!block_data) return false; this.wrapper.innerHTML = ''; From cd670d16485b3ae9fcc54acf4cd597d56cd59c26 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 14 Jan 2022 13:57:26 +0530 Subject: [PATCH 032/101] fix: sider fix --- frappe/public/js/frappe/utils/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 54d2240b8c..725296a121 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -259,7 +259,7 @@ Object.assign(frappe.utils, { '/': '/', '`': '`', '=': '=' - } + }; return String(txt).replace( /&|<|>|"|'|/|`|=/g, From b6cb0fc1e7e66fb22c2324756b5535f54332065e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 Jan 2022 10:01:29 +0530 Subject: [PATCH 033/101] fix: Pass SQL string of lastupdate instead of normal string - Normal string of pypika field has additional quotes which creates a invalid query - `get_sql` returns column name without additional quotes --- frappe/sessions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/sessions.py b/frappe/sessions.py index 6c9acdba13..d2d1a8fcbc 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -112,7 +112,7 @@ def get_expired_sessions(): frappe.db.get_values( sessions, filters=( - PseudoColumn(f"({Now() - sessions.lastupdate})") + PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})") > get_expiry_period_for_query(device) ) & (sessions.device == device), @@ -334,7 +334,7 @@ class Session: sessions, filters=(sessions.sid == self.sid) & ( - PseudoColumn(f"({Now() - sessions.lastupdate})") + PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})") < get_expiry_period_for_query(self.device) ), fieldname=["user", "sessiondata"], From b1383df15aff40c2626263605806a895948bd2ef Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 17 Jan 2022 10:37:51 +0100 Subject: [PATCH 034/101] refactor: use `is None` instead of `== None` --- frappe/__init__.py | 6 +++--- frappe/core/doctype/user/user.py | 2 +- frappe/defaults.py | 4 ++-- frappe/desk/moduleview.py | 2 +- frappe/desk/page/user_profile/user_profile.py | 2 +- frappe/desk/search.py | 2 +- frappe/model/base_document.py | 4 ++-- frappe/model/db_query.py | 2 +- frappe/model/document.py | 18 +++++++++--------- frappe/model/dynamic_links.py | 2 +- .../patches/v11_0/remove_skip_for_doctype.py | 2 +- frappe/permissions.py | 4 +++- frappe/sessions.py | 2 +- .../energy_point_rule/energy_point_rule.py | 2 +- frappe/tests/test_twofactor.py | 2 +- frappe/translate.py | 2 +- frappe/utils/__init__.py | 2 +- frappe/utils/csvutils.py | 2 +- frappe/utils/data.py | 2 +- frappe/utils/minify.py | 2 +- frappe/website/doctype/web_form/web_form.py | 2 +- frappe/website/utils.py | 2 +- 22 files changed, 36 insertions(+), 34 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index a8bf114b9b..20fc41b83a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -102,7 +102,7 @@ def as_unicode(text, encoding='utf-8'): '''Convert to unicode if required''' if isinstance(text, str): return text - elif text==None: + elif text is None: return '' elif isinstance(text, bytes): return str(text, encoding) @@ -294,7 +294,7 @@ def get_conf(site=None): class init_site: def __init__(self, site=None): - '''If site==None, initialize it for empty site ('') to load common_site_config.json''' + '''If site is None, initialize it for empty site ('') to load common_site_config.json''' self.site = site or '' def __enter__(self): @@ -1661,7 +1661,7 @@ def local_cache(namespace, key, generator, regenerate_if_none=False): if key not in local.cache[namespace]: local.cache[namespace][key] = generator() - elif local.cache[namespace][key]==None and regenerate_if_none: + elif local.cache[namespace][key] is None and regenerate_if_none: # if key exists but the previous result was None local.cache[namespace][key] = generator() diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index b674ea6891..f1ccc25c6e 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -344,7 +344,7 @@ class User(Document): frappe.sendmail(recipients=self.email, sender=sender, subject=subject, template=template, args=args, header=[subject, "green"], - delayed=(not now) if now!=None else self.flags.delay_emails, retry=3) + delayed=(not now) if now is not None else self.flags.delay_emails, retry=3) def a_system_manager_should_exist(self): if not self.get_other_system_managers(): diff --git a/frappe/defaults.py b/frappe/defaults.py index eb98db449f..e249ef2099 100644 --- a/frappe/defaults.py +++ b/frappe/defaults.py @@ -126,7 +126,7 @@ def set_default(key, value, parent, parenttype="__default"): "defkey": key, "parent": parent }) - if value != None: + if value is not None: add_default(key, value, parent) else: _clear_cache(parent) @@ -187,7 +187,7 @@ def get_defaults_for(parent="__default"): """get all defaults""" defaults = frappe.cache().hget("defaults", parent) - if defaults==None: + if defaults is None: # sort descending because first default must get precedence table = DocType("DefaultValue") res = frappe.qb.from_(table).where( diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py index e2e2c4c155..7a9c211c3c 100644 --- a/frappe/desk/moduleview.py +++ b/frappe/desk/moduleview.py @@ -524,7 +524,7 @@ def get_last_modified(doctype): raise # hack: save as -1 so that it is cached - if last_modified==None: + if last_modified is None: last_modified = -1 return last_modified diff --git a/frappe/desk/page/user_profile/user_profile.py b/frappe/desk/page/user_profile/user_profile.py index 73df6d78cb..0d91fd0d91 100644 --- a/frappe/desk/page/user_profile/user_profile.py +++ b/frappe/desk/page/user_profile/user_profile.py @@ -30,7 +30,7 @@ def get_energy_points_percentage_chart_data(user, field): as_list = True) return { - "labels": [r[0] for r in result if r[0] != None], + "labels": [r[0] for r in result if r[0] is not None], "datasets": [{ "values": [r[1] for r in result] }] diff --git a/frappe/desk/search.py b/frappe/desk/search.py index db88e6ec52..95397070ae 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -107,7 +107,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, else: filters.append([doctype, f[0], "=", f[1]]) - if filters==None: + if filters is None: filters = [] or_filters = [] diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 631174b4db..11e97a38b9 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -172,7 +172,7 @@ class BaseDocument(object): ... }) """ - if value==None: + if value is None: value={} if isinstance(value, (dict, BaseDocument)): if not self.__dict__.get(key): @@ -272,7 +272,7 @@ class BaseDocument(object): )): d[fieldname] = str(d[fieldname]) - if d[fieldname] == None and ignore_nulls: + if d[fieldname] is None and ignore_nulls: del d[fieldname] return d diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 51d53c69a5..79be261981 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -545,7 +545,7 @@ class DatabaseQuery(object): elif f.operator.lower() in ("like", "not like") or (isinstance(f.value, str) and (not df or df.fieldtype not in ["Float", "Int", "Currency", "Percent", "Check"])): - value = "" if f.value==None else f.value + value = "" if f.value is None else f.value fallback = "''" if f.operator.lower() in ("like", "not like") and isinstance(value, str): diff --git a/frappe/model/document.py b/frappe/model/document.py index e055a12950..db4b7703ba 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -211,13 +211,13 @@ class Document(BaseDocument): self.flags.notifications_executed = [] - if ignore_permissions!=None: + if ignore_permissions is not None: self.flags.ignore_permissions = ignore_permissions - if ignore_links!=None: + if ignore_links is not None: self.flags.ignore_links = ignore_links - if ignore_mandatory!=None: + if ignore_mandatory is not None: self.flags.ignore_mandatory = ignore_mandatory self.set("__islocal", True) @@ -297,7 +297,7 @@ class Document(BaseDocument): self.flags.notifications_executed = [] - if ignore_permissions!=None: + if ignore_permissions is not None: self.flags.ignore_permissions = ignore_permissions self.flags.ignore_version = frappe.flags.in_test if ignore_version is None else ignore_version @@ -441,7 +441,7 @@ class Document(BaseDocument): values = self.as_dict() # format values for key, value in values.items(): - if value==None: + if value is None: values[key] = "" return values @@ -489,7 +489,7 @@ class Document(BaseDocument): frappe.flags.currently_saving.append((self.doctype, self.name)) def set_docstatus(self): - if self.docstatus==None: + if self.docstatus is None: self.docstatus=0 for d in self.get_all_children(): @@ -887,14 +887,14 @@ class Document(BaseDocument): if (frappe.flags.in_import and frappe.flags.mute_emails) or frappe.flags.in_patch or frappe.flags.in_install: return - if self.flags.notifications_executed==None: + if self.flags.notifications_executed is None: self.flags.notifications_executed = [] from frappe.email.doctype.notification.notification import evaluate_alert - if self.flags.notifications == None: + if self.flags.notifications is None: alerts = frappe.cache().hget('notifications', self.doctype) - if alerts==None: + if alerts is None: alerts = frappe.get_all('Notification', fields=['name', 'event', 'method'], filters={'enabled': 1, 'document_type': self.doctype}) frappe.cache().hset('notifications', self.doctype, alerts) diff --git a/frappe/model/dynamic_links.py b/frappe/model/dynamic_links.py index 7311b39b30..03f616ef60 100644 --- a/frappe/model/dynamic_links.py +++ b/frappe/model/dynamic_links.py @@ -32,7 +32,7 @@ def get_dynamic_link_map(for_delete=False): Note: Will not map single doctypes ''' - if getattr(frappe.local, 'dynamic_link_map', None)==None or frappe.flags.in_test: + if getattr(frappe.local, 'dynamic_link_map', None) is None or frappe.flags.in_test: # Build from scratch dynamic_link_map = {} for df in get_dynamic_links(): diff --git a/frappe/patches/v11_0/remove_skip_for_doctype.py b/frappe/patches/v11_0/remove_skip_for_doctype.py index 1bbe74bb6d..6e66c75f68 100644 --- a/frappe/patches/v11_0/remove_skip_for_doctype.py +++ b/frappe/patches/v11_0/remove_skip_for_doctype.py @@ -33,7 +33,7 @@ def execute(): continue skip_for_doctype = user_permission.skip_for_doctype.split('\n') else: # while migrating from v10 -> v11 - if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) == None: + if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) is None: skip_for_doctype = get_doctypes_to_skip(user_permission.allow, user_permission.user) # cache skip for doctype for same user and doctype skip_for_doctype_map[(user_permission.allow, user_permission.user)] = skip_for_doctype diff --git a/frappe/permissions.py b/frappe/permissions.py index 5faaf7dcfb..59ca9c2cb2 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -559,7 +559,9 @@ def filter_allowed_docs_for_doctype(user_permissions, doctype, with_default_doc= return (allowed_doc, default_doc) if with_default_doc else allowed_doc def push_perm_check_log(log): - if frappe.flags.get('has_permission_check_logs') == None: return + if frappe.flags.get('has_permission_check_logs') is None: + return + frappe.flags.get('has_permission_check_logs').append(_(log)) def has_child_table_permission(child_doctype, ptype="read", child_doc=None, diff --git a/frappe/sessions.py b/frappe/sessions.py index d2d1a8fcbc..6a5771b617 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -374,7 +374,7 @@ class Session: # database persistence is secondary, don't update it too often updated_in_db = False - if force or (time_diff==None) or (time_diff > 600): + if force or (time_diff is None) or (time_diff > 600): # update sessions table frappe.db.sql("""update `tabSessions` set sessiondata=%s, lastupdate=NOW() where sid=%s""" , (str(self.data['data']), diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index b48ec396de..ab860eb1aa 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -57,7 +57,7 @@ class EnergyPointRule(Document): def rule_condition_satisfied(self, doc): if self.for_doc_event == 'New': # indicates that this was a new doc - return doc.get_doc_before_save() == None + return doc.get_doc_before_save() is None if self.for_doc_event == 'Submit': return doc.docstatus == 1 if self.for_doc_event == 'Cancel': diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index 72c29cd47b..a1a2bf9b9c 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -222,7 +222,7 @@ def disable_2fa(): def toggle_2fa_all_role(state=None): '''Enable or disable 2fa for 'all' role on the system.''' all_role = frappe.get_doc('Role','All') - if state == None: + if state is None: state = False if all_role.two_factor_auth == True else False if state not in [True, False]: return all_role.two_factor_auth = cint(state) diff --git a/frappe/translate.py b/frappe/translate.py index c5ef24bc2a..c883e63de3 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -206,7 +206,7 @@ def make_dict_from_messages(messages, full_dict=None, load_user_translation=True :param messages: List of untranslated messages """ out = {} - if full_dict==None: + if full_dict is None: if load_user_translation: full_dict = get_full_dict(frappe.local.lang) else: diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 54a6f0b7e8..351c0413ce 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -290,7 +290,7 @@ def remove_blanks(d): """ empty_keys = [] for key in d: - if d[key]=='' or d[key]==None: + if d[key] == "" or d[key] is None: # del d[key] raises runtime exception, using a workaround empty_keys.append(key) for key in empty_keys: diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py index e26da3da1c..2fb212ea3c 100644 --- a/frappe/utils/csvutils.py +++ b/frappe/utils/csvutils.py @@ -112,7 +112,7 @@ def check_record(d): docfield = doc.meta.get_field(key) val = d[key] if docfield: - if docfield.reqd and (val=='' or val==None): + if docfield.reqd and (val=='' or val is None): frappe.msgprint(_("{0} is required").format(docfield.label), raise_exception=1) if docfield.fieldtype=='Select' and val and docfield.options: diff --git a/frappe/utils/data.py b/frappe/utils/data.py index b4ac5e7fef..891a55deda 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -129,7 +129,7 @@ def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, minutes=0, se from dateutil.parser._parser import ParserError from dateutil.relativedelta import relativedelta - if date==None: + if date is None: date = now_datetime() if hours: diff --git a/frappe/utils/minify.py b/frappe/utils/minify.py index b2cc93e554..634aa11038 100644 --- a/frappe/utils/minify.py +++ b/frappe/utils/minify.py @@ -70,7 +70,7 @@ class JavascriptMinify(object): """ c = self.theLookahead self.theLookahead = None - if c == None: + if c is None: c = self.instream.read(1) if c >= ' ' or c == '\n': return c diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index cef1a8d8a3..2e4d7a247b 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -305,7 +305,7 @@ def get_context(context): if not section: section = add_section() column = None - if column==None: + if column is None: column = add_column() column.append(df) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index cb8008277c..d4d0cead63 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -301,7 +301,7 @@ def get_html_content_based_on_type(doc, fieldname, content_type): elif content_type == 'HTML': content = doc.get(fieldname + '_html') - if content == None: + if content is None: content = '' return content From 4b1eb4786034a5f2b7a9db02e77798a962f05726 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 17 Jan 2022 16:00:27 +0530 Subject: [PATCH 035/101] fix: the YYYY.MM.DD format not working for the document naming rule --- .../doctype/document_naming_rule/document_naming_rule.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.py b/frappe/core/doctype/document_naming_rule/document_naming_rule.py index 8013f9df6f..5c445fd058 100644 --- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py +++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py @@ -5,6 +5,7 @@ import frappe from frappe.model.document import Document from frappe.utils.data import evaluate_filters +from frappe.model.naming import parse_naming_series from frappe import _ class DocumentNamingRule(Document): @@ -27,7 +28,9 @@ class DocumentNamingRule(Document): return counter = frappe.db.get_value(self.doctype, self.name, 'counter', for_update=True) or 0 - doc.name = self.prefix + ('%0'+str(self.prefix_digits)+'d') % (counter + 1) + naming_series = parse_naming_series(self.prefix, doc=doc) + + doc.name = naming_series + ('%0'+str(self.prefix_digits)+'d') % (counter + 1) frappe.db.set_value(self.doctype, self.name, 'counter', counter + 1) @frappe.whitelist() From 6ef4b6833d60afaa33475a08f0dee42e34a4e390 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 17 Jan 2022 17:00:53 +0530 Subject: [PATCH 036/101] fix: datatable column resize in rtl --- frappe/public/scss/desk/frappe_datatable.scss | 5 +++++ package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss index 48645bbbfc..fb7d795ced 100644 --- a/frappe/public/scss/desk/frappe_datatable.scss +++ b/frappe/public/scss/desk/frappe_datatable.scss @@ -87,6 +87,11 @@ } } + .dt-cell__resize-handle { + right: -3px !important; + left: unset !important; + } + .dt-row.dt-row-totalRow { font-weight: bold; } diff --git a/package.json b/package.json index 1bbedb33fc..afde0ea978 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "express": "^4.17.1", "fast-deep-equal": "^2.0.1", "frappe-charts": "^2.0.0-rc13", - "frappe-datatable": "^1.16.0", + "frappe-datatable": "^1.16.1", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index a7cbf0cf60..cfb0f1aedb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1601,10 +1601,10 @@ frappe-charts@^2.0.0-rc13: resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072" integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w== -frappe-datatable@^1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.0.tgz#822dbcaaf48e5171f47ce2909da88e9a31bb2cbc" - integrity sha512-FkeHcaxxz4+BQLhwiegk94602PlnWNG4LiBPehgKdEL+OpJcwl8oNKWb/wPNw9lgW25u0LaaQwq/11sw7mnEbA== +frappe-datatable@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.1.tgz#a5844b7ad8259ef45606608f492ca4b343006818" + integrity sha512-TRj3459YWyJdoP9MgHfOAEq7ylyoT3TVkwxLQGEmn5Xj6UAJOFa7F9j4TaWnFXW8tuoy69z/TktDclOurMeT2w== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From 3f7ede278df62a6a5b63802cdbe4475dd4060683 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:45:00 +0530 Subject: [PATCH 037/101] build: Upgrade Frappe Gantt from 0.5.0 to 0.6.0 (#15635) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1bbedb33fc..2623d9fd38 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "fast-deep-equal": "^2.0.1", "frappe-charts": "^2.0.0-rc13", "frappe-datatable": "^1.16.0", - "frappe-gantt": "^0.5.0", + "frappe-gantt": "^0.6.0", "fuse.js": "^3.4.6", "highlight.js": "^10.4.1", "html5-qrcode": "^2.0.11", diff --git a/yarn.lock b/yarn.lock index a7cbf0cf60..c9e81f7628 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1610,10 +1610,10 @@ frappe-datatable@^1.16.0: lodash "^4.17.5" sortablejs "^1.7.0" -frappe-gantt@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.5.0.tgz#4dc7aa125f318efea64b4ae0e38f67a720238c1d" - integrity sha512-RAskVuBmnTcPJXh87oVhYmnNGy/9lvZlLHGui8QFB8yRBuUjzpZoZfZ+hKmDtBDmWNrE2/LRta06W5WmhTzzWQ== +frappe-gantt@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.6.0.tgz#fece2fdecc0b8d6065d3c420d9681b719b827047" + integrity sha512-/P7s9edP6EoLD09EX2HPqsy1u0v4zYcurMy4ByExArvj7t0UDJlpxp88nISFtMkQe+aofaO9dR0fd61ZwX0O6g== fresh@0.5.2: version "0.5.2" From dac9349aef5e9d476b228157f70948cb9dac2e44 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 17 Jan 2022 15:40:33 +0100 Subject: [PATCH 038/101] refactor: use `is bool` instead of `== bool` --- frappe/__init__.py | 2 +- frappe/auth.py | 3 ++- frappe/installer.py | 2 +- frappe/permissions.py | 2 +- frappe/tests/test_twofactor.py | 7 ++++--- frappe/utils/redis_wrapper.py | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) mode change 100755 => 100644 frappe/installer.py diff --git a/frappe/__init__.py b/frappe/__init__.py index 20fc41b83a..c6cbfead43 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -446,7 +446,7 @@ def throw(msg, exc=ValidationError, title=None, is_minimizable=None, wide=None, msgprint(msg, raise_exception=exc, title=title, indicator='red', is_minimizable=is_minimizable, wide=wide, as_list=as_list) def emit_js(js, user=False, **kwargs): - if user == False: + if user is False: user = session.user publish_realtime('eval_js', js, user=user, **kwargs) diff --git a/frappe/auth.py b/frappe/auth.py index a87edb6460..d4778eb0c1 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -111,7 +111,8 @@ class LoginManager: self.user_type = None if frappe.local.form_dict.get('cmd')=='login' or frappe.local.request.path=="/api/method/login": - if self.login()==False: return + if self.login() is False: + return self.resume = False # run login triggers diff --git a/frappe/installer.py b/frappe/installer.py old mode 100755 new mode 100644 index b50fa4a3b5..b24dd7db41 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -154,7 +154,7 @@ def install_app(name, verbose=False, set_as_patched=True): for before_install in app_hooks.before_install or []: out = frappe.get_attr(before_install)() - if out==False: + if out is False: return if name != "frappe": diff --git a/frappe/permissions.py b/frappe/permissions.py index 59ca9c2cb2..af17faba01 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -23,7 +23,7 @@ def print_has_permission_check_logs(func): frappe.flags['has_permission_check_logs'] = [] result = func(*args, **kwargs) self_perm_check = True if not kwargs.get('user') else kwargs.get('user') == frappe.session.user - raise_exception = False if kwargs.get('raise_exception') == False else True + raise_exception = False if kwargs.get('raise_exception') is False else True # print only if access denied # and if user is checking his own permission diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index a1a2bf9b9c..fadc61a551 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -222,9 +222,10 @@ def disable_2fa(): def toggle_2fa_all_role(state=None): '''Enable or disable 2fa for 'all' role on the system.''' all_role = frappe.get_doc('Role','All') - if state is None: - state = False if all_role.two_factor_auth == True else False - if state not in [True, False]: return + state = state if state is not None else False + if type(state) != bool: + return + all_role.two_factor_auth = cint(state) all_role.save(ignore_permissions=True) frappe.db.commit() diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index dac9ab7a6d..9ca5bbfd4f 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -22,7 +22,7 @@ class RedisWrapper(redis.Redis): if shared: return key if user: - if user == True: + if user is True: user = frappe.session.user key = "user:{0}:{1}".format(user, key) From 115bb8faedae45031b5b08093552fd2d48c483f4 Mon Sep 17 00:00:00 2001 From: John Bulcher Date: Mon, 17 Jan 2022 10:10:18 -0800 Subject: [PATCH 039/101] feat: Add click-drag scrolling to kanban boards --- .../js/frappe/views/kanban/kanban_board.js | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index c1e3c3bfe6..37862370bd 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -337,6 +337,7 @@ frappe.provide("frappe.views"); function bind_events() { bind_add_column(); + bind_clickdrag(); } function setup_sortable() { @@ -392,6 +393,45 @@ frappe.provide("frappe.views"); }); } + function bind_clickdrag() { + let isDown = false; + let startX; + let scrollLeft; + let draggable = self.$kanban_board[0]; + + draggable.addEventListener('mousedown', (e) => { + // don't trigger scroll if one of the ancestors of the + // clicked element matches any of these selectors + let ignoreEl = [ + '.kanban-column .kanban-column-header', + '.kanban-column .add-card', + '.kanban-column .kanban-card.new-card-area', + '.kanban-card-wrapper', + ]; + if (ignoreEl.some((el) => e.target.closest(el))) return; + + isDown = true; + draggable.classList.add('clickdrag-active'); + startX = e.pageX - draggable.offsetLeft; + scrollLeft = draggable.scrollLeft; + }); + draggable.addEventListener('mouseleave', () => { + isDown = false; + draggable.classList.remove('clickdrag-active'); + }); + draggable.addEventListener('mouseup', () => { + isDown = false; + draggable.classList.remove('clickdrag-active'); + }); + draggable.addEventListener('mousemove', (e) => { + if(!isDown) return; + e.preventDefault(); + const x = e.pageX - draggable.offsetLeft; + const walk = (x - startX); + draggable.scrollLeft = scrollLeft - walk; + }); + } + function setup_restore_columns() { var cur_list = store.getState().cur_list; var columns = store.getState().columns; From a6307638498fb181c2dab8207c501a21f4bd34d7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 18 Jan 2022 09:13:42 +0530 Subject: [PATCH 040/101] style: Fix formatting --- frappe/public/js/frappe/views/kanban/kanban_board.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index 37862370bd..dac14936a0 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -424,7 +424,7 @@ frappe.provide("frappe.views"); draggable.classList.remove('clickdrag-active'); }); draggable.addEventListener('mousemove', (e) => { - if(!isDown) return; + if (!isDown) return; e.preventDefault(); const x = e.pageX - draggable.offsetLeft; const walk = (x - startX); From 53dc9f528d434410bbabf4d351953c7a02f3005d Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 18 Jan 2022 07:21:32 +0100 Subject: [PATCH 041/101] fix: document email in timeline (#15592) --- cypress/integration/timeline_email.js | 6 +-- .../js/frappe/form/footer/base_timeline.js | 9 ++-- .../js/frappe/form/footer/form_timeline.js | 8 ++-- frappe/public/scss/desk/timeline.scss | 46 +++++++------------ 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/cypress/integration/timeline_email.js b/cypress/integration/timeline_email.js index dfe80e0019..1b7634d211 100644 --- a/cypress/integration/timeline_email.js +++ b/cypress/integration/timeline_email.js @@ -19,7 +19,7 @@ context('Timeline Email', () => { cy.get('.list-row > .level-left > .list-subject').eq(0).click(); //Creating a new email - cy.get('.timeline-actions > .btn').click(); + cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click(); cy.fill_field('recipients', 'test@example.com', 'MultiSelect'); cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail'); @@ -57,11 +57,11 @@ context('Timeline Email', () => { cy.wait(500); //To check if the discard button functionality in email is working correctly - cy.get('.timeline-actions > .btn').click(); + cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click(); cy.fill_field('recipients', 'test@example.com', 'MultiSelect'); cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click(); cy.wait(500); - cy.get('.timeline-actions > .btn').click(); + cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click(); cy.wait(500); cy.get_field('recipients', 'MultiSelect').should('have.text', ''); cy.get('.modal-header:visible > .modal-actions > .btn-modal-close > .icon').click(); diff --git a/frappe/public/js/frappe/form/footer/base_timeline.js b/frappe/public/js/frappe/form/footer/base_timeline.js index beeba16459..ba7a4eb565 100644 --- a/frappe/public/js/frappe/form/footer/base_timeline.js +++ b/frappe/public/js/frappe/form/footer/base_timeline.js @@ -12,8 +12,11 @@ class BaseTimeline { this.wrapper = this.timeline_wrapper; this.timeline_items_wrapper = $(`
`); this.timeline_actions_wrapper = $(` -
-
+
+
+
+
+
`); @@ -37,7 +40,7 @@ class BaseTimeline { ${label} `); action_btn.click(action); - this.timeline_actions_wrapper.append(action_btn); + this.timeline_actions_wrapper.find('.action-buttons').append(action_btn); return action_btn; } diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js index f278d1b64b..d440874f36 100644 --- a/frappe/public/js/frappe/form/footer/form_timeline.js +++ b/frappe/public/js/frappe/form/footer/form_timeline.js @@ -77,12 +77,14 @@ class FormTimeline extends BaseTimeline { const message = __("Add to this activity by mailing to {0}", [link.bold()]); this.document_email_link_wrapper = $(` -
+
- ${message} +
+ ${message} +
`); - this.timeline_wrapper.append(this.document_email_link_wrapper); + this.timeline_actions_wrapper.append(this.document_email_link_wrapper); this.document_email_link_wrapper .find('.document-email-link') diff --git a/frappe/public/scss/desk/timeline.scss b/frappe/public/scss/desk/timeline.scss index 1861ee018b..a99f2648e8 100644 --- a/frappe/public/scss/desk/timeline.scss +++ b/frappe/public/scss/desk/timeline.scss @@ -57,35 +57,6 @@ $threshold: 34; } } } - .timeline-actions { - display: inline-flex; - width: 100%; - margin-bottom: var(--timeline-item-bottom-margin); - padding: var(--padding-sm); - position: relative; - .action-btn { - margin-left: var(--margin-md); - display: flex; - align-items: center; - line-height: var(--text-xl); - .icon { - margin-right: var(--margin-xs); - } - } - .action-btn:first-of-type { - margin-left: var(--timeline-item-left-margin); - } - } - .document-email-link-container { - @extend .ellipsis; - position: relative; - padding: var(--padding-sm); - font-size: var(--text-sm); - margin-bottom: var(--timeline-item-bottom-margin); - span:first-of-type { - margin-left: var(--timeline-item-left-margin); - } - } .timeline-item { font-size: var(--text-md); position: relative; @@ -94,6 +65,23 @@ $threshold: 34; color: var(--text-color); font-weight: var(--text-bold); } + .action-buttons { + display: inline-flex; + white-space: nowrap; + overflow: auto; + .action-btn { + margin-left: var(--margin-md); + display: flex; + align-items: center; + line-height: var(--text-xl); + .icon { + margin-right: var(--margin-xs); + } + } + .action-btn:first-of-type { + margin-left: 0; + } + } .timeline-content { max-width: var(--timeline-content-max-width); padding: var(--padding-sm); From abaa2dc35e8355af9a13d7887cf24dcb6f0f89c8 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 18 Jan 2022 11:57:38 +0530 Subject: [PATCH 042/101] style: Fix formatting issue --- frappe/www/printview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 088c9dc403..bea1300764 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -251,7 +251,7 @@ def get_print_format(doctype, print_format): # server, find template module = print_format.module or frappe.db.get_value("DocType", doctype, "module") - path = os.path.join(get_module_path(module, "Print Format",print_format.name), + path = os.path.join(get_module_path(module, "Print Format", print_format.name), frappe.scrub(print_format.name) + ".html") if os.path.exists(path): From 53d4ddca43b114414f1b81c58944064559a3e823 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Tue, 18 Jan 2022 13:24:28 +0530 Subject: [PATCH 043/101] fix: Recursive routing for Form route (#15539) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/router.js | 7 ++++--- frappe/public/js/frappe/views/formview.js | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 7874ffcdde..4fcf0dbd14 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -282,7 +282,7 @@ frappe.router = { resolve(); }); }, 100); - }); + }).finally(() => frappe.route_flags = {}); }, get_route_from_arguments(route) { @@ -374,8 +374,9 @@ frappe.router = { // change the URL and call the router if (window.location.pathname !== url) { - // push state so the browser looks fine - history.pushState(null, null, url); + // push/replace state so the browser looks fine + const method = frappe.route_flags.replace_route ? "replaceState" : "pushState"; + history[method](null, null, url); // now process the route this.route(); diff --git a/frappe/public/js/frappe/views/formview.js b/frappe/public/js/frappe/views/formview.js index 6708a6ffb1..5da11afd71 100644 --- a/frappe/public/js/frappe/views/formview.js +++ b/frappe/public/js/frappe/views/formview.js @@ -98,6 +98,7 @@ frappe.views.FormFactory = class FormFactory extends frappe.views.Factory { if (new_name===name) { this.render(doctype_layout, name); } else { + frappe.route_flags.replace_route = true; frappe.set_route("Form", doctype_layout, new_name); } } From 6752460f1ef64549eee95b626b9a65b4d480c3a4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Jan 2022 17:37:16 +0530 Subject: [PATCH 044/101] fix(minor): smaller default image for empty list --- frappe/public/scss/desk/page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss index 91bd942889..f0a9152cfb 100644 --- a/frappe/public/scss/desk/page.scss +++ b/frappe/public/scss/desk/page.scss @@ -164,7 +164,7 @@ // To compensate for perceived centering .null-state { - height: 85px; + height: 60px; width: auto; margin-bottom: var(--margin-md); img { From acac60d061bbb1ee4957ca613c92e1526098aa3b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Jan 2022 18:06:27 +0530 Subject: [PATCH 045/101] fix(minor): allow auto close without permission check --- frappe/automation/doctype/assignment_rule/assignment_rule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.py b/frappe/automation/doctype/assignment_rule/assignment_rule.py index a8c75bffd9..90099eebb6 100644 --- a/frappe/automation/doctype/assignment_rule/assignment_rule.py +++ b/frappe/automation/doctype/assignment_rule/assignment_rule.py @@ -272,7 +272,7 @@ def apply(doc=None, method=None, doctype=None, name=None): for todo in todos_to_close: _todo = frappe.get_doc("ToDo", todo) _todo.status = "Closed" - _todo.save() + _todo.save(ignore_permissions=True) break else: From e153a087ca180e021d73ba26e51fe821763acc74 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:57:32 +0530 Subject: [PATCH 046/101] fix(patch): reload property setter for new fields (#15654) (#15655) (cherry picked from commit 8f05cdb5d57c4f8d0525554f3ac0ca6b0c689d9f) Co-authored-by: Ankush Menat --- frappe/patches.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 4231a59466..16ae349941 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -123,6 +123,8 @@ frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats frappe.patches.v12_0.remove_example_email_thread_notify execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() frappe.patches.v12_0.set_correct_url_in_files +execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) +execute:frappe.reload_doc('custom', 'doctype', 'property_setter') frappe.patches.v13_0.remove_invalid_options_for_data_fields frappe.patches.v13_0.website_theme_custom_scss frappe.patches.v13_0.make_user_type @@ -154,7 +156,6 @@ frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items frappe.patches.v13_0.set_social_icons frappe.patches.v12_0.set_default_password_reset_limit -execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) frappe.patches.v13_0.set_route_for_blog_category frappe.patches.v13_0.enable_custom_script frappe.patches.v13_0.update_newsletter_content_type @@ -180,7 +181,6 @@ frappe.patches.v13_0.rename_list_view_setting_to_list_view_settings frappe.patches.v13_0.remove_twilio_settings frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns -execute:frappe.reload_doc('core', 'doctype', 'doctype') frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty frappe.patches.v13_0.set_first_day_of_the_week From a7a265c4b1e04998cc949c0fa3cc6e49858366db Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 Jan 2022 14:29:50 +0530 Subject: [PATCH 047/101] fix: Set toast's background color based on alert type --- frappe/public/js/frappe/ui/messages.js | 9 ++++++--- frappe/public/scss/desk/dark.scss | 22 ++++++++++++++++++++++ frappe/public/scss/desk/toast.scss | 22 +++++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 185d275ac3..17845c0787 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -365,7 +365,7 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) { let indicator_icon_map = { 'orange': "solid-warning", 'yellow': "solid-warning", - 'blue': "solid-success", + 'blue': "solid-info", 'green': "solid-success", 'red': "solid-error" }; @@ -387,8 +387,10 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) { icon = 'solid-info'; } + const indicator = message.indicator || 'blue'; + const div = $(` -
+
${frappe.utils.icon(icon, 'lg')}
@@ -398,7 +400,8 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
${frappe.utils.icon('close-alt')} -
`); +
+ `); div.hide().appendTo("#alert-container").show(); diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index f894704ca2..d2c2c70fda 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -166,4 +166,26 @@ color: var(--text-color); background: var(--gray-500); } + + .desk-alert { + &.red { + --toast-bg: var(--red-900); + } + + &.yellow { + --toast-bg: var(--yellow-900); + } + + &.orange { + --toast-bg: var(--orange-900); + } + + &.blue { + --toast-bg: var(--blue-900); + } + + &.green { + --toast-bg: var(--green-900); + } + } } diff --git a/frappe/public/scss/desk/toast.scss b/frappe/public/scss/desk/toast.scss index d10cfd871e..18d7ef9944 100644 --- a/frappe/public/scss/desk/toast.scss +++ b/frappe/public/scss/desk/toast.scss @@ -9,7 +9,27 @@ } } -#alert-container .desk-alert { +.desk-alert { + &.red { + --toast-bg: var(--red-100); + } + + &.yellow { + --toast-bg: var(--yellow-50); + } + + &.orange { + --toast-bg: var(--orange-50); + } + + &.blue { + --toast-bg: var(--blue-50); + } + + &.green { + --toast-bg: var(--green-50); + } + box-shadow: var(--modal-shadow); width: 400px; min-height: 50px; From 377eb881983aff2330052e0480dd9b834ecccde4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 Jan 2022 09:29:29 +0530 Subject: [PATCH 048/101] fix: Update alert colors according to the new design --- frappe/public/js/frappe/ui/messages.js | 2 +- frappe/public/scss/common/alert.scss | 12 ++++++++ frappe/public/scss/common/css_variables.scss | 10 ++++++ frappe/public/scss/desk/dark.scss | 32 ++++++-------------- frappe/public/scss/desk/index.scss | 1 + frappe/public/scss/desk/toast.scss | 12 ++++---- frappe/public/scss/website/index.scss | 3 +- 7 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 frappe/public/scss/common/alert.scss diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index 17845c0787..0e0b6527e6 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -390,7 +390,7 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) { const indicator = message.indicator || 'blue'; const div = $(` -
+