From 739d0cd20fc5171a830869d52ecbac8d4b1ac89c Mon Sep 17 00:00:00 2001 From: Naren Date: Thu, 12 Mar 2020 17:40:32 +0530 Subject: [PATCH 001/337] fix: sticky footer logic implemented --- frappe/public/css/website.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index eecb7005e4..dd317952d9 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -1,7 +1,19 @@ /* the element that this class is applied to, should have a max width for this to work*/ +html { + height: 100%; +} body { + min-height: 100%; + display: flex; + flex-direction: column; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } +body > div { + flex: 1 0 auto; +} +footer { + flex-shrink: 0; +} a { cursor: pointer; } From bdc9893820c5dbc0079d191010f1df52c8744f78 Mon Sep 17 00:00:00 2001 From: Naren Date: Fri, 13 Mar 2020 15:30:02 +0530 Subject: [PATCH 002/337] fix: logic moved from css to scss file --- frappe/public/css/website.css | 12 ------------ frappe/public/scss/website.scss | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index dd317952d9..eecb7005e4 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -1,19 +1,7 @@ /* the element that this class is applied to, should have a max width for this to work*/ -html { - height: 100%; -} body { - min-height: 100%; - display: flex; - flex-direction: column; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } -body > div { - flex: 1 0 auto; -} -footer { - flex-shrink: 0; -} a { cursor: pointer; } diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index a297054ee2..9901eb7fbf 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -4,8 +4,23 @@ @import "multilevel-dropdown"; @import "website-image"; +html { + height: 100%; +} + body { + min-height: 100%; + display: flex; + flex-direction: column; font-size: 16px; + + > div { + flex: 1 0 auto; + } +} + +footer { + flex-shrink: 0; } .navbar.bg-dark { From 6624f3a1af1c6328279c1d74303d479fd4ae41ba Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 3 Apr 2020 18:12:32 +0530 Subject: [PATCH 003/337] enhancement: provision to scheduled server scripts execution --- .../scheduled_job_type.json | 9 +++++++- .../scheduled_job_type/scheduled_job_type.py | 7 +++++- .../doctype/server_script/server_script.json | 14 +++++++++--- .../doctype/server_script/server_script.py | 22 +++++++++++++++++++ .../server_script/server_script_utils.py | 3 ++- frappe/utils/safe_exec.py | 3 +++ 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json index e2ec921679..48c98c0bc4 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -12,6 +12,7 @@ "engine": "InnoDB", "field_order": [ "stopped", + "execute_via_server_script", "method", "frequency", "cron_format", @@ -63,6 +64,12 @@ "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", "read_only": 1, "reqd": 1 + }, + { + "default": "0", + "fieldname": "execute_via_server_script", + "fieldtype": "Check", + "label": "Execute Via Server Script" } ], "in_create": 1, @@ -72,7 +79,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2019-12-09 11:10:21.259929", + "modified": "2020-04-03 17:14:13.899031", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 3cd994ebfa..b1b867d527 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -70,7 +70,12 @@ class ScheduledJobType(Document): self.scheduler_log = None try: self.log_status('Start') - frappe.get_attr(self.method)() + if self.execute_via_server_script: + script_name = frappe.db.get_value("Server Script", {'api_method': self.method}) + if script_name: + frappe.get_doc('Server Script', script_name).execute_scheduled_method() + else: + frappe.get_attr(self.method)() frappe.db.commit() self.log_status('Complete') except Exception: diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index 36c297cc26..aeed982162 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -11,6 +11,7 @@ "column_break_3", "reference_doctype", "doctype_event", + "scheduler_event", "api_method", "allow_guest", "section_break_8", @@ -22,7 +23,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Script Type", - "options": "DocType Event\nAPI", + "options": "DocType Event\nScheduler Event\nAPI", "reqd": 1 }, { @@ -47,7 +48,7 @@ "options": "Before Insert\nBefore Save\nAfter Save\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)" }, { - "depends_on": "eval:doc.script_type==='API'", + "depends_on": "eval:doc.script_type==='API' || doc.script_type==='Scheduler Event'", "fieldname": "api_method", "fieldtype": "Data", "label": "API Method" @@ -72,10 +73,17 @@ { "fieldname": "section_break_8", "fieldtype": "Section Break" + }, + { + "depends_on": "eval:doc.script_type==='Scheduler Event'", + "fieldname": "scheduler_event", + "fieldtype": "Select", + "label": "Scheduler Event", + "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual" } ], "links": [], - "modified": "2019-12-17 12:55:07.389775", + "modified": "2020-04-03 16:33:08.765621", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index e2c6d3b7b0..c651da2269 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -8,6 +8,7 @@ import frappe from frappe.model.document import Document from frappe.utils.safe_exec import safe_exec + class ServerScript(Document): @staticmethod def validate(): @@ -15,6 +16,7 @@ class ServerScript(Document): @staticmethod def on_update(): + setup_scheduler_events() frappe.cache().delete_value('server_script_map') def execute_method(self): @@ -31,3 +33,23 @@ class ServerScript(Document): # execute event safe_exec(self.script, None, dict(doc = doc)) + def execute_scheduled_method(self): + if self.script_type == 'Scheduler Event': + safe_exec(self.script) + else: + # wrong report type! + raise frappe.DoesNotExistError + +def setup_scheduler_events(): + enabled_server_scripts = frappe.get_all('Server Script', + fields=('name', 'doctype_event','api_method', 'scheduler_event'), + filters={'disabled': 0, 'script_type': 'Scheduler Event'}) + + for script in enabled_server_scripts: + if not frappe.db.exists('Scheduled Job Type', dict(method=script.api_method)): + frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = script.api_method, + frequency = script.scheduler_event, + has_server_script=1 + )).insert() \ No newline at end of file diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py index 2e1a5ae8bb..e03504f30b 100644 --- a/frappe/core/doctype/server_script/server_script_utils.py +++ b/frappe/core/doctype/server_script/server_script_utils.py @@ -66,6 +66,7 @@ def get_server_script_map(): script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name) else: script_map.setdefault('_api', {})[script.api_method] = script.name + frappe.cache().set_value('server_script_map', script_map) - return script_map + return script_map \ No newline at end of file diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 62d0286e03..ed949d8a01 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -11,6 +11,7 @@ from frappe.website.utils import (get_shade, get_toc, get_next_link) from frappe.modules import scrub from frappe.www.printview import get_visible_columns import frappe.exceptions +import frappe.integrations.utils class ServerScriptNotEnabled(frappe.PermissionError): pass @@ -79,6 +80,8 @@ def get_safe_globals(): user=user, csrf_token=frappe.local.session.data.csrf_token if getattr(frappe.local, "session", None) else '' ), + make_get_request = frappe.integrations.utils.make_get_request, + make_post_request = frappe.integrations.utils.make_post_request, socketio_port=frappe.conf.socketio_port, get_hooks=frappe.get_hooks, ), From 30e7d9e1512c2d9d774844c15dd30b41beee5797 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 6 Apr 2020 12:05:48 +0530 Subject: [PATCH 004/337] feat: link server scripts in scheduler --- .../scheduled_job_type.json | 14 ++++--- .../scheduled_job_type/scheduled_job_type.py | 4 +- .../doctype/server_script/server_script.js | 42 ++++++++++++++++++- .../doctype/server_script/server_script.json | 12 +----- .../doctype/server_script/server_script.py | 42 +++++++++++++------ 5 files changed, 81 insertions(+), 33 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json index 48c98c0bc4..2a9c1a4573 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -12,8 +12,8 @@ "engine": "InnoDB", "field_order": [ "stopped", - "execute_via_server_script", "method", + "server_script", "frequency", "cron_format", "last_execution", @@ -66,10 +66,12 @@ "reqd": 1 }, { - "default": "0", - "fieldname": "execute_via_server_script", - "fieldtype": "Check", - "label": "Execute Via Server Script" + "fieldname": "server_script", + "fieldtype": "Link", + "label": "Server Script", + "options": "Server Script", + "read_only": 1, + "search_index": 1 } ], "in_create": 1, @@ -79,7 +81,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2020-04-03 17:14:13.899031", + "modified": "2020-04-05 17:27:33.480562", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index b1b867d527..c179054550 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -70,8 +70,8 @@ class ScheduledJobType(Document): self.scheduler_log = None try: self.log_status('Start') - if self.execute_via_server_script: - script_name = frappe.db.get_value("Server Script", {'api_method': self.method}) + if self.server_script: + script_name = frappe.db.get_value("Server Script", self.server_script) if script_name: frappe.get_doc('Server Script', script_name).execute_scheduled_method() else: diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js index eea8558456..d7f4c3e536 100644 --- a/frappe/core/doctype/server_script/server_script.js +++ b/frappe/core/doctype/server_script/server_script.js @@ -2,7 +2,45 @@ // For license information, please see license.txt frappe.ui.form.on('Server Script', { - // refresh: function(frm) { + refresh: function(frm) { + if(frm.doc.script_type === 'Scheduler Event' && !frm.doc.disabled){ + frm.add_custom_button('Schedule Script', function() { + var d = new frappe.ui.Dialog({ + title: "Schedule Script Execution", + fields: [ + { + fieldname: "event_type", + label: __('Select Event Type'), + fieldtype: "Select", + options: "All\nHourly\nDaily\nWeekly\nMonthly\nYearly\nHourly Long\nDaily Long\nWeekly Long\nMonthly Long" + }, + ], + primary_action_label: __('Schedule Script'), + primary_action: () => { + d.get_primary_btn().attr('disabled', true); + var data = d.get_values(); + d.hide(); + if(data) { + frm.events.schedule_script(frm, data); + } + + } + }); + + d.show(); + + }); + } + }, + + schedule_script(frm, data){ + frm.call({ + method: "frappe.core.doctype.server_script.server_script.setup_scheduler_events", + args: { + 'script_name': frm.doc.name, + 'frequency': data.event_type + } + }) + } - // } }); diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index aeed982162..bef3dfc60c 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -11,7 +11,6 @@ "column_break_3", "reference_doctype", "doctype_event", - "scheduler_event", "api_method", "allow_guest", "section_break_8", @@ -48,7 +47,7 @@ "options": "Before Insert\nBefore Save\nAfter Save\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)" }, { - "depends_on": "eval:doc.script_type==='API' || doc.script_type==='Scheduler Event'", + "depends_on": "eval:doc.script_type==='API'", "fieldname": "api_method", "fieldtype": "Data", "label": "API Method" @@ -73,17 +72,10 @@ { "fieldname": "section_break_8", "fieldtype": "Section Break" - }, - { - "depends_on": "eval:doc.script_type==='Scheduler Event'", - "fieldname": "scheduler_event", - "fieldtype": "Select", - "label": "Scheduler Event", - "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual" } ], "links": [], - "modified": "2020-04-03 16:33:08.765621", + "modified": "2020-04-06 11:24:38.161555", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index c651da2269..9522b77b4b 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe.utils.safe_exec import safe_exec +from frappe import _ class ServerScript(Document): @@ -16,7 +17,6 @@ class ServerScript(Document): @staticmethod def on_update(): - setup_scheduler_events() frappe.cache().delete_value('server_script_map') def execute_method(self): @@ -40,16 +40,32 @@ class ServerScript(Document): # wrong report type! raise frappe.DoesNotExistError -def setup_scheduler_events(): - enabled_server_scripts = frappe.get_all('Server Script', - fields=('name', 'doctype_event','api_method', 'scheduler_event'), - filters={'disabled': 0, 'script_type': 'Scheduler Event'}) +@frappe.whitelist() +def setup_scheduler_events(script_name, frequency): + method = frappe.scrub(script_name) + '_' + frequency.lower() + scheduled_script = frappe.db.get_value('Scheduled Job Type', + dict(method=method)) - for script in enabled_server_scripts: - if not frappe.db.exists('Scheduled Job Type', dict(method=script.api_method)): - frappe.get_doc(dict( - doctype = 'Scheduled Job Type', - method = script.api_method, - frequency = script.scheduler_event, - has_server_script=1 - )).insert() \ No newline at end of file + if not scheduled_script: + doc = frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = method, + frequency = frequency, + server_script = script_name + )) + + doc.insert() + + frappe.msgprint(_('Enabled scheduled execution for script {0}').format(script_name)) + + else: + doc = frappe.get_doc('Scheduled Job Type', scheduled_script) + doc.update(dict( + doctype = 'Scheduled Job Type', + method = method, + frequency = frequency, + server_script = script_name + )) + doc.save() + + frappe.msgprint(_('Scheduled execution for script {0} has updated').format(script_name)) From 2e0abf4bb2c6bdcfd260239382efdd83a3512bef Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 7 Apr 2020 14:54:53 +0530 Subject: [PATCH 005/337] fix: setup invalid for grid forms Co-authored-by: Prssanna Desai --- frappe/public/js/frappe/form/controls/base_input.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js index 0dbaaeb63c..685aac90a3 100644 --- a/frappe/public/js/frappe/form/controls/base_input.js +++ b/frappe/public/js/frappe/form/controls/base_input.js @@ -180,7 +180,12 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({ this.$wrapper.toggleClass("has-error", (this.df.reqd && is_null(value)) ? true : false); }, set_invalid: function () { - this.$wrapper.toggleClass("has-error", (this.df.invalid ? true : false)); + if(this.$input) { + this.$wrapper.toggleClass("has-error", (this.df.invalid ? true : false)); + } + if(this.disp_area) { + $(this.disp_area).toggleClass("has-error", (this.df.invalid ? true : false)); + } }, set_bold: function() { if(this.$input) { From a23ba1fc56d4ee98bb0aa3a4025926a9eaaed299 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 7 Apr 2020 17:52:10 +0530 Subject: [PATCH 006/337] feat: data validation for child table --- .../public/js/frappe/form/controls/base_control.js | 6 ++++-- frappe/public/js/frappe/form/controls/base_input.js | 12 +++++++----- frappe/public/js/frappe/form/grid_row.js | 5 ++++- frappe/public/less/form_grid.less | 8 ++++++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js index c1ba41ab16..41e06537e1 100644 --- a/frappe/public/js/frappe/form/controls/base_control.js +++ b/frappe/public/js/frappe/form/controls/base_control.js @@ -152,12 +152,14 @@ frappe.ui.form.Control = Class.extend({ () => me.set_model_value(value), () => { me.set_mandatory && me.set_mandatory(value); - me.set_invalid && me.set_invalid(); if(me.df.change || me.df.onchange) { // onchange event specified in df - return (me.df.change || me.df.onchange).apply(me, [e]); + let set = (me.df.change || me.df.onchange).apply(me, [e]); + me.set_invalid && me.set_invalid(); + return set; } + me.set_invalid && me.set_invalid(); } ]); }; diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js index 685aac90a3..f3f04ec4d8 100644 --- a/frappe/public/js/frappe/form/controls/base_input.js +++ b/frappe/public/js/frappe/form/controls/base_input.js @@ -180,11 +180,13 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({ this.$wrapper.toggleClass("has-error", (this.df.reqd && is_null(value)) ? true : false); }, set_invalid: function () { - if(this.$input) { - this.$wrapper.toggleClass("has-error", (this.df.invalid ? true : false)); - } - if(this.disp_area) { - $(this.disp_area).toggleClass("has-error", (this.df.invalid ? true : false)); + let invalid = !!this.df.invalid; + if (this.grid) { + this.$wrapper.parents('.grid-static-col').toggleClass('invalid', invalid); + this.$input.toggleClass('invalid', invalid); + this.grid_row.columns[this.df.fieldname].is_invalid = invalid; + } else { + this.$wrapper.toggleClass('has-error', invalid); } }, set_bold: function() { diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 0e36e671cc..1fd0fcce24 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -268,7 +268,10 @@ export default class GridRow { if(df.reqd && !txt) { column.addClass('error'); } - if (df.reqd || df.bold) { + if (column.is_invalid) { + column.addClass('invalid'); + } + else if ((df.reqd || df.bold)) { column.addClass('bold'); } } diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less index 28f08635ba..102719308c 100644 --- a/frappe/public/less/form_grid.less +++ b/frappe/public/less/form_grid.less @@ -80,6 +80,10 @@ background-color: @extra-light-yellow; } +.editable-form .grid-static-col.invalid { + background-color: @label-danger-bg; +} + .validated-form .grid-static-col.error { background-color: @label-danger-bg; } @@ -150,6 +154,10 @@ } } + input.form-control.invalid { + background-color: @label-danger-bg; + } + input[data-fieldtype="Int"], input[data-fieldtype="Float"], input[data-fieldtype="Currency"] { text-align: right; } From 24a8b036393c6aa71db16cb0fccf17064505c403 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Wed, 8 Apr 2020 20:27:38 +0530 Subject: [PATCH 007/337] chore: improve error message on delete --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index d77898020d..b6db154bd4 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -210,7 +210,7 @@ def check_permission_and_not_submitted(doc): # check if submitted if doc.docstatus == 1: - frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted.").format(_(doc.doctype), doc.name), + frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must Cancel it first.").format(_(doc.doctype), doc.name), raise_exception=True) def check_if_doc_is_linked(doc, method="Delete"): From 5cc11910adced726619a81a4b3824aa298a8beb3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 10 Apr 2020 13:34:38 +0530 Subject: [PATCH 008/337] fix: return Job object on frappe.enqueue_doc --- frappe/utils/background_jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 03f063e058..4b37e850f0 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -73,7 +73,7 @@ def enqueue(method, queue='default', timeout=None, event=None, def enqueue_doc(doctype, name=None, method=None, queue='default', timeout=300, now=False, **kwargs): '''Enqueue a method to be run on a document''' - enqueue('frappe.utils.background_jobs.run_doc_method', doctype=doctype, name=name, + return enqueue('frappe.utils.background_jobs.run_doc_method', doctype=doctype, name=name, doc_method=method, queue=queue, timeout=timeout, now=now, **kwargs) def run_doc_method(doctype, name, doc_method, **kwargs): From 0a0045e9cc7cddcc77da1f8b7a42b4dd5d0c3e4e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 10 Apr 2020 13:38:28 +0530 Subject: [PATCH 009/337] chore: raise exception via frappe.msgprint --- frappe/core/doctype/file/file.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 6633884bb3..485885ec24 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -608,8 +608,7 @@ def get_local_image(file_url): try: image = Image.open(file_path) except IOError: - frappe.msgprint(_("Unable to read file format for {0}").format(file_url)) - raise + frappe.msgprint(_("Unable to read file format for {0}").format(file_url), raise_exception=True) content = None From 558fec0d7cb12aef812419eada3c3e229e1f0641 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 10 Apr 2020 23:40:34 +0530 Subject: [PATCH 010/337] fix: move Video DocType from Education Module to Core --- frappe/core/doctype/video/__init__.py | 0 frappe/core/doctype/video/test_video.js | 23 +++++ frappe/core/doctype/video/test_video.py | 10 +++ frappe/core/doctype/video/video.js | 8 ++ frappe/core/doctype/video/video.json | 114 ++++++++++++++++++++++++ frappe/core/doctype/video/video.py | 10 +++ 6 files changed, 165 insertions(+) create mode 100644 frappe/core/doctype/video/__init__.py create mode 100644 frappe/core/doctype/video/test_video.js create mode 100644 frappe/core/doctype/video/test_video.py create mode 100644 frappe/core/doctype/video/video.js create mode 100644 frappe/core/doctype/video/video.json create mode 100644 frappe/core/doctype/video/video.py diff --git a/frappe/core/doctype/video/__init__.py b/frappe/core/doctype/video/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/video/test_video.js b/frappe/core/doctype/video/test_video.js new file mode 100644 index 0000000000..a82a221319 --- /dev/null +++ b/frappe/core/doctype/video/test_video.js @@ -0,0 +1,23 @@ +/* eslint-disable */ +// rename this file from _test_[name] to test_[name] to activate +// and remove above this line + +QUnit.test("test: Video", function (assert) { + let done = assert.async(); + + // number of asserts + assert.expect(1); + + frappe.run_serially([ + // insert a new Video + () => frappe.tests.make('Video', [ + // values to be set + {key: 'value'} + ]), + () => { + assert.equal(cur_frm.doc.key, 'value'); + }, + () => done() + ]); + +}); diff --git a/frappe/core/doctype/video/test_video.py b/frappe/core/doctype/video/test_video.py new file mode 100644 index 0000000000..0bed1e98d6 --- /dev/null +++ b/frappe/core/doctype/video/test_video.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestVideo(unittest.TestCase): + pass diff --git a/frappe/core/doctype/video/video.js b/frappe/core/doctype/video/video.js new file mode 100644 index 0000000000..36ea240a36 --- /dev/null +++ b/frappe/core/doctype/video/video.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Video', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/core/doctype/video/video.json b/frappe/core/doctype/video/video.json new file mode 100644 index 0000000000..875926088b --- /dev/null +++ b/frappe/core/doctype/video/video.json @@ -0,0 +1,114 @@ +{ + "actions": [], + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:title", + "creation": "2018-10-17 05:47:13.087395", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "provider", + "url", + "column_break_4", + "publish_date", + "duration", + "section_break_7", + "description" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "provider", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Provider", + "options": "YouTube\nVimeo", + "reqd": 1 + }, + { + "fieldname": "url", + "fieldtype": "Data", + "in_list_view": 1, + "label": "URL", + "reqd": 1 + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "publish_date", + "fieldtype": "Date", + "label": "Publish Date" + }, + { + "fieldname": "duration", + "fieldtype": "Data", + "label": "Duration" + }, + { + "fieldname": "section_break_7", + "fieldtype": "Section Break" + }, + { + "fieldname": "description", + "fieldtype": "Text Editor", + "in_list_view": 1, + "label": "Description", + "reqd": 1 + } + ], + "links": [], + "modified": "2020-04-10 23:04:41.124053", + "modified_by": "Administrator", + "module": "Core", + "name": "Video", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Academics User", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Instructor", + "share": 1, + "write": 1 + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "LMS User", + "share": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/core/doctype/video/video.py b/frappe/core/doctype/video/video.py new file mode 100644 index 0000000000..fdbd3a1abe --- /dev/null +++ b/frappe/core/doctype/video/video.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class Video(Document): + pass From 275a678bd658b75bd3a5f7e3b68722d58bce0533 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 11:42:02 +0530 Subject: [PATCH 011/337] fix: site cleanup in case of errors on new-site Added _new_site_cleanup to handle exceptions raised in case of interuppted install of Frappe site. Deletes folders after calling _drop_site --- frappe/commands/site.py | 61 +++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index fd43cc8cf3..055d4317a5 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -1,13 +1,25 @@ -from __future__ import unicode_literals, absolute_import, print_function +# imports - standard imports +import atexit +import compileall +import hashlib +import os +import re +import shutil +import sys + +# imports - third party imports import click -import hashlib, os, sys, compileall, re +from pymysql.err import OperationalError +from six import text_type + +# imports - module imports import frappe from frappe import _ -from frappe.commands import pass_context, get_site +from frappe.commands import get_site, pass_context from frappe.commands.scheduler import _is_scheduler_enabled from frappe.installer import update_site_config -from frappe.utils import touch_file, get_site_path -from six import text_type +from frappe.utils import get_site_path, touch_file + @click.command('new-site') @click.argument('site') @@ -68,32 +80,33 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N make_site_dirs() - installing = None - try: - installing = touch_file(get_site_path('locks', 'installing.lock')) + installing = touch_file(get_site_path('locks', 'installing.lock')) + atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password) - install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, - db_name=db_name, admin_password=admin_password, verbose=verbose, - source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, + db_name=db_name, admin_password=admin_password, verbose=verbose, + source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) + for app in apps_to_install: + _install_app(app, verbose=verbose, set_as_patched=not source_sql) - apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) - for app in apps_to_install: - _install_app(app, verbose=verbose, set_as_patched=not source_sql) + os.remove(installing) - frappe.utils.scheduler.toggle_scheduler(enable_scheduler) - frappe.db.commit() + frappe.utils.scheduler.toggle_scheduler(enable_scheduler) + frappe.db.commit() - scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" - print("*** Scheduler is", scheduler_status, "***") + scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" + print("*** Scheduler is", scheduler_status, "***") - except frappe.exceptions.ImproperDBConfigurationError: - _drop_site(site, mariadb_root_username, mariadb_root_password, force=True) +def _new_site_cleanup(site, mariadb_root_username, mariadb_root_password): + installing = get_site_path('locks', 'installing.lock') - finally: - if installing and os.path.exists(installing): - os.remove(installing) + if installing and os.path.exists(installing): + if mariadb_root_password: + _drop_site(site, mariadb_root_username, mariadb_root_password, force=True) + shutil.rmtree(site) - frappe.destroy() + frappe.destroy() @click.command('restore') @click.argument('sql-file-path') From 41c6c09fb9e157df5b867a42d3f5926f9437e736 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 12:05:46 +0530 Subject: [PATCH 012/337] feat: handle failed cases in publish_realtime --- frappe/public/js/frappe/form/dashboard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index c4c739dbcc..3b6ccd9a5c 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -125,8 +125,9 @@ frappe.ui.form.Dashboard = Class.extend({ }, format_percent: function(title, percent) { - var width = cint(percent) < 1 ? 1 : cint(percent); - var progress_class = "progress-bar-success"; + const percentage = cint(percent); + const width = percentage < 0 ? 100 : percentage; + const progress_class = percentage < 0 ? "progress-bar-danger" : "progress-bar-success"; return [{ title: title, From 30e0fa7561b9d21caff689fedbd943e7dd8f33c6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 12:21:31 +0530 Subject: [PATCH 013/337] style: remove unused imports --- frappe/commands/site.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 055d4317a5..540f250918 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -9,8 +9,6 @@ import sys # imports - third party imports import click -from pymysql.err import OperationalError -from six import text_type # imports - module imports import frappe From 5b170c031dd622018133b0f88a1e751c54db69d5 Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Mon, 13 Apr 2020 16:40:09 +0530 Subject: [PATCH 014/337] perf: enqueue instance of send_one for better performance Usecase: Suppose I have hundred's of emails in the Email Queue and the flush job executes. While the execution of the flush job is going another flush job starts and so on. Because of this a list of flush jobs gets lined up in the background jobs queue. To avoid this it is better to enqueue the send_one function inside the flush job this will very efficiently improve the performance of the flush job. --- frappe/email/queue.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index b35f5944b2..9b1cfdd6b4 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -348,7 +348,19 @@ def flush(from_test=False): smtpserver = SMTPServer() smtpserver_dict[email.sender] = smtpserver - send_one(email.name, smtpserver, auto_commit, from_test=from_test) + # send_one(email.name, smtpserver, auto_commit, from_test=from_test) + from frappe import enqueue + send_one_args = { + 'email': email.name, + 'smtpserver':smtpserver, + 'auto_commit': auto_commit, + 'from_test':from_test + } + enqueue( + method='frappe.email.queue.send_one', + queue='short', + **send_one_args + ) # NOTE: removing commit here because we pass auto_commit # finally: From b0e236badd319bd247c1e215cdee53d38aafb5cb Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:07:08 +0530 Subject: [PATCH 015/337] workflow for github actions to check translation formats --- .../workflows/check_translation_format.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/check_translation_format.yml diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/check_translation_format.yml new file mode 100644 index 0000000000..e5d2031182 --- /dev/null +++ b/.github/workflows/check_translation_format.yml @@ -0,0 +1,42 @@ +name: Check format +on: + pull_request: + branches: + - master + - develop +jobs: + check_translation: + name: Check format + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: Setup python3 + uses: actions/setup-python@v1 + with: + python-version: 3.6 + - name: Run check_translation for pull_request + run: | + import os + import subprocess + import re + errors_encounter = 0 + pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") + temp = re.compile(r"_\(([\"']{,3})") + subprocess.run('git fetch origin '+os.environ['GITHUB_BASE_REF']+ ' :' +os.environ['GITHUB_BASE_REF']+ ' -q', shell=True) + files = subprocess.check_output('git diff --name-only '+os.environ['GITHUB_BASE_REF'], shell=True) + files = files.decode('utf-8') + files = files.split() + for file in files: + with open(file, 'r') as f: + for num, line in enumerate(f, 1): + all_matches = temp.finditer(line) + if all_matches: + for match in all_matches: + verify = pattern.search(line) + if not verify: + errors_encounter += 1 + print(num) + print(line) + if errors_encounter > 0 : + assert 1+1 == 3 + shell: python \ No newline at end of file From e6ff382d14af27140e13ea5014bb60e4cca5f65d Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:39:14 +0530 Subject: [PATCH 016/337] printing proper error message --- .github/workflows/check_translation_format.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/check_translation_format.yml index e5d2031182..6b8ba91e99 100644 --- a/.github/workflows/check_translation_format.yml +++ b/.github/workflows/check_translation_format.yml @@ -1,4 +1,4 @@ -name: Check format +name: frappe_linter on: pull_request: branches: @@ -35,8 +35,9 @@ jobs: verify = pattern.search(line) if not verify: errors_encounter += 1 - print(num) - print(line) + print('A syntax error has been discovered at line number: ' + num) + print('Syntax error occured with: ' + line) if errors_encounter > 0 : + print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') assert 1+1 == 3 shell: python \ No newline at end of file From fe1dd4d88c9c2e538dd95b3fa16d416ac3890390 Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:40:44 +0530 Subject: [PATCH 017/337] renamed .yml file --- .../{check_translation_format.yml => translation_linter.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{check_translation_format.yml => translation_linter.yml} (100%) diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/translation_linter.yml similarity index 100% rename from .github/workflows/check_translation_format.yml rename to .github/workflows/translation_linter.yml From 7b10a2d88a2f15a3487f8ceeb337f3cbf29dbc35 Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Mon, 13 Apr 2020 20:07:46 +0530 Subject: [PATCH 018/337] style: removed comment and formatted dictionary --- frappe/email/queue.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 9b1cfdd6b4..d82d93fa75 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -348,13 +348,12 @@ def flush(from_test=False): smtpserver = SMTPServer() smtpserver_dict[email.sender] = smtpserver - # send_one(email.name, smtpserver, auto_commit, from_test=from_test) from frappe import enqueue send_one_args = { 'email': email.name, - 'smtpserver':smtpserver, + 'smtpserver': smtpserver, 'auto_commit': auto_commit, - 'from_test':from_test + 'from_test': from_test } enqueue( method='frappe.email.queue.send_one', From 8e9d642f44d0f394b153f45b7d4031ea85ec92a8 Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Mon, 13 Apr 2020 20:11:54 +0530 Subject: [PATCH 019/337] style: formatted parameters of enqueue function --- frappe/email/queue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index d82d93fa75..4b60ee858b 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -356,8 +356,8 @@ def flush(from_test=False): 'from_test': from_test } enqueue( - method='frappe.email.queue.send_one', - queue='short', + method = 'frappe.email.queue.send_one', + queue = 'short', **send_one_args ) From 47446469bd4f21742fb7def8a8bf2797e062f60f Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Mon, 13 Apr 2020 20:20:02 +0530 Subject: [PATCH 020/337] refactor: moved import to the top of the file --- frappe/email/queue.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 4b60ee858b..d4fbf798c5 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -6,7 +6,7 @@ import frappe import sys from six.moves import html_parser as HTMLParser import smtplib, quopri, json -from frappe import msgprint, _, safe_decode, safe_encode +from frappe import msgprint, _, safe_decode, safe_encode, enqueue from frappe.email.smtp import SMTPServer, get_outgoing_email_account from frappe.email.email_body import get_email, get_formatted_html, add_attachment from frappe.utils.verified_command import get_signed_params, verify_request @@ -347,8 +347,7 @@ def flush(from_test=False): if not smtpserver: smtpserver = SMTPServer() smtpserver_dict[email.sender] = smtpserver - - from frappe import enqueue + send_one_args = { 'email': email.name, 'smtpserver': smtpserver, From 821934db3d715d5f7415e97b38b8fa9247c36382 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 14 Apr 2020 12:27:26 +0530 Subject: [PATCH 021/337] feat: enable customizations for hidden sections --- frappe/public/js/frappe/views/desktop/desktop.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js index 12d33affa7..9f0df6e172 100644 --- a/frappe/public/js/frappe/views/desktop/desktop.js +++ b/frappe/public/js/frappe/views/desktop/desktop.js @@ -203,8 +203,8 @@ class DesktopPage { this.allow_customization && this.make_customization_link(); let create_shortcuts_and_cards = () => { - this.data.shortcuts.items.length && this.make_shortcuts(); - this.data.cards.items.length && this.make_cards(); + this.make_shortcuts(); + this.make_cards(); if (this.allow_customization) { // Move the widget group up to align with labels if customization is allowed @@ -212,7 +212,7 @@ class DesktopPage { } }; - if (!this.sections["onboarding"] && this.data.charts.items.length) { + if (!this.sections["onboarding"]) { this.make_charts().then(() => { create_shortcuts_and_cards(); }); From 607be5ad2a1d3b0afe5e2356b57283a8edd03528 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 14 Apr 2020 12:54:55 +0530 Subject: [PATCH 022/337] feat: add sidebar items to navbar in mobile --- .../includes/navbar/navbar_items.html | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html index 10d484df65..4e5ad0dd0a 100644 --- a/frappe/templates/includes/navbar/navbar_items.html +++ b/frappe/templates/includes/navbar/navbar_items.html @@ -64,6 +64,24 @@ {% if not only_static %} {% block navbar_right_extension %}{% endblock %} {% endif %} + + {% if show_sidebar %} +
+
+ {% for item in sidebar_items -%} +
  • + {% if item.type != 'input' %} + + {{ _(item.title or item.label) }} + + {% endif %} +
    • + {%- endfor %} +
    +
    + {% endif %} + {% include "templates/includes/navbar/navbar_search.html" %} {% include "templates/includes/navbar/navbar_login.html" %} - + \ No newline at end of file From 9b9bbd8cef77204f45bcab1a5e60318dd9350948 Mon Sep 17 00:00:00 2001 From: Rohan Date: Wed, 15 Apr 2020 14:08:52 +0530 Subject: [PATCH 023/337] format: fix whitespace Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/scss/website.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 9901eb7fbf..6f82e25ee0 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -10,8 +10,8 @@ html { body { min-height: 100%; - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; font-size: 16px; > div { From bc042b37b7d1e014012dfed9978cbc2a43e966c2 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:01:27 +0530 Subject: [PATCH 024/337] feat: added Page View doctype --- frappe/website/doctype/page_view/__init__.py | 0 frappe/website/doctype/page_view/page_view.js | 8 ++ .../website/doctype/page_view/page_view.json | 75 +++++++++++++++++++ frappe/website/doctype/page_view/page_view.py | 34 +++++++++ .../doctype/page_view/test_page_view.py | 10 +++ .../website_settings/test_website_settings.py | 10 +++ 6 files changed, 137 insertions(+) create mode 100644 frappe/website/doctype/page_view/__init__.py create mode 100644 frappe/website/doctype/page_view/page_view.js create mode 100644 frappe/website/doctype/page_view/page_view.json create mode 100644 frappe/website/doctype/page_view/page_view.py create mode 100644 frappe/website/doctype/page_view/test_page_view.py create mode 100644 frappe/website/doctype/website_settings/test_website_settings.py diff --git a/frappe/website/doctype/page_view/__init__.py b/frappe/website/doctype/page_view/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/page_view/page_view.js b/frappe/website/doctype/page_view/page_view.js new file mode 100644 index 0000000000..3d6bf92429 --- /dev/null +++ b/frappe/website/doctype/page_view/page_view.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Page View', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/page_view/page_view.json b/frappe/website/doctype/page_view/page_view.json new file mode 100644 index 0000000000..a79472154f --- /dev/null +++ b/frappe/website/doctype/page_view/page_view.json @@ -0,0 +1,75 @@ +{ + "actions": [], + "creation": "2020-04-15 22:54:46.009703", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "path", + "referrer", + "browser", + "browser_version", + "date" + ], + "fields": [ + { + "fieldname": "path", + "fieldtype": "Data", + "label": "Path", + "set_only_once": 1 + }, + { + "fieldname": "referrer", + "fieldtype": "Data", + "label": "Referrer", + "search_index": 1, + "set_only_once": 1 + }, + { + "fieldname": "browser", + "fieldtype": "Data", + "label": "Browser", + "search_index": 1, + "set_only_once": 1 + }, + { + "fieldname": "browser_version", + "fieldtype": "Data", + "label": "Browser Version", + "set_only_once": 1 + }, + { + "fieldname": "date", + "fieldtype": "Datetime", + "label": "Date", + "set_only_once": 1 + } + ], + "in_create": 1, + "links": [], + "modified": "2020-04-15 23:31:27.517793", + "modified_by": "Administrator", + "module": "Website", + "name": "Page View", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 1, + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "path", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/page_view/page_view.py b/frappe/website/doctype/page_view/page_view.py new file mode 100644 index 0000000000..9c41e1c4aa --- /dev/null +++ b/frappe/website/doctype/page_view/page_view.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class PageView(Document): + pass + + +@frappe.whitelist(allow_guest=True) +def make_view_log(path, referrer=None, browser=None, version=None): + if path.startswith('/'): + path = path[1:] + + if is_tracking_enabled(): + view = frappe.new_doc("Page View") + view.path = path + view.referrer = referrer + view.browser = browser + view.browser_version = version + view.date = frappe.utils.now_datetime() + view.insert(ignore_permissions=True) + + return + +@frappe.whitelist() +def get_page_view_count(path): + return frappe.db.count("Page View", filters={'path': path}) + +def is_tracking_enabled(): + return frappe.db.get_value("Website Settings", "Website Settings", "enable_view_tracking") \ No newline at end of file diff --git a/frappe/website/doctype/page_view/test_page_view.py b/frappe/website/doctype/page_view/test_page_view.py new file mode 100644 index 0000000000..2ac98f2be2 --- /dev/null +++ b/frappe/website/doctype/page_view/test_page_view.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestPageView(unittest.TestCase): + pass diff --git a/frappe/website/doctype/website_settings/test_website_settings.py b/frappe/website/doctype/website_settings/test_website_settings.py new file mode 100644 index 0000000000..9eca957713 --- /dev/null +++ b/frappe/website/doctype/website_settings/test_website_settings.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestWebsiteSettings(unittest.TestCase): + pass From 3d454607495fd7997a5b3b909745c0ef0d0ab4f4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:01:38 +0530 Subject: [PATCH 025/337] feat: added tracking script to website --- frappe/www/website_script.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frappe/www/website_script.js b/frappe/www/website_script.js index fd361f8986..9f0dd329c6 100644 --- a/frappe/www/website_script.js +++ b/frappe/www/website_script.js @@ -12,3 +12,17 @@ ga('create', '{{ google_analytics_id }}', 'auto'); ga('send', 'pageview'); // End Google Analytics {%- endif %} + +{% if enable_view_tracking %} + if (navigator.doNotTrack != 1) { + frappe.ready(() => { + let browser = frappe.utils.get_browser(); + frappe.call("frappe.website.doctype.page_view.page_view.make_view_log", { + path: location.pathname, + referrer: document.referrer, + browser: browser.name, + version: browser.version + }) + }) + } +{% endif %} From 9ad1cf94f2a6db4ad88f68493b52030323c9e823 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:01:55 +0530 Subject: [PATCH 026/337] feat: add tracking enabled info to boot --- frappe/boot.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/boot.py b/frappe/boot.py index e6d1199b19..e11dd87990 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -17,6 +17,7 @@ from frappe.utils.change_log import get_versions from frappe.translate import get_lang_dict from frappe.email.inbox import get_email_accounts from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled +from frappe.website.doctype.page_view.page_view import is_tracking_enabled from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points from frappe.social.doctype.post.post import frequently_visited_links @@ -79,6 +80,7 @@ def get_bootinfo(): bootinfo.success_action = get_success_action() bootinfo.update(get_email_accounts(user=frappe.session.user)) bootinfo.energy_points_enabled = is_energy_point_enabled() + bootinfo.website_tracking_enabled = is_tracking_enabled() bootinfo.points = get_energy_points(frappe.session.user) bootinfo.frequently_visited_links = frequently_visited_links() bootinfo.link_preview_doctypes = get_link_preview_doctypes() From 6233e94dab4de5bf73f161aa7565f758662e2100 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:02:27 +0530 Subject: [PATCH 027/337] feat: added utility to get browser details --- frappe/public/js/frappe/utils/utils.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index a2b03f180e..a81d6deece 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -743,7 +743,25 @@ Object.assign(frappe.utils, { }); return $el; - } + }, + + get_browser() { + var ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || []; + if(/trident/i.test(M[1])){ + tem=/\brv[ :]+(\d+)/g.exec(ua) || []; + return {name:'IE',version:(tem[1]||'')}; + } + if(M[1]==='Chrome'){ + tem=ua.match(/\bOPR|Edge\/(\d+)/) + if(tem!=null) {return {name:'Opera', version:tem[1]};} + } + M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?']; + if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1]);} + return { + name: M[0], + version: M[1] + }; + } }); // Array de duplicate From 815f05a0eb4939b73f531da9b939991916139d15 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:02:52 +0530 Subject: [PATCH 028/337] feat: added enable tracking flag to default website context --- .../doctype/website_settings/website_settings.json | 11 +++++++++-- .../doctype/website_settings/website_settings.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index 39ffa2329f..f247082046 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -29,6 +29,7 @@ "footer_items", "hide_footer_signup", "integrations", + "enable_view_tracking", "enable_google_indexing", "authorize_api_indexing_access", "indexing_refresh_token", @@ -186,7 +187,7 @@ "collapsible": 1, "fieldname": "integrations", "fieldtype": "Section Break", - "label": "Google Integrations" + "label": "Integrations" }, { "description": "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.", @@ -319,6 +320,12 @@ "fieldname": "authorize_api_indexing_access", "fieldtype": "Button", "label": "Authorize API Indexing Access" + }, + { + "default": "0", + "fieldname": "enable_view_tracking", + "fieldtype": "Check", + "label": "Enable In App Website Tracking" } ], "icon": "fa fa-cog", @@ -326,7 +333,7 @@ "issingle": 1, "links": [], "max_attachments": 10, - "modified": "2020-02-21 16:46:59.947403", + "modified": "2020-04-15 22:59:26.256662", "modified_by": "Administrator", "module": "Website", "name": "Website Settings", diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index 4356b1aa82..ff94bd15a3 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -118,7 +118,7 @@ def get_website_settings(): for k in ["banner_html", "brand_html", "copyright", "twitter_share_via", "facebook_share", "google_plus_one", "twitter_share", "linked_in_share", "disable_signup", "hide_footer_signup", "head_html", "title_prefix", - "navbar_search"]: + "navbar_search", "enable_view_tracking"]: if hasattr(settings, k): context[k] = settings.get(k) From 7a9a16b6afec7d34435004275f4b6a168c56f856 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 00:03:17 +0530 Subject: [PATCH 029/337] feat: add page view count to form --- frappe/public/js/frappe/form/sidebar/form_sidebar.js | 9 +++++++++ frappe/public/js/frappe/form/templates/form_sidebar.html | 1 + frappe/public/js/frappe/utils/common.js | 6 ++++++ frappe/public/less/sidebar.less | 3 ++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 02caf25557..677d53bb64 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -81,6 +81,15 @@ frappe.ui.form.Sidebar = Class.extend({ } this.frm.viewers.refresh(); this.frm.tags && this.frm.tags.refresh(this.frm.get_docinfo().tags); + + if (this.frm.doc.route && frappe.boot.website_tracking_enabled) { + let route = this.frm.doc.route; + frappe.utils.get_page_view_count(route).then(res => { + this.sidebar.find(".pageview-count").html(__("{0} Page Views", + ["" + res.message + ""])); + }) + } + this.sidebar.find(".modified-by").html(__("{0} edited this {1}", ["" + frappe.user.full_name(this.frm.doc.modified_by) + "", "
    " + comment_when(this.frm.doc.modified)])); diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index b611557c43..30b2205bae 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -105,6 +105,7 @@
      +
    diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js index e919012664..5d20b04616 100644 --- a/frappe/public/js/frappe/utils/common.js +++ b/frappe/public/js/frappe/utils/common.js @@ -352,3 +352,9 @@ frappe.utils.new_auto_repeat_prompt = function(frm) { __('Save') ); } + +frappe.utils.get_page_view_count = function(route) { + return frappe.call("frappe.website.doctype.page_view.page_view.get_page_view_count", { + path: route + }) +} diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index ac5a5c33d5..28dae1a948 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -273,7 +273,8 @@ body[data-route^="Module"] .main-menu { } .layout-side-section .form-sidebar { - .modified-by { + .modified-by, + .pageview-count { margin-bottom: 15px; } } From 5bb489c63748d5bfba0024f2f08a02b58df1f642 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 16 Apr 2020 10:06:41 +0530 Subject: [PATCH 030/337] Update frappe/model/delete_doc.py --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index b6db154bd4..c0d2c4eef9 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -210,7 +210,7 @@ def check_permission_and_not_submitted(doc): # check if submitted if doc.docstatus == 1: - frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must Cancel it first.").format(_(doc.doctype), doc.name), + frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must {2} Cancel {3} it first.").format(_(doc.doctype), doc.name, "", ""), raise_exception=True) def check_if_doc_is_linked(doc, method="Delete"): From 985392d07f8880f5277c3830462a58416271a3ee Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 11:29:15 +0530 Subject: [PATCH 031/337] fix: linting fixes --- .../js/frappe/form/sidebar/form_sidebar.js | 2 +- frappe/public/js/frappe/utils/common.js | 4 +- frappe/public/js/frappe/utils/utils.js | 37 ++++++++++++------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 677d53bb64..9910227590 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -87,7 +87,7 @@ frappe.ui.form.Sidebar = Class.extend({ frappe.utils.get_page_view_count(route).then(res => { this.sidebar.find(".pageview-count").html(__("{0} Page Views", ["" + res.message + ""])); - }) + }); } this.sidebar.find(".modified-by").html(__("{0} edited this {1}", diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js index 5d20b04616..7ffec5e541 100644 --- a/frappe/public/js/frappe/utils/common.js +++ b/frappe/public/js/frappe/utils/common.js @@ -356,5 +356,5 @@ frappe.utils.new_auto_repeat_prompt = function(frm) { frappe.utils.get_page_view_count = function(route) { return frappe.call("frappe.website.doctype.page_view.page_view.get_page_view_count", { path: route - }) -} + }); +}; diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index b07e71bc91..315637092d 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -748,22 +748,33 @@ Object.assign(frappe.utils, { }, get_browser() { - var ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || []; - if(/trident/i.test(M[1])){ - tem=/\brv[ :]+(\d+)/g.exec(ua) || []; - return {name:'IE',version:(tem[1]||'')}; + var ua = navigator.userAgent, + tem, + M = + ua.match( + /(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i + ) || []; + if (/trident/i.test(M[1])) { + tem = /\brv[ :]+(\d+)/g.exec(ua) || []; + return { name: "IE", version: tem[1] || "" }; + } + if (M[1] === "Chrome") { + tem = ua.match(/\bOPR|Edge\/(\d+)/); + if (tem != null) { + return { name: "Opera", version: tem[1] }; } - if(M[1]==='Chrome'){ - tem=ua.match(/\bOPR|Edge\/(\d+)/) - if(tem!=null) {return {name:'Opera', version:tem[1]};} - } - M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?']; - if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1]);} + } + M = M[2] + ? [M[1], M[2]] + : [navigator.appName, navigator.appVersion, "-?"]; + if ((tem = ua.match(/version\/(\d+)/i)) != null) { + M.splice(1, 1, tem[1]); + } return { - name: M[0], - version: M[1] + name: M[0], + version: M[1], }; - } + }, }); // Array de duplicate From 24b737f4c003388c5cbfbb88a91b001533339687 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 12:05:37 +0530 Subject: [PATCH 032/337] refactor: Move Syntax checking code to a separate file --- .github/frappe_linter/translation.py | 26 +++++++++++++++ .github/workflows/translation_linter.yml | 41 ++++++------------------ 2 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 .github/frappe_linter/translation.py diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py new file mode 100644 index 0000000000..c8a90e68ce --- /dev/null +++ b/.github/frappe_linter/translation.py @@ -0,0 +1,26 @@ +import re +import sys + +errors_encounter = 0 +pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") +start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") + +files = sys.argv +for _file in files: + if not _file.endswith(('.py', '.js')): + continue + with open(_file, 'r') as f: + print(f'Checking: {_file}') + for num, line in enumerate(f, 1): + all_matches = start_pattern.finditer(line) + if all_matches: + for match in all_matches: + verify = pattern.search(line) + if not verify: + errors_encounter += 1 + num_str = str(num) + print(f'A syntax error has been discovered at line number: {num}') + print(f'Syntax error occurred with: {line}') +if errors_encounter > 0 : + print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') + assert 1+1 == 3 \ No newline at end of file diff --git a/.github/workflows/translation_linter.yml b/.github/workflows/translation_linter.yml index 6b8ba91e99..ca7b152921 100644 --- a/.github/workflows/translation_linter.yml +++ b/.github/workflows/translation_linter.yml @@ -1,12 +1,13 @@ -name: frappe_linter +name: Frappe Linter on: pull_request: - branches: - - master - - develop + branches: + - develop + - version-12-hotfix + - version-11-hotfix jobs: check_translation: - name: Check format + name: Translation Syntax Check runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -14,30 +15,8 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.6 - - name: Run check_translation for pull_request + - name: Validating Translation Syntax run: | - import os - import subprocess - import re - errors_encounter = 0 - pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") - temp = re.compile(r"_\(([\"']{,3})") - subprocess.run('git fetch origin '+os.environ['GITHUB_BASE_REF']+ ' :' +os.environ['GITHUB_BASE_REF']+ ' -q', shell=True) - files = subprocess.check_output('git diff --name-only '+os.environ['GITHUB_BASE_REF'], shell=True) - files = files.decode('utf-8') - files = files.split() - for file in files: - with open(file, 'r') as f: - for num, line in enumerate(f, 1): - all_matches = temp.finditer(line) - if all_matches: - for match in all_matches: - verify = pattern.search(line) - if not verify: - errors_encounter += 1 - print('A syntax error has been discovered at line number: ' + num) - print('Syntax error occured with: ' + line) - if errors_encounter > 0 : - print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') - assert 1+1 == 3 - shell: python \ No newline at end of file + git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q + files=$(git diff --name-only $GITHUB_BASE_REF) + python $GITHUB_WORKSPACE/.github/frappe_linter/translation.py $files \ No newline at end of file From ab673a9bb95e5ba33dd30bb537dd5f540dd5cf1e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 12:37:53 +0530 Subject: [PATCH 033/337] fix(patch): custom and standard scss is separated in theme --- frappe/patches.txt | 1 + frappe/patches/v13_0/website_theme_custom_scss.py | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 frappe/patches/v13_0/website_theme_custom_scss.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 0e02423639..cbda8cf677 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -272,3 +272,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account') execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings') frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() +frappe.patches.v13_0.website_theme_custom_scss diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py new file mode 100644 index 0000000000..72c98bfc88 --- /dev/null +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -0,0 +1,9 @@ +import frappe + +def execute(): + for theme in frappe.get_all('Website Theme'): + doc = frappe.get_doc('Website Theme', theme.name) + if not doc.custom_scss and doc.theme_scss: + # move old theme to new theme + doc.custom_scss = doc.theme_scss + doc.save() \ No newline at end of file From fd68b7f39854d9cfc30bee92b1521915ff143438 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Apr 2020 12:54:06 +0530 Subject: [PATCH 034/337] fix: Skip first 2 arguments --- .github/frappe_linter/translation.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py index c8a90e68ce..63c4821775 100644 --- a/.github/frappe_linter/translation.py +++ b/.github/frappe_linter/translation.py @@ -5,7 +5,8 @@ errors_encounter = 0 pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") -files = sys.argv +# skip first 2 arguments +files = sys.argv[2:] for _file in files: if not _file.endswith(('.py', '.js')): continue @@ -18,9 +19,10 @@ for _file in files: verify = pattern.search(line) if not verify: errors_encounter += 1 - num_str = str(num) print(f'A syntax error has been discovered at line number: {num}') print(f'Syntax error occurred with: {line}') -if errors_encounter > 0 : +if errors_encounter > 0: print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') - assert 1+1 == 3 \ No newline at end of file + assert 1+1 == 3 +else: + print('Good To Go!') From 82806dd16158121af32e849419eea73d7b618eea Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 12:48:42 +0530 Subject: [PATCH 035/337] feat: disable file browser for both attach and attach image --- frappe/public/js/frappe/web_form/webform_script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js index 688c0938c4..53d9701774 100644 --- a/frappe/public/js/frappe/web_form/webform_script.js +++ b/frappe/public/js/frappe/web_form/webform_script.js @@ -113,8 +113,9 @@ frappe.ready(function() { df.only_select = true; } if (["Attach", "Attach Image"].includes(df.fieldtype)) { - if (!df.options) + if (typeof df.options !== "object") { df.options = {}; + } df.options.disable_file_browser = true; } }); From 15493a9a23e4d0a5ef69431f13962b7549c15988 Mon Sep 17 00:00:00 2001 From: P-Froggy <60393001+P-Froggy@users.noreply.github.com> Date: Thu, 16 Apr 2020 09:49:41 +0200 Subject: [PATCH 036/337] fix: Incorrect translation of short format time difference strings (#9802) --- frappe/public/js/frappe/utils/pretty_date.js | 115 ++++++++++--------- frappe/translations/de.csv | 30 +++-- 2 files changed, 81 insertions(+), 64 deletions(-) diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js index 1ad02e675c..060ae73a98 100644 --- a/frappe/public/js/frappe/utils/pretty_date.js +++ b/frappe/public/js/frappe/utils/pretty_date.js @@ -1,64 +1,71 @@ -// moment strings for translation +function prettyDate(date, mini) { + if (!date) return ''; -function prettyDate(time, mini) { - if (!time) { - time = new Date(); - } - if ('moment' in window) { // use frappe.ImportError ;) - let ret; - if (frappe.sys_defaults && frappe.sys_defaults.time_zone) { - ret = moment.tz(time, frappe.sys_defaults.time_zone).locale(frappe.boot.lang).fromNow(mini); - } else { - ret = moment(time).locale(frappe.boot.lang).fromNow(mini); - } - if (mini) { - if (ret === moment().locale(frappe.boot.lang).fromNow(mini)) { - ret = __("now"); - } else { - var parts = ret.split(" "); - if (parts.length > 1) { - if (parts[0] === "a" || parts[0] === "an") { - parts[0] = 1; - } - if (parts[1].substr(0, 2) === "mo") { - ret = parts[0] + " M"; - } else { - ret = parts[0] + " " + parts[1].substr(0, 1); - } - } + if (typeof (date) == "string") + date = new Date((date || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, "")); + + let diff = (((new Date()).getTime() - date.getTime()) / 1000); + let day_diff = Math.floor(diff / 86400); + + if (isNaN(day_diff) || day_diff < 0) return ''; + + if (mini) { + // Return short format of time difference + if (day_diff == 0) { + if (diff < 60) { + return __("Now"); + } else if (diff < 3600) { + return __("{0} m", [Math.floor(diff / 60)]); + } else if (diff < 86400) { + return __("{0} h", [Math.floor(diff / 3600)]); + } + } else { + if (day_diff < 7) { + return __("{0} D", [day_diff]); + } else if (day_diff < 31) { + return __("{0} W", [Math.ceil(day_diff / 7)]); + } else if (day_diff < 365) { + return __("{0} M", [Math.ceil(day_diff / 30)]); + } else { + return __("{0} Y", [Math.ceil(day_diff / 365)]); } - ret = ret.substr(0, 5); } - return ret; } else { - if (!time) return ''; - var date = time; - if (typeof (time) == "string") - date = new Date((time || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, "")); - - var diff = (((new Date()).getTime() - date.getTime()) / 1000), - day_diff = Math.floor(diff / 86400); - - if (isNaN(day_diff) || day_diff < 0) - return ''; - - var when = day_diff == 0 && ( - diff < 60 && __("just now") || - diff < 120 && __("1 minute ago") || - diff < 3600 && __("{0} minutes ago", [Math.floor(diff / 60)]) || - diff < 7200 && __("1 hour ago") || - diff < 86400 && ("{0} hours ago", [Math.floor(diff / 3600)])) || - day_diff == 1 && __("Yesterday") || - day_diff < 7 && __("{0} days ago", day_diff) || - day_diff < 31 && __("{0} weeks ago", [Math.ceil(day_diff / 7)]) || - day_diff < 365 && __("{0} months ago", [Math.ceil(day_diff / 30)]) || - __("> {0} year(s) ago", [Math.floor(day_diff / 365)]); - - return when; + // Return long format of time difference + if (day_diff == 0) { + if (diff < 60) { + return __("Just now"); + } else if (diff < 120) { + return __("1 minute ago"); + } else if (diff < 3600) { + return __("{0} minutes ago", [Math.floor(diff / 60)]); + } else if (diff < 7200) { + return __("1 hour ago"); + } else if (diff < 86400) { + return __("{0} hours ago", [Math.floor(diff / 3600)]); + } + } else { + if (day_diff == 1) { + return __("Yesterday"); + } else if (day_diff < 7) { + return __("{0} days ago", [day_diff]); + } else if (day_diff < 14) { + return __("1 week ago"); + } else if (day_diff < 31) { + return __("{0} weeks ago", [Math.ceil(day_diff / 7)]); + } else if (day_diff < 62) { + return __("1 month ago"); + } else if (day_diff < 365) { + return __("{0} months ago", [Math.ceil(day_diff / 30)]); + } else if (day_diff < 730) { + return __("1 year ago"); + } else { + return __("{0} years ago", [Math.ceil(day_diff / 365)]); + } + } } } - frappe.provide("frappe.datetime"); window.comment_when = function(datetime, mini) { var timestamp = frappe.datetime.str_to_user ? diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index efeb68df62..18d66591b3 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -63,7 +63,6 @@ apps/frappe/frappe/templates/emails/download_data.html,We have received a reques DocType: System Settings,"If enabled, the password strength will be enforced based on the Minimum Password Score value. A value of 2 being medium strong and 4 being very strong.","Falls diese Option aktiviert ist, wird die Passwortstärke auf der Grundlage des Minimum Password Score Wertes erzwungen. Ein Wert von 2 ist mittelstark und 4 sehr stark." DocType: About Us Settings,"""Team Members"" or ""Management""",„Teammitglieder“ oder „Management“ apps/frappe/frappe/core/doctype/doctype/doctype.py,Default for 'Check' type of field must be either '0' or '1',Standard für 'Prüfen'-Feldtyp muss entweder '0' oder '1' sein -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Yesterday,Gestern DocType: Contact,Designation,Bezeichnung apps/frappe/frappe/email/doctype/email_account/email_account.py,Automatic Linking can be activated only for one Email Account.,Die automatische Verknüpfung kann nur für ein E-Mail-Konto aktiviert werden. DocType: Test Runner,Test Runner,Tester @@ -120,7 +119,6 @@ DocType: Dashboard Chart,Timespan,Zeitspanne apps/frappe/frappe/public/js/frappe/file_uploader/FileUploader.vue,Web Link,Weblink DocType: Deleted Document,Restored,Restauriert apps/frappe/frappe/public/js/frappe/form/print.js,"Error connecting to QZ Tray Application...

    You need to have QZ Tray application installed and running, to use the Raw Print feature.

    Click here to Download and install QZ Tray.
    Click here to learn more about Raw Printing.","Fehler beim Verbinden mit der QZ-Tray-Anwendung ...

    Sie müssen die QZ Tray-Anwendung installiert haben und ausführen, um die Raw Print-Funktion verwenden zu können.

    Klicken Sie hier, um QZ Tray herunterzuladen und zu installieren .
    Klicken Sie hier, um mehr über den Rohdruck zu erfahren ." -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 minute ago,Vor 1 Minute apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html,"Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.",Zusätzlich zum System-Manager können Rollen mit der Erlaubnis Benutzer anzulegen Berechtigungen für andere Nutzer für diesen Dokumententyp setzen. apps/frappe/frappe/website/doctype/website_theme/website_theme.js,Configure Theme,Thema konfigurieren DocType: Company History,Company History,Unternehmensgeschichte @@ -971,7 +969,6 @@ apps/frappe/frappe/public/js/frappe/list/list_view.js,Share URL,URL teilen DocType: System Settings,Allow Consecutive Login Attempts ,Erlaube aufeinanderfolgende Login-Versuche apps/frappe/frappe/templates/pages/integrations/stripe_checkout.html,An error occured during the payment process. Please contact us.,Während des Bezahlvorgangs ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns. DocType: Onboarding Slide,If Slide Type is Create or Settings there should be a 'create_onboarding_docs' method in the {ref_doctype}.py file bound to be executed after the slide is completed.,"Wenn der Folientyp "Erstellen" oder "Einstellungen" ist, sollte die Methode "create_onboarding_docs" in der Datei "{ref_doctype} .py" enthalten sein, die nach Abschluss der Folie ausgeführt werden soll." -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} days ago,vor {0} Tag(en) DocType: Email Account,Awaiting Password,Warte auf Passwort DocType: Address,Address Line 1,Adresse Zeile 1 apps/frappe/frappe/public/js/frappe/ui/filters/filter.js,Not Descendants Of,Nicht Nachkommen von @@ -1360,7 +1357,6 @@ apps/frappe/frappe/social/doctype/energy_point_rule/energy_point_rule.py,Referen DocType: PayPal Settings,PayPal Settings,PayPal-Einstellungen apps/frappe/frappe/core/page/permission_manager/permission_manager.js,Select Document Type,Dokumenttyp auswählen apps/frappe/frappe/utils/nestedset.py,Cannot delete {0} as it has child nodes,"{0} kann nicht gelöscht werden, da es Unterknoten gibt" -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} minutes ago,vor {0} Minute(n) apps/frappe/frappe/automation/doctype/assignment_rule/assignment_rule.py,Assignment Day {0} has been repeated.,Der Zuordnungstag {0} wurde wiederholt. DocType: Kanban Board Column,lightblue,hellblau apps/frappe/frappe/integrations/doctype/webhook/webhook.py,Same Field is entered more than once,Gleiches Feld wird mehrmals eingegeben @@ -1787,7 +1783,6 @@ DocType: Notification Log,Assignment,Zuordnung DocType: Notification,Slack Channel,Slack-Kanal DocType: About Us Team Member,Image Link,Bildverknüpfung DocType: Auto Email Report,Report Filters,Berichtsfilter -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,now,jetzt DocType: Workflow State,step-backward,Schritt zurück apps/frappe/frappe/utils/boilerplate.py,{app_title},{app_title} apps/frappe/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py,Please set Dropbox access keys in your site config,Bitte Dropbox-Zugriffsdaten in den Einstellungen der Seite setzen @@ -2520,7 +2515,6 @@ apps/frappe/frappe/public/js/frappe/form/print.js,QZ Tray Connection Active!,QZ- DocType: Contact Us Settings,Settings for Contact Us Page,Einstellungen Kontakt DocType: Server Script,Script Type,Skripttyp DocType: Print Settings,Enable Print Server,Aktivieren Sie den Druckserver -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} weeks ago,vor {0} Woche(n) DocType: Email Account,Footer,Fußzeile apps/frappe/frappe/config/integrations.py,Authentication,Authentifizierung apps/frappe/frappe/utils/verified_command.py,Invalid Link,Ungültige Verknüpfung @@ -3444,7 +3438,6 @@ apps/frappe/frappe/integrations/doctype/ldap_settings/ldap_settings.py,Please In apps/frappe/frappe/core/doctype/data_import/log_details.html,Row Status,Zeilenstatus DocType: S3 Backup Settings,sa-east-1,sa-east-1 DocType: Workflow Transition,Workflow Transition,Workflow-Übergang -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} months ago,vor {0} Monate(n) apps/frappe/frappe/custom/doctype/custom_field/custom_field.py,Custom Fields can only be added to a standard DocType.,Benutzerdefinierte Felder können nur zu einem Standard-DocType hinzugefügt werden. apps/frappe/frappe/public/js/frappe/list/list_sidebar_group_by.js,Created By,Erstellt von apps/frappe/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py,Dropbox Setup,Dropbox-Setup @@ -3500,7 +3493,6 @@ apps/frappe/frappe/website/doctype/website_theme/website_theme.js,Theme Colors,T apps/frappe/frappe/printing/page/print_format_builder/print_format_builder.js,Select a DocType to make a new format,"DocType auswählen, um ein neues Format zu erstellen" apps/frappe/frappe/desk/page/user_profile/user_profile.js,User does not exist,Benutzer existiert nicht apps/frappe/frappe/automation/doctype/auto_repeat/auto_repeat.py,'Recipients' not specified,"Keine ""Empfänger"" angegeben" -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,just now,gerade eben apps/frappe/frappe/public/js/frappe/ui/filters/edit_filter.html,Apply,Anwenden DocType: Footer Item,Policy,Politik apps/frappe/frappe/integrations/utils.py,{0} Settings not found,{0} Einstellungen nicht gefunden @@ -3592,7 +3584,6 @@ DocType: Auto Email Report,Period,Periode apps/frappe/frappe/core/doctype/data_import_beta/data_import_beta.js,About {0} minute remaining,Noch ungefähr {0} Minuten apps/frappe/frappe/www/login.py,Invalid Login Token,Invalid Login Token apps/frappe/frappe/public/js/frappe/chat.js,Discard,Verwerfen -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 hour ago,vor 1 Stunde DocType: Website Settings,Home Page,Startseite DocType: Error Snapshot,Parent Error Snapshot,Momentaufnahme des übergeordneten Fehlers apps/frappe/frappe/public/js/frappe/data_import/import_preview.js,Map columns from {0} to fields in {1},Ordnen Sie Spalten von {0} Feldern in {1} zu. @@ -3804,7 +3795,6 @@ DocType: Webhook,on_update_after_submit,on_update_after_submit DocType: System Settings,Allow Login using User Name,Login mit Benutzernamen zulassen apps/frappe/frappe/core/doctype/report/report.js,Enable Report,Bericht aktivieren DocType: DocField,Display Depends On,Anzeige ist abhängig von -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,> {0} year(s) ago,> {0} Jahr (e) her DocType: Social Login Key,API Endpoint,API-Endpunkt DocType: Web Page,Insert Code,Code einfügen DocType: Data Migration Run,Current Mapping Type,Aktueller Kartentyp @@ -4188,3 +4178,23 @@ DocType: DocField,Ignore User Permissions,Ignorieren von Benutzerberechtigungen apps/frappe/frappe/public/js/frappe/web_form/web_form.js,Saved Successfully,Erfolgreich gespeichert apps/frappe/frappe/core/doctype/user/user.py,Please ask your administrator to verify your sign-up,Bitte fragen Sie Ihren Administrator Ihre Anmeldung bis zum überprüfen DocType: Domain Settings,Active Domains,Aktive Domains +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Now,Jetzt +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} m,{0} m +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} h,{0} h +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} D,{0} T +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} W,{0} W +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} M,{0} M +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} Y,{0} J +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Just now,Gerade eben +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 minute ago,Vor einer Minute +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} minutes ago,Vor {0} Minuten +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 hour ago,Vor einer Stunde +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} hours ago,Vor {0} Stunden +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Yesterday,Gestern +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} days ago,Vor {0} Tagen +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 week ago,Vor einer Woche +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} weeks ago,Vor {0} Wochen +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 month ago,Vor einem Monat +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} months ago,Vor {0} Monaten +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 year ago,Vor einem Jahr +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} years ago,Vor {0} Jahren \ No newline at end of file From 326439a4d1e90b085aee8b2a6eef4536c1dbd545 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 16 Apr 2020 14:09:21 +0530 Subject: [PATCH 037/337] fix: backups dont break if one site is corrupted --- frappe/commands/site.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index fd43cc8cf3..b88e9f78c0 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -317,10 +317,18 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non "Backup" from frappe.utils.backups import scheduled_backup verbose = context.verbose + exit_code = 0 for site in context.sites: - frappe.init(site=site) - frappe.connect() - odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True) + try: + frappe.init(site=site) + frappe.connect() + odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True) + except Exception as e: + if verbose: + print("Backup failed for {0}. Database or site_config.json may be corrupted".format(site)) + exit_code = 1 + continue + if verbose: from frappe.utils import now print("database backup taken -", odb.backup_path_db, "- on", now()) @@ -329,6 +337,7 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non print("private files backup taken -", odb.backup_path_private_files, "- on", now()) frappe.destroy() + sys.exit(exit_code) @click.command('remove-from-installed-apps') @click.argument('app') From 23b3f65b3bae0c04177c9a670e8f0af5d06be13a Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 16 Apr 2020 14:09:59 +0530 Subject: [PATCH 038/337] fix: limit file upload mimetype if user has no desk access limits file upload mimetype to jpg, png, and pdf in case the user does not have desk access, to prevent abuse of the servers as a file storage system Signed-off-by: Chinmay D. Pai --- frappe/handler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/handler.py b/frappe/handler.py index 6e0bf7a6be..d3fec3cf8f 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -148,12 +148,14 @@ def uploadfile(): @frappe.whitelist(allow_guest=True) def upload_file(): + user = None if frappe.session.user == 'Guest': if frappe.get_system_settings('allow_guests_to_upload_files'): ignore_permissions = True else: return else: + user = frappe.get_doc("User", frappe.session.user) ignore_permissions = False files = frappe.request.files @@ -175,7 +177,7 @@ def upload_file(): frappe.local.uploaded_file = content frappe.local.uploaded_filename = filename - if frappe.session.user == 'Guest': + if frappe.session.user == 'Guest' or (user and not user.has_desk_access()): import mimetypes filetype = mimetypes.guess_type(filename)[0] if filetype not in ['image/png', 'image/jpeg', 'application/pdf']: From e20df3d83c4f76a05f40e832aff9fab097bb838a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 14:19:01 +0530 Subject: [PATCH 039/337] fix(path): __init__ for v13_0 folder --- frappe/patches/v13_0/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 frappe/patches/v13_0/__init__.py diff --git a/frappe/patches/v13_0/__init__.py b/frappe/patches/v13_0/__init__.py new file mode 100644 index 0000000000..e69de29bb2 From feba8878d9739490c2240bc29cacfe022c86f5f3 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 16 Apr 2020 14:26:55 +0530 Subject: [PATCH 040/337] fix: increase the length of the password to maximum possible under current structure --- frappe/utils/password.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/utils/password.py b/frappe/utils/password.py index da5cdecc55..b939607b19 100644 --- a/frappe/utils/password.py +++ b/frappe/utils/password.py @@ -131,9 +131,9 @@ def create_auth_table(): frappe.db.create_auth_table() def encrypt(pwd): - if len(pwd) > 100: - # encrypting > 100 chars will lead to truncation - frappe.throw(_('Password cannot be more than 100 characters long')) + if len(pwd) > 127: + # encrypting > 127 chars will lead to truncation + frappe.throw(_('Password cannot be more than 127 characters long')) cipher_suite = Fernet(encode(get_encryption_key())) cipher_text = cstr(cipher_suite.encrypt(encode(pwd))) From d7e9ef60b87ba8c947d2ce89f3c645691dd95bc4 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 16 Apr 2020 14:31:25 +0530 Subject: [PATCH 041/337] fix: add support for more document mimetypes Signed-off-by: Chinmay D. Pai --- frappe/handler.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/handler.py b/frappe/handler.py index d3fec3cf8f..9699ff6d44 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -14,6 +14,12 @@ from frappe.core.doctype.server_script.server_script_utils import run_server_scr from werkzeug.wrappers import Response from six import string_types +ALLOWED_MIMETYPES = ('image/png', 'image/jpeg', 'application/pdf', 'application/msword', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.spreadsheet') + + def handle(): """handle request""" validate_auth() @@ -180,8 +186,8 @@ def upload_file(): if frappe.session.user == 'Guest' or (user and not user.has_desk_access()): import mimetypes filetype = mimetypes.guess_type(filename)[0] - if filetype not in ['image/png', 'image/jpeg', 'application/pdf']: - frappe.throw("You can only upload JPG, PNG or PDF files.") + if filetype not in ALLOWED_MIMETYPES: + frappe.throw("You can only upload JPG, PNG, PDF, or Microsoft documents.") if method: method = frappe.get_attr(method) From 7b8b5a8490d1f2927cb55b9dbd522d4d06c06cca Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 15:46:05 +0530 Subject: [PATCH 042/337] feat: show self xss warning in console --- frappe/public/js/frappe/desk.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index a1418f9149..902f382879 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -86,6 +86,14 @@ frappe.Application = Class.extend({ this.show_update_available(); } + if (!frappe.boot.developer_mode) { + let console_security_message = __("Using this console may allow attackers to impersonate you and steal your information. Do not enter or paste code that you do not understand.") + console.log( + `%c${console_security_message}`, + "font-size: large" + ); + } + this.show_notes(); if (frappe.boot.is_first_startup) { From 82cedb86171d83485629490b94b1aa2c7c488160 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 16 Apr 2020 16:37:35 +0530 Subject: [PATCH 043/337] fix: Attribute errors and better msgprint --- .../doctype/email_domain/email_domain.py | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/frappe/email/doctype/email_domain/email_domain.py b/frappe/email/doctype/email_domain/email_domain.py index b6585d966b..08583dc228 100644 --- a/frappe/email/doctype/email_domain/email_domain.py +++ b/frappe/email/doctype/email_domain/email_domain.py @@ -39,7 +39,7 @@ class EmailDomain(Document): except Exception: frappe.throw(_("Incoming email account not correct")) - return None + finally: try: if self.use_imap: @@ -48,9 +48,10 @@ class EmailDomain(Document): test.quit() except Exception: pass + try: - if self.use_ssl_for_outgoing: - if not self.smtp_port: + if self.get('use_ssl_for_outgoing'): + if not self.get('smtp_port'): self.smtp_port = 465 sess = smtplib.SMTP_SSL((self.smtp_server or "").encode('utf-8'), @@ -62,28 +63,15 @@ class EmailDomain(Document): sess.quit() except Exception: frappe.throw(_("Outgoing email account not correct")) - return None - return def on_update(self): """update all email accounts using this domain""" - for email_account in frappe.get_all("Email Account", - filters={"domain": self.name}): - + for email_account in frappe.get_all("Email Account", filters={"domain": self.name}): try: - email_account = frappe.get_doc("Email Account", - email_account.name) - email_account.set("email_server",self.email_server) - email_account.set("use_imap",self.use_imap) - email_account.set("use_ssl",self.use_ssl) - email_account.set("use_tls",self.use_tls) - email_account.set("attachment_limit",self.attachment_limit) - email_account.set("smtp_server",self.smtp_server) - email_account.set("smtp_port",self.smtp_port) - email_account.set("use_ssl_for_outgoing", self.use_ssl_for_outgoing) - email_account.set("append_emails_to_sent_folder", self.append_emails_to_sent_folder) + email_account = frappe.get_doc("Email Account", email_account.name) + for attr in ["email_server", "use_imap", "use_ssl", "use_tls", "attachment_limit", "smtp_server", "smtp_port", "use_ssl_for_outgoing", "append_emails_to_sent_folder"]: + email_account.set(attr, self.get(attr, default=0)) email_account.save() + except Exception as e: - frappe.msgprint(email_account.name) - frappe.throw(e) - return None + frappe.msgprint(_("Error has occurred in {0}").format(email_account.name), raise_exception=e.__class__) From 33c6089049938695d1604584eb0de5af0f86a17d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 15:35:46 +0530 Subject: [PATCH 044/337] feat: rename doctype to Web Page View --- frappe/boot.py | 2 +- frappe/public/js/frappe/utils/common.js | 2 +- .../doctype/{page_view => web_page_view}/__init__.py | 0 .../test_web_page_view.py} | 2 +- .../page_view.js => web_page_view/web_page_view.js} | 2 +- .../page_view.json => web_page_view/web_page_view.json} | 2 +- .../page_view.py => web_page_view/web_page_view.py} | 6 +++--- frappe/website/website_theme/standard/standard.json | 4 ++-- frappe/www/website_script.js | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename frappe/website/doctype/{page_view => web_page_view}/__init__.py (100%) rename frappe/website/doctype/{page_view/test_page_view.py => web_page_view/test_web_page_view.py} (81%) rename frappe/website/doctype/{page_view/page_view.js => web_page_view/web_page_view.js} (80%) rename frappe/website/doctype/{page_view/page_view.json => web_page_view/web_page_view.json} (98%) rename frappe/website/doctype/{page_view/page_view.py => web_page_view/web_page_view.py} (85%) diff --git a/frappe/boot.py b/frappe/boot.py index e11dd87990..dc7ea8b3da 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -17,7 +17,7 @@ from frappe.utils.change_log import get_versions from frappe.translate import get_lang_dict from frappe.email.inbox import get_email_accounts from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled -from frappe.website.doctype.page_view.page_view import is_tracking_enabled +from frappe.website.doctype.web_page_view.web_page_view import is_tracking_enabled from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points from frappe.social.doctype.post.post import frequently_visited_links diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js index 7ffec5e541..6ad15e44bf 100644 --- a/frappe/public/js/frappe/utils/common.js +++ b/frappe/public/js/frappe/utils/common.js @@ -354,7 +354,7 @@ frappe.utils.new_auto_repeat_prompt = function(frm) { } frappe.utils.get_page_view_count = function(route) { - return frappe.call("frappe.website.doctype.page_view.page_view.get_page_view_count", { + return frappe.call("frappe.website.doctype.web_page_view.web_page_view.get_page_view_count", { path: route }); }; diff --git a/frappe/website/doctype/page_view/__init__.py b/frappe/website/doctype/web_page_view/__init__.py similarity index 100% rename from frappe/website/doctype/page_view/__init__.py rename to frappe/website/doctype/web_page_view/__init__.py diff --git a/frappe/website/doctype/page_view/test_page_view.py b/frappe/website/doctype/web_page_view/test_web_page_view.py similarity index 81% rename from frappe/website/doctype/page_view/test_page_view.py rename to frappe/website/doctype/web_page_view/test_web_page_view.py index 2ac98f2be2..d51727ec68 100644 --- a/frappe/website/doctype/page_view/test_page_view.py +++ b/frappe/website/doctype/web_page_view/test_web_page_view.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe import unittest -class TestPageView(unittest.TestCase): +class TestWebPageView(unittest.TestCase): pass diff --git a/frappe/website/doctype/page_view/page_view.js b/frappe/website/doctype/web_page_view/web_page_view.js similarity index 80% rename from frappe/website/doctype/page_view/page_view.js rename to frappe/website/doctype/web_page_view/web_page_view.js index 3d6bf92429..77a047e408 100644 --- a/frappe/website/doctype/page_view/page_view.js +++ b/frappe/website/doctype/web_page_view/web_page_view.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on('Page View', { +frappe.ui.form.on('Web Page View', { // refresh: function(frm) { // } diff --git a/frappe/website/doctype/page_view/page_view.json b/frappe/website/doctype/web_page_view/web_page_view.json similarity index 98% rename from frappe/website/doctype/page_view/page_view.json rename to frappe/website/doctype/web_page_view/web_page_view.json index a79472154f..7a1a210d62 100644 --- a/frappe/website/doctype/page_view/page_view.json +++ b/frappe/website/doctype/web_page_view/web_page_view.json @@ -50,7 +50,7 @@ "modified": "2020-04-15 23:31:27.517793", "modified_by": "Administrator", "module": "Website", - "name": "Page View", + "name": "Web Page View", "owner": "Administrator", "permissions": [ { diff --git a/frappe/website/doctype/page_view/page_view.py b/frappe/website/doctype/web_page_view/web_page_view.py similarity index 85% rename from frappe/website/doctype/page_view/page_view.py rename to frappe/website/doctype/web_page_view/web_page_view.py index 9c41e1c4aa..d09ee8ecb3 100644 --- a/frappe/website/doctype/page_view/page_view.py +++ b/frappe/website/doctype/web_page_view/web_page_view.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -class PageView(Document): +class WebPageView(Document): pass @@ -16,7 +16,7 @@ def make_view_log(path, referrer=None, browser=None, version=None): path = path[1:] if is_tracking_enabled(): - view = frappe.new_doc("Page View") + view = frappe.new_doc("Web Page View") view.path = path view.referrer = referrer view.browser = browser @@ -28,7 +28,7 @@ def make_view_log(path, referrer=None, browser=None, version=None): @frappe.whitelist() def get_page_view_count(path): - return frappe.db.count("Page View", filters={'path': path}) + return frappe.db.count("Web Page View", filters={'path': path}) def is_tracking_enabled(): return frappe.db.get_value("Website Settings", "Website Settings", "enable_view_tracking") \ No newline at end of file diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index a719031c40..138168a648 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -5,12 +5,12 @@ "doctype": "Website Theme", "font_properties": "300,600", "idx": 26, - "modified": "2020-04-16 11:23:03.707474", + "modified": "2020-04-16 18:23:34.573404", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", "theme": "Standard", "theme_scss": "\n\n\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_25d87270.css" + "theme_url": "/assets/css/standard_a9402c50.css" } \ No newline at end of file diff --git a/frappe/www/website_script.js b/frappe/www/website_script.js index 9f0dd329c6..38f11a18a7 100644 --- a/frappe/www/website_script.js +++ b/frappe/www/website_script.js @@ -17,7 +17,7 @@ ga('send', 'pageview'); if (navigator.doNotTrack != 1) { frappe.ready(() => { let browser = frappe.utils.get_browser(); - frappe.call("frappe.website.doctype.page_view.page_view.make_view_log", { + frappe.call("frappe.website.doctype.web_page_view.web_page_view.make_view_log", { path: location.pathname, referrer: document.referrer, browser: browser.name, From 0bc153704ccd6ae69f11bd67748391fe6aeb2a99 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 18:30:20 +0530 Subject: [PATCH 045/337] style: linting & formatting fixes --- .../js/frappe/form/sidebar/form_sidebar.js | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 9910227590..3da6bedb8c 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -69,7 +69,7 @@ frappe.ui.form.Sidebar = Class.extend({ }, refresh: function() { - if(this.frm.doc.__islocal) { + if (this.frm.doc.__islocal) { this.sidebar.toggle(false); } else { this.sidebar.toggle(true); @@ -84,18 +84,31 @@ frappe.ui.form.Sidebar = Class.extend({ if (this.frm.doc.route && frappe.boot.website_tracking_enabled) { let route = this.frm.doc.route; - frappe.utils.get_page_view_count(route).then(res => { - this.sidebar.find(".pageview-count").html(__("{0} Page Views", - ["" + res.message + ""])); + frappe.utils.get_page_view_count(route).then((res) => { + this.sidebar + .find(".pageview-count") + .html( + __("{0} Page Views", [String(res.message).bold()]) + ); }); } - this.sidebar.find(".modified-by").html(__("{0} edited this {1}", - ["" + frappe.user.full_name(this.frm.doc.modified_by) + "", - "
    " + comment_when(this.frm.doc.modified)])); - this.sidebar.find(".created-by").html(__("{0} created this {1}", - ["" + frappe.user.full_name(this.frm.doc.owner) + "", - "
    " + comment_when(this.frm.doc.creation)])); + this.sidebar + .find(".modified-by") + .html( + __("{0} edited this {1}", [ + frappe.user.full_name(this.frm.doc.modified_by).bold(), + "
    " + comment_when(this.frm.doc.modified), + ]) + ); + this.sidebar + .find(".created-by") + .html( + __("{0} created this {1}", [ + frappe.user.full_name(this.frm.doc.owner).bold(), + "
    " + comment_when(this.frm.doc.creation), + ]) + ); this.refresh_like(); frappe.ui.form.set_user_image(this.frm); From ede263ca8c357ebba4718775ed2609b4c58dfae0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Apr 2020 19:06:45 +0530 Subject: [PATCH 046/337] chore(linter): Skip only first argument --- .github/frappe_linter/translation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py index 63c4821775..bb81e848f1 100644 --- a/.github/frappe_linter/translation.py +++ b/.github/frappe_linter/translation.py @@ -5,8 +5,8 @@ errors_encounter = 0 pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") -# skip first 2 arguments -files = sys.argv[2:] +# skip first argument +files = sys.argv[1:] for _file in files: if not _file.endswith(('.py', '.js')): continue From 7e0e2da3bdac0cf839030e469063a6c2a4275ffb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 19:17:58 +0530 Subject: [PATCH 047/337] fix: render template if items exists --- frappe/templates/includes/navbar/navbar_items.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html index 4e5ad0dd0a..352fc23bbd 100644 --- a/frappe/templates/includes/navbar/navbar_items.html +++ b/frappe/templates/includes/navbar/navbar_items.html @@ -65,7 +65,7 @@ {% block navbar_right_extension %}{% endblock %} {% endif %} - {% if show_sidebar %} + {% if show_sidebar and sidebar_items %}
    {% for item in sidebar_items -%} @@ -84,4 +84,4 @@ {% include "templates/includes/navbar/navbar_search.html" %} {% include "templates/includes/navbar/navbar_login.html" %} - \ No newline at end of file + From d20de0495f5e6f55be57afd473a72028cb75467b Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 16 Apr 2020 20:21:23 +0530 Subject: [PATCH 048/337] fix: Remove focus outline from summary tag --- frappe/public/less/common.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index b0aca5cb47..c2de48d553 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -32,6 +32,10 @@ details > summary { cursor: pointer; } +details > summary:focus { + outline: none; +} + .text-color { color: @text-color !important; } From c440f13bd1df0bd0b31dffc2f3c7239577b4a643 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:26:01 +0530 Subject: [PATCH 049/337] feat: Add checkbox option to text editor's toolbar --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index b35c92c1ae..4e18b081cc 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 87f6c17dc887b27abe679d8b788635dbeac9d1e9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:31:01 +0530 Subject: [PATCH 050/337] Revert "feat: Add checkbox option to text editor's toolbar" This reverts commit c440f13bd1df0bd0b31dffc2f3c7239577b4a643. --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 4e18b081cc..b35c92c1ae 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 32330f46681fca749f3eca4026276a397df31950 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:26:01 +0530 Subject: [PATCH 051/337] feat: Add checkbox option to text editor's toolbar --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index b35c92c1ae..4e18b081cc 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 051fa9b2cc08c1a8132504921f17ea49915cf6ee Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:54:20 +0530 Subject: [PATCH 052/337] fix: Check is_dirty only if action is save --- frappe/public/js/frappe/form/save.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index d40b3ed341..7efbbe2d3d 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -21,7 +21,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) { remove_empty_rows(); $(frm.wrapper).addClass('validated-form'); - if (frm.is_dirty() && check_mandatory()) { + if ((action !== 'Save' || frm.is_dirty()) && check_mandatory()) { _call({ method: "frappe.desk.form.save.savedocs", args: { doc: frm.doc, action: action }, From 0cdcfdcd9ed7cae9c3af17c86ae1ca47c170ff93 Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 16 Apr 2020 22:13:51 +0530 Subject: [PATCH 053/337] fix: User should not be able to create a language --- frappe/core/doctype/language/language.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/language/language.json b/frappe/core/doctype/language/language.json index 099b383980..eed29883c1 100644 --- a/frappe/core/doctype/language/language.json +++ b/frappe/core/doctype/language/language.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_rename": 1, "autoname": "field:language_code", "creation": "2014-08-22 16:12:17.249590", @@ -41,7 +42,9 @@ } ], "icon": "fa fa-globe", - "modified": "2019-07-19 16:32:12.652550", + "in_create": 1, + "links": [], + "modified": "2020-04-16 22:11:33.066852", "modified_by": "Administrator", "module": "Core", "name": "Language", From 389034aea8d4eb359acf6e13fa3b7236b774a1b0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 17 Apr 2020 10:44:28 +0530 Subject: [PATCH 054/337] test: Increase defaultCommandTimeout to 10sec --- cypress.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index 7d853271b9..ae0c45c3ae 100644 --- a/cypress.json +++ b/cypress.json @@ -1,5 +1,7 @@ { "baseUrl": "http://test_site_ui:8000", "projectId": "92odwv", - "adminPassword": "admin" + "adminPassword": "admin", + "defaultCommandTimeout": 10000, + "pageLoadTimeout": 15000 } From 9a3998c43c156b1ec480c694e4e7b2e80d6a261e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 17 Apr 2020 11:17:31 +0530 Subject: [PATCH 055/337] fix(patch): reload doctype before running the patch --- frappe/patches/v13_0/website_theme_custom_scss.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py index 72c98bfc88..9d5a78643e 100644 --- a/frappe/patches/v13_0/website_theme_custom_scss.py +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -1,6 +1,7 @@ import frappe def execute(): + frappe.reload_doctype('Website Theme') for theme in frappe.get_all('Website Theme'): doc = frappe.get_doc('Website Theme', theme.name) if not doc.custom_scss and doc.theme_scss: From d93a04aa1691718e7dbf3c2b52aa51f5b7d23377 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 17 Apr 2020 11:48:59 +0530 Subject: [PATCH 056/337] fix: linting fixes --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 902f382879..b5046d4b12 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -87,7 +87,7 @@ frappe.Application = Class.extend({ } if (!frappe.boot.developer_mode) { - let console_security_message = __("Using this console may allow attackers to impersonate you and steal your information. Do not enter or paste code that you do not understand.") + let console_security_message = __("Using this console may allow attackers to impersonate you and steal your information. Do not enter or paste code that you do not understand."); console.log( `%c${console_security_message}`, "font-size: large" From 3db595f06d61a6e4e7e206c8725e4beb8c823c25 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:15:49 +0530 Subject: [PATCH 057/337] Delete test_video.js --- frappe/core/doctype/video/test_video.js | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 frappe/core/doctype/video/test_video.js diff --git a/frappe/core/doctype/video/test_video.js b/frappe/core/doctype/video/test_video.js deleted file mode 100644 index a82a221319..0000000000 --- a/frappe/core/doctype/video/test_video.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Video", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Video - () => frappe.tests.make('Video', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); From 7e0e6630bd66b1b29db886e597a82475ba581a16 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 17 Apr 2020 13:00:48 +0530 Subject: [PATCH 058/337] feat: add user timezone and unique visit check --- .../website/doctype/web_page_view/web_page_view.py | 14 ++++++++++++-- frappe/www/website_script.js | 6 ++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/web_page_view/web_page_view.py b/frappe/website/doctype/web_page_view/web_page_view.py index d09ee8ecb3..ba2d707e44 100644 --- a/frappe/website/doctype/web_page_view/web_page_view.py +++ b/frappe/website/doctype/web_page_view/web_page_view.py @@ -11,7 +11,15 @@ class WebPageView(Document): @frappe.whitelist(allow_guest=True) -def make_view_log(path, referrer=None, browser=None, version=None): +def make_view_log(path, referrer=None, browser=None, version=None, url=None, user_tz=None): + from pprint import pprint + request_dict = frappe.request.__dict__ + user_agent = request_dict.get('environ', {}).get('HTTP_USER_AGENT') + + is_unique = True + if referrer.startswith(url): + is_unique = False + if path.startswith('/'): path = path[1:] @@ -21,7 +29,9 @@ def make_view_log(path, referrer=None, browser=None, version=None): view.referrer = referrer view.browser = browser view.browser_version = version - view.date = frappe.utils.now_datetime() + view.time_zone = user_tz + view.user_agent = user_agent + view.is_unique = is_unique view.insert(ignore_permissions=True) return diff --git a/frappe/www/website_script.js b/frappe/www/website_script.js index 38f11a18a7..7fdc2e94d6 100644 --- a/frappe/www/website_script.js +++ b/frappe/www/website_script.js @@ -21,8 +21,10 @@ ga('send', 'pageview'); path: location.pathname, referrer: document.referrer, browser: browser.name, - version: browser.version + version: browser.version, + url: location.origin, + user_tz: Intl.DateTimeFormat().resolvedOptions().timeZone }) }) } -{% endif %} +{% endif %} \ No newline at end of file From 37bae8cfac8bfca9c501c45ac9512ebe85c91f57 Mon Sep 17 00:00:00 2001 From: gavin Date: Fri, 17 Apr 2020 13:01:14 +0530 Subject: [PATCH 059/337] style: install_db re-arrange parameters Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/commands/site.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 540f250918..9dcf97005a 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -81,9 +81,9 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N installing = touch_file(get_site_path('locks', 'installing.lock')) atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password) - install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, - db_name=db_name, admin_password=admin_password, verbose=verbose, - source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, db_name=db_name, + admin_password=admin_password, verbose=verbose, source_sql=source_sql, force=force, reinstall=reinstall, + db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) for app in apps_to_install: _install_app(app, verbose=verbose, set_as_patched=not source_sql) From 938684759ba4925cd7a32f4bf7a850e80dd7f4a6 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 17 Apr 2020 13:35:17 +0530 Subject: [PATCH 060/337] fix: update Roles in Video DocType --- frappe/core/doctype/video/video.json | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/frappe/core/doctype/video/video.json b/frappe/core/doctype/video/video.json index 875926088b..b0a154f5d4 100644 --- a/frappe/core/doctype/video/video.json +++ b/frappe/core/doctype/video/video.json @@ -68,7 +68,7 @@ } ], "links": [], - "modified": "2020-04-10 23:04:41.124053", + "modified": "2020-04-17 13:34:06.461574", "modified_by": "Administrator", "module": "Core", "name": "Video", @@ -82,30 +82,9 @@ "print": 1, "read": 1, "report": 1, - "role": "Academics User", + "role": "All", "share": 1, "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Instructor", - "share": 1, - "write": 1 - }, - { - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "LMS User", - "share": 1 } ], "sort_field": "modified", From 00cb903462fc53c3eb415ed83e7d0902eea24056 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 17 Apr 2020 15:47:56 +0530 Subject: [PATCH 061/337] feat: remove unused import --- frappe/website/doctype/web_page_view/web_page_view.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/website/doctype/web_page_view/web_page_view.py b/frappe/website/doctype/web_page_view/web_page_view.py index ba2d707e44..08625f9d6f 100644 --- a/frappe/website/doctype/web_page_view/web_page_view.py +++ b/frappe/website/doctype/web_page_view/web_page_view.py @@ -12,7 +12,6 @@ class WebPageView(Document): @frappe.whitelist(allow_guest=True) def make_view_log(path, referrer=None, browser=None, version=None, url=None, user_tz=None): - from pprint import pprint request_dict = frappe.request.__dict__ user_agent = request_dict.get('environ', {}).get('HTTP_USER_AGENT') From a877fba5d938876e1484c9a63ab53f003adc50e5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 17 Apr 2020 17:44:41 +0530 Subject: [PATCH 062/337] test: set_invalid controller for child tables --- cypress/integration/form.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cypress/integration/form.js b/cypress/integration/form.js index 9d1210ca2b..a622a66e13 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -41,4 +41,21 @@ context('Form', () => { list_view.filter_area.filter_list.clear_filters(); }); }); + it('validates behaviour of Data options validations in child table', () => { + // test email validations for set_invalid controller + let website_input = 'website.in'; + let expectBackgroundColor = 'rgb(255, 220, 220)'; + + cy.visit('/desk#Form/Contact/New Contact 1'); + cy.get('.frappe-control[data-fieldname="email_ids"]').as('table'); + cy.get('@table').find('button.grid-add-row').click(); + cy.get('.grid-body .rows [data-fieldname="email_id"]').click(); + cy.get('@table').find('input.input-with-feedback.form-control').as('email_input'); + cy.get('@email_input').type(website_input, { waitForAnimations: false }); + cy.fill_field('company_name', 'Test Company'); + cy.get('@email_input').should($div => { + const style = window.getComputedStyle($div[0]); + expect(style.backgroundColor).to.equal(expectBackgroundColor); + }); + }); }); From 06ccba048fa25b22f4e89325852dd04f4945310c Mon Sep 17 00:00:00 2001 From: gavin Date: Fri, 17 Apr 2020 17:53:59 +0530 Subject: [PATCH 063/337] style: block style fixes (via slider) --- frappe/public/js/frappe/form/grid_row.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 65c11b43bf..0b8e7e8d23 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -270,8 +270,7 @@ export default class GridRow { } if (column.is_invalid) { column.addClass('invalid'); - } - else if ((df.reqd || df.bold)) { + } else if (df.reqd || df.bold) { column.addClass('bold'); } } From 8f21ca4997ddb7323ce2f774662fff27897b1441 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 18 Apr 2020 13:47:06 +0530 Subject: [PATCH 064/337] fix: Ability to resize expand/collapse code field --- frappe/public/js/frappe/form/controls/code.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index 0648ad6e22..bdf36b706a 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -9,6 +9,12 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({ this.ace_editor_target = $('
    ') .appendTo(this.input_area); + this.expanded = false; + this.$expand_button = $(``).click(() => { + this.expanded = !this.expanded; + this.refresh_height(); + }).insertAfter(this.ace_editor_target); + // styling this.ace_editor_target.addClass('border rounded'); this.ace_editor_target.css('height', 300); @@ -26,6 +32,11 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({ }, 300)); }, + refresh_height() { + this.ace_editor_target.css('height', this.expanded ? 600 : 300); + this.editor.resize(); + }, + set_language() { const language_map = { 'Javascript': 'ace/mode/javascript', From 2431767fdf77815606a00f24836c04e4cfb8ce1c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 18 Apr 2020 15:02:56 +0530 Subject: [PATCH 065/337] feat: Page Builder based on Tailwind - Website Theme based on: Bootstrap 4, Tailwind - Web Page: Page Builder - Web Template: Create templates for web pages - Added some common Web Templates - Components: Standard components directly usable in Jinja - Purge Tailwind Classes in Production - PostCSS Config to support tailwind --- frappe/__init__.py | 1 + frappe/public/build.json | 3 + frappe/public/css/email.css | 47 +++ frappe/public/tailwind.css | 8 + frappe/templates/base.html | 21 +- frappe/templates/components/button.html | 27 ++ frappe/templates/components/card.html | 7 + frappe/templates/components/dropdown.html | 25 ++ frappe/templates/components/navbar.html | 20 ++ frappe/templates/components/navbar_link.html | 3 + .../components/web_page_section.html | 5 + frappe/templates/includes/navbar/navbar.html | 9 +- frappe/templates/web.html | 4 +- frappe/utils/data.py | 3 + frappe/utils/jinja.py | 77 +++- frappe/website/context.py | 2 + .../doctype/web_page/templates/web_page.html | 6 + frappe/website/doctype/web_page/web_page.js | 34 +- frappe/website/doctype/web_page/web_page.json | 14 +- frappe/website/doctype/web_page/web_page.py | 19 + .../doctype/web_page_block/__init__.py | 0 .../web_page_block/web_page_block.json | 51 +++ .../doctype/web_page_block/web_page_block.py | 10 + .../website/doctype/web_template/__init__.py | 0 .../doctype/web_template/test_web_template.py | 10 + .../doctype/web_template/web_template.js | 8 + .../doctype/web_template/web_template.json | 61 ++++ .../doctype/web_template/web_template.py | 45 +++ .../doctype/web_template_field/__init__.py | 0 .../test_web_template_field.py | 10 + .../web_template_field/web_template_field.js | 8 + .../web_template_field.json | 47 +++ .../web_template_field/web_template_field.py | 10 + .../doctype/website_theme/website_theme.json | 70 +++- frappe/website/render.py | 27 ++ frappe/website/web_template/__init__.py | 0 .../web_template/full_width_image/__init__.py | 0 .../full_width_image/full_width_image.html | 1 + .../full_width_image/full_width_image.json | 24 ++ .../hero_with_right_image/__init__.py | 0 .../hero_with_right_image.html | 39 ++ .../hero_with_right_image.json | 49 +++ .../section_with_big_cards/__init__.py | 0 .../section_with_big_cards.html | 19 + .../section_with_big_cards.json | 58 +++ .../web_template/section_with_cta/__init__.py | 0 .../section_with_cta/section_with_cta.html | 7 + .../section_with_cta/section_with_cta.json | 33 ++ .../section_with_image/__init__.py | 0 .../section_with_image.html | 4 + .../section_with_image.json | 33 ++ .../section_with_left_image/__init__.py | 0 .../section_with_left_image.html | 9 + .../section_with_left_image.json | 29 ++ .../section_with_small_cards/__init__.py | 0 .../section_with_small_cards.html | 19 + .../section_with_small_cards.json | 103 ++++++ .../section_with_tabs/__init__.py | 0 .../section_with_tabs/section_with_tabs.html | 109 ++++++ .../section_with_tabs/section_with_tabs.json | 83 +++++ .../website_theme/standard/standard.json | 36 +- package.json | 12 +- purgecss.js | 23 ++ requirements.txt | 2 +- rollup/config.js | 28 +- tailwind.config.js | 75 ++++ yarn.lock | 334 +++++++++++++++++- 67 files changed, 1753 insertions(+), 68 deletions(-) create mode 100644 frappe/public/tailwind.css create mode 100644 frappe/templates/components/button.html create mode 100644 frappe/templates/components/card.html create mode 100644 frappe/templates/components/dropdown.html create mode 100644 frappe/templates/components/navbar.html create mode 100644 frappe/templates/components/navbar_link.html create mode 100644 frappe/templates/components/web_page_section.html create mode 100644 frappe/website/doctype/web_page_block/__init__.py create mode 100644 frappe/website/doctype/web_page_block/web_page_block.json create mode 100644 frappe/website/doctype/web_page_block/web_page_block.py create mode 100644 frappe/website/doctype/web_template/__init__.py create mode 100644 frappe/website/doctype/web_template/test_web_template.py create mode 100644 frappe/website/doctype/web_template/web_template.js create mode 100644 frappe/website/doctype/web_template/web_template.json create mode 100644 frappe/website/doctype/web_template/web_template.py create mode 100644 frappe/website/doctype/web_template_field/__init__.py create mode 100644 frappe/website/doctype/web_template_field/test_web_template_field.py create mode 100644 frappe/website/doctype/web_template_field/web_template_field.js create mode 100644 frappe/website/doctype/web_template_field/web_template_field.json create mode 100644 frappe/website/doctype/web_template_field/web_template_field.py create mode 100644 frappe/website/web_template/__init__.py create mode 100644 frappe/website/web_template/full_width_image/__init__.py create mode 100644 frappe/website/web_template/full_width_image/full_width_image.html create mode 100644 frappe/website/web_template/full_width_image/full_width_image.json create mode 100644 frappe/website/web_template/hero_with_right_image/__init__.py create mode 100644 frappe/website/web_template/hero_with_right_image/hero_with_right_image.html create mode 100644 frappe/website/web_template/hero_with_right_image/hero_with_right_image.json create mode 100644 frappe/website/web_template/section_with_big_cards/__init__.py create mode 100644 frappe/website/web_template/section_with_big_cards/section_with_big_cards.html create mode 100644 frappe/website/web_template/section_with_big_cards/section_with_big_cards.json create mode 100644 frappe/website/web_template/section_with_cta/__init__.py create mode 100644 frappe/website/web_template/section_with_cta/section_with_cta.html create mode 100644 frappe/website/web_template/section_with_cta/section_with_cta.json create mode 100644 frappe/website/web_template/section_with_image/__init__.py create mode 100644 frappe/website/web_template/section_with_image/section_with_image.html create mode 100644 frappe/website/web_template/section_with_image/section_with_image.json create mode 100644 frappe/website/web_template/section_with_left_image/__init__.py create mode 100644 frappe/website/web_template/section_with_left_image/section_with_left_image.html create mode 100644 frappe/website/web_template/section_with_left_image/section_with_left_image.json create mode 100644 frappe/website/web_template/section_with_small_cards/__init__.py create mode 100644 frappe/website/web_template/section_with_small_cards/section_with_small_cards.html create mode 100644 frappe/website/web_template/section_with_small_cards/section_with_small_cards.json create mode 100644 frappe/website/web_template/section_with_tabs/__init__.py create mode 100644 frappe/website/web_template/section_with_tabs/section_with_tabs.html create mode 100644 frappe/website/web_template/section_with_tabs/section_with_tabs.json create mode 100644 purgecss.js create mode 100644 tailwind.config.js diff --git a/frappe/__init__.py b/frappe/__init__.py index e19327fcff..97ac94afc6 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -830,6 +830,7 @@ def rename_doc(*args, **kwargs): Calls `frappe.model.rename_doc.rename_doc` """ + kwargs.pop('cmd', None) kwargs.pop('ignore_permissions', None) from frappe.model.rename_doc import rename_doc return rename_doc(*args, **kwargs) diff --git a/frappe/public/build.json b/frappe/public/build.json index 75a89e5010..88f5aac577 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -350,5 +350,8 @@ ], "js/data_import_tools.min.js": [ "public/js/frappe/data_import/index.js" + ], + "css/tailwind.css": [ + "public/tailwind.css" ] } diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css index 40c6149927..92ac433fd2 100644 --- a/frappe/public/css/email.css +++ b/frappe/public/css/email.css @@ -1,64 +1,82 @@ /* csslint ignore:start */ + /* palette colors*/ + body { line-height: 1.5; color: #36414c; } + p { margin: 1em 0 !important; } + hr { border-top: 1px solid #d1d8dd; } + .body-table { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } + .body-table td { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } + .email-header, .email-body, .email-footer { width: 100% !important; min-width: 100% !important; } + .email-body { font-size: 14px; } + .email-footer { border-top: 1px solid #d1d8dd; font-size: 12px; } + .email-header { border: 1px solid #d1d8dd; border-radius: 4px 4px 0 0; } + .email-header .brand-image { width: 24px; height: 24px; display: block; } + .email-header-title { font-weight: bold; } + .body-table.has-header .email-body { border: 1px solid #d1d8dd; border-radius: 0 0 4px 4px; border-top: none; } + .body-table.has-header .email-footer { border-top: none; } + .email-footer-container { margin-top: 30px; } + .email-footer-container > div:not(:last-child) { margin-bottom: 5px; } + .email-unsubscribe a { color: #8d99a6; text-decoration: underline; } + .btn { text-decoration: none; padding: 7px 10px; @@ -66,20 +84,24 @@ hr { border: 1px solid; border-radius: 3px; } + .btn.btn-default { color: #fff; background-color: #f0f4f7; border-color: transparent; } + .btn.btn-primary { color: #fff; background-color: #5e64ff; border-color: #444bff; } + .table { width: 100%; border-collapse: collapse; } + .table td, .table th { padding: 8px; @@ -88,53 +110,68 @@ hr { border-top: 1px solid #d1d8dd; text-align: left; } + .table th { font-weight: bold; } + .table > thead > tr > th { vertical-align: middle; border-bottom: 2px solid #d1d8dd; } + .table > thead:first-child > tr:first-child > th { border-top: none; } + .table.table-bordered { border: 1px solid #d1d8dd; } + .table.table-bordered td, .table.table-bordered th { border: 1px solid #d1d8dd; } + .more-info { font-size: 80% !important; color: #8d99a6 !important; border-top: 1px solid #ebeff2; padding-top: 10px; } + .text-right { text-align: right !important; } + .text-center { text-align: center !important; } + .text-muted { color: #8d99a6 !important; } + .text-extra-muted { color: #d1d8dd !important; } + .text-regular { font-size: 14px; } + .text-medium { font-size: 12px; } + .text-small { font-size: 10px; } + .text-bold { font-weight: bold; } + .indicator { width: 8px; height: 8px; @@ -143,33 +180,43 @@ hr { display: inline-block; margin-right: 5px; } + .indicator.indicator-blue { background-color: #5e64ff; } + .indicator.indicator-green { background-color: #98d85b; } + .indicator.indicator-orange { background-color: #ffa00a; } + .indicator.indicator-red { background-color: #ff5858; } + .indicator.indicator-yellow { background-color: #feef72; } + .screenshot { box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); border: 1px solid #d1d8dd; margin: 8px 0; max-width: 100%; } + .list-unstyled { list-style-type: none; padding: 0; } + /* auto email report */ + .report-title { margin-bottom: 20px; } + /* csslint ignore:end */ diff --git a/frappe/public/tailwind.css b/frappe/public/tailwind.css new file mode 100644 index 0000000000..98a3b3a032 --- /dev/null +++ b/frappe/public/tailwind.css @@ -0,0 +1,8 @@ +@tailwind base; +@tailwind components; + +details.dropdown summary::-webkit-details-marker { + display: none; +} + +@tailwind utilities; diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 1c5f286442..3a1cfc0da3 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -25,15 +25,26 @@ {{ head_html or "" }} {%- endif %} - {% if theme.theme_url %} - + {%- if theme.based_on == 'Bootstrap 4' -%} + {%- if theme.theme_url -%} + + {%- else -%} + + {%- endif -%} {% else %} - + {%- if developer_mode -%} + + + {%- else -%} + + + + {% endif %} + {%- endif -%} {%- for link in web_include_css %} {%- endfor -%} - {% endif %} {%- endblock -%} {%- block head_include %} @@ -50,7 +61,7 @@ } window.dev_server = {{ dev_server }}; window.socketio_port = {{ frappe.socketio_port }}; - + {%- block banner -%} diff --git a/frappe/templates/components/button.html b/frappe/templates/components/button.html new file mode 100644 index 0000000000..985e80315c --- /dev/null +++ b/frappe/templates/components/button.html @@ -0,0 +1,27 @@ +--- +name: "button" +variant: "secondary" +disabled: 0 +url: null +--- + +{%- set static_classes = "px-4 py-2 border rounded-md inline-flex justify-center items-center focus:outline-none leading-5 font-medium text-sm" -%} +{%- set dynamic_classes = { + "opacity-50 cursor-not-allowed pointer-events-none": disabled, + "bg-blue-500 border-transparent hover:bg-blue-400 text-white focus:shadow-outline-blue focus:border-blue-700": + variant == "primary", + "bg-white border-gray-400 hover:text-gray-800 text-gray-900 focus:shadow-outline-blue focus:border-blue-300": + variant == "secondary", + "bg-red-500 border-transparent hover:bg-red-400 text-white focus:shadow-outline-red focus:border-red-700": + variant == "danger" + } +-%} +{%- set html_tag = "a" if url else "button" -%} + +<{{html_tag}} + class="{{ resolve_class([static_classes, dynamic_classes, class]) }}" + {{ 'disabled' if disabled else '' }} + {{ ('href="' + url + '"') if url else '' }} +> + {{ label }} + diff --git a/frappe/templates/components/card.html b/frappe/templates/components/card.html new file mode 100644 index 0000000000..0ba34dd5f1 --- /dev/null +++ b/frappe/templates/components/card.html @@ -0,0 +1,7 @@ +
    +

    {{ title }}

    +

    {{ subtitle }}

    +
    + {{ actions }} +
    +
    diff --git a/frappe/templates/components/dropdown.html b/frappe/templates/components/dropdown.html new file mode 100644 index 0000000000..4c197eaa03 --- /dev/null +++ b/frappe/templates/components/dropdown.html @@ -0,0 +1,25 @@ +
    + + + {{ label }} + + + + + +
    +
    +
    + {%- for item in items -%} + + {{ item.label }} + + {%- endfor -%} +
    +
    +
    +
    diff --git a/frappe/templates/components/navbar.html b/frappe/templates/components/navbar.html new file mode 100644 index 0000000000..db167923c4 --- /dev/null +++ b/frappe/templates/components/navbar.html @@ -0,0 +1,20 @@ +
    +
    +
    + + {{ brand_html or (frappe.get_hooks("brand_html") or [_("Home")])[0] }} + +
    + +
    + {%- for item in theme.navbar_items -%} + {{ c('navbar_link', label=item.label, url=item.url) }} + {%- endfor -%} + {{ c('navbar_link', label=_('Login'), url='/login') }} + {%- if theme.primary_action_label and theme.primary_action_url -%} + {{ c('button', label=theme.primary_action_label, url=theme.primary_action_url, variant="primary") }} + {%- endif -%} +
    +
    +
    diff --git a/frappe/templates/components/navbar_link.html b/frappe/templates/components/navbar_link.html new file mode 100644 index 0000000000..01d37ad22f --- /dev/null +++ b/frappe/templates/components/navbar_link.html @@ -0,0 +1,3 @@ + + {{ label }} + diff --git a/frappe/templates/components/web_page_section.html b/frappe/templates/components/web_page_section.html new file mode 100644 index 0000000000..b44162a9b5 --- /dev/null +++ b/frappe/templates/components/web_page_section.html @@ -0,0 +1,5 @@ +
    +
    + {{ section.rendered_html }} +
    +
    diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html index 3037c08c63..220970f754 100644 --- a/frappe/templates/includes/navbar/navbar.html +++ b/frappe/templates/includes/navbar/navbar.html @@ -1,4 +1,5 @@ -
    +{%- else -%} +{{ c('navbar', theme=theme) }} +{%- endif -%} diff --git a/frappe/templates/web.html b/frappe/templates/web.html index e61672124a..36a9ab86b5 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -13,7 +13,7 @@ {% block page_container %} -
    +
    {% block header %}{% endblock %} @@ -43,7 +43,7 @@ id="page-{{ name or route | e }}" data-path="{{ pathname | e }}" {%- if page_or_ {% endmacro %} {% if show_sidebar %} -
    +
    {% block page_sidebar %} diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 39c8c387eb..7d58594657 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1091,3 +1091,6 @@ def get_source_value(source, key): def is_subset(list_a, list_b): '''Returns whether list_a is a subset of list_b''' return len(list(set(list_a) & set(list_b))) == len(list_a) + +def generate_hash(*args, **kwargs): + return frappe.generate_hash(*args, **kwargs) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 7c3b9b0482..8c8cc74fc4 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -11,12 +11,19 @@ def get_jenv(): from jinja2.sandbox import SandboxedEnvironment # frappe will be loaded last, so app templates will get precedence - jenv = SandboxedEnvironment(loader = get_jloader(), - undefined=DebugUndefined) + jenv = SandboxedEnvironment( + loader=get_jloader(), + undefined=DebugUndefined + ) set_filters(jenv) jenv.globals.update(get_safe_globals()) jenv.globals.update(get_jenv_customization('methods')) + jenv.globals.update({ + 'component': component, + 'c': component, + 'inspect': inspect + }) frappe.local.jenv = jenv @@ -149,3 +156,69 @@ def get_jenv_customization(customization_type): out[fn_name] = frappe.get_attr(fn_string) return out + + +def component(name, **kwargs): + from jinja2 import TemplateNotFound + + template_name = 'templates/components/' + name + '.html' + jenv = get_jenv() + + try: + source = jenv.loader.get_source(jenv, template_name)[0] + except TemplateNotFound: + return '
    Component "{0}" not found
    '.format(name) + + attributes, html = parse_front_matter_attrs_and_html(source) + context = {} + context.update(attributes) + context.update(kwargs) + + if 'class' in context: + context['class'] = resolve_class(context['class']) + else: + context['class'] = '' + context['resolve_class'] = resolve_class + + return get_jenv().from_string(html).render(context) + +def resolve_class(classes): + import frappe + + if isinstance(classes, frappe.string_types): + return classes + + if isinstance(classes, (list, tuple)): + return ' '.join([resolve_class(c) for c in classes]) + + if isinstance(classes, dict): + return ' '.join([classname for classname in classes if classes[classname]]) + + return classes + +def parse_front_matter_attrs_and_html(source): + from frontmatter import Frontmatter + + html = source + attributes = {} + + if not source.startswith('---'): + return attributes, html + + try: + res = Frontmatter.read(source) + if res['attributes']: + attributes = res['attributes'] + html = res['body'] + except Exception as e: + print('Error parsing Frontmatter in template: ' + e) + + return attributes, html + +def inspect(var, render=True): + context = { "var": var } + if render: + html = "
    {{ var | pprint | e }}
    " + else: + html = "" + return get_jenv().from_string(html).render(context) diff --git a/frappe/website/context.py b/frappe/website/context.py index dcef22af43..5ea48b61f1 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -36,6 +36,8 @@ def get_context(path, args=None): if frappe.conf.developer_mode: context._context_dict = context + context.developer_mode = frappe.conf.developer_mode + return context def update_controller_context(context, controller): diff --git a/frappe/website/doctype/web_page/templates/web_page.html b/frappe/website/doctype/web_page/templates/web_page.html index 274b8abe32..ce4e52b312 100644 --- a/frappe/website/doctype/web_page/templates/web_page.html +++ b/frappe/website/doctype/web_page/templates/web_page.html @@ -15,6 +15,11 @@ {% endblock %} {% block page_content %} +{%- if content_type == 'Page Builder' -%} +{%- for section in page_builder_sections -%} +{{ c('web_page_section', section=section) }} +{%- endfor -%} +{%- else -%}
    {% include "templates/includes/slideshow.html" %}
    @@ -26,6 +31,7 @@ {% include 'templates/includes/comments/comments.html' %} {%- endif %}
    +{%- endif -%} {% endblock %} {% block style %} diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js index ed6b25fe4d..8eb882bae6 100644 --- a/frappe/website/doctype/web_page/web_page.js +++ b/frappe/website/doctype/web_page/web_page.js @@ -1,7 +1,7 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt -frappe.ui.form.on("Web Page", { +frappe.ui.form.on('Web Page', { title: function(frm) { if (frm.doc.title && !frm.doc.route) { frm.set_value('route', frappe.scrub(frm.doc.title, '-')); @@ -26,7 +26,7 @@ frappe.ui.form.on("Web Page", { frm.events.layout(frm); } }, - published: function (frm) { + published: function(frm) { // If current date is before end date, // and web page is manually unpublished, // set end date to current date. @@ -35,13 +35,37 @@ frappe.ui.form.on("Web Page", { // Set date a few seconds in the future to avoid throwing // start and end date validation error - end_date.setSeconds(end_date.getSeconds() + 5) + end_date.setSeconds(end_date.getSeconds() + 5); - frm.set_value("end_date", end_date); + frm.set_value('end_date', end_date); } }, set_meta_tags(frm) { frappe.utils.set_meta_tag(frm.doc.route); } -}) +}); + +frappe.ui.form.on('Web Page Block', { + edit_values(frm, cdt, cdn) { + let row = frm.selected_doc; + frappe.model.with_doc('Web Template', row.web_template).then(doc => { + let d = new frappe.ui.Dialog({ + title: __('Edit Values'), + fields: doc.fields, + primary_action(values) { + frappe.model.set_value( + cdt, + cdn, + 'web_template_values', + JSON.stringify(values) + ); + d.hide(); + } + }); + let values = JSON.parse(row.web_template_values || '{}'); + d.set_values(values); + d.show(); + }); + } +}); diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 645d83e155..ca352adbc8 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_guest_to_view": 1, "allow_import": 1, "creation": "2013-03-28 10:35:30", @@ -22,6 +23,7 @@ "main_section", "main_section_md", "main_section_html", + "page_blocks", "custom_javascript", "insert_code", "javascript", @@ -105,7 +107,7 @@ "fieldname": "content_type", "fieldtype": "Select", "label": "Content Type", - "options": "Rich Text\nMarkdown\nHTML" + "options": "Rich Text\nMarkdown\nHTML\nPage Builder" }, { "depends_on": "eval:doc.content_type==='Rich Text'", @@ -242,14 +244,22 @@ "fieldname": "dynamic_template", "fieldtype": "Check", "label": "Dynamic Template" + }, + { + "depends_on": "eval:doc.content_type=='Page Builder'", + "fieldname": "page_blocks", + "fieldtype": "Table", + "label": "Page Building Blocks", + "options": "Web Page Block" } ], "has_web_view": 1, "icon": "fa fa-file-alt", "idx": 1, "is_published_field": "published", + "links": [], "max_attachments": 20, - "modified": "2019-10-02 13:58:50.825481", + "modified": "2020-04-16 22:57:35.414032", "modified_by": "Administrator", "module": "Website", "name": "Web Page", diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 9509e57798..e3feb41cbb 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -18,6 +18,7 @@ from frappe.website.router import resolve_route from frappe.website.utils import (extract_title, find_first_image, get_comment_list, get_html_content_based_on_type) from frappe.website.website_generator import WebsiteGenerator +from frappe.website.doctype.web_template.web_template import get_rendered_template class WebPage(WebsiteGenerator): @@ -53,6 +54,7 @@ class WebPage(WebsiteGenerator): self.set_metatags(context) self.set_breadcrumbs(context) self.set_title_and_header(context) + self.build_page_blocks(context) return context @@ -103,6 +105,23 @@ class WebPage(WebsiteGenerator): if not context.title and context.header: context.title = strip_html(context.header) + def build_page_blocks(self, context): + if self.content_type != 'Page Builder': + return + + sections = [] + + for block in self.page_blocks: + values = frappe.parse_json(block.web_template_values) + rendered_html = get_rendered_template(block.web_template, values) + section = frappe._dict() + section.title = block.title + section.css_class = block.css_class + section.rendered_html = rendered_html + sections.append(section) + + context.page_builder_sections = sections + def add_hero(self, context): """Add a hero element if specified in content or hooks. Hero elements get full page width.""" diff --git a/frappe/website/doctype/web_page_block/__init__.py b/frappe/website/doctype/web_page_block/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_page_block/web_page_block.json b/frappe/website/doctype/web_page_block/web_page_block.json new file mode 100644 index 0000000000..64bf07cf52 --- /dev/null +++ b/frappe/website/doctype/web_page_block/web_page_block.json @@ -0,0 +1,51 @@ +{ + "actions": [], + "creation": "2020-04-16 22:57:13.729460", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "web_template", + "edit_values", + "web_template_values", + "css_class" + ], + "fields": [ + { + "fieldname": "web_template", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Web Template", + "options": "Web Template" + }, + { + "fieldname": "edit_values", + "fieldtype": "Button", + "in_list_view": 1, + "label": "Edit Values" + }, + { + "fieldname": "web_template_values", + "fieldtype": "Code", + "label": "Web Template Values", + "options": "JSON" + }, + { + "fieldname": "css_class", + "fieldtype": "Small Text", + "label": "CSS Class" + } + ], + "istable": 1, + "links": [], + "modified": "2020-04-18 12:50:00.070761", + "modified_by": "Administrator", + "module": "Website", + "name": "Web Page Block", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_page_block/web_page_block.py b/frappe/website/doctype/web_page_block/web_page_block.py new file mode 100644 index 0000000000..f0e5f12ed6 --- /dev/null +++ b/frappe/website/doctype/web_page_block/web_page_block.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class WebPageBlock(Document): + pass diff --git a/frappe/website/doctype/web_template/__init__.py b/frappe/website/doctype/web_template/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py new file mode 100644 index 0000000000..0a9b8f3926 --- /dev/null +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestWebTemplate(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_template/web_template.js b/frappe/website/doctype/web_template/web_template.js new file mode 100644 index 0000000000..aacfd485bb --- /dev/null +++ b/frappe/website/doctype/web_template/web_template.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Web Template', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json new file mode 100644 index 0000000000..9c0ef37b1c --- /dev/null +++ b/frappe/website/doctype/web_template/web_template.json @@ -0,0 +1,61 @@ +{ + "actions": [], + "allow_rename": 1, + "autoname": "Prompt", + "creation": "2020-04-17 12:12:52.145708", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "standard", + "template", + "fields" + ], + "fields": [ + { + "depends_on": "eval:!doc.standard", + "fieldname": "template", + "fieldtype": "Code", + "in_list_view": 1, + "label": "Template", + "options": "HTML" + }, + { + "fieldname": "fields", + "fieldtype": "Table", + "label": "Fields", + "options": "Web Template Field", + "reqd": 1 + }, + { + "default": "0", + "fieldname": "standard", + "fieldtype": "Check", + "label": "Standard" + } + ], + "links": [], + "modified": "2020-04-17 14:05:28.499020", + "modified_by": "Administrator", + "module": "Website", + "name": "Web Template", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_template/web_template.py b/frappe/website/doctype/web_template/web_template.py new file mode 100644 index 0000000000..660e52e989 --- /dev/null +++ b/frappe/website/doctype/web_template/web_template.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +import os +from frappe.model.document import Document +from frappe.modules.export_file import export_to_files, create_folder, get_module_path, scrub_dt_dn + + +class WebTemplate(Document): + def validate(self): + for field in self.fields: + if not field.fieldname: + field.fieldname = frappe.scrub(field.label) + + def on_update(self): + if self.standard and frappe.conf.developer_mode: + export_to_files(record_list=[["Web Template", self.name]], create_init=True) + self.create_template_file() + + def create_template_file(self): + if self.standard: + folder = create_folder("Website", self.doctype, self.name, False) + path = os.path.join(folder, frappe.scrub(self.name) + '.html') + if not os.path.exists(path): + open(path, 'w').close() + + +def get_rendered_template(web_template, values): + standard = frappe.db.get_value("Web Template", web_template, "standard") + if standard: + module_path = get_module_path("Website") + dt, dn = scrub_dt_dn("Web Template", web_template) + scrubbed = frappe.scrub(web_template) + full_path = os.path.join("frappe", module_path, dt, dn, scrubbed + ".html") + root_app_path = os.path.abspath(os.path.join(frappe.get_app_path('frappe'), '..')) + template = os.path.relpath(full_path, root_app_path) + else: + template = frappe.db.get_value("Web Template", web_template, "template") + + context = values or {} + context.update({'values': values}) + return frappe.render_template(template, context) diff --git a/frappe/website/doctype/web_template_field/__init__.py b/frappe/website/doctype/web_template_field/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_template_field/test_web_template_field.py b/frappe/website/doctype/web_template_field/test_web_template_field.py new file mode 100644 index 0000000000..40f5d7a1cc --- /dev/null +++ b/frappe/website/doctype/web_template_field/test_web_template_field.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestWebTemplateField(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_template_field/web_template_field.js b/frappe/website/doctype/web_template_field/web_template_field.js new file mode 100644 index 0000000000..909a05483a --- /dev/null +++ b/frappe/website/doctype/web_template_field/web_template_field.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Web Template Field', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/web_template_field/web_template_field.json b/frappe/website/doctype/web_template_field/web_template_field.json new file mode 100644 index 0000000000..af0aaf9ef7 --- /dev/null +++ b/frappe/website/doctype/web_template_field/web_template_field.json @@ -0,0 +1,47 @@ +{ + "actions": [], + "creation": "2020-04-17 12:12:31.857277", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "label", + "fieldname", + "fieldtype" + ], + "fields": [ + { + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label", + "reqd": 1 + }, + { + "fieldname": "fieldname", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Fieldname" + }, + { + "fieldname": "fieldtype", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Fieldtype", + "options": "Data\nSmall Text\nText\nAttach Image", + "reqd": 1 + } + ], + "istable": 1, + "links": [], + "modified": "2020-04-17 19:30:33.829203", + "modified_by": "Administrator", + "module": "Website", + "name": "Web Template Field", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_template_field/web_template_field.py b/frappe/website/doctype/web_template_field/web_template_field.py new file mode 100644 index 0000000000..80019c2222 --- /dev/null +++ b/frappe/website/doctype/web_template_field/web_template_field.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document + +class WebTemplateField(Document): + pass diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index 0d59384f3c..fb365e4a7f 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "autoname": "field:theme", "creation": "2015-02-18 12:46:38.168929", @@ -7,11 +8,21 @@ "engine": "InnoDB", "field_order": [ "theme", + "based_on", "module", "custom", + "tailwind_theme_section", + "brand_color", + "bootstrap_theme_section", "theme_scss", "theme_json", "theme_url", + "navbar_section", + "navbar_items", + "primary_action_label", + "primary_action_url", + "footer_section", + "footer_items", "custom_js_section", "js" ], @@ -68,9 +79,66 @@ "hidden": 1, "label": "Theme JSON", "options": "JSON" + }, + { + "default": "Bootstrap 4", + "fieldname": "based_on", + "fieldtype": "Select", + "label": "Theme Based On", + "options": "Bootstrap 4\nTailwind" + }, + { + "fieldname": "navbar_section", + "fieldtype": "Section Break", + "label": "Navbar" + }, + { + "fieldname": "navbar_items", + "fieldtype": "Table", + "label": "Navbar Items", + "options": "Top Bar Item" + }, + { + "depends_on": "eval:doc.based_on=='Tailwind'", + "fieldname": "tailwind_theme_section", + "fieldtype": "Section Break", + "label": "Tailwind Theme" + }, + { + "depends_on": "eval:doc.based_on == 'Bootstrap 4'", + "fieldname": "bootstrap_theme_section", + "fieldtype": "Section Break", + "label": "Bootstrap Theme" + }, + { + "fieldname": "brand_color", + "fieldtype": "Color", + "label": "Brand Color" + }, + { + "fieldname": "primary_action_label", + "fieldtype": "Data", + "label": "Primary Action Label" + }, + { + "fieldname": "primary_action_url", + "fieldtype": "Data", + "label": "Primary Action URL" + }, + { + "fieldname": "footer_section", + "fieldtype": "Section Break", + "label": "Footer" + }, + { + "fieldname": "footer_items", + "fieldtype": "Table", + "label": "Footer Items", + "options": "Top Bar Item" } ], - "modified": "2019-06-14 18:36:21.283390", + "links": [], + "modified": "2020-04-17 21:23:13.735307", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/render.py b/frappe/website/render.py index 7b8db59e4e..c67e9cf018 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -202,6 +202,9 @@ def build_page(path): if '{next}' in html: html = html.replace('{next}', get_next_link(context.route)) + if '' in html and not frappe.conf.developer_mode: + html = add_processed_tailwind_css(context, html) + # html = frappe.get_template(context.base_template_path).render(context) if can_cache(context.no_cache): @@ -350,3 +353,27 @@ def raise_if_disabled(path): _path = r.route.lstrip('/') if path == _path and not r.enabled: raise frappe.PermissionError + +def add_processed_tailwind_css(context, html): + from subprocess import Popen, PIPE + + print('asdfasdf') + + # theme_file = 'css/frappe-web-b4.css' + # if context.theme.theme_url: + # theme_file = context.theme.theme_url.lstrip('/assets/') + + # css_files = ','.join(['css/tailwind.css', theme_file]) + replace_string = '' + command = ['node', 'purgecss.js', 'css/tailwind.css', html] + process = Popen(command, cwd=frappe.get_app_path('frappe', '..'), stdout=PIPE, stderr=PIPE) + + stdout, stderr = process.communicate() + if stderr: + stderr = frappe.safe_decode(stderr) + print(stderr) + else: + css = frappe.safe_decode(stdout) + html = html.replace(replace_string, ''.format(css)) + + return html diff --git a/frappe/website/web_template/__init__.py b/frappe/website/web_template/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/full_width_image/__init__.py b/frappe/website/web_template/full_width_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/full_width_image/full_width_image.html b/frappe/website/web_template/full_width_image/full_width_image.html new file mode 100644 index 0000000000..2cd08252b2 --- /dev/null +++ b/frappe/website/web_template/full_width_image/full_width_image.html @@ -0,0 +1 @@ +{{ description }} diff --git a/frappe/website/web_template/full_width_image/full_width_image.json b/frappe/website/web_template/full_width_image/full_width_image.json new file mode 100644 index 0000000000..1081bac1ff --- /dev/null +++ b/frappe/website/web_template/full_width_image/full_width_image.json @@ -0,0 +1,24 @@ +{ + "creation": "2020-04-17 16:03:35.676241", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "url", + "fieldtype": "Data", + "label": "URL" + }, + { + "fieldname": "description", + "fieldtype": "Data", + "label": "Description" + } + ], + "idx": 0, + "modified": "2020-04-17 16:03:35.676241", + "modified_by": "Administrator", + "name": "Full Width Image", + "owner": "Administrator", + "standard": 1, + "template": "" +} \ No newline at end of file diff --git a/frappe/website/web_template/hero_with_right_image/__init__.py b/frappe/website/web_template/hero_with_right_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html new file mode 100644 index 0000000000..3adf9b88ed --- /dev/null +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -0,0 +1,39 @@ +
    +
    +
    +
    +
    +

    + {{ title }} +

    +

    + {{ subtitle }} +

    +
    + {%- if primary_action -%} +
    + + {{ primary_action_label }} + +
    + {%- endif -%} + {%- if secondary_action -%} +
    + + {{ secondary_action_label }} + +
    + {%- endif -%} +
    +
    +
    +
    +
    +
    + +
    +
    diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json new file mode 100644 index 0000000000..26dd33b6c4 --- /dev/null +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json @@ -0,0 +1,49 @@ +{ + "creation": "2020-04-17 12:18:04.376273", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "subtitle", + "fieldtype": "Text", + "label": "Subtitle" + }, + { + "fieldname": "image", + "fieldtype": "Data", + "label": "Image" + }, + { + "fieldname": "primary_action_label", + "fieldtype": "Data", + "label": "Primary Action Label" + }, + { + "fieldname": "primary_action", + "fieldtype": "Data", + "label": "Primary Action" + }, + { + "fieldname": "secondary_action_label", + "fieldtype": "Data", + "label": "Secondary Action Label" + }, + { + "fieldname": "secondary_action", + "fieldtype": "Data", + "label": "Secondary Action" + } + ], + "idx": 0, + "modified": "2020-04-17 14:18:24.738411", + "modified_by": "Administrator", + "name": "Hero with Right Image", + "owner": "Administrator", + "standard": 1, + "template": "" +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_big_cards/__init__.py b/frappe/website/web_template/section_with_big_cards/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html new file mode 100644 index 0000000000..838fed22ce --- /dev/null +++ b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html @@ -0,0 +1,19 @@ +{%- macro card(title, content) -%} +
    +

    {{ title }}

    +

    {{ content }}

    +
    +{%- endmacro -%} + + +{%- if title -%} +

    {{ title }}

    +{%- endif -%} +
    + {%- for index in ['1', '2', '3', '4'] -%} + {%- if values['card_' + index + '_title'] -%} + {{ card(values['card_' + index + '_title'], values['card_' + index + '_content']) }} + {%- endif -%} + {%- endfor -%} +
    + diff --git a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json new file mode 100644 index 0000000000..a47e010b92 --- /dev/null +++ b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json @@ -0,0 +1,58 @@ +{ + "creation": "2020-04-17 16:09:37.340176", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "card_1_title", + "fieldtype": "Data", + "label": "Card 1 Title" + }, + { + "fieldname": "card_1_content", + "fieldtype": "Text", + "label": "Card 1 Content" + }, + { + "fieldname": "card_2_title", + "fieldtype": "Data", + "label": "Card 2 Title" + }, + { + "fieldname": "card_2_content", + "fieldtype": "Text", + "label": "Card 2 Content" + }, + { + "fieldname": "card_3_title", + "fieldtype": "Data", + "label": "Card 3 Title" + }, + { + "fieldname": "card_3_content", + "fieldtype": "Text", + "label": "Card 3 Content" + }, + { + "fieldname": "card_4_title", + "fieldtype": "Data", + "label": "Card 4 Title" + }, + { + "fieldname": "card_4_content", + "fieldtype": "Text", + "label": "Card 4 Content" + } + ], + "idx": 0, + "modified": "2020-04-17 19:42:19.712813", + "modified_by": "Administrator", + "name": "Section with Big Cards", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_cta/__init__.py b/frappe/website/web_template/section_with_cta/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_cta/section_with_cta.html b/frappe/website/web_template/section_with_cta/section_with_cta.html new file mode 100644 index 0000000000..9dbff01cbd --- /dev/null +++ b/frappe/website/web_template/section_with_cta/section_with_cta.html @@ -0,0 +1,7 @@ +
    +

    {{ title }}

    +

    {{ subtitle }}

    +

    + {{ c('button', label=cta_label, url=cta_url, variant="primary") }} +

    +
    diff --git a/frappe/website/web_template/section_with_cta/section_with_cta.json b/frappe/website/web_template/section_with_cta/section_with_cta.json new file mode 100644 index 0000000000..8739abbf16 --- /dev/null +++ b/frappe/website/web_template/section_with_cta/section_with_cta.json @@ -0,0 +1,33 @@ +{ + "creation": "2020-04-17 19:57:40.534914", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "subtitle", + "fieldtype": "Small Text", + "label": "Subtitle" + }, + { + "fieldname": "cta_label", + "fieldtype": "Data", + "label": "CTA Label" + }, + { + "fieldname": "cta_url", + "fieldtype": "Data", + "label": "CTA URL" + } + ], + "idx": 0, + "modified": "2020-04-17 19:57:40.534914", + "modified_by": "Administrator", + "name": "Section with CTA", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_image/__init__.py b/frappe/website/web_template/section_with_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_image/section_with_image.html b/frappe/website/web_template/section_with_image/section_with_image.html new file mode 100644 index 0000000000..4a1414f176 --- /dev/null +++ b/frappe/website/web_template/section_with_image/section_with_image.html @@ -0,0 +1,4 @@ +

    {{ title }}

    +

    {{ subtitle }}

    + +{{ image_description }} diff --git a/frappe/website/web_template/section_with_image/section_with_image.json b/frappe/website/web_template/section_with_image/section_with_image.json new file mode 100644 index 0000000000..5f610e5e2f --- /dev/null +++ b/frappe/website/web_template/section_with_image/section_with_image.json @@ -0,0 +1,33 @@ +{ + "creation": "2020-04-17 19:29:21.186193", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "subtitle", + "fieldtype": "Small Text", + "label": "Subtitle" + }, + { + "fieldname": "image", + "fieldtype": "Attach Image", + "label": "Image" + }, + { + "fieldname": "image_description", + "fieldtype": "Data", + "label": "Image Description" + } + ], + "idx": 0, + "modified": "2020-04-17 19:31:33.474017", + "modified_by": "Administrator", + "name": "Section with Image", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_left_image/__init__.py b/frappe/website/web_template/section_with_left_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_left_image/section_with_left_image.html b/frappe/website/web_template/section_with_left_image/section_with_left_image.html new file mode 100644 index 0000000000..d2d1568708 --- /dev/null +++ b/frappe/website/web_template/section_with_left_image/section_with_left_image.html @@ -0,0 +1,9 @@ +
    +
    + {{ title }} +
    +
    +

    {{ title }}

    +

    {{ content }}

    +
    +
    diff --git a/frappe/website/web_template/section_with_left_image/section_with_left_image.json b/frappe/website/web_template/section_with_left_image/section_with_left_image.json new file mode 100644 index 0000000000..bae672d312 --- /dev/null +++ b/frappe/website/web_template/section_with_left_image/section_with_left_image.json @@ -0,0 +1,29 @@ +{ + "creation": "2020-04-18 12:58:28.670489", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "content", + "fieldtype": "Small Text", + "label": "Content" + }, + { + "fieldname": "image", + "fieldtype": "Attach Image", + "label": "Image" + } + ], + "idx": 0, + "modified": "2020-04-18 12:58:28.670489", + "modified_by": "Administrator", + "name": "Section with Left Image", + "owner": "Administrator", + "standard": 1, + "template": "" +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_small_cards/__init__.py b/frappe/website/web_template/section_with_small_cards/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_small_cards/section_with_small_cards.html b/frappe/website/web_template/section_with_small_cards/section_with_small_cards.html new file mode 100644 index 0000000000..b39f19a6a5 --- /dev/null +++ b/frappe/website/web_template/section_with_small_cards/section_with_small_cards.html @@ -0,0 +1,19 @@ +{%- macro card(title, content) -%} +
    +

    {{ title }}

    +

    {{ content }}

    +
    +{%- endmacro -%} + + +{%- if title -%} +

    {{ title }}

    +{%- endif -%} +
    + {%- for index in ['1', '2', '3', '4', '5', '6', '7', '8'] -%} + {%- if values['card_' + index + '_title'] -%} + {{ card(values['card_' + index + '_title'], values['card_' + index + '_content']) }} + {%- endif -%} + {%- endfor -%} +
    + diff --git a/frappe/website/web_template/section_with_small_cards/section_with_small_cards.json b/frappe/website/web_template/section_with_small_cards/section_with_small_cards.json new file mode 100644 index 0000000000..8f1c574888 --- /dev/null +++ b/frappe/website/web_template/section_with_small_cards/section_with_small_cards.json @@ -0,0 +1,103 @@ +{ + "creation": "2020-04-17 19:47:33.378013", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle" + }, + { + "fieldname": "card_1_title", + "fieldtype": "Data", + "label": "Card 1 Title" + }, + { + "fieldname": "card_1_content", + "fieldtype": "Small Text", + "label": "Card 1 Content" + }, + { + "fieldname": "card_2_title", + "fieldtype": "Data", + "label": "Card 2 Title" + }, + { + "fieldname": "card_2_content", + "fieldtype": "Small Text", + "label": "Card 2 Content" + }, + { + "fieldname": "card_3_title", + "fieldtype": "Data", + "label": "Card 3 Title" + }, + { + "fieldname": "card_3_content", + "fieldtype": "Small Text", + "label": "Card 3 Content" + }, + { + "fieldname": "card_4_title", + "fieldtype": "Data", + "label": "Card 4 Title" + }, + { + "fieldname": "card_4_content", + "fieldtype": "Small Text", + "label": "Card 4 Content" + }, + { + "fieldname": "card_5_title", + "fieldtype": "Data", + "label": "Card 5 Title" + }, + { + "fieldname": "card_5_content", + "fieldtype": "Small Text", + "label": "Card 5 Content" + }, + { + "fieldname": "card_6_title", + "fieldtype": "Data", + "label": "Card 6 Title" + }, + { + "fieldname": "card_6_content", + "fieldtype": "Small Text", + "label": "Card 6 Content" + }, + { + "fieldname": "card_7_title", + "fieldtype": "Data", + "label": "Card 7 Title" + }, + { + "fieldname": "card_7_content", + "fieldtype": "Small Text", + "label": "Card 7 Content" + }, + { + "fieldname": "card_8_title", + "fieldtype": "Data", + "label": "Card 8 Title" + }, + { + "fieldname": "card_8_content", + "fieldtype": "Small Text", + "label": "Card 8 Content" + } + ], + "idx": 0, + "modified": "2020-04-17 19:47:33.378013", + "modified_by": "Administrator", + "name": "Section with Small Cards", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_tabs/__init__.py b/frappe/website/web_template/section_with_tabs/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/section_with_tabs/section_with_tabs.html b/frappe/website/web_template/section_with_tabs/section_with_tabs.html new file mode 100644 index 0000000000..90c658f0b8 --- /dev/null +++ b/frappe/website/web_template/section_with_tabs/section_with_tabs.html @@ -0,0 +1,109 @@ +

    {{ title }}

    +

    {{ subtitle }}

    + +
    +
    + {% set ns = namespace(tabs=[]) %} + + {%- for index in ['1', '2', '3', '4', '5', '6'] -%} + + {%- set buttonid = 'id-' + frappe.utils.generate_hash('TabButton', 12) -%} + {%- set panelid = 'id-' + frappe.utils.generate_hash('TabPanel', 12) -%} + + {%- set tab = { + 'title': values['tab_' + index + '_title'], + 'content': values['tab_' + index + '_content'], + 'buttonid': buttonid, + 'panelid': panelid, } + -%} + + {%- if tab.title and tab.content -%} + {%- set ns.tabs = ns.tabs + [tab] -%} + {%- endif -%} + + {%- endfor -%} +
    + {%- for tab in ns.tabs -%} + {%- set first_tab = true if loop.index0 == 0 else false -%} + + {%- endfor -%} +
    + {%- for tab in ns.tabs -%} + {%- set first_tab = true if loop.index0 == 0 else false -%} +
    + {{ tab.content }} +
    + {%- endfor -%} +
    +
    + + diff --git a/frappe/website/web_template/section_with_tabs/section_with_tabs.json b/frappe/website/web_template/section_with_tabs/section_with_tabs.json new file mode 100644 index 0000000000..7b5b7f2eb4 --- /dev/null +++ b/frappe/website/web_template/section_with_tabs/section_with_tabs.json @@ -0,0 +1,83 @@ +{ + "creation": "2020-04-17 16:34:09.726205", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "subtitle", + "fieldtype": "Data", + "label": "Subtitle" + }, + { + "fieldname": "tab_1_title", + "fieldtype": "Data", + "label": "Tab 1 Title" + }, + { + "fieldname": "tab_1_content", + "fieldtype": "Text", + "label": "Tab 1 Content" + }, + { + "fieldname": "tab_2_title", + "fieldtype": "Data", + "label": "Tab 2 Title" + }, + { + "fieldname": "tab_2_content", + "fieldtype": "Text", + "label": "Tab 2 Content" + }, + { + "fieldname": "tab_3_title", + "fieldtype": "Data", + "label": "Tab 3 Title" + }, + { + "fieldname": "tab_3_content", + "fieldtype": "Text", + "label": "Tab 3 Content" + }, + { + "fieldname": "tab_4_title", + "fieldtype": "Data", + "label": "Tab 4 Title" + }, + { + "fieldname": "tab_4_content", + "fieldtype": "Text", + "label": "Tab 4 Content" + }, + { + "fieldname": "tab_5_title", + "fieldtype": "Data", + "label": "Tab 5 Title" + }, + { + "fieldname": "tab_5_content", + "fieldtype": "Text", + "label": "Tab 5 Content" + }, + { + "fieldname": "tab_6_title", + "fieldtype": "Data", + "label": "Tab 6 Title" + }, + { + "fieldname": "tab_6_content", + "fieldtype": "Text", + "label": "Tab 6 Content" + } + ], + "idx": 0, + "modified": "2020-04-17 16:46:54.719420", + "modified_by": "Administrator", + "name": "Section with Tabs", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index e610d82582..03c6c9bb78 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,26 +1,14 @@ { - "apply_style": 0, - "apply_text_styles": 0, - "creation": "2015-02-19 13:37:33.925909", - "css": ".navbar-header {\n display: none;\n}", - "custom": 0, - "docstatus": 0, - "doctype": "Website Theme", - "font_size": "14px", - "footer_color": "", - "footer_text_color": "", - "heading_style": "", - "heading_webfont": "", - "idx": 26, - "link_color": "", - "modified": "2016-12-29 05:40:17.289226", - "modified_by": "Administrator", - "module": "Website", - "name": "Standard", - "owner": "Administrator", - "text_color": "", - "text_webfont": "", - "theme": "Standard", - "top_bar_color": "", - "top_bar_text_color": "" + "based_on": "Bootstrap 4", + "creation": "2015-02-19 13:37:33.925909", + "custom": 0, + "docstatus": 0, + "doctype": "Website Theme", + "idx": 26, + "modified": "2020-04-16 18:43:01.567830", + "modified_by": "Administrator", + "module": "Website", + "name": "Standard", + "owner": "Administrator", + "theme": "Standard" } \ No newline at end of file diff --git a/package.json b/package.json index e6635fada1..5bbaaed8a1 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,7 @@ "production": "FRAPPE_ENV=production node rollup/build.js", "watch": "node rollup/watch.js", "cypress:run": "cypress run --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb", - "cypress:open": "cypress open", - "snyk-protect": "snyk protect", - "prepare": "yarn run snyk-protect" + "cypress:open": "cypress open" }, "repository": { "type": "git", @@ -20,11 +18,13 @@ }, "homepage": "https://frappe.io", "dependencies": { + "@tailwindcss/ui": "^0.1.3", "ace-builds": "^1.4.8", "air-datepicker": "http://github.com/frappe/air-datepicker", "awesomplete": "^1.1.5", "bootstrap": "^4.4.1", "cookie": "^0.4.0", + "cssnano": "^4.1.10", "express": "^4.17.1", "fast-deep-equal": "^2.0.1", "frappe-charts": "^1.3.0", @@ -36,17 +36,19 @@ "jsbarcode": "^3.9.0", "moment": "^2.20.1", "moment-timezone": "^0.5.28", + "purgecss": "^2.1.0", "quagga": "^0.12.1", "quill": "2.0.0-dev.2", "qz-tray": "^2.0.8", "redis": "^2.8.0", "showdown": "^1.9.1", + "snyk": "^1.297.4", "socket.io": "^2.3.0", "superagent": "^3.8.2", + "tailwindcss": "^1.2.0", "touch": "^3.1.0", "vue": "^2.6.11", - "vue-router": "^2.0.0", - "snyk": "^1.297.4" + "vue-router": "^2.0.0" }, "devDependencies": { "babel-runtime": "^6.26.0", diff --git a/purgecss.js b/purgecss.js new file mode 100644 index 0000000000..86d5794244 --- /dev/null +++ b/purgecss.js @@ -0,0 +1,23 @@ +const path = require('path'); +const utils = require('./rollup/rollup.utils'); +const { PurgeCSS } = require('purgecss'); + +let css_files = process.argv[2].split(','); +let css_file_paths = css_files.map(p => path.resolve(utils.assets_path, p)); +let html_content = process.argv[3]; +html_content = html_content.replace(/\\n/g, '\n'); + +new PurgeCSS() + .purge({ + content: [ + { + raw: html_content, + extension: 'html' + } + ], + css: css_file_paths, + defaultExtractor: content => content.match(/[\w-/:]+(? { + console.log(result[0].css); + }); diff --git a/requirements.txt b/requirements.txt index 55a4910056..efb9da7c16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ gunicorn==19.10.0 html2text==2016.9.19 html5lib==1.0.1 ipython==5.9.0 -Jinja2==2.10.3 +Jinja2==2.11.1 ldap3==2.7 markdown2==2.3.8 maxminddb-geolite2==2018.703 diff --git a/rollup/config.js b/rollup/config.js index 93bb226927..7249ea6c61 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -108,29 +108,34 @@ function get_rollup_options_for_js(output_file, input_files) { function get_rollup_options_for_css(output_file, input_files) { const output_path = path.resolve(assets_path, output_file); - const minimize_css = output_path.startsWith('css/') && production; + const minimize_css = output_path.includes('/assets/css/') && production; const plugins = [ // enables array of inputs multi_entry(), // less -> css postcss({ + plugins: [ + require('tailwindcss'), + require('autoprefixer'), + minimize_css ? require('cssnano')({ preset: 'default' }) : null + ].filter(Boolean), extract: output_path, use: [ - ['less', { - // import other less/css files starting from these folders - paths: [ - path.resolve(get_public_path('frappe'), 'less') - ] - }], + [ + 'less', + { + // import other less/css files starting from these folders + paths: [path.resolve(get_public_path('frappe'), 'less')] + } + ], ['sass', get_options_for_scss()] ], include: [ path.resolve(bench_path, '**/*.less'), path.resolve(bench_path, '**/*.scss'), path.resolve(bench_path, '**/*.css') - ], - minimize: minimize_css + ] }) ]; @@ -138,11 +143,12 @@ function get_rollup_options_for_css(output_file, input_files) { inputOptions: { input: input_files, plugins: plugins, - onwarn(warning) { + onwarn(warning, warn) { // skip warnings if (['EMPTY_BUNDLE'].includes(warning.code)) return; - // console.warn everything else + // console.warn everything else + log(warning) log(chalk.yellow.underline(warning.code), ':', warning.message); } }, diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000000..590fa18c15 --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,75 @@ +const defaultTheme = require('tailwindcss/defaultTheme'); +const plugin = require('tailwindcss/plugin'); + +module.exports = { + theme: { + extend: { + fontFamily: { + sans: ['Inter var', ...defaultTheme.fontFamily.sans] + }, + colors: { + black: '#112B42', + blue: { + '50': '#f4f9ff', + '100': '#E8F4FD', + '200': '#BDDDFA', + '300': '#88C3F6', + '400': '#54A8F2', + '500': '#2490EF', + '600': '#107CDB', + '700': '#0D66B5', + '800': '#0A518F', + '900': '#083B69' + }, + gray: { + '100': '#f4f4f6', + '200': '#e9ebed', + '300': '#dfe1e2', + '400': '#cccfd1', + '500': '#b7bfc6', + '600': '#a1abb4', + '700': '#9fa5a8', + '800': '#7f878a', + '900': '#415668' + }, + code: { + green: '#b5f4a5', + yellow: '#ffe484', + purple: '#d9a9ff', + red: '#ff8383', + blue: '#93ddfd', + white: '#fff' + } + }, + borderRadius: { + 'xl': '0.75rem' + }, + container: { + center: true, + padding: '1.25rem' + }, + screens: { + 'xl': '1120px', + }, + important: true + } + }, + variants: {}, + plugins: [ + require('@tailwindcss/ui'), + plugin(function({ addUtilities, e, theme, variants }) { + let utilities = {}; + Object.entries(theme('padding')).map(([modifier, size]) => { + utilities[`.${e(`space-y-${modifier}`)} > * + *`] = { + marginTop: `${size}` + }; + utilities[`.${e(`space-x-${modifier}`)} > * + *`] = { + marginLeft: `${size}` + }; + }); + addUtilities(utilities, { + variants: variants('padding') + }); + }) + ] +}; diff --git a/yarn.lock b/yarn.lock index 1b3d0a2176..8cf0e8e30b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -173,6 +173,24 @@ semver-diff "^2.0.0" xdg-basedir "^3.0.0" +"@tailwindcss/custom-forms@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@tailwindcss/custom-forms/-/custom-forms-0.2.1.tgz#40e5ed1fff6d29d8ed1c508a0b2aaf8da96962e0" + integrity sha512-XdP5XY6kxo3x5o50mWUyoYWxOPV16baagLoZ5uM41gh6IhXzhz/vJYzqrTb/lN58maGIKlpkxgVsQUNSsbAS3Q== + dependencies: + lodash "^4.17.11" + mini-svg-data-uri "^1.0.3" + traverse "^0.6.6" + +"@tailwindcss/ui@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@tailwindcss/ui/-/ui-0.1.3.tgz#4cc46f8a5788fcad937eff1ab567f5688080eb24" + integrity sha512-ggEEFj0N6YY6fFjHtoGArv9j7wr5nj+TswpGzEezN2l15jHJK1NZ+Lnt0XKsbJy2zWFSNy/KKpPCbh3d6/66tw== + dependencies: + "@tailwindcss/custom-forms" "^0.2.1" + hex-to-rgba "^2.0.1" + postcss-selector-parser "^6.0.2" + "@types/agent-base@^4.2.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@types/agent-base/-/agent-base-4.2.0.tgz#00644e8b395b40e1bf50aaf1d22cabc1200d5051" @@ -216,6 +234,11 @@ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.8.tgz#d27600e9ba2f371e08695d90a0fe0408d89c7be7" integrity sha512-m812CONwdZn/dMzkIJEY0yAs4apyTkTORgfB2UsMOxgkUbC205AHnm4T8I0I5gPg9MHrFc1dJ35iS75c0CJkjg== +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/debug@^4.1.4": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" @@ -391,6 +414,20 @@ ace-builds@^1.4.8: resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.8.tgz#d14be41d30294a2a12581f0bcfee4b696481ffdd" integrity sha512-8ZVAxwyCGAxQX8mOp9imSXH0hoSPkGfy8igJy+WO/7axL30saRhKgg1XPACSmxxPA7nfHVwM+ShWXT+vKsNuFg== +acorn-node@^1.6.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== + dependencies: + acorn "^7.0.0" + acorn-walk "^7.0.0" + xtend "^4.0.2" + +acorn-walk@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" + integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== + acorn@^5.2.1: version "5.7.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" @@ -401,6 +438,11 @@ acorn@^6.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== +acorn@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" + integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== + after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -500,6 +542,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + ansicolors@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" @@ -629,6 +679,19 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autoprefixer@^9.4.5: + version "9.7.5" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.5.tgz#8df10b9ff9b5814a8d411a5cfbab9c793c392376" + integrity sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg== + dependencies: + browserslist "^4.11.0" + caniuse-lite "^1.0.30001036" + chalk "^2.4.2" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.27" + postcss-value-parser "^4.0.3" + awesomplete@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/awesomplete/-/awesomplete-1.1.5.tgz#1b2b5dd106d3955595619c03da472a1dc0faf0af" @@ -805,6 +868,16 @@ browserslist@^4.0.0: electron-to-chromium "^1.3.113" node-releases "^1.1.8" +browserslist@^4.11.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.0.tgz#aef4357b10a8abda00f97aac7cd587b2082ba1ad" + integrity sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A== + dependencies: + caniuse-lite "^1.0.30001035" + electron-to-chromium "^1.3.380" + node-releases "^1.1.52" + pkg-up "^3.1.0" + buble@^0.19.6: version "0.19.6" resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3" @@ -832,7 +905,7 @@ builtin-modules@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1" integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg== -bytes@3.1.0: +bytes@3.1.0, bytes@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== @@ -883,6 +956,11 @@ callsites@^2.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= +camelcase-css@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== + camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" @@ -926,6 +1004,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000940.tgz#19f2b1497fbfa5b96b615963097c3757f27989ce" integrity sha512-rp/086IBUfCsNgBpko6DGQv674jRjeXPesDatDB2kxrkmDfD+S5Gesw+uT8YjpRWvLKLMRBy72SLRZ8I0EgQFw== +caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001036: + version "1.0.30001038" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz#44da3cbca2ab6cb6aa83d1be5d324e17f141caff" + integrity sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ== + capture-stack-trace@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" @@ -965,6 +1048,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -1096,12 +1187,19 @@ color-convert@^1.9.0, color-convert@^1.9.1: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -1139,6 +1237,11 @@ commander@^2.19.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + common-tags@1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0" @@ -1397,6 +1500,11 @@ cssesc@^2.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + cssnano-preset-default@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" @@ -1455,7 +1563,7 @@ cssnano-util-same-parent@^4.0.0: resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== -cssnano@^4.1.8: +cssnano@^4.1.10, cssnano@^4.1.8: version "4.1.10" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== @@ -1646,6 +1754,11 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +defined@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + degenerator@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095" @@ -1675,6 +1788,15 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detective@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== + dependencies: + acorn-node "^1.6.1" + defined "^1.0.0" + minimist "^1.1.1" + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -1761,6 +1883,11 @@ electron-to-chromium@^1.3.113: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== +electron-to-chromium@^1.3.380: + version "1.3.390" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.390.tgz#a49e67dea22e52ea8027c475dd5447b1c00b1d4e" + integrity sha512-4RvbM5x+002gKI8sltkqWEk5pptn0UnzekUx8RTThAMPDSb8jjpm6SwGiSnEve7f85biyZl8DMXaipaCxDjXag== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -2293,6 +2420,15 @@ fs-extra@4.0.1: jsonfile "^3.0.0" universalify "^0.1.0" +fs-extra@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2536,7 +2672,7 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -2608,6 +2744,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207" @@ -2678,6 +2819,11 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +hex-to-rgba@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/hex-to-rgba/-/hex-to-rgba-2.0.1.tgz#4176977882a1cb32b83ce5ab1db6828ab84d5a13" + integrity sha512-5XqPJBpsEUMsseJUi2w2Hl7cHFFi3+OO10M2pzAvKB1zL6fc+koGMhmBqoDOCB4GemiRM/zvDMRIhVw6EkB8dQ== + highlight.js@^9.18.1: version "9.18.1" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" @@ -3325,6 +3471,13 @@ jsonfile@^3.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -3550,6 +3703,11 @@ lodash.set@^4.3.2: resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= +lodash.toarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" + integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -3785,6 +3943,11 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== +mini-svg-data-uri@^1.0.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.1.3.tgz#9759ee5f4d89a4b724d089ce52eab4b623bfbc88" + integrity sha512-EeKOmdzekjdPe53/GdxmUpNgDQFkNeSte6XkJmOBt4BfWL6FQ9G9RtLNh+JMjFS3LhdpSICMIkZdznjiecASHQ== + minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -3802,6 +3965,11 @@ minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.1.1: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -3938,6 +4106,13 @@ node-bitmap@0.0.1: resolved "https://registry.yarnpkg.com/node-bitmap/-/node-bitmap-0.0.1.tgz#180eac7003e0c707618ef31368f62f84b2a69091" integrity sha1-GA6scAPgxwdhjvMTaPYvhLKmkJE= +node-emoji@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da" + integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw== + dependencies: + lodash.toarray "^4.4.0" + node-gyp@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" @@ -3956,6 +4131,11 @@ node-gyp@^3.8.0: tar "^2.0.0" which "1" +node-releases@^1.1.52: + version "1.1.53" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4" + integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ== + node-releases@^1.1.8: version "1.1.9" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.9.tgz#70d0985ec4bf7de9f08fc481f5dae111889ca482" @@ -4010,11 +4190,21 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + normalize-url@^3.0.0, normalize-url@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +normalize.css@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3" + integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg== + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4039,6 +4229,11 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -4054,7 +4249,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -4438,6 +4633,13 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pkg-up@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + pngjs@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -4505,6 +4707,24 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" +postcss-functions@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e" + integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4= + dependencies: + glob "^7.1.2" + object-assign "^4.1.1" + postcss "^6.0.9" + postcss-value-parser "^3.3.0" + +postcss-js@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9" + integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w== + dependencies: + camelcase-css "^2.0.1" + postcss "^7.0.18" + postcss-load-config@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484" @@ -4629,6 +4849,14 @@ postcss-modules@^1.4.1: postcss "^7.0.1" string-hash "^1.1.1" +postcss-nested@^4.1.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.1.tgz#4bc2e5b35e3b1e481ff81e23b700da7f82a8b248" + integrity sha512-AMayXX8tS0HCp4O4lolp4ygj9wBn32DJWXvG6gCv+ZvJrEa00GUxJcJEEzMh87BIe6FrWdYkpR2cuyqHKrxmXw== + dependencies: + postcss "^7.0.21" + postcss-selector-parser "^6.0.2" + postcss-normalize-charset@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" @@ -4757,6 +4985,15 @@ postcss-selector-parser@^5.0.0, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" + integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + dependencies: + cssesc "^3.0.0" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-svgo@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" @@ -4776,11 +5013,16 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== +postcss-value-parser@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d" + integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg== + postcss@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" @@ -4790,6 +5032,15 @@ postcss@6.0.1: source-map "^0.5.6" supports-color "^3.2.3" +postcss@7.0.27, postcss@^7.0.11, postcss@^7.0.18, postcss@^7.0.21, postcss@^7.0.27: + version "7.0.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" + integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + postcss@^5.2.5: version "5.2.18" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" @@ -4800,7 +5051,7 @@ postcss@^5.2.5: source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.22: +postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.22, postcss@^6.0.9: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== @@ -4838,6 +5089,11 @@ prettier@^1.13.0: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717" integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g== +pretty-hrtime@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" + integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= + process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -4925,6 +5181,16 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +purgecss@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.1.0.tgz#6da655d166073824efe2532b0c6466c740d939d6" + integrity sha512-QnXhowNjeWo9vNnGES2LVzDXdRR/8EvG/O03m4bYOWfAX0ShmG/Pmj7brVtVBy2eaaRAmNy23L+GBc4SpDFUeQ== + dependencies: + commander "^4.0.0" + glob "^7.0.0" + postcss "7.0.27" + postcss-selector-parser "^6.0.2" + q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -5113,6 +5379,14 @@ redis@^2.8.0: redis-commands "^1.2.0" redis-parser "^2.6.0" +reduce-css-calc@^2.1.6: + version "2.1.7" + resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.7.tgz#1ace2e02c286d78abcd01fd92bfe8097ab0602c2" + integrity sha512-fDnlZ+AybAS3C7Q9xDq5y8A2z+lT63zLbynew/lur/IR24OQF5x98tfNwf79mzEdfywZ0a2wpM860FhFfMxZlA== + dependencies: + css-unit-converter "^1.1.1" + postcss-value-parser "^3.3.0" + regenerate-unicode-properties@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c" @@ -5329,6 +5603,13 @@ resolve@^1.10.0, resolve@^1.4.0, resolve@^1.5.0: dependencies: path-parse "^1.0.6" +resolve@^1.14.2: + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== + dependencies: + path-parse "^1.0.6" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -6307,6 +6588,13 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + svgo@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3" @@ -6332,6 +6620,28 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= +tailwindcss@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.2.0.tgz#5df317cebac4f3131f275d258a39da1ba3a0f291" + integrity sha512-CKvY0ytB3ze5qvynG7qv4XSpQtFNGPbu9pUn8qFdkqgD8Yo/vGss8mhzbqls44YCXTl4G62p3qVZBj45qrd6FQ== + dependencies: + autoprefixer "^9.4.5" + bytes "^3.0.0" + chalk "^3.0.0" + detective "^5.2.0" + fs-extra "^8.0.0" + lodash "^4.17.15" + node-emoji "^1.8.1" + normalize.css "^8.0.1" + postcss "^7.0.11" + postcss-functions "^3.0.0" + postcss-js "^2.0.0" + postcss-nested "^4.1.1" + postcss-selector-parser "^6.0.0" + pretty-hrtime "^1.0.3" + reduce-css-calc "^2.1.6" + resolve "^1.14.2" + tar-stream@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" @@ -6496,6 +6806,11 @@ tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" +traverse@^0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" + integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc= + tree-kill@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" @@ -6885,6 +7200,11 @@ xregexp@2.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= +xtend@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + y18n@^3.2.0, y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" From e2eea4447b60a3358f305ea57d1de13128324f0e Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 18 Apr 2020 21:20:45 +0530 Subject: [PATCH 066/337] fix(Reports): don't export hidden columns in reports --- frappe/desk/query_report.py | 1 + frappe/public/js/frappe/views/reports/query_report.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index aaf859e7fd..a08667161a 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -299,6 +299,7 @@ def export_query(): _("You can try changing the filters of your report.")) return + data.columns = [col for col in data.columns if not col.get('hidden')] columns = get_columns_dict(data.columns) from frappe.utils.xlsxutils import make_xlsx diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 08da956072..07616886f2 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1084,7 +1084,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { ], ({ file_format, include_indentation }) => { this.make_access_log('Export', file_format); if (file_format === 'CSV') { - const column_row = this.columns.map(col => col.label); + const column_row = this.columns.map(col => { + if (!col.hidden) { + return col.label; + } + }); const data = this.get_data_for_csv(include_indentation); const out = [column_row].concat(data); From 8dafe6256cfdf56f595f68246417ea7fbb8abcc5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 18 Apr 2020 21:32:16 +0530 Subject: [PATCH 067/337] fix: check if column is a dict --- frappe/desk/query_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index a08667161a..f994dc0d30 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -299,7 +299,7 @@ def export_query(): _("You can try changing the filters of your report.")) return - data.columns = [col for col in data.columns if not col.get('hidden')] + data.columns = [col for col in data.columns if isinstance(col, dict) and not col.get('hidden')] columns = get_columns_dict(data.columns) from frappe.utils.xlsxutils import make_xlsx @@ -311,7 +311,7 @@ def export_query(): frappe.response['type'] = 'binary' -def build_xlsx_data(columns, data, visible_idx,include_indentation): +def build_xlsx_data(columns, data, visible_idx, include_indentation): result = [[]] # add column headings From 191165f704d7b682001617ee994befa66306b7c5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 00:34:21 +0530 Subject: [PATCH 068/337] fix: use .reduce to filter out hidden columns --- frappe/public/js/frappe/views/reports/query_report.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 07616886f2..be24273cb5 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1084,11 +1084,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { ], ({ file_format, include_indentation }) => { this.make_access_log('Export', file_format); if (file_format === 'CSV') { - const column_row = this.columns.map(col => { + const column_row = this.columns.reduce((acc, col) => { if (!col.hidden) { - return col.label; + acc.push(col.label); } - }); + return acc; + }, []); const data = this.get_data_for_csv(include_indentation); const out = [column_row].concat(data); From 76648bc6cf2c4e3c4c56b95d2499d648bf7dc085 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 19 Apr 2020 12:58:15 +0530 Subject: [PATCH 069/337] fix: Invalid align-items value --- frappe/public/less/flex.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/less/flex.less b/frappe/public/less/flex.less index a5ad611683..12797241ce 100644 --- a/frappe/public/less/flex.less +++ b/frappe/public/less/flex.less @@ -38,7 +38,7 @@ .flush-top { display: flex; justify-content: space-between; - align-items: end; + align-items: flex-end; } .level { @@ -79,4 +79,4 @@ .fill-width { flex: 1 -} \ No newline at end of file +} From 1632653a39847cea1107e38f39f8dd42950e305b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 19 Apr 2020 12:58:35 +0530 Subject: [PATCH 070/337] chore: Log full warning --- rollup/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rollup/config.js b/rollup/config.js index 7249ea6c61..20651ceb3c 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -108,7 +108,7 @@ function get_rollup_options_for_js(output_file, input_files) { function get_rollup_options_for_css(output_file, input_files) { const output_path = path.resolve(assets_path, output_file); - const minimize_css = output_path.includes('/assets/css/') && production; + const minimize_css = output_path.includes('/assets/css/') && production; const plugins = [ // enables array of inputs @@ -147,9 +147,9 @@ function get_rollup_options_for_css(output_file, input_files) { // skip warnings if (['EMPTY_BUNDLE'].includes(warning.code)) return; - // console.warn everything else - log(warning) + // console.warn everything else log(chalk.yellow.underline(warning.code), ':', warning.message); + log(warning); } }, outputOptions: { From c424c7e263bdf893a421560e7d1346e910cca165 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 10 Apr 2020 12:43:55 +0530 Subject: [PATCH 071/337] feat: Add show preview popup to Customize Form --- frappe/boot.py | 8 +++++++- frappe/custom/doctype/custom_field/custom_field.json | 9 ++++++++- frappe/custom/doctype/customize_form/customize_form.json | 9 ++++++++- frappe/custom/doctype/customize_form/customize_form.py | 2 ++ .../customize_form_field/customize_form_field.json | 9 ++++++++- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index e6d1199b19..8b9668430c 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -268,4 +268,10 @@ def get_success_action(): return frappe.get_all("Success Action", fields=["*"]) def get_link_preview_doctypes(): - return [d.name for d in frappe.db.get_all('DocType', {'show_preview_popup': 1})] \ No newline at end of file + link_preview_doctypes = [d.name for d in frappe.db.get_all('DocType', {'show_preview_popup': 1})] + customizations = frappe.get_all("Property Setter", + fields=['doc_type'], + filters={'property': 'show_preview_popup', 'value': "1" + }) + link_preview_doctypes += [custom.doc_type for custom in customizations] + return link_preview_doctypes diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index b274033f80..394f38b56c 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -41,6 +41,7 @@ "in_list_view", "in_standard_filter", "in_global_search", + "in_preview", "bold", "report_hide", "search_index", @@ -371,12 +372,18 @@ "fieldname": "allow_in_quick_entry", "fieldtype": "Check", "label": "Allow in Quick Entry" + }, + { + "default": "0", + "fieldname": "in_preview", + "fieldtype": "Check", + "label": "In Preview" } ], "icon": "fa fa-glass", "idx": 1, "links": [], - "modified": "2020-03-16 14:52:43.954709", + "modified": "2020-04-10 11:57:10.392218", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json index 51a5c0b85f..cd57aa23fe 100644 --- a/frappe/custom/doctype/customize_form/customize_form.json +++ b/frappe/custom/doctype/customize_form/customize_form.json @@ -20,6 +20,7 @@ "track_views", "allow_auto_repeat", "allow_import", + "show_preview_popup", "image_view", "column_break_5", "title_field", @@ -203,6 +204,12 @@ "depends_on": "doc_type", "fieldname": "section_break_23", "fieldtype": "Section Break" + }, + { + "default": "0", + "fieldname": "show_preview_popup", + "fieldtype": "Check", + "label": "Show Preview Popup" } ], "hide_toolbar": 1, @@ -210,7 +217,7 @@ "idx": 1, "issingle": 1, "links": [], - "modified": "2020-03-27 15:06:35.443861", + "modified": "2020-04-10 12:16:01.320411", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form", diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 7d081953dd..9efa555152 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -32,6 +32,7 @@ doctype_properties = { 'track_views': 'Check', 'allow_auto_repeat': 'Check', 'allow_import': 'Check', + 'show_preview_popup': 'Check', 'email_append_to': 'Check', 'subject_field': 'Data', 'sender_field': 'Data' @@ -53,6 +54,7 @@ docfield_properties = { 'in_list_view': 'Check', 'in_standard_filter': 'Check', 'in_global_search': 'Check', + 'in_preview': 'Check', 'bold': 'Check', 'hidden': 'Check', 'collapsible': 'Check', diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index 350d159541..d7887cf8bd 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -16,6 +16,7 @@ "in_list_view", "in_standard_filter", "in_global_search", + "in_preview", "bold", "allow_in_quick_entry", "translatable", @@ -381,12 +382,18 @@ "fieldtype": "Code", "label": "Read Only Depends On", "options": "JS" + }, + { + "default": "0", + "fieldname": "in_preview", + "fieldtype": "Check", + "label": "In Preview" } ], "idx": 1, "istable": 1, "links": [], - "modified": "2020-04-15 02:26:59.673750", + "modified": "2020-04-10 11:58:44.573537", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", From 685df9b1f16e9a03a93df36fec978ba908fe2f4f Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 14:33:52 +0530 Subject: [PATCH 072/337] fix: remove doctype from link_preview_doctypes if custom value is 0 --- frappe/boot.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 8b9668430c..eed434f870 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -268,10 +268,18 @@ def get_success_action(): return frappe.get_all("Success Action", fields=["*"]) def get_link_preview_doctypes(): + from frappe.utils import cint + link_preview_doctypes = [d.name for d in frappe.db.get_all('DocType', {'show_preview_popup': 1})] customizations = frappe.get_all("Property Setter", - fields=['doc_type'], - filters={'property': 'show_preview_popup', 'value': "1" - }) - link_preview_doctypes += [custom.doc_type for custom in customizations] + fields=['doc_type', 'value'], + filters={'property': 'show_preview_popup'} + ) + + for custom in customizations: + if not cint(custom.value) and custom.doc_type in link_preview_doctypes: + link_preview_doctypes.remove(custom.doc_type) + else: + link_preview_doctypes.append(custom.doc_type) + return link_preview_doctypes From 25d92ac9b2af2ce0dce8be938fb132ec1ba47d7c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 19 Apr 2020 15:02:22 +0530 Subject: [PATCH 073/337] fix(Web View): renamed Web View Item to Web View Components, made Web Views embeddable, introduced full width, introduced Color --- frappe/public/scss/website.scss | 11 +++ frappe/templates/web.html | 10 ++- .../{web_view_item => color}/__init__.py | 0 frappe/website/doctype/color/color.js | 8 ++ frappe/website/doctype/color/color.json | 44 +++++++++++ .../web_view_item.py => color/color.py} | 2 +- frappe/website/doctype/color/test_color.py | 10 +++ frappe/website/doctype/web_page/web_page.json | 11 ++- frappe/website/doctype/web_page/web_page.py | 1 + .../web_view/templates/web_view_content.html | 22 ++++-- .../website/doctype/web_view/test_web_view.py | 26 ++++++- frappe/website/doctype/web_view/web_view.json | 61 ++++++++++++--- frappe/website/doctype/web_view/web_view.py | 77 ++++++++++++------- .../doctype/web_view_component/__init__.py | 0 .../web_view_component.json} | 39 ++++++++-- .../web_view_component/web_view_component.py | 10 +++ .../doctype/website_theme/website_theme.json | 61 ++++++++++----- .../website_theme/website_theme_template.scss | 6 +- .../website_theme/standard/standard.json | 42 +++++----- 19 files changed, 331 insertions(+), 110 deletions(-) rename frappe/website/doctype/{web_view_item => color}/__init__.py (100%) create mode 100644 frappe/website/doctype/color/color.js create mode 100644 frappe/website/doctype/color/color.json rename frappe/website/doctype/{web_view_item/web_view_item.py => color/color.py} (89%) create mode 100644 frappe/website/doctype/color/test_color.py create mode 100644 frappe/website/doctype/web_view_component/__init__.py rename frappe/website/doctype/{web_view_item/web_view_item.json => web_view_component/web_view_component.json} (70%) create mode 100644 frappe/website/doctype/web_view_component/web_view_component.py diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 6f82e25ee0..546110bd5c 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -23,6 +23,17 @@ footer { flex-shrink: 0; } +// make navbar padding consistent with the page +.navbar { + padding-left: 0; + padding-right: 0; + + .container { + padding-left: 15px; + padding-right: 15px; + } +} + .navbar.bg-dark { .dropdown-menu { font-size: .75rem; diff --git a/frappe/templates/web.html b/frappe/templates/web.html index d2d38a6320..2fdfc9564a 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -13,7 +13,7 @@
    {% block page_container %} -
    +
    {% block header %}{% endblock %} @@ -38,9 +38,11 @@
    {% endmacro %} -{% macro container_attributes() %} -id="page-{{ name or route | e }}" data-path="{{ pathname | e }}" {%- if page_or_generator=="Generator" %}source-type="Generator" data-doctype="{{ doctype }}"{% endif %} -{% endmacro %} +{% macro container_attributes() -%} +id="page-{{ name or route | e }}" data-path="{{ pathname | e }}" + {%- if page_or_generator=="Generator" %}source-type="Generator" data-doctype="{{ doctype }}"{%- endif %} + {%- if source_content_type %}source-content-type="{{ source_content_type }}"{%- endif %} +{%- endmacro %} {% if show_sidebar %}
    diff --git a/frappe/website/doctype/web_view_item/__init__.py b/frappe/website/doctype/color/__init__.py similarity index 100% rename from frappe/website/doctype/web_view_item/__init__.py rename to frappe/website/doctype/color/__init__.py diff --git a/frappe/website/doctype/color/color.js b/frappe/website/doctype/color/color.js new file mode 100644 index 0000000000..78b3f773d1 --- /dev/null +++ b/frappe/website/doctype/color/color.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Color', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/color/color.json b/frappe/website/doctype/color/color.json new file mode 100644 index 0000000000..f42898da12 --- /dev/null +++ b/frappe/website/doctype/color/color.json @@ -0,0 +1,44 @@ +{ + "actions": [], + "autoname": "Prompt", + "creation": "2020-04-19 02:25:37.010180", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "color" + ], + "fields": [ + { + "fieldname": "color", + "fieldtype": "Color", + "in_list_view": 1, + "label": "Color", + "reqd": 1 + } + ], + "links": [], + "modified": "2020-04-19 02:25:47.417772", + "modified_by": "Administrator", + "module": "Website", + "name": "Color", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Website Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_view_item/web_view_item.py b/frappe/website/doctype/color/color.py similarity index 89% rename from frappe/website/doctype/web_view_item/web_view_item.py rename to frappe/website/doctype/color/color.py index cc440305c0..245b9e9165 100644 --- a/frappe/website/doctype/web_view_item/web_view_item.py +++ b/frappe/website/doctype/color/color.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe from frappe.model.document import Document -class WebViewItem(Document): +class Color(Document): pass diff --git a/frappe/website/doctype/color/test_color.py b/frappe/website/doctype/color/test_color.py new file mode 100644 index 0000000000..2f2be331ad --- /dev/null +++ b/frappe/website/doctype/color/test_color.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestColor(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 645d83e155..5f90f3adbf 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_guest_to_view": 1, "allow_import": 1, "creation": "2013-03-28 10:35:30", @@ -13,6 +14,7 @@ "slideshow", "cb1", "published", + "full_width", "show_title", "start_date", "end_date", @@ -242,14 +244,21 @@ "fieldname": "dynamic_template", "fieldtype": "Check", "label": "Dynamic Template" + }, + { + "default": "0", + "fieldname": "full_width", + "fieldtype": "Check", + "label": "Full Width" } ], "has_web_view": 1, "icon": "fa fa-file-alt", "idx": 1, "is_published_field": "published", + "links": [], "max_attachments": 20, - "modified": "2019-10-02 13:58:50.825481", + "modified": "2020-04-19 01:55:48.363008", "modified_by": "Administrator", "module": "Website", "name": "Web Page", diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index ffa836e3c5..98065e4cce 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -36,6 +36,7 @@ class WebPage(WebsiteGenerator): def get_context(self, context): context.main_section = get_html_content_based_on_type(self, 'main_section', self.content_type) + context.source_content_type = self.content_type self.render_dynamic(context) # if static page, get static content diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html index f2e750a472..a1ac143639 100644 --- a/frappe/website/doctype/web_view/templates/web_view_content.html +++ b/frappe/website/doctype/web_view/templates/web_view_content.html @@ -9,7 +9,7 @@ {%- endif -%} {%- macro render_element(element) -%} - {%- if element.element_type=='Content' -%} + {%- if element.element_type in ('Content', 'Web View') -%}
    {{ element.web_content_html }}
    @@ -25,17 +25,16 @@ {%- endmacro -%} {%- macro element_style(element) -%} - {%- if element.element_style -%} - style = "{{ element.element_style }}" + {%- if element.element_style or element.background_color -%} + style = "{{ element.element_style or '' }} {%if element.background_color %}background-color: {{ element.background_color }};{% endif %}" {%- endif -%} {%- endmacro -%} - +{%- macro render_sections(sections) -%} {%- for section in sections -%} -
    -
    +
    +
    {%- if section.section_intro -%} -
    {{ section.section_intro }}
    {%- endif -%} @@ -74,4 +73,11 @@ {%- endif -%}
    -{%- endfor -%} \ No newline at end of file +{%- endfor -%} +{%- endmacro -%} + +{% if content_type == 'HTML' -%} +{{ content_html }} +{%- else -%} +{{ render_sections(sections) }} +{%- endif -%} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py index 67b353844d..3dc072a6dd 100644 --- a/frappe/website/doctype/web_view/test_web_view.py +++ b/frappe/website/doctype/web_view/test_web_view.py @@ -14,6 +14,7 @@ class TestWebView(unittest.TestCase): @classmethod def setUpClass(cls): frappe.delete_doc_if_exists('Web View', 'test-web-view') + frappe.delete_doc_if_exists('Web View', 'html-web-view') frappe.delete_doc_if_exists('CSS Class', 'test-css-class') frappe.get_doc(dict( @@ -22,12 +23,25 @@ class TestWebView(unittest.TestCase): css = '.test-class { color: red; }' )).insert() + # simple html webview + frappe.get_doc(dict( + doctype = 'Web View', + title = 'HTML Web View', + route = 'html-web-view', + published = 1, + content_type = 'HTML', + content_html = '

    Hello HTML

    ' + )).insert() + + # simple web view with components + frappe.get_doc(dict( doctype = 'Web View', title = 'Test Web View', route = 'test-web-view', published = 1, - items = [ + content_type = 'Components', + components = [ dict( element_type = 'Section', section_type = 'List' @@ -57,19 +71,27 @@ class TestWebView(unittest.TestCase): web_content_type = 'Markdown', web_content_markdown = 'Column 2' ), + dict( + element_type = 'Web View', + web_view = 'html-web-view', + ), ] )).insert() def test_web_view(self): html = get_page_content('test-web-view') - #print(html) self.assert_web_view_in_html(html) + def test_html_web_view(self): + html = get_page_content('html-web-view') + self.assertTrue('Hello HTML' in html) + def assert_web_view_in_html(self, html): self.assertTrue('

    Heading

    ' in html) self.assertTrue('
    Here is some HTML
    ' in html) self.assertTrue('Column 1' in html) self.assertTrue('Column 2' in html) + self.assertTrue('Hello HTML' in html) self.assertTrue('.test-class { color: red; }' in html) def test_web_view_in_footer(self): diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json index 6d957fd0d9..c804d31de3 100644 --- a/frappe/website/doctype/web_view/web_view.json +++ b/frappe/website/doctype/web_view/web_view.json @@ -12,18 +12,17 @@ "field_order": [ "title", "route", + "column_break_4", + "full_width", "published", - "items", + "section_break_6", + "content_type", + "content_html", + "components", + "style_section", "css" ], "fields": [ - { - "fieldname": "items", - "fieldtype": "Table", - "label": "Items", - "options": "Web View Item", - "reqd": 1 - }, { "fieldname": "title", "fieldtype": "Data", @@ -36,8 +35,7 @@ "fieldname": "route", "fieldtype": "Data", "in_list_view": 1, - "label": "Route", - "reqd": 1 + "label": "Route" }, { "default": "0", @@ -49,12 +47,53 @@ "fieldname": "css", "fieldtype": "Code", "label": "CSS" + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "full_width", + "fieldtype": "Check", + "label": "Full Width" + }, + { + "fieldname": "section_break_6", + "fieldtype": "Section Break", + "label": "Content" + }, + { + "default": "Components", + "fieldname": "content_type", + "fieldtype": "Select", + "label": "Content Type", + "options": "Components\nHTML", + "reqd": 1 + }, + { + "depends_on": "eval:doc.content_type==='Components'", + "fieldname": "components", + "fieldtype": "Table", + "label": "Components", + "options": "Web View Component" + }, + { + "depends_on": "eval:doc.content_type===\"HTML\"", + "fieldname": "content_html", + "fieldtype": "HTML Editor", + "label": "Content HTML" + }, + { + "fieldname": "style_section", + "fieldtype": "Section Break", + "label": "Style" } ], "has_web_view": 1, "is_published_field": "published", "links": [], - "modified": "2020-04-15 23:58:12.208049", + "modified": "2020-04-19 05:05:43.620000", "modified_by": "Administrator", "module": "Website", "name": "Web View", diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py index 6828057fe1..eeebb169dc 100644 --- a/frappe/website/doctype/web_view/web_view.py +++ b/frappe/website/doctype/web_view/web_view.py @@ -10,49 +10,70 @@ import frappe class WebView(WebsiteGenerator): def get_context(self, context): - # group items into sections - context.sections = [] - context.css_rules = [] - for item in self.items: - if not context.sections and item.element_type!='Section': - self.add_default_section(context) - - if item.element_type=='Section': - self.add_section(context, item) - else: - self.add_item(context, item) - - self.add_css_class(context, item) + # group components into sections + if self.content_type=='Components': + self.build_components(context) return context - def add_section(self, context, item): - item.elements = [] - context.sections.append(item) + def build_components(self, context): + context.sections = [] + context.css_rules = [] + for component in self.components: + if not context.sections and component.element_type!='Section': + self.add_default_section(context) - if item.section_intro: - item.section_intro = markdown(item.section_intro) + if component.element_type=='Section': + self.add_section(context, component) + else: + self.add_component(context, component) - def add_item(self, context, item): - if item.hide: + self.add_css_class(context, component) + self.add_color(component) + self.add_missing_semi(component) + + return context + + def add_section(self, context, component): + component.elements = [] + context.sections.append(component) + + if component.section_intro: + component.section_intro = markdown(component.section_intro) + + def add_component(self, context, component): + if component.hide: return - if item.web_content_type == 'Markdown': - item.web_content_html = markdown(item.web_content_markdown) + if component.element_type == 'Web View' and component.web_view: + component.web_content_html = frappe.get_doc('Web View', component.web_view).render_content() - if item.title: - item.element_id = frappe.scrub(item.title) + elif component.web_content_type == 'Markdown': + component.web_content_html = markdown(component.web_content_markdown) - context.sections[-1].elements.append(item) + if component.title: + component.element_id = frappe.scrub(component.title) - def add_css_class(self, context, item): + context.sections[-1].elements.append(component) + + def add_css_class(self, context, component): # add css class definitions selected by the user - if item.element_class and not item.hide: - css, is_dynamic = frappe.db.get_value('CSS Class', item.element_class, ['css', 'is_dynamic']) + if component.element_class and not component.hide: + css, is_dynamic = frappe.db.get_value('CSS Class', component.element_class, ['css', 'is_dynamic']) if is_dynamic: css = frappe.render_template(css, self.get_theme()) context.css_rules.append(css) + def add_color(self, component): + # convert to css color + if component.background_color and not component.hide: + component.background_color = frappe.db.get_value('Color', + component.background_color, 'color', cache=True) + + def add_missing_semi(self, component): + if component.element_style and not component.element_style.strip().endswith(';'): + component.element_style = component.element_style.strip() + ';' + def render_content(self): # webview can be rendered as an object (see footer) return frappe.render_template("frappe/website/doctype/web_view/templates/web_view_content.html", self.get_context(self.as_dict())) diff --git a/frappe/website/doctype/web_view_component/__init__.py b/frappe/website/doctype/web_view_component/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_view_item/web_view_item.json b/frappe/website/doctype/web_view_component/web_view_component.json similarity index 70% rename from frappe/website/doctype/web_view_item/web_view_item.json rename to frappe/website/doctype/web_view_component/web_view_component.json index 0d33cbb8ce..15dd761c81 100644 --- a/frappe/website/doctype/web_view_item/web_view_item.json +++ b/frappe/website/doctype/web_view_component/web_view_component.json @@ -8,11 +8,14 @@ "element_type", "title", "hide", + "contain_section_width", "column_break_3", "columns", + "background_color", "element_class", "element_style", "section_break_5", + "web_view", "section_type", "web_content_type", "web_content_html", @@ -26,33 +29,35 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Element Type", - "options": "Section\nContent\nParagraph\nWeb List\nWeb Form", + "options": "Section\nContent\nImage\nWeb View", "reqd": 1 }, { + "default": "List", "depends_on": "eval:doc.element_type==='Section'", "fieldname": "section_type", "fieldtype": "Select", "in_list_view": 1, "label": "Section Type", - "options": "\nList\nTabbed\nGrid" + "options": "List\nTabbed\nGrid" }, { + "default": "Markdown", "depends_on": "eval:doc.element_type==='Content'", "fieldname": "web_content_type", "fieldtype": "Select", "in_list_view": 1, "label": "Web Content Type", - "options": "\nHTML\nMarkdown" + "options": "Markdown\nHTML" }, { - "depends_on": "eval:doc.web_content_type==='HTML'", + "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'HTML'", "fieldname": "web_content_html", "fieldtype": "HTML Editor", "label": "Web Content HTML" }, { - "depends_on": "eval:doc.web_content_type==='Markdown'", + "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'Markdown'", "fieldname": "web_content_markdown", "fieldtype": "Markdown Editor", "label": "Web Content Markdown" @@ -104,14 +109,34 @@ "fieldname": "element_style", "fieldtype": "Small Text", "label": "Element Style" + }, + { + "default": "0", + "depends_on": "eval:doc.element_type==='Section'", + "fieldname": "contain_section_width", + "fieldtype": "Check", + "label": "Contain Section Width" + }, + { + "fieldname": "background_color", + "fieldtype": "Link", + "label": "Background Color", + "options": "Color" + }, + { + "depends_on": "eval:doc.element_type==='Web View'", + "fieldname": "web_view", + "fieldtype": "Link", + "label": "Web View", + "options": "Web View" } ], "istable": 1, "links": [], - "modified": "2020-03-28 14:21:50.014823", + "modified": "2020-04-19 03:02:53.233036", "modified_by": "Administrator", "module": "Website", - "name": "Web View Item", + "name": "Web View Component", "owner": "Administrator", "permissions": [], "quick_entry": 1, diff --git a/frappe/website/doctype/web_view_component/web_view_component.py b/frappe/website/doctype/web_view_component/web_view_component.py new file mode 100644 index 0000000000..dcf1726c4a --- /dev/null +++ b/frappe/website/doctype/web_view_component/web_view_component.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class WebViewComponent(Document): + pass diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index f7c6a9a1f2..78a845fadc 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -14,8 +14,10 @@ "google_font", "font_size", "font_properties", - "use_full_width", - "column_break_7", + "button_rounded_corners", + "button_shadows", + "button_gradients", + "column_break_11", "primary_color", "text_color", "light_color", @@ -99,29 +101,29 @@ "fieldtype": "Data", "label": "Font Size" }, - { - "fieldname": "column_break_7", - "fieldtype": "Column Break" - }, { "fieldname": "primary_color", - "fieldtype": "Color", - "label": "Primary Color" + "fieldtype": "Link", + "label": "Primary Color", + "options": "Color" }, { "fieldname": "text_color", - "fieldtype": "Color", - "label": "Text Color" + "fieldtype": "Link", + "label": "Text Color", + "options": "Color" }, { "fieldname": "dark_color", - "fieldtype": "Color", - "label": "Dark Color" + "fieldtype": "Link", + "label": "Dark Color", + "options": "Color" }, { "fieldname": "background_color", - "fieldtype": "Color", - "label": "Background Color" + "fieldtype": "Link", + "label": "Background Color", + "options": "Color" }, { "fieldname": "stylesheet_section", @@ -135,8 +137,9 @@ }, { "fieldname": "light_color", - "fieldtype": "Color", - "label": "Light Color" + "fieldtype": "Link", + "label": "Light Color", + "options": "Color" }, { "default": "300,600", @@ -145,14 +148,30 @@ "label": "Font Properties" }, { - "description": "Content will not be inside a \"container\" class, you will have to add your own containers for different sections.", - "fieldname": "use_full_width", - "fieldtype": "Data", - "label": "Use Full Width" + "default": "1", + "fieldname": "button_rounded_corners", + "fieldtype": "Check", + "label": "Button Rounded Corners" + }, + { + "default": "0", + "fieldname": "button_shadows", + "fieldtype": "Check", + "label": "Button Shadows" + }, + { + "default": "0", + "fieldname": "button_gradients", + "fieldtype": "Check", + "label": "Button Gradients" + }, + { + "fieldname": "column_break_11", + "fieldtype": "Column Break" } ], "links": [], - "modified": "2020-03-19 09:46:48.750150", + "modified": "2020-04-19 05:18:49.820803", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index e1728eee36..7b0bc043d7 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -8,9 +8,9 @@ $font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, {% if text_color %}$body-color: {{ text_color }};{% endif %} {% if background_color %}$body-bg: {{ background_color }};{% endif %} -$enable-shadows: {{ enable_shadows and "true" or "false" }}; -$enable-gradients: {{ enable_gradients and "true" or "false" }}; -$enable-rounded: {{ enable_rounded and "true" or "false" }}; +$enable-shadows: {{ button_shadows and "true" or "false" }}; +$enable-gradients: {{ button_gradients and "true" or "false" }}; +$enable-rounded: {{ button_rounded_corners and "true" or "false" }}; @import "frappe/public/scss/website"; diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index e610d82582..331f4ab7e5 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,26 +1,20 @@ { - "apply_style": 0, - "apply_text_styles": 0, - "creation": "2015-02-19 13:37:33.925909", - "css": ".navbar-header {\n display: none;\n}", - "custom": 0, - "docstatus": 0, - "doctype": "Website Theme", - "font_size": "14px", - "footer_color": "", - "footer_text_color": "", - "heading_style": "", - "heading_webfont": "", - "idx": 26, - "link_color": "", - "modified": "2016-12-29 05:40:17.289226", - "modified_by": "Administrator", - "module": "Website", - "name": "Standard", - "owner": "Administrator", - "text_color": "", - "text_webfont": "", - "theme": "Standard", - "top_bar_color": "", - "top_bar_text_color": "" + "button_gradients": 0, + "button_rounded_corners": 1, + "button_shadows": 0, + "creation": "2015-02-19 13:37:33.925909", + "custom": 0, + "docstatus": 0, + "doctype": "Website Theme", + "font_properties": "300,600", + "idx": 27, + "modified": "2020-04-19 05:00:20.668017", + "modified_by": "Administrator", + "module": "Website", + "name": "Standard", + "owner": "Administrator", + "primary_color": "#7575ff", + "theme": "Standard", + "theme_scss": "\n\n$primary: #7575ff;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", + "theme_url": "/assets/css/standard_55b00b4f.css" } \ No newline at end of file From 54e765cfc04b88a72cfac3c73aa1d27186bdafae Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 19 Apr 2020 15:05:28 +0530 Subject: [PATCH 074/337] fix(minor): fix color in Website Theme --- .../doctype/website_theme/website_theme_template.scss | 8 ++++---- frappe/website/website_theme/standard/standard.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index 7b0bc043d7..caad55810a 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -3,10 +3,10 @@ $font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; {% endif %} -{% if primary_color %}$primary: {{ primary_color }};{% endif %} -{% if dark_color %}$dark: {{ dark_color }};{% endif %} -{% if text_color %}$body-color: {{ text_color }};{% endif %} -{% if background_color %}$body-bg: {{ background_color }};{% endif %} +{% if primary_color %}$primary: {{ frappe.db.get_value('Color', primary_color, 'color') }};{% endif %} +{% if dark_color %}$dark: {{ frappe.db.get_value('Color', dark_color, 'color') }};{% endif %} +{% if text_color %}$body-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif %} +{% if background_color %}$body-bg: {{ frappe.db.get_value('Color', background_color, 'color') }};{% endif %} $enable-shadows: {{ button_shadows and "true" or "false" }}; $enable-gradients: {{ button_gradients and "true" or "false" }}; diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 331f4ab7e5..2393b684ca 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -8,13 +8,13 @@ "doctype": "Website Theme", "font_properties": "300,600", "idx": 27, - "modified": "2020-04-19 05:00:20.668017", + "modified": "2020-04-19 05:34:56.086984", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", - "primary_color": "#7575ff", + "primary_color": "Blue", "theme": "Standard", - "theme_scss": "\n\n$primary: #7575ff;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_55b00b4f.css" + "theme_scss": "\n\n$primary: #5e3aa8;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", + "theme_url": "/assets/css/standard_999ef15b.css" } \ No newline at end of file From 6ac3fe4ed7372e0e55fe4a176e903e7184f11167 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 19 Apr 2020 16:17:41 +0530 Subject: [PATCH 075/337] chore: Add postcss-nested plugin --- package.json | 1 + rollup/config.js | 1 + yarn.lock | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bbaaed8a1..fc4a094633 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "cypress-file-upload": "^3.1.0", "less": "^3.11.1", "node-sass": "^4.13.1", + "postcss-nested": "^4.2.1", "rollup": "^1.2.2", "rollup-plugin-buble": "^0.19.2", "rollup-plugin-commonjs": "^8.3.0", diff --git a/rollup/config.js b/rollup/config.js index 20651ceb3c..e98010c650 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -117,6 +117,7 @@ function get_rollup_options_for_css(output_file, input_files) { postcss({ plugins: [ require('tailwindcss'), + require('postcss-nested'), require('autoprefixer'), minimize_css ? require('cssnano')({ preset: 'default' }) : null ].filter(Boolean), diff --git a/yarn.lock b/yarn.lock index 8cf0e8e30b..f6223cdbad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4849,7 +4849,7 @@ postcss-modules@^1.4.1: postcss "^7.0.1" string-hash "^1.1.1" -postcss-nested@^4.1.1: +postcss-nested@^4.1.1, postcss-nested@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.1.tgz#4bc2e5b35e3b1e481ff81e23b700da7f82a8b248" integrity sha512-AMayXX8tS0HCp4O4lolp4ygj9wBn32DJWXvG6gCv+ZvJrEa00GUxJcJEEzMh87BIe6FrWdYkpR2cuyqHKrxmXw== From 5ea86c645460f1ef1708301e9d7f5459a88d7d25 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 19 Apr 2020 16:19:02 +0530 Subject: [PATCH 076/337] fix: Use Web Page Block for Navbar and Footer - Add more Web Templates --- .../public/js/frappe/utils/web_page_block.js | 23 +++++ frappe/public/tailwind.css | 88 +++++++++++++++++ frappe/templates/components/web_block.html | 13 +++ frappe/templates/components/web_blocks.html | 3 + .../components/web_page_section.html | 5 - frappe/templates/includes/footer/footer.html | 16 ++- frappe/templates/includes/navbar/navbar.html | 2 +- frappe/utils/jinja.py | 9 +- .../doctype/web_page/templates/web_page.html | 4 +- frappe/website/doctype/web_page/web_page.js | 27 +----- frappe/website/doctype/web_page/web_page.py | 18 ---- .../web_page_block/web_page_block.json | 31 +++++- .../doctype/web_page_block/web_page_block.py | 22 ++++- .../web_template_field.json | 13 ++- .../doctype/website_theme/website_theme.js | 3 + .../doctype/website_theme/website_theme.json | 36 +++---- .../doctype/website_theme/website_theme.py | 2 +- .../footer_horizontal/__init__.py | 0 .../footer_horizontal/footer_horizontal.html | 25 +++++ .../footer_horizontal/footer_horizontal.json | 97 +++++++++++++++++++ frappe/website/web_template/hero/__init__.py | 0 frappe/website/web_template/hero/hero.html | 31 ++++++ frappe/website/web_template/hero/hero.json | 50 ++++++++++ .../hero_with_right_image.html | 12 ++- .../website/web_template/markdown/__init__.py | 0 .../web_template/markdown/markdown.html | 3 + .../web_template/markdown/markdown.json | 19 ++++ .../navbar_with_links_on_right/__init__.py | 0 .../navbar_with_links_on_right.html | 26 +++++ .../navbar_with_links_on_right.json | 97 +++++++++++++++++++ .../section_with_big_cards.html | 13 ++- .../section_with_big_cards.json | 53 ++++++++-- 32 files changed, 631 insertions(+), 110 deletions(-) create mode 100644 frappe/public/js/frappe/utils/web_page_block.js create mode 100644 frappe/templates/components/web_block.html create mode 100644 frappe/templates/components/web_blocks.html delete mode 100644 frappe/templates/components/web_page_section.html create mode 100644 frappe/website/web_template/footer_horizontal/__init__.py create mode 100644 frappe/website/web_template/footer_horizontal/footer_horizontal.html create mode 100644 frappe/website/web_template/footer_horizontal/footer_horizontal.json create mode 100644 frappe/website/web_template/hero/__init__.py create mode 100644 frappe/website/web_template/hero/hero.html create mode 100644 frappe/website/web_template/hero/hero.json create mode 100644 frappe/website/web_template/markdown/__init__.py create mode 100644 frappe/website/web_template/markdown/markdown.html create mode 100644 frappe/website/web_template/markdown/markdown.json create mode 100644 frappe/website/web_template/navbar_with_links_on_right/__init__.py create mode 100644 frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html create mode 100644 frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.json diff --git a/frappe/public/js/frappe/utils/web_page_block.js b/frappe/public/js/frappe/utils/web_page_block.js new file mode 100644 index 0000000000..bcf821bcfa --- /dev/null +++ b/frappe/public/js/frappe/utils/web_page_block.js @@ -0,0 +1,23 @@ +frappe.ui.form.on('Web Page Block', { + edit_values(frm, cdt, cdn) { + let row = frm.selected_doc; + frappe.model.with_doc('Web Template', row.web_template).then(doc => { + let d = new frappe.ui.Dialog({ + title: __('Edit Values'), + fields: doc.fields, + primary_action(values) { + frappe.model.set_value( + cdt, + cdn, + 'web_template_values', + JSON.stringify(values) + ); + d.hide(); + } + }); + let values = JSON.parse(row.web_template_values || '{}'); + d.set_values(values); + d.show(); + }); + } +}); diff --git a/frappe/public/tailwind.css b/frappe/public/tailwind.css index 98a3b3a032..f0667bd10c 100644 --- a/frappe/public/tailwind.css +++ b/frappe/public/tailwind.css @@ -5,4 +5,92 @@ details.dropdown summary::-webkit-details-marker { display: none; } +.from-markdown { + @apply text-xl; + @apply text-gray-900; + @apply leading-relaxed; + @apply py-20; + + > * + * { + @apply mt-6; + } + + > :first-child { + margin-top: 0; + } + + ul, + ol { + @apply pl-10; + } + + ul { + @apply list-disc; + } + + ol { + @apply list-decimal; + } + + li > * + * { + @apply mt-4; + } + + > ul > * + *, + > ol > * + * { + @apply mt-4; + } + + > blockquote { + @apply px-6 py-4 text-lg text-gray-900 border border-l-4 border-gray-800; + } + + > h1 { + @apply text-4xl; + @apply mt-16; + @apply mb-4; + @apply leading-none; + @apply font-bold; + } + + > h2 { + @apply mt-16; + @apply mb-4; + @apply leading-none; + @apply font-bold; + @apply text-3xl; + } + + > h3 { + @apply mt-16; + @apply mb-4; + @apply leading-none; + @apply font-bold; + @apply text-2xl; + } + + > a, + > p a, + > ul li a, + > ol li a { + @apply border-b border-gray-800; + &:hover { + @apply text-gray-700; + } + } + + tr > td, + tr > th { + @apply px-4 py-2 border border-gray-800; + } + + th:empty { + display: none; + } + + img { + @apply border border-gray-800; + } +} + @tailwind utilities; diff --git a/frappe/templates/components/web_block.html b/frappe/templates/components/web_block.html new file mode 100644 index 0000000000..d61fb79dee --- /dev/null +++ b/frappe/templates/components/web_block.html @@ -0,0 +1,13 @@ +{%- set htmltag = htmltag or 'section' -%} +{%- set classes = resolve_class([ + { + 'py-32': web_block.add_padding, + 'bg-gray-100': web_block.add_shade, + }, + web_block.css_class +]) -%} +<{{htmltag}} class="{{ classes }}" data-section-idx="{{ web_block.idx | e }}" data-section-template="{{ web_block.web_template | e }}"> +
    + {{ web_block.render() }} +
    + diff --git a/frappe/templates/components/web_blocks.html b/frappe/templates/components/web_blocks.html new file mode 100644 index 0000000000..3a9e3c5944 --- /dev/null +++ b/frappe/templates/components/web_blocks.html @@ -0,0 +1,3 @@ +{%- for web_block in web_blocks -%} +{{ c('web_block', web_block=web_block, htmltag=htmltag) }} +{%- endfor -%} diff --git a/frappe/templates/components/web_page_section.html b/frappe/templates/components/web_page_section.html deleted file mode 100644 index b44162a9b5..0000000000 --- a/frappe/templates/components/web_page_section.html +++ /dev/null @@ -1,5 +0,0 @@ -
    -
    - {{ section.rendered_html }} -
    -
    diff --git a/frappe/templates/includes/footer/footer.html b/frappe/templates/includes/footer/footer.html index 400575148f..b2ee6a2361 100644 --- a/frappe/templates/includes/footer/footer.html +++ b/frappe/templates/includes/footer/footer.html @@ -1,8 +1,9 @@ +{%- if theme.based_on == 'Bootstrap 4' -%}
    -
    +
    {% if footer_items -%}
    {% include "templates/includes/footer/footer_items.html" %} @@ -10,13 +11,13 @@ {% endif %}
    -
    +
    {% block extension %} {% include "templates/includes/footer/footer_extension.html" %} {% endblock %}
    -
    +
    {% if copyright %} © {{ copyright }} @@ -27,8 +28,7 @@ {% endif %}
    {# powered #} -
    +
    {% block powered %} {% include "templates/includes/footer/footer_powered.html" %} {% endblock %} @@ -37,3 +37,9 @@
    + +{%- else -%} +
    +{{ c('web_blocks', web_blocks=theme.footer) }} +
    +{%- endif -%} diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html index 220970f754..cdab27c366 100644 --- a/frappe/templates/includes/navbar/navbar.html +++ b/frappe/templates/includes/navbar/navbar.html @@ -19,5 +19,5 @@
    {%- else -%} -{{ c('navbar', theme=theme) }} +{{ c('web_blocks', web_blocks=theme.navbar, htmltag='nav') }} {%- endif -%} diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 8c8cc74fc4..c73858f1e2 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -22,6 +22,7 @@ def get_jenv(): jenv.globals.update({ 'component': component, 'c': component, + 'resolve_class': resolve_class, 'inspect': inspect }) @@ -178,21 +179,23 @@ def component(name, **kwargs): context['class'] = resolve_class(context['class']) else: context['class'] = '' - context['resolve_class'] = resolve_class return get_jenv().from_string(html).render(context) def resolve_class(classes): import frappe + if classes is None: + return '' + if isinstance(classes, frappe.string_types): return classes if isinstance(classes, (list, tuple)): - return ' '.join([resolve_class(c) for c in classes]) + return ' '.join([resolve_class(c) for c in classes]).strip() if isinstance(classes, dict): - return ' '.join([classname for classname in classes if classes[classname]]) + return ' '.join([classname for classname in classes if classes[classname]]).strip() return classes diff --git a/frappe/website/doctype/web_page/templates/web_page.html b/frappe/website/doctype/web_page/templates/web_page.html index ce4e52b312..e951121faa 100644 --- a/frappe/website/doctype/web_page/templates/web_page.html +++ b/frappe/website/doctype/web_page/templates/web_page.html @@ -16,9 +16,7 @@ {% block page_content %} {%- if content_type == 'Page Builder' -%} -{%- for section in page_builder_sections -%} -{{ c('web_page_section', section=section) }} -{%- endfor -%} +{{ c('web_blocks', web_blocks=doc.page_blocks) }} {%- else -%}
    {% include "templates/includes/slideshow.html" %} diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js index 8eb882bae6..c0a3bcdc20 100644 --- a/frappe/website/doctype/web_page/web_page.js +++ b/frappe/website/doctype/web_page/web_page.js @@ -2,6 +2,9 @@ // MIT License. See license.txt frappe.ui.form.on('Web Page', { + onload: function() { + frappe.require('/assets/frappe/js/frappe/utils/web_page_block.js'); + }, title: function(frm) { if (frm.doc.title && !frm.doc.route) { frm.set_value('route', frappe.scrub(frm.doc.title, '-')); @@ -45,27 +48,3 @@ frappe.ui.form.on('Web Page', { frappe.utils.set_meta_tag(frm.doc.route); } }); - -frappe.ui.form.on('Web Page Block', { - edit_values(frm, cdt, cdn) { - let row = frm.selected_doc; - frappe.model.with_doc('Web Template', row.web_template).then(doc => { - let d = new frappe.ui.Dialog({ - title: __('Edit Values'), - fields: doc.fields, - primary_action(values) { - frappe.model.set_value( - cdt, - cdn, - 'web_template_values', - JSON.stringify(values) - ); - d.hide(); - } - }); - let values = JSON.parse(row.web_template_values || '{}'); - d.set_values(values); - d.show(); - }); - } -}); diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index e3feb41cbb..cce28af213 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -54,7 +54,6 @@ class WebPage(WebsiteGenerator): self.set_metatags(context) self.set_breadcrumbs(context) self.set_title_and_header(context) - self.build_page_blocks(context) return context @@ -105,23 +104,6 @@ class WebPage(WebsiteGenerator): if not context.title and context.header: context.title = strip_html(context.header) - def build_page_blocks(self, context): - if self.content_type != 'Page Builder': - return - - sections = [] - - for block in self.page_blocks: - values = frappe.parse_json(block.web_template_values) - rendered_html = get_rendered_template(block.web_template, values) - section = frappe._dict() - section.title = block.title - section.css_class = block.css_class - section.rendered_html = rendered_html - sections.append(section) - - context.page_builder_sections = sections - def add_hero(self, context): """Add a hero element if specified in content or hooks. Hero elements get full page width.""" diff --git a/frappe/website/doctype/web_page_block/web_page_block.json b/frappe/website/doctype/web_page_block/web_page_block.json index 64bf07cf52..b415567bd0 100644 --- a/frappe/website/doctype/web_page_block/web_page_block.json +++ b/frappe/website/doctype/web_page_block/web_page_block.json @@ -8,7 +8,11 @@ "web_template", "edit_values", "web_template_values", - "css_class" + "css_class", + "column_break_5", + "add_container", + "add_padding", + "add_shade" ], "fields": [ { @@ -27,6 +31,7 @@ { "fieldname": "web_template_values", "fieldtype": "Code", + "hidden": 1, "label": "Web Template Values", "options": "JSON" }, @@ -34,11 +39,33 @@ "fieldname": "css_class", "fieldtype": "Small Text", "label": "CSS Class" + }, + { + "fieldname": "column_break_5", + "fieldtype": "Column Break" + }, + { + "default": "1", + "fieldname": "add_padding", + "fieldtype": "Check", + "label": "Add Padding" + }, + { + "default": "0", + "fieldname": "add_shade", + "fieldtype": "Check", + "label": "Shaded Section" + }, + { + "default": "1", + "fieldname": "add_container", + "fieldtype": "Check", + "label": "Add Container" } ], "istable": 1, "links": [], - "modified": "2020-04-18 12:50:00.070761", + "modified": "2020-04-19 16:16:44.524042", "modified_by": "Administrator", "module": "Website", "name": "Web Page Block", diff --git a/frappe/website/doctype/web_page_block/web_page_block.py b/frappe/website/doctype/web_page_block/web_page_block.py index f0e5f12ed6..fbf06c6b16 100644 --- a/frappe/website/doctype/web_page_block/web_page_block.py +++ b/frappe/website/doctype/web_page_block/web_page_block.py @@ -3,8 +3,26 @@ # For license information, please see license.txt from __future__ import unicode_literals -# import frappe + +import frappe from frappe.model.document import Document +from frappe.website.doctype.web_template.web_template import get_rendered_template + class WebPageBlock(Document): - pass + def render(self): + values = frappe.parse_json(self.web_template_values) + rendered_html = get_rendered_template(self.web_template, values) + return rendered_html + + +def render_web_page_blocks(blocks): + for block in blocks: + context = frappe._dict() + context.dark_theme = block.dark_theme + values = frappe.parse_json(block.web_template_values) + context.update(values) + rendered_html = get_rendered_template(block.web_template, context) + section = frappe._dict(block.as_dict()) + section.rendered_html = rendered_html + sections.append(section) diff --git a/frappe/website/doctype/web_template_field/web_template_field.json b/frappe/website/doctype/web_template_field/web_template_field.json index af0aaf9ef7..11e7de888c 100644 --- a/frappe/website/doctype/web_template_field/web_template_field.json +++ b/frappe/website/doctype/web_template_field/web_template_field.json @@ -7,7 +7,8 @@ "field_order": [ "label", "fieldname", - "fieldtype" + "fieldtype", + "reqd" ], "fields": [ { @@ -28,13 +29,19 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Fieldtype", - "options": "Data\nSmall Text\nText\nAttach Image", + "options": "Data\nSmall Text\nText\nAttach Image\nMarkdown Editor", "reqd": 1 + }, + { + "default": "0", + "fieldname": "reqd", + "fieldtype": "Check", + "label": "Mandatory" } ], "istable": 1, "links": [], - "modified": "2020-04-17 19:30:33.829203", + "modified": "2020-04-19 15:56:01.606898", "modified_by": "Administrator", "module": "Website", "name": "Web Template Field", diff --git a/frappe/website/doctype/website_theme/website_theme.js b/frappe/website/doctype/website_theme/website_theme.js index b39bd5defe..6383945fe4 100644 --- a/frappe/website/doctype/website_theme/website_theme.js +++ b/frappe/website/doctype/website_theme/website_theme.js @@ -2,6 +2,9 @@ // MIT License. See license.txt frappe.ui.form.on('Website Theme', { + onload: function() { + frappe.require('/assets/frappe/js/frappe/utils/web_page_block.js'); + }, refresh(frm) { frm.clear_custom_buttons(); frm.toggle_display(["module", "custom"], !frappe.boot.developer_mode); diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index fb365e4a7f..324321da40 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -18,11 +18,9 @@ "theme_json", "theme_url", "navbar_section", - "navbar_items", - "primary_action_label", - "primary_action_url", + "navbar", "footer_section", - "footer_items", + "footer", "custom_js_section", "js" ], @@ -92,12 +90,6 @@ "fieldtype": "Section Break", "label": "Navbar" }, - { - "fieldname": "navbar_items", - "fieldtype": "Table", - "label": "Navbar Items", - "options": "Top Bar Item" - }, { "depends_on": "eval:doc.based_on=='Tailwind'", "fieldname": "tailwind_theme_section", @@ -115,30 +107,26 @@ "fieldtype": "Color", "label": "Brand Color" }, - { - "fieldname": "primary_action_label", - "fieldtype": "Data", - "label": "Primary Action Label" - }, - { - "fieldname": "primary_action_url", - "fieldtype": "Data", - "label": "Primary Action URL" - }, { "fieldname": "footer_section", "fieldtype": "Section Break", "label": "Footer" }, { - "fieldname": "footer_items", + "fieldname": "navbar", "fieldtype": "Table", - "label": "Footer Items", - "options": "Top Bar Item" + "label": "Navbar", + "options": "Web Page Block" + }, + { + "fieldname": "footer", + "fieldtype": "Table", + "label": "Footer", + "options": "Web Page Block" } ], "links": [], - "modified": "2020-04-17 21:23:13.735307", + "modified": "2020-04-19 13:43:18.722297", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index f16fc90d79..25f2acca33 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -96,7 +96,7 @@ def add_website_theme(context): if not context.disable_website_theme: website_theme = get_active_theme() - context.theme = website_theme and website_theme.as_dict() or frappe._dict() + context.theme = website_theme or frappe._dict() def get_active_theme(): website_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme") diff --git a/frappe/website/web_template/footer_horizontal/__init__.py b/frappe/website/web_template/footer_horizontal/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.html b/frappe/website/web_template/footer_horizontal/footer_horizontal.html new file mode 100644 index 0000000000..507c80bd42 --- /dev/null +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.html @@ -0,0 +1,25 @@ +
    +
    + Brand Logo +
    +
    + {%- for index in ['1', '2', '3', '4', '5'] -%} + + {%- set label = values['item_' + index + '_label'] -%} + {%- set url = values['item_' + index + '_url'] -%} + + {%- if label and url -%} + {{ c('navbar_link', label=label, url=url) }} + {%- endif -%} + + {%- endfor -%} +
    +
    +
    + {{ address }} +
    +
    + {{ copyright }} +
    +
    +
    diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.json b/frappe/website/web_template/footer_horizontal/footer_horizontal.json new file mode 100644 index 0000000000..9a66e1d555 --- /dev/null +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.json @@ -0,0 +1,97 @@ +{ + "creation": "2020-04-19 15:01:23.344637", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "brand_image", + "fieldtype": "Attach Image", + "label": "Brand Image", + "reqd": 0 + }, + { + "fieldname": "brand_label", + "fieldtype": "Data", + "label": "Brand Label", + "reqd": 0 + }, + { + "fieldname": "address", + "fieldtype": "Small Text", + "label": "Address", + "reqd": 0 + }, + { + "fieldname": "copyright", + "fieldtype": "Small Text", + "label": "Copyright", + "reqd": 0 + }, + { + "fieldname": "item_1_label", + "fieldtype": "Data", + "label": "Item 1 Label", + "reqd": 0 + }, + { + "fieldname": "item_1_url", + "fieldtype": "Data", + "label": "Item 1 URL", + "reqd": 0 + }, + { + "fieldname": "item_2_label", + "fieldtype": "Data", + "label": "Item 2 Label", + "reqd": 0 + }, + { + "fieldname": "item_2_url", + "fieldtype": "Data", + "label": "Item 2 URL", + "reqd": 0 + }, + { + "fieldname": "item_3_label", + "fieldtype": "Data", + "label": "Item 3 Label", + "reqd": 0 + }, + { + "fieldname": "item_3_url", + "fieldtype": "Data", + "label": "Item 3 URL", + "reqd": 0 + }, + { + "fieldname": "item_4_label", + "fieldtype": "Data", + "label": "Item 4 Label", + "reqd": 0 + }, + { + "fieldname": "item_4_url", + "fieldtype": "Data", + "label": "Item 4 URL", + "reqd": 0 + }, + { + "fieldname": "item_5_label", + "fieldtype": "Data", + "label": "Item 5 Label", + "reqd": 0 + }, + { + "fieldname": "item_5_url", + "fieldtype": "Data", + "label": "Item 5 URL", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2020-04-19 15:11:42.097670", + "modified_by": "Administrator", + "name": "Footer Horizontal", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/hero/__init__.py b/frappe/website/web_template/hero/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/hero/hero.html b/frappe/website/web_template/hero/hero.html new file mode 100644 index 0000000000..a3f1ada408 --- /dev/null +++ b/frappe/website/web_template/hero/hero.html @@ -0,0 +1,31 @@ +
    +

    + {{ title }} +

    + {%- if subtitle -%} +

    + {{ subtitle }} +

    + {%- endif -%} + {%- if primary_action or secondary_action -%} +
    + {%- if primary_action -%} +
    + + {{ primary_action_label }} + +
    + {%- endif -%} + {%- if secondary_action -%} +
    + + {{ secondary_action_label }} + +
    + {%- endif -%} +
    + {%- endif -%} +
    diff --git a/frappe/website/web_template/hero/hero.json b/frappe/website/web_template/hero/hero.json new file mode 100644 index 0000000000..97fdbab7e0 --- /dev/null +++ b/frappe/website/web_template/hero/hero.json @@ -0,0 +1,50 @@ +{ + "creation": "2020-04-19 15:26:23.140620", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "reqd": 0 + }, + { + "fieldname": "subtitle", + "fieldtype": "Text", + "label": "Subtitle", + "reqd": 0 + }, + { + "fieldname": "primary_action_label", + "fieldtype": "Data", + "label": "Primary Action Label", + "reqd": 0 + }, + { + "fieldname": "primary_action", + "fieldtype": "Data", + "label": "Primary Action", + "reqd": 0 + }, + { + "fieldname": "secondary_action_label", + "fieldtype": "Data", + "label": "Secondary Action Label", + "reqd": 0 + }, + { + "fieldname": "secondary_action", + "fieldtype": "Data", + "label": "Secondary Action", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2020-04-19 15:26:23.140620", + "modified_by": "Administrator", + "name": "Hero", + "owner": "Administrator", + "standard": 1, + "template": "" +} \ No newline at end of file diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html index 3adf9b88ed..a5855d95c1 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -1,16 +1,18 @@ -
    +
    -
    +

    {{ title }}

    + {%- if subtitle -%}

    {{ subtitle }}

    + {%- endif -%}
    {%- if primary_action -%}
    @@ -32,8 +34,10 @@
    -
    -
    +
    + {%- if image -%} +
    + {%- endif -%}
    diff --git a/frappe/website/web_template/markdown/__init__.py b/frappe/website/web_template/markdown/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/markdown/markdown.html b/frappe/website/web_template/markdown/markdown.html new file mode 100644 index 0000000000..b086dd327c --- /dev/null +++ b/frappe/website/web_template/markdown/markdown.html @@ -0,0 +1,3 @@ +
    + {{ frappe.utils.md_to_html(content) }} +
    diff --git a/frappe/website/web_template/markdown/markdown.json b/frappe/website/web_template/markdown/markdown.json new file mode 100644 index 0000000000..34db1d1aab --- /dev/null +++ b/frappe/website/web_template/markdown/markdown.json @@ -0,0 +1,19 @@ +{ + "creation": "2020-04-19 15:56:20.833205", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "content", + "fieldtype": "Markdown Editor", + "label": "Content", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2020-04-19 15:56:20.833205", + "modified_by": "Administrator", + "name": "Markdown", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/navbar_with_links_on_right/__init__.py b/frappe/website/web_template/navbar_with_links_on_right/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html new file mode 100644 index 0000000000..ee8b5c17bd --- /dev/null +++ b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html @@ -0,0 +1,26 @@ +
    +
    +
    + + Brand Logo + +
    +
    + {%- for index in ['1', '2', '3', '4', '5'] -%} + + {%- set label = values['item_' + index + '_label'] -%} + {%- set url = values['item_' + index + '_url'] -%} + + {%- if label and url -%} + {{ c('navbar_link', label=label, url=url) }} + {%- endif -%} + + {%- endfor -%} + + {%- if cta_label and cta_url -%} + {{ c('button', label=cta_label, url=cta_url, variant="primary") }} + {%- endif -%} +
    +
    +
    diff --git a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.json b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.json new file mode 100644 index 0000000000..8b3200d19e --- /dev/null +++ b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.json @@ -0,0 +1,97 @@ +{ + "creation": "2020-04-19 13:49:33.971237", + "docstatus": 0, + "doctype": "Web Template", + "fields": [ + { + "fieldname": "brand_image", + "fieldtype": "Attach Image", + "label": "Brand Image", + "reqd": 0 + }, + { + "fieldname": "brand_label", + "fieldtype": "Data", + "label": "Brand Label", + "reqd": 0 + }, + { + "fieldname": "cta_label", + "fieldtype": "Data", + "label": "CTA Label", + "reqd": 0 + }, + { + "fieldname": "cta_url", + "fieldtype": "Data", + "label": "CTA URL", + "reqd": 0 + }, + { + "fieldname": "item_1_label", + "fieldtype": "Data", + "label": "Item 1 Label", + "reqd": 0 + }, + { + "fieldname": "item_1_url", + "fieldtype": "Data", + "label": "Item 1 URL", + "reqd": 0 + }, + { + "fieldname": "item_2_label", + "fieldtype": "Data", + "label": "Item 2 Label", + "reqd": 0 + }, + { + "fieldname": "item_2_url", + "fieldtype": "Data", + "label": "Item 2 URL", + "reqd": 0 + }, + { + "fieldname": "item_3_label", + "fieldtype": "Data", + "label": "Item 3 Label", + "reqd": 0 + }, + { + "fieldname": "item_3_url", + "fieldtype": "Data", + "label": "Item 3 URL", + "reqd": 0 + }, + { + "fieldname": "item_4_label", + "fieldtype": "Data", + "label": "Item 4 Label", + "reqd": 0 + }, + { + "fieldname": "item_4_url", + "fieldtype": "Data", + "label": "Item 4 URL", + "reqd": 0 + }, + { + "fieldname": "item_5_label", + "fieldtype": "Data", + "label": "Item 5 Label", + "reqd": 0 + }, + { + "fieldname": "item_5_url", + "fieldtype": "Data", + "label": "Item 5 URL", + "reqd": 0 + } + ], + "idx": 0, + "modified": "2020-04-19 13:51:26.391098", + "modified_by": "Administrator", + "name": "Navbar with Links on Right", + "owner": "Administrator", + "standard": 1 +} \ No newline at end of file diff --git a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html index 838fed22ce..286c4ef961 100644 --- a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html +++ b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.html @@ -1,8 +1,8 @@ -{%- macro card(title, content) -%} -
    +{%- macro card(title, content, url) -%} +

    {{ title }}

    {{ content }}

    -
    + {%- endmacro -%} @@ -11,8 +11,11 @@ {%- endif -%}
    {%- for index in ['1', '2', '3', '4'] -%} - {%- if values['card_' + index + '_title'] -%} - {{ card(values['card_' + index + '_title'], values['card_' + index + '_content']) }} + {%- set title = values['card_' + index + '_title'] -%} + {%- set content = values['card_' + index + '_content'] -%} + {%- set url = values['card_' + index + '_url'] -%} + {%- if title -%} + {{ card(title, content, url) }} {%- endif -%} {%- endfor -%}
    diff --git a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json index a47e010b92..f29d2bd79c 100644 --- a/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json +++ b/frappe/website/web_template/section_with_big_cards/section_with_big_cards.json @@ -6,51 +6,84 @@ { "fieldname": "title", "fieldtype": "Data", - "label": "Title" + "label": "Title", + "reqd": 0 }, { "fieldname": "card_1_title", "fieldtype": "Data", - "label": "Card 1 Title" + "label": "Card 1 Title", + "reqd": 0 }, { "fieldname": "card_1_content", "fieldtype": "Text", - "label": "Card 1 Content" + "label": "Card 1 Content", + "reqd": 0 + }, + { + "fieldname": "card_1_url", + "fieldtype": "Data", + "label": "Card 1 URL", + "reqd": 0 }, { "fieldname": "card_2_title", "fieldtype": "Data", - "label": "Card 2 Title" + "label": "Card 2 Title", + "reqd": 0 }, { "fieldname": "card_2_content", "fieldtype": "Text", - "label": "Card 2 Content" + "label": "Card 2 Content", + "reqd": 0 + }, + { + "fieldname": "card_2_url", + "fieldtype": "Data", + "label": "Card 2 URL", + "reqd": 0 }, { "fieldname": "card_3_title", "fieldtype": "Data", - "label": "Card 3 Title" + "label": "Card 3 Title", + "reqd": 0 }, { "fieldname": "card_3_content", "fieldtype": "Text", - "label": "Card 3 Content" + "label": "Card 3 Content", + "reqd": 0 + }, + { + "fieldname": "card_3_url", + "fieldtype": "Data", + "label": "Card 3 URL", + "reqd": 0 }, { "fieldname": "card_4_title", "fieldtype": "Data", - "label": "Card 4 Title" + "label": "Card 4 Title", + "reqd": 0 }, { "fieldname": "card_4_content", "fieldtype": "Text", - "label": "Card 4 Content" + "label": "Card 4 Content", + "reqd": 0 + }, + { + "fieldname": "card_4_url", + "fieldtype": "Data", + "label": "Card 4 URL", + "reqd": 0 } ], "idx": 0, - "modified": "2020-04-17 19:42:19.712813", + "modified": "2020-04-19 15:57:56.743514", "modified_by": "Administrator", "name": "Section with Big Cards", "owner": "Administrator", From 9f26548b3101853884d9bb63690a6e90617ddaaa Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 19 Apr 2020 18:01:06 +0530 Subject: [PATCH 077/337] fix(minor): update web page test and allow dashboards for custom doctype --- .../doctype/data_import/test_exporter_new.py | 2 +- frappe/desk/form/meta.py | 2 - frappe/model/meta.py | 18 +- frappe/website/doctype/blogger/blogger.json | 348 +++++------------- 4 files changed, 102 insertions(+), 268 deletions(-) diff --git a/frappe/core/doctype/data_import/test_exporter_new.py b/frappe/core/doctype/data_import/test_exporter_new.py index 7464d6edc5..06d7879a09 100644 --- a/frappe/core/doctype/data_import/test_exporter_new.py +++ b/frappe/core/doctype/data_import/test_exporter_new.py @@ -20,7 +20,7 @@ class TestExporter(unittest.TestCase): e = Exporter('Web Page', export_fields='All') csv_array = e.get_csv_array() header = csv_array[0] - self.assertEqual(len(header), 24) + self.assertEqual(len(header), 25) def test_exports_selected_fields(self): diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py index 26fc6037fd..ba0e5c2216 100644 --- a/frappe/desk/form/meta.py +++ b/frappe/desk/form/meta.py @@ -196,8 +196,6 @@ class FormMeta(Meta): self.get("__messages").update(messages, as_value=True) def load_dashboard(self): - if self.custom: - return self.set('__dashboard', self.get_dashboard_data()) def load_kanban_meta(self): diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 9c71f8c0b1..2321e0c22a 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -425,17 +425,19 @@ class Meta(Document): implemented in other Frappe applications via hooks. ''' data = frappe._dict() - try: - module = load_doctype_module(self.name, suffix='_dashboard') - if hasattr(module, 'get_data'): - data = frappe._dict(module.get_data()) - except ImportError: - pass + if not self.custom: + try: + module = load_doctype_module(self.name, suffix='_dashboard') + if hasattr(module, 'get_data'): + data = frappe._dict(module.get_data()) + except ImportError: + pass self.add_doctype_links(data) - for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []): - data = frappe.get_attr(hook)(data=data) + if not self.custom: + for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []): + data = frappe.get_attr(hook)(data=data) return data diff --git a/frappe/website/doctype/blogger/blogger.json b/frappe/website/doctype/blogger/blogger.json index be4eb6399e..b8165a5908 100644 --- a/frappe/website/doctype/blogger/blogger.json +++ b/frappe/website/doctype/blogger/blogger.json @@ -1,274 +1,108 @@ { - "allow_copy": 0, - "allow_import": 1, - "allow_rename": 0, - "autoname": "field:short_name", - "beta": 0, - "creation": "2013-03-25 16:00:51", - "custom": 0, - "description": "User ID of a Blogger", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Setup", - "editable_grid": 0, + "actions": [], + "allow_import": 1, + "autoname": "field:short_name", + "creation": "2013-03-25 16:00:51", + "description": "User ID of a Blogger", + "doctype": "DocType", + "document_type": "Setup", + "engine": "InnoDB", + "field_order": [ + "disabled", + "short_name", + "full_name", + "user", + "bio", + "avatar", + "posts" + ], "fields": [ { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "disabled", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Disabled", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "disabled", + "fieldtype": "Check", + "label": "Disabled" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "Will be used in url (usually first name).", - "fieldname": "short_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Short Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "description": "Will be used in url (usually first name).", + "fieldname": "short_name", + "fieldtype": "Data", + "label": "Short Name", + "reqd": 1, + "unique": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "full_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Full Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "full_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Full Name", + "reqd": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "User", - "length": 0, - "no_copy": 0, - "options": "User", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "user", + "fieldtype": "Link", + "label": "User", + "options": "User" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "bio", - "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Bio", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "bio", + "fieldtype": "Small Text", + "label": "Bio" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "avatar", - "fieldtype": "Attach", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Avatar", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "avatar", + "fieldtype": "Attach", + "label": "Avatar" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "posts", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Posts", - "length": 0, - "no_copy": 1, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldname": "posts", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Posts", + "no_copy": 1, + "read_only": 1 } - ], - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-user", - "idx": 1, - "image_view": 0, - "in_create": 0, - - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 1, - "modified": "2018-10-10 14:40:40.407657", - "modified_by": "Administrator", - "module": "Website", - "name": "Blogger", - "owner": "Administrator", + ], + "icon": "fa fa-user", + "idx": 1, + "links": [ + { + "link_doctype": "Blog Post", + "link_fieldname": "blogger" + } + ], + "max_attachments": 1, + "modified": "2020-04-19 08:21:09.684300", + "modified_by": "Administrator", + "module": "Website", + "name": "Blogger", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 1, - "is_custom": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Website Manager", - "set_user_permissions": 1, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "import": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Website Manager", + "set_user_permissions": 1, + "share": 1, "write": 1 - }, + }, { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "is_custom": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "Blogger", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "email": 1, + "print": 1, + "read": 1, + "role": "Blogger", + "share": 1, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "title_field": "full_name", - "track_changes": 1, - "track_seen": 0 + ], + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "full_name", + "track_changes": 1 } \ No newline at end of file From e821d95a01139cc6ef5be844a3f1503340d30ef7 Mon Sep 17 00:00:00 2001 From: RJPvT <48353029+RJPvT@users.noreply.github.com> Date: Sun, 19 Apr 2020 15:51:47 +0200 Subject: [PATCH 078/337] fix: two_factor_is_enabled needs username --- frappe/twofactor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/twofactor.py b/frappe/twofactor.py index e60113215b..b44092d6a1 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -374,11 +374,11 @@ def delete_qrimage(user, check_expiry=False): def delete_all_barcodes_for_users(): '''Task to delete all barcodes for user.''' - if not two_factor_is_enabled(): - return users = frappe.get_all('User', {'enabled':1}) for user in users: + if not two_factor_is_enabled(user=user.name): + continue delete_qrimage(user.name, check_expiry=True) def should_remove_barcode_image(barcode): From be14e59d4aab9fdd4848f3dd123cdac2ccf43c01 Mon Sep 17 00:00:00 2001 From: RJPvT <48353029+RJPvT@users.noreply.github.com> Date: Sun, 19 Apr 2020 15:58:29 +0200 Subject: [PATCH 079/337] fix: no need for password check --- frappe/auth.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/auth.py b/frappe/auth.py index dba8b05a62..1353acf10f 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -219,7 +219,10 @@ class LoginManager: user = frappe.db.get_value("User", filters={"username": user}, fieldname="name") or user self.check_if_enabled(user) - self.user = self.check_password(user, pwd) + if not frappe.form_dict.get('tmp_id'): + self.user = self.check_password(user, pwd) + else: + self.user = user def force_user_to_reset_password(self): if not self.user: From 2fd199650678213a43fb2751e084f75306dc0873 Mon Sep 17 00:00:00 2001 From: RJPvT <48353029+RJPvT@users.noreply.github.com> Date: Sun, 19 Apr 2020 16:02:19 +0200 Subject: [PATCH 080/337] fix: check if ldap user requires 2fa on login --- frappe/integrations/doctype/ldap_settings/ldap_settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index 558f7117c0..80dfef2693 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe import _, safe_encode from frappe.model.document import Document - +from frappe.twofactor import (should_run_2fa, authenticate_for_2factor,confirm_otp_token) class LDAPSettings(Document): def validate(self): @@ -237,6 +237,10 @@ def login(): user = ldap.authenticate(frappe.as_unicode(args.usr), frappe.as_unicode(args.pwd)) frappe.local.login_manager.user = user.name + if should_run_2fa(user.name): + authenticate_for_2factor(user.name) + if not confirm_otp_token(frappe.local.login_manager): + return False frappe.local.login_manager.post_login() # because of a GET request! From 624470b088b5bd06e95f77757a2fdd5f53a7b605 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Sun, 19 Apr 2020 20:45:47 +0530 Subject: [PATCH 081/337] fix: allow modifying standard theme in migrate Signed-off-by: Chinmay D. Pai --- frappe/website/doctype/website_theme/website_theme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index d0ce582482..a1b475450d 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -25,7 +25,7 @@ class WebsiteTheme(Document): def is_standard_and_not_valid_user(self): return (not self.custom and not frappe.local.conf.get('developer_mode') - and not (frappe.flags.in_import or frappe.flags.in_test)) + and not (frappe.flags.in_import or frappe.flags.in_test or frappe.flags.in_migrate)) def on_trash(self): if self.is_standard_and_not_valid_user(): From 3b5a1aaa3f505cf6ef87435bc21fce1e3a366a03 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 21:56:31 +0530 Subject: [PATCH 082/337] fix: fix position of mandatory field in docfield --- frappe/core/doctype/docfield/docfield.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index 4614dd09c4..6d8ee41a5a 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -11,9 +11,9 @@ "label", "fieldtype", "fieldname", - "reqd", "precision", "length", + "reqd", "search_index", "in_list_view", "in_standard_filter", @@ -453,7 +453,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2020-04-15 02:26:03.310781", + "modified": "2020-04-19 21:54:13.783908", "modified_by": "Administrator", "module": "Core", "name": "DocField", From 982600fab04d05084071189adbc533c221d53ae5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 19 Apr 2020 22:02:03 +0530 Subject: [PATCH 083/337] fix(metatags): Better Meta Tags for Web Page and Web View --- frappe/website/context.py | 25 ++++++--------- frappe/website/doctype/web_page/web_page.json | 31 +++++++++++++++++-- frappe/website/doctype/web_page/web_page.py | 8 ++--- frappe/website/doctype/web_view/web_view.json | 28 +++++++++++++++-- frappe/website/doctype/web_view/web_view.py | 9 ++++++ 5 files changed, 76 insertions(+), 25 deletions(-) diff --git a/frappe/website/context.py b/frappe/website/context.py index dcef22af43..dc3af34de9 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -221,24 +221,24 @@ def add_metatags(context): tags = frappe._dict(context.get("metatags") or {}) if tags: - if not "twitter:card" in tags: - tags["twitter:card"] = "summary_large_image" - if not "og:type" in tags: tags["og:type"] = "article" - if tags.get("name"): - tags["og:title"] = tags["twitter:title"] = tags["name"] + name = tags.get('name') or tags.get('title') + if name: + tags["og:title"] = tags["twitter:title"] = name - if tags.get("title"): - tags["og:title"] = tags["twitter:title"] = tags["title"] - - if tags.get("description"): - tags["og:description"] = tags["twitter:description"] = tags["description"] + description = tags.get("description") or context.description + if description: + tags['description'] = tags["og:description"] = tags["twitter:description"] = description image = tags.get('image', context.image or None) if image: tags["og:image"] = tags["twitter:image:src"] = tags["image"] = frappe.utils.get_url(image) + tags['twitter:card'] = "summary_large_image" + + if context.author or tags.get('author'): + tags['author'] = context.author or tags.get('author') if context.path: tags['og:url'] = tags['url'] = frappe.utils.get_url(context.path) @@ -246,11 +246,6 @@ def add_metatags(context): if context.published_on: tags['datePublished'] = context.published_on - if context.author: - tags['author'] = context.author - - if context.description: - tags['description'] = context.description tags['language'] = frappe.local.lang or 'en' diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 5f90f3adbf..9e348d2412 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -41,6 +41,10 @@ "sb2", "header", "breadcrumbs", + "metatags_section", + "meta_title", + "meta_description", + "meta_image", "set_meta_tags" ], "fields": [ @@ -219,7 +223,7 @@ "depends_on": "eval:!doc.__islocal", "fieldname": "sb2", "fieldtype": "Section Break", - "label": "Header, Breadcrumbs and Meta Tags" + "label": "Header and Breadcrumbs" }, { "description": "HTML for header section. Optional", @@ -237,7 +241,7 @@ { "fieldname": "set_meta_tags", "fieldtype": "Button", - "label": "Set Meta Tags" + "label": "Add Custom Tags" }, { "default": "0", @@ -250,6 +254,27 @@ "fieldname": "full_width", "fieldtype": "Check", "label": "Full Width" + }, + { + "collapsible": 1, + "fieldname": "metatags_section", + "fieldtype": "Section Break", + "label": "Meta Tags" + }, + { + "fieldname": "meta_title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "meta_description", + "fieldtype": "Small Text", + "label": "Description" + }, + { + "fieldname": "meta_image", + "fieldtype": "Attach Image", + "label": "Image" } ], "has_web_view": 1, @@ -258,7 +283,7 @@ "is_published_field": "published", "links": [], "max_attachments": 20, - "modified": "2020-04-19 01:55:48.363008", + "modified": "2020-04-19 12:26:21.546908", "modified_by": "Administrator", "module": "Website", "name": "Web Page", diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 98065e4cce..da4bf31f46 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -128,13 +128,11 @@ class WebPage(WebsiteGenerator): def set_metatags(self, context): context.metatags = { - "name": context.title + "name": self.meta_title or self.title, + "description": self.meta_description, + "image": self.meta_image or find_first_image(context.main_section or "") } - image = find_first_image(context.main_section or "") - if image: - context.metatags["image"] = image - def validate_dates(self): if self.end_date: if self.start_date and get_datetime(self.end_date) < get_datetime(self.start_date): diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json index c804d31de3..8c42f51421 100644 --- a/frappe/website/doctype/web_view/web_view.json +++ b/frappe/website/doctype/web_view/web_view.json @@ -20,7 +20,11 @@ "content_html", "components", "style_section", - "css" + "css", + "metatags_section", + "meta_title", + "meta_description", + "meta_image" ], "fields": [ { @@ -88,12 +92,32 @@ "fieldname": "style_section", "fieldtype": "Section Break", "label": "Style" + }, + { + "fieldname": "metatags_section", + "fieldtype": "Section Break", + "label": "Meta Tags" + }, + { + "fieldname": "meta_title", + "fieldtype": "Data", + "label": "Title" + }, + { + "fieldname": "meta_description", + "fieldtype": "Small Text", + "label": "Description" + }, + { + "fieldname": "meta_image", + "fieldtype": "Attach Image", + "label": "Image" } ], "has_web_view": 1, "is_published_field": "published", "links": [], - "modified": "2020-04-19 05:05:43.620000", + "modified": "2020-04-19 12:25:48.014935", "modified_by": "Administrator", "module": "Website", "name": "Web View", diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py index eeebb169dc..8b441579b6 100644 --- a/frappe/website/doctype/web_view/web_view.py +++ b/frappe/website/doctype/web_view/web_view.py @@ -14,6 +14,7 @@ class WebView(WebsiteGenerator): if self.content_type=='Components': self.build_components(context) + self.set_metatags(context) return context def build_components(self, context): @@ -93,3 +94,11 @@ class WebView(WebsiteGenerator): title='Default Section', elements=[] )) + + def set_metatags(self, context): + context.metatags = { + "name": self.meta_title or context.title, + "description": self.meta_description, + "image": self.meta_image + } + From 89e0a9804bd1ade5063aedbcee070e5bc3742cdf Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 22:13:10 +0530 Subject: [PATCH 084/337] fix: add missing fullstop in system update message --- frappe/utils/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 1dfbbe5516..fe7af072cf 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -218,6 +218,6 @@ def send_private_file(path): def handle_session_stopped(): frappe.respond_as_web_page(_("Updating"), - _("Your system is being updated. Please refresh again after a few moments"), + _("Your system is being updated. Please refresh again after a few moments."), http_status_code=503, indicator_color='orange', fullpage = True, primary_action=None) return frappe.website.render.render("message", http_status_code=503) From fb4338b78035d20e6520f425a1ac852b2d878cfe Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 19 Apr 2020 22:18:24 +0530 Subject: [PATCH 085/337] fix(test): Exporter test, uses Web Page --- frappe/core/doctype/data_import/test_exporter_new.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/data_import/test_exporter_new.py b/frappe/core/doctype/data_import/test_exporter_new.py index 06d7879a09..eabf371b07 100644 --- a/frappe/core/doctype/data_import/test_exporter_new.py +++ b/frappe/core/doctype/data_import/test_exporter_new.py @@ -20,7 +20,7 @@ class TestExporter(unittest.TestCase): e = Exporter('Web Page', export_fields='All') csv_array = e.get_csv_array() header = csv_array[0] - self.assertEqual(len(header), 25) + self.assertEqual(len(header), 28) def test_exports_selected_fields(self): From 7b2f469bf01064a5af9b77811aa899cc42d1979f Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Sun, 19 Apr 2020 23:05:48 +0530 Subject: [PATCH 086/337] fix: remove nowrap from ellipsis class --- frappe/templates/styles/card_style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/templates/styles/card_style.css b/frappe/templates/styles/card_style.css index 595d974011..cf90ff0bd5 100644 --- a/frappe/templates/styles/card_style.css +++ b/frappe/templates/styles/card_style.css @@ -31,7 +31,6 @@ } .ellipsis { - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%; From a4f309a40fa208e64eefa4b7592be4fd208484dd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 20 Apr 2020 10:19:37 +0530 Subject: [PATCH 087/337] chore(formatting): some fixes for theme.scss --- .../website_theme/website_theme_template.scss | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index caad55810a..1bb4685b98 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -1,12 +1,14 @@ {% if google_font %} @import url('https://fonts.googleapis.com/css?family={{ google_font.replace(' ', '+') }}:{{ font_properties }}&display=swap'); -$font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -{% endif %} -{% if primary_color %}$primary: {{ frappe.db.get_value('Color', primary_color, 'color') }};{% endif %} -{% if dark_color %}$dark: {{ frappe.db.get_value('Color', dark_color, 'color') }};{% endif %} -{% if text_color %}$body-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif %} -{% if background_color %}$body-bg: {{ frappe.db.get_value('Color', background_color, 'color') }};{% endif %} +$font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; + +{% endif -%} + +{% if primary_color %}$primary: {{ frappe.db.get_value('Color', primary_color, 'color') }};{% endif -%} +{% if dark_color %}$dark: {{ frappe.db.get_value('Color', dark_color, 'color') }};{% endif -%} +{% if text_color %}$body-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif -%} +{% if background_color %}$body-bg: {{ frappe.db.get_value('Color', background_color, 'color') }};{% endif -%} $enable-shadows: {{ button_shadows and "true" or "false" }}; $enable-gradients: {{ button_gradients and "true" or "false" }}; @@ -14,8 +16,8 @@ $enable-rounded: {{ button_rounded_corners and "true" or "false" }}; @import "frappe/public/scss/website"; +{% if font_size -%} body { - {% if font_size %} font-size: {{ font_size }}; - {% endif %} } +{%- endif %} From 16e96b14f863dc3db7b0b3100c72cb585f18a137 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 20 Apr 2020 12:43:01 +0530 Subject: [PATCH 088/337] fix: message on reset password --- frappe/www/update-password.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index f0ee0688d4..34e5ea137d 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -57,11 +57,11 @@ frappe.ready(function() { } if(!args.old_password && !args.key) { - frappe.msgprint("{{ _("Old Password Required.") }}"); + frappe.msgprint("{{ _('Old Password Required.') }}"); return; } if(!args.new_password) { - frappe.msgprint("{{ _("New Password Required.") }}"); + frappe.msgprint("{{ _('New Password Required.') }}"); return; } frappe.call({ @@ -79,11 +79,11 @@ frappe.ready(function() { strength_indicator.addClass('hidden'); strength_message.addClass('hidden'); $('.page-card-head .indicator') - .removeClass().addClass('indicator green') - .html("{{ _('Password Updated') }}"); + .removeClass().addClass('indicator blue') + .html("{{ _('Status Updated') }}"); if(r.message) { frappe.msgprint({ - message: "{{ _("Password Updated") }}", + message: `{{ _('${r.message}') }}`, // password is updated successfully // clear any server message clear: true From f1806aa8ef9976d4617571cf8c0c443c1ca71a62 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 20 Apr 2020 12:43:24 +0530 Subject: [PATCH 089/337] fix: form not being saved on setting empty value for some fieldtypes --- frappe/public/js/frappe/form/form.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index e714418375..82478db707 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -184,13 +184,7 @@ frappe.ui.form.Form = class FrappeForm { frappe.model.on(me.doctype, "*", function(fieldname, value, doc) { // set input if(doc.name===me.docname) { - if ((value==='' || value===null) && !doc[fieldname]) { - // both the incoming and outgoing values are falsy - // the texteditor, summernote, changes nulls to empty strings on render, - // so ignore those changes - } else { - me.dirty(); - } + me.dirty(); let field = me.fields_dict[fieldname]; field && field.refresh(fieldname); From 6f1caf101f4caed049e6efa200b086bfc0577f9b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 20 Apr 2020 12:54:30 +0530 Subject: [PATCH 090/337] fix: Check if Event Consumer exists before checking for consumers the logic for event streaming has been hardcoded into `document.py` Scenario: a site (say, v12) backup needs to be restored on a v13 bench and then updated Solution: use `bench migrate`; works flawlessly. However, if this site has an app installed that isn't available on the v13 bench, then bench migrate fails. Also, `bench remove-from-installed-apps` fails, because of the absence of "Event Consumer" --- frappe/model/document.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/model/document.py b/frappe/model/document.py index 03b21ea667..f2495e9e20 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1318,6 +1318,9 @@ def make_event_update_log(doc, update_type): def check_doctype_has_consumers(doctype): """Check if doctype has event consumers for event streaming""" + if not frappe.db.exists("DocType", "Event Consumer"): + return False + event_consumers = frappe.get_all('Event Consumer') for event_consumer in event_consumers: consumer = frappe.get_doc('Event Consumer', event_consumer.name) From f6f55fa0ad682aee77a93c4af4b6e571244b6d8f Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 20 Apr 2020 13:32:18 +0530 Subject: [PATCH 091/337] fix(background jobs): Show method name on Background Jobs page. (#10014) After https://github.com/frappe/frappe/pull/8486 background jobs page doesn't provide any information. --- frappe/core/page/background_jobs/background_jobs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/page/background_jobs/background_jobs.py b/frappe/core/page/background_jobs/background_jobs.py index c8a2352968..4a94de4ace 100644 --- a/frappe/core/page/background_jobs/background_jobs.py +++ b/frappe/core/page/background_jobs/background_jobs.py @@ -28,6 +28,7 @@ def get_info(show_failed=False): if j.kwargs.get('site')==frappe.local.site: jobs.append({ 'job_name': j.kwargs.get('kwargs', {}).get('playbook_method') \ + or j.kwargs.get('kwargs', {}).get('job_type') \ or str(j.kwargs.get('job_name')), 'status': j.get_status(), 'queue': name, 'creation': format_datetime(convert_utc_to_user_timezone(j.created_at)), From ba03e6ee5d0d18f1e2f7b49081c06e97cf56b28d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 20 Apr 2020 16:36:52 +0530 Subject: [PATCH 092/337] fix: conflict --- frappe/website/website_theme/standard/standard.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 138168a648..2393b684ca 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,16 +1,20 @@ { + "button_gradients": 0, + "button_rounded_corners": 1, + "button_shadows": 0, "creation": "2015-02-19 13:37:33.925909", "custom": 0, "docstatus": 0, "doctype": "Website Theme", "font_properties": "300,600", - "idx": 26, - "modified": "2020-04-16 18:23:34.573404", + "idx": 27, + "modified": "2020-04-19 05:34:56.086984", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", + "primary_color": "Blue", "theme": "Standard", - "theme_scss": "\n\n\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_a9402c50.css" + "theme_scss": "\n\n$primary: #5e3aa8;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", + "theme_url": "/assets/css/standard_999ef15b.css" } \ No newline at end of file From 1a8e8437a2ce6fc6a04b75e4dbfa51d3aca19e06 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 20 Apr 2020 20:04:08 +0530 Subject: [PATCH 093/337] fix: Breadcrumb and Desk Page for Video DocType --- frappe/automation/desk_page/tools/tools.json | 4 ++-- frappe/public/js/frappe/views/breadcrumbs.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/automation/desk_page/tools/tools.json b/frappe/automation/desk_page/tools/tools.json index 235498724d..2164a4ce38 100644 --- a/frappe/automation/desk_page/tools/tools.json +++ b/frappe/automation/desk_page/tools/tools.json @@ -3,7 +3,7 @@ { "hidden": 0, "label": "Tools", - "links": "[\n {\n \"description\": \"Documents assigned to you and by you.\",\n \"label\": \"To Do\",\n \"name\": \"ToDo\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Event and other calendars.\",\n \"label\": \"Calendar\",\n \"link\": \"List/Event/Calendar\",\n \"name\": \"Event\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Private and public Notes.\",\n \"label\": \"Note\",\n \"name\": \"Note\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Files\",\n \"name\": \"File\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Activity log of all users.\",\n \"label\": \"Activity\",\n \"name\": \"activity\",\n \"type\": \"page\"\n }\n]" + "links": "[\n {\n \"description\": \"Documents assigned to you and by you.\",\n \"label\": \"To Do\",\n \"name\": \"ToDo\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Event and other calendars.\",\n \"label\": \"Calendar\",\n \"link\": \"List/Event/Calendar\",\n \"name\": \"Event\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Private and public Notes.\",\n \"label\": \"Note\",\n \"name\": \"Note\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Files\",\n \"name\": \"File\",\n \"type\": \"doctype\"\n },\n {\n \"label\": \"Video\",\n \"name\": \"Video\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Activity log of all users.\",\n \"label\": \"Activity\",\n \"name\": \"activity\",\n \"type\": \"page\"\n }\n]" }, { "hidden": 0, @@ -32,7 +32,7 @@ "idx": 0, "is_standard": 1, "label": "Tools", - "modified": "2020-04-01 11:24:40.804346", + "modified": "2020-04-20 18:21:14.152537", "modified_by": "Administrator", "module": "Automation", "name": "Tools", diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js index 2aef1a8218..1c1049391f 100644 --- a/frappe/public/js/frappe/views/breadcrumbs.js +++ b/frappe/public/js/frappe/views/breadcrumbs.js @@ -6,9 +6,10 @@ frappe.breadcrumbs = { preferred: { "File": "", + "Video": "", "Dashboard": "Customization", "Dashboard Chart": "Customization", - "Dashboard Chart Source": "Customization", + "Dashboard Chart Source": "Customization" }, module_map: { From 90dd7294969c4ce8db16b52f3056e93911dc8e71 Mon Sep 17 00:00:00 2001 From: marination Date: Mon, 20 Apr 2020 20:31:27 +0530 Subject: [PATCH 094/337] fix: Migrate fails on `move_email_and_phone_to_child_table` patch --- .../patches/v12_0/move_email_and_phone_to_child_table.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/patches/v12_0/move_email_and_phone_to_child_table.py b/frappe/patches/v12_0/move_email_and_phone_to_child_table.py index 4388d3c849..12680609d5 100644 --- a/frappe/patches/v12_0/move_email_and_phone_to_child_table.py +++ b/frappe/patches/v12_0/move_email_and_phone_to_child_table.py @@ -1,6 +1,10 @@ import frappe def execute(): + frappe.reload_doc("contacts", "doctype", "contact_email") + frappe.reload_doc("contacts", "doctype", "contact_phone") + frappe.reload_doc("contacts", "doctype", "contact") + contact_details = frappe.db.sql(""" SELECT `name`, `email_id`, `phone`, `mobile_no`, `modified_by`, `creation`, `modified` @@ -10,10 +14,6 @@ def execute(): and `tabContact Email`.email_id=`tabContact`.email_id) """, as_dict=True) - frappe.reload_doc("contacts", "doctype", "contact_email") - frappe.reload_doc("contacts", "doctype", "contact_phone") - frappe.reload_doc("contacts", "doctype", "contact") - email_values = [] phone_values = [] for count, contact_detail in enumerate(contact_details): From 83a2b354d96b6236e7693636566659e0a39baac0 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 20 Apr 2020 20:45:25 +0530 Subject: [PATCH 095/337] fix: MultiSelectList field being rendered multiple times in dialog --- frappe/public/js/frappe/form/controls/multiselect_list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js index 3e8dc21dca..cd86bdd767 100644 --- a/frappe/public/js/frappe/form/controls/multiselect_list.js +++ b/frappe/public/js/frappe/form/controls/multiselect_list.js @@ -18,6 +18,7 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({ this.$list_wrapper = $(template); this.$input = $(''); this.input = this.$input.get(0); + this.has_input = true; this.$list_wrapper.prependTo(this.input_area); this.$filter_input = this.$list_wrapper.find('input'); this.$list_wrapper.on('click', '.dropdown-menu', e => { From 02d3654b452daae9da087cff3cca2a0e87d35bae Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 20 Apr 2020 23:23:22 +0530 Subject: [PATCH 096/337] fix: custom options not adding in the dashboard chart --- .../doctype/dashboard_chart/dashboard_chart.js | 4 ++++ .../doctype/dashboard_chart/dashboard_chart.json | 9 ++++++++- .../doctype/dashboard_chart/dashboard_chart.py | 14 ++++++++++++++ .../public/js/frappe/views/reports/query_report.js | 9 ++++++++- frappe/public/js/frappe/widgets/chart_widget.js | 8 ++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index a130c1d6cf..275028fc15 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -59,6 +59,10 @@ frappe.ui.form.on('Dashboard Chart', { if (frm.doc.report_name) { frm.trigger('set_chart_report_filters'); } + + if (!frappe.boot.developer_mode) { + frm.set_df_property("custom_options", "hidden", 1); + } }, source: function(frm) { diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 676cdbe24a..6f037baec3 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -33,6 +33,7 @@ "type", "column_break_2", "color", + "custom_options", "section_break_10", "last_synced_on" ], @@ -213,10 +214,16 @@ "label": "Y Axis", "mandatory_depends_on": "eval:doc.report_name && !doc.is_custom", "options": "Dashboard Chart Field" + }, + { + "description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"]", + "fieldname": "custom_options", + "fieldtype": "Code", + "label": "Custom Options" } ], "links": [], - "modified": "2020-04-08 18:54:36.739183", + "modified": "2020-04-16 03:15:51.455196", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index b2a6f0a0ff..36a75bd9d5 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -97,6 +97,10 @@ def create_report_chart(args): _doc = frappe.new_doc('Dashboard Chart') _doc.update(args) + + if (args.get("custom_options")): + _doc.custom_options = json.dumps(args.get("custom_options")) + if frappe.db.exists('Dashboard Chart', args.chart_name): args.chart_name = append_number_if_name_exists('Dashboard Chart', args.chart_name) _doc.chart_name = args.chart_name @@ -108,6 +112,7 @@ def create_report_chart(args): @frappe.whitelist() def add_chart_to_dashboard(args): args = frappe.parse_json(args) + dashboard = frappe.get_doc('Dashboard', args.dashboard) dashboard_link = frappe.new_doc('Dashboard Chart Link') dashboard_link.chart = args.chart_name @@ -362,6 +367,8 @@ class DashboardChart(Document): self.check_required_field() self.check_document_type() + self.validate_custom_options() + def check_required_field(self): if not self.document_type: frappe.throw(_("Document type is required to create a dashboard chart")) @@ -378,3 +385,10 @@ class DashboardChart(Document): def check_document_type(self): if frappe.get_meta(self.document_type).issingle: frappe.throw("You cannot create a dashboard chart from single DocTypes") + + def validate_custom_options(self): + if self.custom_options: + try: + json.loads(self.custom_options) + except ValueError as error: + frappe.throw("Invalid json added in the custom options: %s" % error) \ No newline at end of file diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 08da956072..9c04f6e879 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -183,7 +183,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } create_dashboard_chart(chart_args, dashboard_name, chart_name) { - let args = { 'dashboard': dashboard_name || null, 'chart_type': 'Report', @@ -191,8 +190,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { 'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type), 'color': chart_args.color, 'filters_json': JSON.stringify(this.get_filter_values()), + 'custom_options': {} }; + for (let key in chart_args) { + if (key != "data") { + args['custom_options'][key] = chart_args[key]; + } + } + if (this.chart_fields) { let x_field_title = toTitle(chart_args.x_field); let y_field_title = toTitle(chart_args.y_fields[0]); @@ -218,6 +224,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { ); } + debugger frappe.xcall( 'frappe.desk.doctype.dashboard_chart.dashboard_chart.create_report_chart', {args: args} diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 9c03f08523..bf19d813d6 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -490,6 +490,14 @@ export default class ChartWidget extends Widget { shortenYAxisNumbers: 1 } }; + + if (this.chart_doc.custom_options) { + let custom_options = JSON.parse(this.chart_doc.custom_options); + for (let key in custom_options) { + chart_args[key] = custom_options[key]; + } + } + if (!this.dashboard_chart) { this.dashboard_chart = new frappe.Chart( this.chart_wrapper[0], From 0c1973538686eeb825fddb7a2f36b79a8de946c3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 21 Apr 2020 09:13:27 +0530 Subject: [PATCH 097/337] fix(minor): standard Website Theme --- frappe/website/website_theme/standard/standard.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 2393b684ca..28667e124d 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -8,13 +8,12 @@ "doctype": "Website Theme", "font_properties": "300,600", "idx": 27, - "modified": "2020-04-19 05:34:56.086984", + "modified": "2020-04-20 23:42:31.649416", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", - "primary_color": "Blue", "theme": "Standard", - "theme_scss": "\n\n$primary: #5e3aa8;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_999ef15b.css" + "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n", + "theme_url": "/assets/css/standard_88c91a7c.css" } \ No newline at end of file From 0fa8266d6d6c5808e3dbac5d11c0c7d10c735c93 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 21 Apr 2020 09:29:24 +0530 Subject: [PATCH 098/337] fix: Translate only if column label exists --- frappe/desk/query_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index f994dc0d30..164f6389eb 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -242,7 +242,7 @@ def get_prepared_report_result(report, filters, dn="", user=None): columns = json.loads(doc.columns) if doc.columns else data[0] for column in columns: - if isinstance(column, dict): + if isinstance(column, dict) and column.get("label"): column["label"] = _(column["label"]) latest_report_data = { From c0f66f3dac78896f7728bb1f0f1bc6b893c3bbca Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 21 Apr 2020 11:41:55 +0530 Subject: [PATCH 099/337] fix(minor): Standard theme naming. It will be common across sites --- frappe/website/doctype/website_theme/website_theme.py | 7 +++++-- frappe/website/website_theme/standard/standard.json | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index a1b475450d..9b1c9115d6 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -61,10 +61,13 @@ class WebsiteTheme(Document): from subprocess import Popen, PIPE folder_path = join_path(frappe.utils.get_bench_path(), 'sites', 'assets', 'css') - self.delete_old_theme_files(folder_path) + + if not self.custom: + self.delete_old_theme_files(folder_path) # add a random suffix - file_name = frappe.scrub(self.name) + '_' + frappe.generate_hash('Website Theme', 8) + '.css' + suffix = frappe.generate_hash('Website Theme', 8) if self.custom else 'style' + file_name = frappe.scrub(self.name) + '_' + suffix + '.css' output_path = join_path(folder_path, file_name) content = get_scss(self) diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 28667e124d..a799f25425 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -7,13 +7,14 @@ "docstatus": 0, "doctype": "Website Theme", "font_properties": "300,600", + "font_size": "", "idx": 27, - "modified": "2020-04-20 23:42:31.649416", + "modified": "2020-04-21 02:10:31.761219", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", "theme": "Standard", "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n", - "theme_url": "/assets/css/standard_88c91a7c.css" + "theme_url": "/assets/css/standard_style.css" } \ No newline at end of file From d265f00f9b28f6f8d0daaacc5a5895fe8e0d51f6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 21 Apr 2020 12:38:04 +0530 Subject: [PATCH 100/337] fix: update timestamp --- .../doctype/website_settings/website_settings.json | 2 +- frappe/website/website_theme/standard/standard.json | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index 635f0d3f22..708d2a0473 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -371,7 +371,7 @@ "issingle": 1, "links": [], "max_attachments": 10, - "modified": "2020-04-21 16:46:59.947403", + "modified": "2020-04-21 12:37:44.070662", "modified_by": "Administrator", "module": "Website", "name": "Website Settings", diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 2393b684ca..099d57da01 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,20 +1,17 @@ { - "button_gradients": 0, - "button_rounded_corners": 1, - "button_shadows": 0, "creation": "2015-02-19 13:37:33.925909", "custom": 0, "docstatus": 0, "doctype": "Website Theme", "font_properties": "300,600", "idx": 27, - "modified": "2020-04-19 05:34:56.086984", + "modified": "2020-04-21 12:36:34.307990", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", "primary_color": "Blue", "theme": "Standard", - "theme_scss": "\n\n$primary: #5e3aa8;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_999ef15b.css" + "theme_scss": "\n\n$primary: Blue;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", + "theme_url": "/assets/css/standard_44af43a7.css" } \ No newline at end of file From ceabdf7403645873b24e25986e1ecec11e060833 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 21 Apr 2020 12:43:26 +0530 Subject: [PATCH 101/337] feat: better handling of website tracking flag --- frappe/public/js/frappe/form/sidebar/form_sidebar.js | 2 +- frappe/website/doctype/website_settings/website_settings.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 3da6bedb8c..a145e47149 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -82,7 +82,7 @@ frappe.ui.form.Sidebar = Class.extend({ this.frm.viewers.refresh(); this.frm.tags && this.frm.tags.refresh(this.frm.get_docinfo().tags); - if (this.frm.doc.route && frappe.boot.website_tracking_enabled) { + if (this.frm.doc.route && cint(frappe.boot.website_tracking_enabled)) { let route = this.frm.doc.route; frappe.utils.get_page_view_count(route).then((res) => { this.sidebar diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js index 38e1ff993a..be294258f4 100644 --- a/frappe/website/doctype/website_settings/website_settings.js +++ b/frappe/website/doctype/website_settings/website_settings.js @@ -56,6 +56,10 @@ frappe.ui.form.on('Website Settings', { }); }, + enable_view_tracking: function(frm) { + frappe.boot.website_tracking_enabled = frm.doc.enable_view_tracking; + }, + set_parent_options: function(frm, doctype, name) { var item = frappe.get_doc(doctype, name); if(item.parentfield === "top_bar_items") { From 7d6adb94309caf806c1b47f29bbc34ea1c32c201 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 21 Apr 2020 13:25:24 +0530 Subject: [PATCH 102/337] feat: allow minimizing new email dialog --- frappe/public/js/frappe/views/communication.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 17b32b3a52..ba290417f5 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -20,7 +20,8 @@ frappe.views.CommunicationComposer = Class.extend({ primary_action: function() { me.delete_saved_draft(); me.send_action(); - } + }, + minimizable: true }); ['recipients', 'cc', 'bcc'].forEach(field => { From 2fccdd5bd20cd4cd5c6852d7bb7bd607e0ec76b4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 21 Apr 2020 13:34:00 +0530 Subject: [PATCH 103/337] fix: resolve conflicts in standard.json --- frappe/website/website_theme/standard/standard.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 099d57da01..a799f25425 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,17 +1,20 @@ { + "button_gradients": 0, + "button_rounded_corners": 1, + "button_shadows": 0, "creation": "2015-02-19 13:37:33.925909", "custom": 0, "docstatus": 0, "doctype": "Website Theme", "font_properties": "300,600", + "font_size": "", "idx": 27, - "modified": "2020-04-21 12:36:34.307990", + "modified": "2020-04-21 02:10:31.761219", "modified_by": "Administrator", "module": "Website", "name": "Standard", "owner": "Administrator", - "primary_color": "Blue", "theme": "Standard", - "theme_scss": "\n\n$primary: Blue;\n\n\n\n\n$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: false;\n\n@import \"frappe/public/scss/website\";\n\nbody {\n \n}", - "theme_url": "/assets/css/standard_44af43a7.css" + "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n", + "theme_url": "/assets/css/standard_style.css" } \ No newline at end of file From 1dfa8ccbc4e44fb45ee7b49c75ecf6278d796f58 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Tue, 21 Apr 2020 15:49:55 +0530 Subject: [PATCH 104/337] feat: add name validation to data fieldtype Signed-off-by: Chinmay D. Pai --- .eslintrc | 1 + frappe/exceptions.py | 3 ++- frappe/model/__init__.py | 2 +- frappe/model/base_document.py | 3 +++ frappe/public/js/frappe/form/controls/data.js | 3 +++ frappe/public/js/frappe/utils/datatype.js | 6 +++++- frappe/public/js/frappe/utils/utils.js | 3 +++ frappe/utils/__init__.py | 18 +++++++++++++++++- 8 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.eslintrc b/.eslintrc index eef33ec8a0..69c731b079 100644 --- a/.eslintrc +++ b/.eslintrc @@ -78,6 +78,7 @@ "has_common": true, "has_words": true, "validate_email": true, + "validate_name": true, "validate_phone": true, "get_number_format": true, "format_number": true, diff --git a/frappe/exceptions.py b/frappe/exceptions.py index ef75a36e03..9a1c1fb0b0 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -78,6 +78,7 @@ class TimestampMismatchError(ValidationError): pass class EmptyTableError(ValidationError): pass class LinkExistsError(ValidationError): pass class InvalidEmailAddressError(ValidationError): pass +class InvalidNameError(ValidationError): pass class InvalidPhoneNumberError(ValidationError): pass class TemplateNotFoundError(ValidationError): pass class UniqueValidationError(ValidationError): pass @@ -95,4 +96,4 @@ class DataTooLongException(ValidationError): pass # OAuth exceptions class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass -class InvalidAuthorizationToken(CSRFTokenError): pass \ No newline at end of file +class InvalidAuthorizationToken(CSRFTokenError): pass diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 7af987f4bc..93ef78df7b 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -48,7 +48,7 @@ table_fields = ('Table', 'Table MultiSelect') core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'DocType Action', 'DocType Link', 'User', 'Role', 'Has Role', 'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form', 'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script') -data_field_options = ('Email', 'Phone') +data_field_options = ('Email', 'Name', 'Phone') def copytables(srctype, src, srcfield, tartype, tar, tarfield, srcfields, tarfields=[]): if not tarfields: diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 9ab1ef7799..5d1d693f8e 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -571,6 +571,9 @@ class BaseDocument(object): for email_address in frappe.utils.split_emails(data): frappe.utils.validate_email_address(email_address, throw=True) + if data_field_options == "Name": + frappe.utils.validate_name(data, throw=True) + if data_field_options == "Phone": frappe.utils.validate_phone_number(data, throw=True) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index a7f0050d65..c943ec89bb 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -96,6 +96,9 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ if(this.df.options == 'Phone') { this.df.invalid = !validate_phone(v); return v; + } else if (this.df.options == 'Name') { + this.df.invalid = !validate_name(v); + return v; } else if(this.df.options == 'Email') { var email_list = frappe.utils.split_emails(v); if (!email_list) { diff --git a/frappe/public/js/frappe/utils/datatype.js b/frappe/public/js/frappe/utils/datatype.js index 16f87b872f..1b9206f434 100644 --- a/frappe/public/js/frappe/utils/datatype.js +++ b/frappe/public/js/frappe/utils/datatype.js @@ -48,6 +48,10 @@ window.validate_phone = function(txt) { return frappe.utils.validate_type(txt, "phone"); }; +window.validate_name = function(txt) { + return frappe.utils.validate_type(txt, "name"); +}; + window.nth = function(number) { number = cint(number); var s = 'th'; @@ -73,4 +77,4 @@ window.has_common = function(list1, list2) { if(in_list(list2, list1[i]))return true; } return false; -}; \ No newline at end of file +}; diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 315637092d..f07d47326e 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -237,6 +237,9 @@ Object.assign(frappe.utils, { case "phone": regExp = /^([0-9\ \+\_\-\,\.\*\#\(\)]){1,20}$/; break; + case "name": + regExp = /^[\w][\w\'\-]*([ \w][\w\'\-]+)*$/; + break; case "number": regExp = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/; break; diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 649d3bf72c..34432839bb 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -81,13 +81,29 @@ def validate_phone_number(phone_number, throw=False): return False phone_number = phone_number.strip() - match = re.match("([0-9\ \+\_\-\,\.\*\#\(\)]){1,20}$", phone_number) + match = re.match(r"([0-9\ \+\_\-\,\.\*\#\(\)]){1,20}$", phone_number) if not match and throw: frappe.throw(frappe._("{0} is not a valid Phone Number").format(phone_number), frappe.InvalidPhoneNumberError) return bool(match) +def validate_name(name, throw=False): + """Returns True if the name is valid + valid names may have unicode and ascii characters, dash, quotes, numbers + anything else is considered invalid + """ + if not name: + return False + + name = name.strip() + match = re.match(r"^[\w][\w\'\-]*([ \w][\w\'\-]+)*$", name) + + if not match and throw: + frappe.throw(frappe._("{0} is not a valid Name").format(name), frappe.InvalidNameError) + + return bool(match) + def validate_email_address(email_str, throw=False): """Validates the email string""" email = email_str = (email_str or "").strip() From 6f63b03aeb43220d51a28cf529d3d614b1695781 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Tue, 21 Apr 2020 16:09:09 +0530 Subject: [PATCH 105/337] chore: fix sider issues Signed-off-by: Chinmay D. Pai --- 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 f07d47326e..1afdbfd81c 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -238,7 +238,7 @@ Object.assign(frappe.utils, { regExp = /^([0-9\ \+\_\-\,\.\*\#\(\)]){1,20}$/; break; case "name": - regExp = /^[\w][\w\'\-]*([ \w][\w\'\-]+)*$/; + regExp = /^[\w][\w'-]*([ \w][\w'-]+)*$/; break; case "number": regExp = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/; From aee3a3a554d910ae61614156f422bcc2a24cac32 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 21 Apr 2020 16:45:51 +0530 Subject: [PATCH 106/337] fix: Add responsive classes in web templates --- .../footer_horizontal/footer_horizontal.html | 6 +- frappe/website/web_template/hero/hero.html | 4 +- frappe/website/web_template/hero/hero.json | 9 ++- .../hero_with_right_image.html | 56 +++++++------------ .../navbar_with_links_on_right.html | 40 +++++++++++-- .../section_with_big_cards.html | 5 +- .../section_with_cta/section_with_cta.html | 8 +-- .../section_with_image.html | 2 +- .../section_with_small_cards.html | 2 +- .../section_with_tabs/section_with_tabs.html | 10 ++-- 10 files changed, 82 insertions(+), 60 deletions(-) diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.html b/frappe/website/web_template/footer_horizontal/footer_horizontal.html index 507c80bd42..0c3335bb9d 100644 --- a/frappe/website/web_template/footer_horizontal/footer_horizontal.html +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.html @@ -2,7 +2,7 @@
    Brand Logo
    -
    +
    {%- for index in ['1', '2', '3', '4', '5'] -%} {%- set label = values['item_' + index + '_label'] -%} @@ -14,11 +14,11 @@ {%- endfor -%}
    -
    +
    {{ address }}
    -
    +
    {{ copyright }}
    diff --git a/frappe/website/web_template/hero/hero.html b/frappe/website/web_template/hero/hero.html index a3f1ada408..7fd4ab0b05 100644 --- a/frappe/website/web_template/hero/hero.html +++ b/frappe/website/web_template/hero/hero.html @@ -13,7 +13,7 @@ {%- if primary_action -%}
    + class="flex items-center justify-center w-full px-8 py-3 text-base font-medium leading-6 text-white transition duration-150 ease-in-out bg-primary-500 border border-transparent rounded-md hover:bg-primary-400 focus:outline-none focus:shadow-outline md:py-4 md:text-lg md:px-10"> {{ primary_action_label }}
    @@ -21,7 +21,7 @@ {%- if secondary_action -%}
    + class="flex items-center justify-center w-full px-8 py-3 text-base font-medium leading-6 text-primary-700 transition duration-150 ease-in-out bg-primary-100 border border-transparent rounded-md hover:text-primary-600 hover:bg-primary-50 focus:outline-none focus:shadow-outline focus:border-primary-300 md:py-4 md:text-lg md:px-10"> {{ secondary_action_label }}
    diff --git a/frappe/website/web_template/hero/hero.json b/frappe/website/web_template/hero/hero.json index 97fdbab7e0..37e06b802d 100644 --- a/frappe/website/web_template/hero/hero.json +++ b/frappe/website/web_template/hero/hero.json @@ -38,10 +38,17 @@ "fieldtype": "Data", "label": "Secondary Action", "reqd": 0 + }, + { + "fieldname": "align", + "fieldtype": "Select", + "label": "Align", + "options": "Left\nCenter", + "reqd": 0 } ], "idx": 0, - "modified": "2020-04-19 15:26:23.140620", + "modified": "2020-04-20 12:27:45.760391", "modified_by": "Administrator", "name": "Hero", "owner": "Administrator", diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html index a5855d95c1..e68a830d54 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -1,42 +1,28 @@ -
    -
    -
    -
    -
    -

    - {{ title }} -

    - {%- if subtitle -%} -

    - {{ subtitle }} -

    - {%- endif -%} -
    - {%- if primary_action -%} -
    - - {{ primary_action_label }} - -
    - {%- endif -%} - {%- if secondary_action -%} -
    - - {{ secondary_action_label }} - -
    - {%- endif -%} -
    -
    +
    +
    +
    +

    + {{ title }} +

    + {%- if subtitle -%} +

    + {{ subtitle }} +

    + {%- endif -%} +
    + {%- if primary_action -%} + {{ c('button', label=primary_action_label, url=primary_action, variant="primary", size="large") }} + {%- endif -%} + {%- if secondary_action -%} + {{ c('button', label=secondary_action_label, url=secondary_action, variant="secondary", size="large", class="ml-4") }} + {%- endif -%}
    {%- if image -%} -
    + {%- endif -%} diff --git a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html index ee8b5c17bd..4961729c7c 100644 --- a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html +++ b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html @@ -1,12 +1,42 @@ -
    -
    -
    +
    +
    +
    Brand Logo
    -
    +
    + + + +
    + {%- for index in ['1', '2', '3', '4', '5'] -%} + + {%- set label = values['item_' + index + '_label'] -%} + {%- set url = values['item_' + index + '_url'] -%} + + {%- if label and url -%} +
    + {{ c('navbar_link', label=label, url=url) }} +
    + {%- endif -%} + + {%- endfor -%} + + {%- if cta_label and cta_url -%} + {{ c('button', label=cta_label, url=cta_url, variant="primary", class="mt-2") }} + {%- endif -%} +
    +
    +
    +
    From aeabcfdb0230eeaf23a570c9771e0a5718a02f4d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 00:08:33 +0530 Subject: [PATCH 169/337] fix: Merge with new theme changes --- .../v13_0/website_theme_custom_scss.py | 4 +- .../doctype/website_theme/custom_theme.css | 11 ++++-- .../doctype/website_theme/website_theme.json | 37 +++++-------------- .../doctype/website_theme/website_theme.py | 7 ++-- .../website_theme/standard/standard.json | 23 +++++++++++- 5 files changed, 45 insertions(+), 37 deletions(-) diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py index 9d5a78643e..0035283428 100644 --- a/frappe/patches/v13_0/website_theme_custom_scss.py +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -4,7 +4,7 @@ def execute(): frappe.reload_doctype('Website Theme') for theme in frappe.get_all('Website Theme'): doc = frappe.get_doc('Website Theme', theme.name) - if not doc.custom_scss and doc.theme_scss: + if not doc.get('custom_scss') and doc.theme_scss: # move old theme to new theme doc.custom_scss = doc.theme_scss - doc.save() \ No newline at end of file + doc.save() diff --git a/frappe/website/doctype/website_theme/custom_theme.css b/frappe/website/doctype/website_theme/custom_theme.css index 1a821604c3..dee4720d31 100644 --- a/frappe/website/doctype/website_theme/custom_theme.css +++ b/frappe/website/doctype/website_theme/custom_theme.css @@ -1,13 +1,16 @@ {% if google_font %} -@import url('https://fonts.googleapis.com/css2?family={{ google_font }}:wght@400;500;600;700;900&display=swap'); +@import url('https://fonts.googleapis.com/css2?family={{ google_font.replace(' ', '+') }}:wght@400;500;600;700;900&display=swap'); {% endif -%} :root { {%- if google_font %} - --font-family: {{ google_font }}; + --font-family: "{{ google_font }}"; {% endif -%} - {% if brand_color %} - --primary-500: {{ brand_color }}; +} + +html, body { + {%- if font_size %} + font-size: {{ font_size }}; {% endif -%} } diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index c8e9aaf5a5..10d018aa05 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -11,12 +11,7 @@ "based_on", "module", "custom", - "tailwind_theme_section", - "brand_color", - "custom_css", - "theme_css", "bootstrap_theme_section", - "configuration_section", "google_font", "font_size", "font_properties", @@ -32,8 +27,10 @@ "stylesheet_section", "theme_scss", "custom_scss", - "theme_json", "theme_url", + "tailwind_theme_section", + "custom_css", + "theme_css", "navbar_section", "navbar", "footer_section", @@ -89,13 +86,6 @@ "label": "JavaScript", "options": "JS" }, - { - "fieldname": "theme_json", - "fieldtype": "Code", - "hidden": 1, - "label": "Theme JSON", - "options": "JSON" - }, { "default": "Bootstrap 4", "fieldname": "based_on", @@ -104,6 +94,7 @@ "options": "Bootstrap 4\nTailwind" }, { + "depends_on": "eval:doc.based_on == 'Tailwind'", "fieldname": "navbar_section", "fieldtype": "Section Break", "label": "Navbar" @@ -115,17 +106,12 @@ "label": "Tailwind Theme" }, { - "depends_on": "eval:doc.based_on == 'Bootstrap 4'", "fieldname": "bootstrap_theme_section", "fieldtype": "Section Break", - "label": "Bootstrap Theme" - }, - { - "fieldname": "brand_color", - "fieldtype": "Color", - "label": "Brand Color" + "label": "Theme Configuration" }, { + "depends_on": "eval:doc.based_on == 'Tailwind'", "fieldname": "footer_section", "fieldtype": "Section Break", "label": "Footer" @@ -151,15 +137,11 @@ { "fieldname": "theme_css", "fieldtype": "Code", + "hidden": 1, "label": "Theme CSS", "options": "CSS", "read_only": 1 }, - { - "fieldname": "configuration_section", - "fieldtype": "Section Break", - "label": "Configuration" - }, { "fieldname": "google_font", "fieldtype": "Data", @@ -195,6 +177,7 @@ "options": "Color" }, { + "depends_on": "eval:doc.based_on == 'Bootstrap 4'", "fieldname": "stylesheet_section", "fieldtype": "Section Break", "label": "Stylesheet" @@ -240,7 +223,7 @@ } ], "links": [], - "modified": "2020-04-19 20:44:22.916580", + "modified": "2020-04-25 00:00:23.347879", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", @@ -266,4 +249,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} +} \ No newline at end of file diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 795473a820..ac7637d6c7 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -41,9 +41,10 @@ class WebsiteTheme(Document): def validate_theme(self): '''Generate theme css if theme_scss has changed''' - doc_before_save = self.get_doc_before_save() - if doc_before_save is None or get_scss(self) != get_scss(doc_before_save): - self.generate_bootstrap_theme() + if self.based_on == 'Bootstrap 4': + doc_before_save = self.get_doc_before_save() + if doc_before_save is None or get_scss(self) != get_scss(doc_before_save): + self.generate_bootstrap_theme() if self.based_on == 'Tailwind': self.theme_css = frappe.render_template('frappe/website/doctype/website_theme/custom_theme.css', self.as_dict(), is_path=True) diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index 0967ef424b..ca9e81bf27 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1 +1,22 @@ -{} +{ + "based_on": "Bootstrap 4", + "button_gradients": 0, + "button_rounded_corners": 1, + "button_shadows": 0, + "creation": "2015-02-19 13:37:33.925909", + "custom": 0, + "docstatus": 0, + "doctype": "Website Theme", + "font_properties": "300,600", + "footer": [], + "idx": 26, + "modified": "2020-04-24 23:52:27.211811", + "modified_by": "Administrator", + "module": "Website", + "name": "Standard", + "navbar": [], + "owner": "Administrator", + "theme": "Standard", + "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n", + "theme_url": "/assets/css/standard_style.css" +} \ No newline at end of file From ebf0e04e5eed4cc40e684849dfae8bae62d9ac3e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 00:15:31 +0530 Subject: [PATCH 170/337] style: Fix linting errors --- frappe/website/doctype/web_page/web_page.py | 1 - frappe/website/doctype/web_template/test_web_template.py | 7 +++---- .../doctype/web_template_field/web_template_field.py | 2 +- purgecss.js | 6 +++--- rollup/config.js | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index f240a7d2af..4b999631a7 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -18,7 +18,6 @@ from frappe.website.router import resolve_route from frappe.website.utils import (extract_title, find_first_image, get_comment_list, get_html_content_based_on_type) from frappe.website.website_generator import WebsiteGenerator -from frappe.website.doctype.web_template.web_template import get_rendered_template class WebPage(WebsiteGenerator): diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index 86b41d48e6..52ebe96f2c 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -33,11 +33,8 @@ class TestWebTemplate(unittest.TestCase): self.assertTrue("/test" == button.attrs["href"]) def test_web_page_with_page_builder(self): - if frappe.db.exists("Web Page", "test-page"): - frappe.delete_doc("Web Page", "test-page") - if not frappe.db.exists("Web Page", "test-page"): - webpage = frappe.get_doc( + frappe.get_doc( { "doctype": "Web Page", "title": "test-page", @@ -90,6 +87,8 @@ class TestWebTemplate(unittest.TestCase): self.assertEqual(sections[0].find("p").text, "test lorem ipsum") self.assertEqual(len(sections[1].find_all("a")), 3) + frappe.db.delete_doc("Web Page", "test-page") + def test_tailwind_styles_in_developer_mode(self): self.create_tailwind_theme() diff --git a/frappe/website/doctype/web_template_field/web_template_field.py b/frappe/website/doctype/web_template_field/web_template_field.py index 80019c2222..8c25b619b6 100644 --- a/frappe/website/doctype/web_template_field/web_template_field.py +++ b/frappe/website/doctype/web_template_field/web_template_field.py @@ -3,7 +3,7 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +# import frappe from frappe.model.document import Document class WebTemplateField(Document): diff --git a/purgecss.js b/purgecss.js index 86d5794244..6cd1f013c2 100644 --- a/purgecss.js +++ b/purgecss.js @@ -15,9 +15,9 @@ new PurgeCSS() extension: 'html' } ], - css: css_file_paths, - defaultExtractor: content => content.match(/[\w-/:]+(? content.match(/[\w-/:]+(? { - console.log(result[0].css); + console.log(result[0].css); // eslint-disable-line }); diff --git a/rollup/config.js b/rollup/config.js index 24ba819bf0..50e8f33061 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -147,7 +147,7 @@ function get_rollup_options_for_css(output_file, input_files) { inputOptions: { input: input_files, plugins: plugins, - onwarn(warning, warn) { + onwarn(warning) { // skip warnings if (['EMPTY_BUNDLE'].includes(warning.code)) return; From 77281c6207d3e8833c487cd201316e43b86ff6e8 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 00:43:31 +0530 Subject: [PATCH 171/337] fix: tests --- frappe/utils/jinja.py | 4 +- .../doctype/web_template/test_web_template.py | 37 +++++++++---------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 6c18e73c7b..900135a275 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -207,7 +207,7 @@ def resolve_class(classes): return classes def parse_front_matter_attrs_and_html(source): - from frontmatter import Frontmatter + from frappe.website.router import get_frontmatter html = source attributes = {} @@ -216,7 +216,7 @@ def parse_front_matter_attrs_and_html(source): return attributes, html try: - res = Frontmatter.read(source) + res = get_frontmatter(source) if res['attributes']: attributes = res['attributes'] html = res['body'] diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index 52ebe96f2c..12ab4b8917 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -22,7 +22,7 @@ class TestWebTemplate(unittest.TestCase): html = doc.render(values) soup = BeautifulSoup(html, "html.parser") - heading = soup.find("h2") + heading = soup.find("h1") self.assertTrue("Test Hero" in heading.text) subtitle = soup.find("p") @@ -87,10 +87,9 @@ class TestWebTemplate(unittest.TestCase): self.assertEqual(sections[0].find("p").text, "test lorem ipsum") self.assertEqual(len(sections[1].find_all("a")), 3) - frappe.db.delete_doc("Web Page", "test-page") - def test_tailwind_styles_in_developer_mode(self): - self.create_tailwind_theme() + theme = self.create_tailwind_theme() + theme.set_as_default() set_request(method="GET", path="testpage") response = render() @@ -102,10 +101,11 @@ class TestWebTemplate(unittest.TestCase): self.assertEqual(stylesheet.attrs['href'], '/assets/css/tailwind.css') - self.delete_tailwind_theme() + frappe.get_doc('Website Theme', 'Standard').set_as_default() def test_tailwind_styles_in_production(self): - self.create_tailwind_theme() + theme = self.create_tailwind_theme() + theme.set_as_default() frappe.conf.developer_mode = 0 @@ -118,19 +118,18 @@ class TestWebTemplate(unittest.TestCase): style = soup.select_one("style[data-tailwind]") self.assertTrue(style) - self.assertTrue('.py-20' in style.text) - self.assertTrue('.text-gray-800' in style.text) + self.assertTrue('py-20' in style.text) + self.assertTrue('text-gray-900' in style.text) - self.delete_tailwind_theme() + frappe.get_doc('Website Theme', 'Standard').set_as_default() def create_tailwind_theme(self): - theme = frappe.get_doc({ - 'doctype': 'Website Theme', - 'theme': 'Tailwind', - 'based_on': 'Tailwind' - }).insert() - theme.set_as_default() - - def delete_tailwind_theme(self): - frappe.get_doc('Website Theme', 'Standard').set_as_default() - frappe.delete_doc('Website Theme', 'Tailwind') + if not frappe.db.exists('Website Theme', 'Tailwind'): + theme = frappe.get_doc({ + 'doctype': 'Website Theme', + 'theme': 'Tailwind', + 'based_on': 'Tailwind' + }).insert() + else: + theme = frappe.get_doc('Website Theme', 'Tailwind') + return theme From e485439ab77073a91bbf07ff0671be0bd5435e9f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 00:53:11 +0530 Subject: [PATCH 172/337] chore: Install node requirements for python tests --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0296f38527..8e6546a299 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,8 +99,7 @@ install: - if [ $TYPE == "server" ]; then sed -i 's/socketio:/# socketio:/g' Procfile; fi - if [ $TYPE == "server" ]; then sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile; fi - - if [ $TYPE == "ui" ]; then bench setup requirements --node; fi - + - bench setup requirements --node - bench start & - bench --site test_site reinstall --yes - bench --site test_site_producer reinstall --yes From 9c78c5b564b18be2b76a0f4e32d2fec5324aeabe Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 25 Apr 2020 10:47:13 +0530 Subject: [PATCH 173/337] fix: don't reset the child doc fields value for new record (#10090) --- frappe/model/document.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/model/document.py b/frappe/model/document.py index 5e01f5e65f..b7f5f6f2e4 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -587,6 +587,9 @@ class Document(BaseDocument): if high_permlevel_fields: self.reset_values_if_no_permlevel_access(has_access_to, high_permlevel_fields) + # If new record then don't reset the values for child table + if self.is_new(): return + # check for child tables for df in self.meta.get_table_fields(): high_permlevel_fields = frappe.get_meta(df.options).get_high_permlevel_fields() From 6344360132374c8290e4496bff97fc823555b11d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 11:24:16 +0530 Subject: [PATCH 174/337] chore: Cache cypress binary to save time --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0296f38527..f41420f050 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,9 @@ cache: - pip - npm - yarn + directories: + # we also need to cache folder with Cypress binary + - ~/.cache matrix: include: From cbaa3b2f8ec2c97959f852123b2742da389697b7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 11:48:26 +0530 Subject: [PATCH 175/337] chore: Use chrome browser for test --- .travis.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f41420f050..90bdeeaabe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ cache: - yarn directories: # we also need to cache folder with Cypress binary + # https://docs.cypress.io/guides/guides/continuous-integration.html#Caching - ~/.cache matrix: diff --git a/package.json b/package.json index 2c06094737..034effe26c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "build": "node rollup/build.js", "production": "FRAPPE_ENV=production node rollup/build.js", "watch": "node rollup/watch.js", - "cypress:run": "cypress run --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb", + "cypress:run": "cypress run --browser chrome --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb", "cypress:open": "cypress open", "snyk-protect": "snyk protect", "prepare": "yarn run snyk-protect" From 15ac34d84f2ecb029728d6bc74c82c7681107d57 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 11:56:08 +0530 Subject: [PATCH 176/337] chore: Install chrome to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 90bdeeaabe..849d28152d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ addons: - test_site_producer mariadb: 10.3 postgresql: 9.5 + chrome: stable git: depth: 1 From 1c3077b2599540cb698fd6914bce45aa24bfe898 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Sat, 25 Apr 2020 11:56:55 +0530 Subject: [PATCH 177/337] fix: Clear `__unsaved` flag in insert method (#10094) --- frappe/model/document.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/model/document.py b/frappe/model/document.py index b7f5f6f2e4..04db33ca69 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -268,6 +268,10 @@ class Document(BaseDocument): if hasattr(self, "__islocal"): delattr(self, "__islocal") + # clear unsaved flag + if hasattr(self, "__unsaved"): + delattr(self, "__unsaved") + if not (frappe.flags.in_migrate or frappe.local.flags.in_install or frappe.flags.in_setup_wizard): follow_document(self.doctype, self.name, frappe.session.user) return self From d1e68d95ad2928b2f4eaf6f624dfe4468da4ec9a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 12:17:27 +0530 Subject: [PATCH 178/337] chore: Fix travis config used https://config.travis-ci.com/explore to verify --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 849d28152d..219d16c74f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ git: depth: 1 cache: - - pip - - npm - - yarn + pip: true + npm: true + yarn: true directories: # we also need to cache folder with Cypress binary # https://docs.cypress.io/guides/guides/continuous-integration.html#Caching From 2ed8cacd2f062a6e05ff557fd1d7362199281b38 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 12:52:14 +0530 Subject: [PATCH 179/337] chore: Use chrome browser for test - Remove unused cypress:run command from package.json --- frappe/commands/utils.py | 2 +- package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index ec30fc19b8..da9d67be3b 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -522,7 +522,7 @@ def run_ui_tests(context, app, headless=False): password_env = 'CYPRESS_adminPassword={}'.format(admin_password) if admin_password else '' # run for headless mode - run_or_open = 'run --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb' if headless else 'open' + run_or_open = 'run --browser chrome --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb' if headless else 'open' command = '{site_env} {password_env} yarn run cypress {run_or_open}' formatted_command = command.format(site_env=site_env, password_env=password_env, run_or_open=run_or_open) frappe.commands.popen(formatted_command, cwd=app_base_path, raise_err=True) diff --git a/package.json b/package.json index 034effe26c..e5d8e71b7e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "build": "node rollup/build.js", "production": "FRAPPE_ENV=production node rollup/build.js", "watch": "node rollup/watch.js", - "cypress:run": "cypress run --browser chrome --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb", "cypress:open": "cypress open", "snyk-protect": "snyk protect", "prepare": "yarn run snyk-protect" From 0b6e1cb78e9d853ada8502d67e4d8d712b7a608b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 13:59:26 +0530 Subject: [PATCH 180/337] test: Remove unnecessary website visit --- cypress/integration/depends_on.js | 4 ---- cypress/support/commands.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index 375b690fb2..93417014c5 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -1,8 +1,4 @@ context('Depends On', () => { - beforeEach(() => { - cy.login(); - return cy.new_form('Test Depends On'); - }); before(() => { cy.login(); cy.visit('/desk#workspace/Website'); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 2d31d9a988..7816d5526f 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -186,7 +186,7 @@ Cypress.Commands.add('fill_field', (fieldname, value, fieldtype = 'Data') => { if (fieldtype === 'Select') { cy.get('@input').select(value); } else { - cy.get('@input').type(value, { waitForAnimations: false }); + cy.get('@input').type(value, { waitForAnimations: false, force: true }); } return cy.get('@input'); }); From 6ecd83a27d0f4015cd81b8fac66fdb5997b2f89d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 14:24:34 +0530 Subject: [PATCH 181/337] test: Add type delay while typing file-web-link --- cypress/integration/file_uploader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js index f4ef2a19f0..f22cbf0c7f 100644 --- a/cypress/integration/file_uploader.js +++ b/cypress/integration/file_uploader.js @@ -50,7 +50,7 @@ context('FileUploader', () => { open_upload_dialog(); cy.get_open_dialog().find('a:contains("web link")').click(); - cy.get_open_dialog().find('.file-web-link input').type('https://github.com'); + cy.get_open_dialog().find('.file-web-link input').type('https://github.com', {delay: 100}); cy.server(); cy.route('POST', '/api/method/upload_file').as('upload_file'); cy.get_open_dialog().find('.btn-primary').click(); From 280e7d982e4324828417571184c167fa3a3e73f2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 14:48:43 +0530 Subject: [PATCH 182/337] feat: Blur-up images before loading --- frappe/public/tailwind.css | 19 +++++++++- .../templates/components/image_with_blur.html | 30 ++++++++++++++++ frappe/utils/data.py | 36 +++++++++++++++++++ frappe/website/doctype/web_page/web_page.py | 3 ++ .../full_width_image/full_width_image.html | 2 +- .../section_with_image.html | 5 +-- 6 files changed, 91 insertions(+), 4 deletions(-) create mode 100644 frappe/templates/components/image_with_blur.html diff --git a/frappe/public/tailwind.css b/frappe/public/tailwind.css index 5cd8d92ec3..01b5eca386 100644 --- a/frappe/public/tailwind.css +++ b/frappe/public/tailwind.css @@ -1,6 +1,7 @@ @tailwind base; -html, body { +html, +body { @apply antialiased; @apply text-black; } @@ -99,3 +100,19 @@ details.hide-summary-arrow summary::-webkit-details-marker { } @tailwind utilities; + +.blur-none { + filter: blur(0rem); +} + +.blur-sm { + filter: blur(1rem); +} + +.blur-md { + filter: blur(1.5rem); +} + +.blur-lg { + filter: blur(2rem); +} diff --git a/frappe/templates/components/image_with_blur.html b/frappe/templates/components/image_with_blur.html new file mode 100644 index 0000000000..e52af07c96 --- /dev/null +++ b/frappe/templates/components/image_with_blur.html @@ -0,0 +1,30 @@ +{%- set res = frappe.utils.get_thumbnail_base64_for_image(src) -%} +{%- if res and res['base64'].startswith('data:') -%} +{{ alt or '' }} +{%- else -%} +{{ alt or '' }} +{%- endif -%} + + diff --git a/frappe/utils/data.py b/frappe/utils/data.py index d6a3a6bce6..ef06a3f616 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -653,6 +653,42 @@ def is_image(filepath): filepath = filepath.split('?')[0] return (guess_type(filepath)[0] or "").startswith("image/") +def get_thumbnail_base64_for_image(src): + from PIL import Image + from frappe.core.doctype.file.file import get_local_image + from frappe import safe_decode, cache + + if not src.startswith('/files'): + return + + def _get_base64(): + try: + image, filename, extn = get_local_image(src) + except IOError: + pass + + original_size = image.size + size = 50, 50 + image.thumbnail(size, Image.ANTIALIAS) + + base64_string = image_to_base64(image, extn) + return { + 'base64': 'data:image/{0};base64,{1}'.format(extn, safe_decode(base64_string)), + 'width': original_size[0], + 'height': original_size[1] + } + + return cache().hget('thumbnail_base64', src, generator=_get_base64) + +def image_to_base64(image, extn): + import base64 + from io import BytesIO + + buffered = BytesIO() + image.save(buffered, extn) + img_str = base64.b64encode(buffered.getvalue()) + return img_str + # from Jinja2 code _striptags_re = re.compile(r'(|<[^>]*>)') diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 4b999631a7..57ace65956 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -212,6 +212,9 @@ def get_web_blocks_html(blocks): if block.web_template not in extracted_scripts: out.scripts += scripts extracted_scripts.append(block.web_template) + + # de-duplicate scripts + out.scripts = list(set(out.scripts)) return out def extract_script_tags(html): diff --git a/frappe/website/web_template/full_width_image/full_width_image.html b/frappe/website/web_template/full_width_image/full_width_image.html index 2cd08252b2..19bd17801a 100644 --- a/frappe/website/web_template/full_width_image/full_width_image.html +++ b/frappe/website/web_template/full_width_image/full_width_image.html @@ -1 +1 @@ -{{ description }} +{{ c('image_with_blur', src=url, alt=description, class="w-full") }} diff --git a/frappe/website/web_template/section_with_image/section_with_image.html b/frappe/website/web_template/section_with_image/section_with_image.html index 34a682b8dc..9a7753cc4a 100644 --- a/frappe/website/web_template/section_with_image/section_with_image.html +++ b/frappe/website/web_template/section_with_image/section_with_image.html @@ -1,4 +1,5 @@

    {{ title }}

    -

    {{ subtitle }}

    +

    {{ subtitle }}

    + +{{ c('image_with_blur', src=image, alt=image_description, class="w-full mt-8 rounded-xl") }} -{{ image_description }} From 816ccade2b8efd6cf7c6634ce5cf9b8d7fa83aae Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 14:51:26 +0530 Subject: [PATCH 183/337] chore: Set node version to 12 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8e6546a299..54bb92ec73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ addons: mariadb: 10.3 postgresql: 9.5 +node_js: + - 12 + git: depth: 1 From ba9b8a4060fbe02118a75ff442f364d5cd7de3a9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 14:55:12 +0530 Subject: [PATCH 184/337] test: Remove unnecessary website page visit --- cypress/integration/file_uploader.js | 2 +- cypress/integration/form.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js index f22cbf0c7f..628aac357c 100644 --- a/cypress/integration/file_uploader.js +++ b/cypress/integration/file_uploader.js @@ -50,7 +50,7 @@ context('FileUploader', () => { open_upload_dialog(); cy.get_open_dialog().find('a:contains("web link")').click(); - cy.get_open_dialog().find('.file-web-link input').type('https://github.com', {delay: 100}); + cy.get_open_dialog().find('.file-web-link input').type('https://github.com', { delay: 100 }); cy.server(); cy.route('POST', '/api/method/upload_file').as('upload_file'); cy.get_open_dialog().find('.btn-primary').click(); diff --git a/cypress/integration/form.js b/cypress/integration/form.js index 9d1210ca2b..586ae0de97 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -6,9 +6,6 @@ context('Form', () => { return frappe.call("frappe.tests.ui_test_helpers.create_contact_records"); }); }); - beforeEach(() => { - cy.visit('/desk#workspace/Website'); - }); it('create a new form', () => { cy.visit('/desk#Form/ToDo/New ToDo 1'); cy.fill_field('description', 'this is a test todo', 'Text Editor').blur(); From d0b725b34775dc0acd38125bd201fbdfaec31320 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 14:58:25 +0530 Subject: [PATCH 185/337] chore: Install node 12 via nvm --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54bb92ec73..fcb9cca220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ addons: mariadb: 10.3 postgresql: 9.5 -node_js: - - 12 - git: depth: 1 @@ -57,7 +54,7 @@ before_install: install: - cd ~ - source ./.nvm/nvm.sh - - nvm install v8.10.0 + - nvm install 12 - git clone https://github.com/frappe/bench --depth 1 - pip install -e ./bench From e8e64012e677c9996465fd188c5a9a1480dc28e8 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 15:22:35 +0530 Subject: [PATCH 186/337] tests: Fix exporter tests --- frappe/core/doctype/data_import/exporter_new.py | 6 +++++- frappe/core/doctype/data_import/test_exporter_new.py | 2 +- frappe/utils/data.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/data_import/exporter_new.py b/frappe/core/doctype/data_import/exporter_new.py index e8e360dc50..85f933be69 100644 --- a/frappe/core/doctype/data_import/exporter_new.py +++ b/frappe/core/doctype/data_import/exporter_new.py @@ -71,7 +71,11 @@ class Exporter: return parent_fields def get_exportable_children_fields(self): - children = [df.options for df in self.meta.fields if df.fieldtype in table_fields] + child_table_fields = [df for df in self.meta.fields if df.fieldtype in table_fields] + if self.export_fields == "Mandatory": + child_table_fields = [df for df in child_table_fields if df.reqd] + + children = [df.options for df in child_table_fields] children_fields = [] for child in children: children_fields += self.get_exportable_fields(child) diff --git a/frappe/core/doctype/data_import/test_exporter_new.py b/frappe/core/doctype/data_import/test_exporter_new.py index eabf371b07..d17cef390b 100644 --- a/frappe/core/doctype/data_import/test_exporter_new.py +++ b/frappe/core/doctype/data_import/test_exporter_new.py @@ -20,7 +20,7 @@ class TestExporter(unittest.TestCase): e = Exporter('Web Page', export_fields='All') csv_array = e.get_csv_array() header = csv_array[0] - self.assertEqual(len(header), 28) + self.assertEqual(len(header), 35) def test_exports_selected_fields(self): diff --git a/frappe/utils/data.py b/frappe/utils/data.py index ef06a3f616..fa7701486f 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -665,7 +665,7 @@ def get_thumbnail_base64_for_image(src): try: image, filename, extn = get_local_image(src) except IOError: - pass + return original_size = image.size size = 50, 50 From 8dbc7ecff4d0462fb44e34d333122acd366ddc10 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 15:26:59 +0530 Subject: [PATCH 187/337] test: Force weblink input --- cypress/integration/file_uploader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js index 628aac357c..5e9a264189 100644 --- a/cypress/integration/file_uploader.js +++ b/cypress/integration/file_uploader.js @@ -50,7 +50,7 @@ context('FileUploader', () => { open_upload_dialog(); cy.get_open_dialog().find('a:contains("web link")').click(); - cy.get_open_dialog().find('.file-web-link input').type('https://github.com', { delay: 100 }); + cy.get_open_dialog().find('.file-web-link input').type('https://github.com', { delay: 100, force: true }); cy.server(); cy.route('POST', '/api/method/upload_file').as('upload_file'); cy.get_open_dialog().find('.btn-primary').click(); From c4891b47bef92d27f0c853316ca2d9a57acea468 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 15:47:45 +0530 Subject: [PATCH 188/337] chore: Install bench via pip --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fcb9cca220..74569412cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,7 @@ install: - source ./.nvm/nvm.sh - nvm install 12 - - git clone https://github.com/frappe/bench --depth 1 - - pip install -e ./bench + - pip install frappe-bench - bench init frappe-bench --skip-assets --python $(which python) --frappe-path $TRAVIS_BUILD_DIR From dbf180f36830bb0425ce56928fa7eb9d53c71bf0 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 15:48:05 +0530 Subject: [PATCH 189/337] fix: Handle empty image --- .../templates/components/image_with_blur.html | 2 +- frappe/utils/data.py | 3 + .../doctype/web_template/test_web_template.py | 115 +++++++++--------- 3 files changed, 64 insertions(+), 56 deletions(-) diff --git a/frappe/templates/components/image_with_blur.html b/frappe/templates/components/image_with_blur.html index e52af07c96..cbee369608 100644 --- a/frappe/templates/components/image_with_blur.html +++ b/frappe/templates/components/image_with_blur.html @@ -1,4 +1,4 @@ -{%- set res = frappe.utils.get_thumbnail_base64_for_image(src) -%} +{%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%} {%- if res and res['base64'].startswith('data:') -%} {{ alt or '' }} diff --git a/frappe/utils/data.py b/frappe/utils/data.py index fa7701486f..fb3f34d916 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -658,6 +658,9 @@ def get_thumbnail_base64_for_image(src): from frappe.core.doctype.file.file import get_local_image from frappe import safe_decode, cache + if not src: + frappe.throw('Invalid source for image: {0}'.format(src)) + if not src.startswith('/files'): return diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index 12ab4b8917..dda49fb107 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -33,14 +33,70 @@ class TestWebTemplate(unittest.TestCase): self.assertTrue("/test" == button.attrs["href"]) def test_web_page_with_page_builder(self): - if not frappe.db.exists("Web Page", "test-page"): + self.create_web_page() + + set_request(method="GET", path="test-web-template") + response = render() + + self.assertEquals(response.status_code, 200) + + html = frappe.safe_decode(response.get_data()) + + soup = BeautifulSoup(html, "html.parser") + sections = soup.find("main").find_all("section") + + self.assertEqual(len(sections), 2) + self.assertEqual(sections[0].find("h2").text, "Test Title") + self.assertEqual(sections[0].find("p").text, "test lorem ipsum") + self.assertEqual(len(sections[1].find_all("a")), 3) + + def test_tailwind_styles_in_developer_mode(self): + self.create_web_page() + theme = self.create_tailwind_theme() + theme.set_as_default() + + set_request(method="GET", path="test-web-template") + response = render() + self.assertEquals(response.status_code, 200) + html = frappe.safe_decode(response.get_data()) + + soup = BeautifulSoup(html, "html.parser") + stylesheet = soup.select_one('link[rel="stylesheet"]') + + self.assertEqual(stylesheet.attrs['href'], '/assets/css/tailwind.css') + + frappe.get_doc('Website Theme', 'Standard').set_as_default() + + def test_tailwind_styles_in_production(self): + self.create_web_page() + theme = self.create_tailwind_theme() + theme.set_as_default() + + frappe.conf.developer_mode = 0 + + set_request(method="GET", path="test-web-template") + response = render() + self.assertEquals(response.status_code, 200) + html = frappe.safe_decode(response.get_data()) + + soup = BeautifulSoup(html, "html.parser") + style = soup.select_one("style[data-tailwind]") + + self.assertTrue(style) + self.assertTrue('py-20' in style.text) + self.assertTrue('text-gray-900' in style.text) + + frappe.get_doc('Website Theme', 'Standard').set_as_default() + + def create_web_page(self): + if not frappe.db.exists("Web Page", "test-web-template"): frappe.get_doc( { "doctype": "Web Page", - "title": "test-page", - "name": "test-page", + "title": "test-web-template", + "name": "test-web-template", "published": 1, - "route": "testpage", + "route": "test-web-template", "content_type": "Page Builder", "page_blocks": [ { @@ -72,57 +128,6 @@ class TestWebTemplate(unittest.TestCase): } ).insert() - set_request(method="GET", path="testpage") - response = render() - - self.assertEquals(response.status_code, 200) - - html = frappe.safe_decode(response.get_data()) - - soup = BeautifulSoup(html, "html.parser") - sections = soup.find("main").find_all("section") - - self.assertEqual(len(sections), 2) - self.assertEqual(sections[0].find("h2").text, "Test Title") - self.assertEqual(sections[0].find("p").text, "test lorem ipsum") - self.assertEqual(len(sections[1].find_all("a")), 3) - - def test_tailwind_styles_in_developer_mode(self): - theme = self.create_tailwind_theme() - theme.set_as_default() - - set_request(method="GET", path="testpage") - response = render() - self.assertEquals(response.status_code, 200) - html = frappe.safe_decode(response.get_data()) - - soup = BeautifulSoup(html, "html.parser") - stylesheet = soup.select_one('link[rel="stylesheet"]') - - self.assertEqual(stylesheet.attrs['href'], '/assets/css/tailwind.css') - - frappe.get_doc('Website Theme', 'Standard').set_as_default() - - def test_tailwind_styles_in_production(self): - theme = self.create_tailwind_theme() - theme.set_as_default() - - frappe.conf.developer_mode = 0 - - set_request(method="GET", path="testpage") - response = render() - self.assertEquals(response.status_code, 200) - html = frappe.safe_decode(response.get_data()) - - soup = BeautifulSoup(html, "html.parser") - style = soup.select_one("style[data-tailwind]") - - self.assertTrue(style) - self.assertTrue('py-20' in style.text) - self.assertTrue('text-gray-900' in style.text) - - frappe.get_doc('Website Theme', 'Standard').set_as_default() - def create_tailwind_theme(self): if not frappe.db.exists('Website Theme', 'Tailwind'): theme = frappe.get_doc({ From 152f2fa7988fe0cfcafa286f7aca085e534d7386 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 16:00:04 +0530 Subject: [PATCH 190/337] fix: Set developer_mode explicitly --- frappe/website/doctype/web_template/test_web_template.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index dda49fb107..d582df17da 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -55,6 +55,8 @@ class TestWebTemplate(unittest.TestCase): theme = self.create_tailwind_theme() theme.set_as_default() + frappe.conf.developer_mode = 1 + set_request(method="GET", path="test-web-template") response = render() self.assertEquals(response.status_code, 200) From dbee5931d2fb6bc104b5bc1c2e0cb32ebd2d1ca2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 25 Apr 2020 16:18:10 +0530 Subject: [PATCH 191/337] test: Fix form.js test - By waiting for form save --- cypress/integration/form.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cypress/integration/form.js b/cypress/integration/form.js index 586ae0de97..2eb48214a3 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -10,7 +10,13 @@ context('Form', () => { cy.visit('/desk#Form/ToDo/New ToDo 1'); cy.fill_field('description', 'this is a test todo', 'Text Editor').blur(); cy.get('.page-title').should('contain', 'Not Saved'); + cy.server(); + cy.route({ + method: 'POST', + url: 'api/method/frappe.desk.form.save.savedocs' + }).as('form_save'); cy.get('.primary-action').click(); + cy.wait('@form_save').its('status').should('eq', 200); cy.visit('/desk#List/ToDo'); cy.location('hash').should('eq', '#List/ToDo/List'); cy.get('h1').should('be.visible').and('contain', 'To Do'); From 31b8b53e88e246a9a9b968585ca350c45049c57b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 20:50:31 +0530 Subject: [PATCH 192/337] fix: Use assertEqual instead of assertEquals - assertEquals will be deprecated --- frappe/website/doctype/web_template/test_web_template.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index d582df17da..a6d887cc24 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -38,7 +38,7 @@ class TestWebTemplate(unittest.TestCase): set_request(method="GET", path="test-web-template") response = render() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) @@ -59,7 +59,7 @@ class TestWebTemplate(unittest.TestCase): set_request(method="GET", path="test-web-template") response = render() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) soup = BeautifulSoup(html, "html.parser") @@ -78,7 +78,7 @@ class TestWebTemplate(unittest.TestCase): set_request(method="GET", path="test-web-template") response = render() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) soup = BeautifulSoup(html, "html.parser") From c676174908ffe89b4238e1ca155fbd23f661629d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 20:50:43 +0530 Subject: [PATCH 193/337] fix: Unused variable name --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index fb3f34d916..acebfa2271 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -666,7 +666,7 @@ def get_thumbnail_base64_for_image(src): def _get_base64(): try: - image, filename, extn = get_local_image(src) + image, unused_filename, extn = get_local_image(src) except IOError: return From 42586041c1e937c53af5d4c99b8909ddf7ab3291 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 20:50:57 +0530 Subject: [PATCH 194/337] fix: Remove unnecessary error handling --- frappe/utils/jinja.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 900135a275..5a8f66b054 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -215,13 +215,10 @@ def parse_front_matter_attrs_and_html(source): if not source.startswith('---'): return attributes, html - try: - res = get_frontmatter(source) - if res['attributes']: - attributes = res['attributes'] - html = res['body'] - except Exception as e: - print('Error parsing Frontmatter in template: ' + e) + res = get_frontmatter(source) + if res['attributes']: + attributes = res['attributes'] + html = res['body'] return attributes, html From 9c7f01b59d69799eaae5354f49c44d67c87f6091 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 20:51:29 +0530 Subject: [PATCH 195/337] fix: Style --- frappe/website/context.py | 2 +- frappe/website/doctype/web_page/web_page.py | 3 +-- frappe/website/render.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/website/context.py b/frappe/website/context.py index 9ed68926c7..5663199545 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -223,7 +223,7 @@ def add_metatags(context): tags = frappe._dict(context.get("metatags") or {}) if tags: - if not "og:type" in tags: + if "og:type" not in tags: tags["og:type"] = "article" name = tags.get('name') or tags.get('title') diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 57ace65956..722c81fce9 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -69,8 +69,7 @@ class WebPage(WebsiteGenerator): is_jinja = context.dynamic_template or "" in context.main_section if is_jinja or ("{{" in context.main_section): try: - context["main_section"] = render_template(context.main_section, - context) + context["main_section"] = render_template(context.main_section, context) if not "" in context.main_section: context["no_cache"] = 1 except TemplateSyntaxError: diff --git a/frappe/website/render.py b/frappe/website/render.py index 365bcf3dcf..601a4e7eb2 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -203,7 +203,7 @@ def build_page(path): html = html.replace('{next}', get_next_link(context.route)) if '' in html and not frappe.conf.developer_mode: - html = add_processed_tailwind_css(context, html) + html = add_processed_tailwind_css(html) # html = frappe.get_template(context.base_template_path).render(context) @@ -354,7 +354,7 @@ def raise_if_disabled(path): if path == _path and not r.enabled: raise frappe.PermissionError -def add_processed_tailwind_css(context, html): +def add_processed_tailwind_css(html): from subprocess import Popen, PIPE replace_string = '' From 6996ff3059d55988005b9f9d21fa8065f2501adb Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 25 Apr 2020 20:51:38 +0530 Subject: [PATCH 196/337] fix: Update modified of Web Page --- frappe/website/doctype/web_page/web_page.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 836dc7dc76..4766c24045 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -291,7 +291,7 @@ "is_published_field": "published", "links": [], "max_attachments": 20, - "modified": "2020-04-19 12:26:21.546908", + "modified": "2020-04-25 20:40:39.253548", "modified_by": "Administrator", "module": "Website", "name": "Web Page", @@ -313,4 +313,4 @@ "sort_order": "ASC", "title_field": "title", "track_changes": 1 -} +} \ No newline at end of file From 580fa4a14409bc22f6319f183980128235bad1c3 Mon Sep 17 00:00:00 2001 From: Fumin Date: Sun, 26 Apr 2020 04:59:21 +0800 Subject: [PATCH 197/337] fix: backups on mariadb listening on other ports Previously, databases not listening on the default 3306 port are not being backup, due to port information not passed to mysqldump. --- frappe/utils/backups.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 984e28db5e..55dcdefe51 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -23,8 +23,9 @@ class BackupGenerator: If specifying db_file_name, also append ".sql.gz" """ def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None, - backup_path_private_files=None, db_host="localhost"): + backup_path_private_files=None, db_host="localhost", db_port=3306): self.db_host = db_host + self.db_port = db_port self.db_name = db_name self.user = user self.password = password @@ -108,10 +109,10 @@ class BackupGenerator: import frappe.utils # escape reserved characters - args = dict([item[0], frappe.utils.esc(item[1], '$ ')] + args = dict([item[0], frappe.utils.esc(str(item[1]), '$ ')] for item in self.__dict__.copy().items()) - cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s | gzip > %(backup_path_db)s """ % args + cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s | gzip > %(backup_path_db)s """ % args err, out = frappe.utils.execute_in_shell(cmd_string) def send_email(self): @@ -171,7 +172,8 @@ def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_pat frappe.conf.db_password, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, - db_host = frappe.db.host) + db_host = frappe.db.host, + db_port = frappe.db.port) odb.get_backup(older_than, ignore_files, force=force) return odb From 1e2744318ec732b5fcc845d959bed39de6e40dcb Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 26 Apr 2020 14:53:34 +0530 Subject: [PATCH 198/337] fix: Markdown styles --- frappe/public/tailwind.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/public/tailwind.css b/frappe/public/tailwind.css index 01b5eca386..270b70a2fc 100644 --- a/frappe/public/tailwind.css +++ b/frappe/public/tailwind.css @@ -13,7 +13,6 @@ details.hide-summary-arrow summary::-webkit-details-marker { } .from-markdown { - @apply text-xl; @apply text-gray-900; @apply leading-relaxed; @@ -48,7 +47,7 @@ details.hide-summary-arrow summary::-webkit-details-marker { } > blockquote { - @apply px-6 py-4 text-lg text-gray-900 border border-l-4 border-gray-800; + @apply px-4 py-3 text-sm font-medium text-gray-900 border border-gray-400 rounded-md bg-gray-50; } > h1 { @@ -87,15 +86,15 @@ details.hide-summary-arrow summary::-webkit-details-marker { tr > td, tr > th { - @apply px-4 py-2 border border-gray-800; + @apply px-4 py-2 border border-gray-400; } th:empty { display: none; } - img { - @apply border border-gray-800; + .screenshot { + @apply border border-gray-400 rounded-md; } } From 252713236f4250d82c2f6d03f192e066b0fdd476 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 26 Apr 2020 14:53:45 +0530 Subject: [PATCH 199/337] fix: Duplicate statement --- frappe/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index b912011a61..912d0b0e42 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -831,7 +831,6 @@ def rename_doc(*args, **kwargs): Calls `frappe.model.rename_doc.rename_doc` """ - kwargs.pop('cmd', None) kwargs.pop('ignore_permissions', None) kwargs.pop('cmd', None) From 027ec14bd7997c95a7f4506863e5e76d609dd476 Mon Sep 17 00:00:00 2001 From: Michelle Alva <50285544+michellealva@users.noreply.github.com> Date: Sun, 26 Apr 2020 14:59:26 +0530 Subject: [PATCH 200/337] fix: convert max_file_size to int Traceback (most recent call last): File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/app.py", line 62, in application response = frappe.api.handle() File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/api.py", line 55, in handle return frappe.handler.handle() File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 22, in handle data = execute_cmd(cmd) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 61, in execute_cmd return frappe.call(method, **frappe.form_dict) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/__init__.py", line 1054, in call return fn(*args, **newargs) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/handler.py", line 198, in upload_file ret.save(ignore_permissions=ignore_permissions) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 273, in save return self._save(*args, **kwargs) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 296, in _save self.insert() File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 223, in insert self.run_method("before_insert") File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 794, in run_method out = Document.hook(fn)(self, *args, **kwargs) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 1065, in composer return composed(self, method, *args, **kwargs) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 1048, in runner add_to_return_value(self, fn(self, *args, **kwargs)) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/model/document.py", line 788, in fn = lambda self, *args, **kwargs: getattr(self, method)(*args, **kwargs) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 55, in before_insert self.save_file(content=self.content, decode=self.decode) File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 439, in save_file self.file_size = self.check_max_file_size() File "/home/frappe/benches/bench-12-f1-0/apps/frappe/frappe/core/doctype/file/file.py", line 495, in check_max_file_size if file_size > max_file_size: TypeError: '>' not supported between instances of 'int' and 'str' --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 0d0803def9..b35abfa861 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -696,7 +696,7 @@ def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_ def get_max_file_size(): - return conf.get('max_file_size') or 10485760 + return cint(conf.get('max_file_size')) or 10485760 def remove_all(dt, dn, from_delete=False): From cac0592a77dba31e4e2af144e4bd6f808995dcf8 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 26 Apr 2020 15:24:10 +0530 Subject: [PATCH 201/337] fix: Add flexible content area in Footer template --- .../footer_horizontal/footer_horizontal.html | 21 ++++++++++++------- .../footer_horizontal/footer_horizontal.json | 8 ++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.html b/frappe/website/web_template/footer_horizontal/footer_horizontal.html index 08d89be046..f4ec2a0696 100644 --- a/frappe/website/web_template/footer_horizontal/footer_horizontal.html +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.html @@ -4,17 +4,22 @@ Brand Logo
    {%- endif -%} -
    - {%- for index in ['1', '2', '3', '4', '5'] -%} +
    +
    + {%- for index in ['1', '2', '3', '4', '5', '6', '7', '8'] -%} - {%- set label = values['item_' + index + '_label'] -%} - {%- set url = values['item_' + index + '_url'] -%} + {%- set label = values['item_' + index + '_label'] -%} + {%- set url = values['item_' + index + '_url'] -%} - {%- if label and url -%} - {{ c('navbar_link', label=label, url=url) }} - {%- endif -%} + {%- if label and url -%} + {{ c('navbar_link', label=label, url=url) }} + {%- endif -%} - {%- endfor -%} + {%- endfor -%} +
    +
    + {{ content }} +
    diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.json b/frappe/website/web_template/footer_horizontal/footer_horizontal.json index 9a66e1d555..5e17f80eb1 100644 --- a/frappe/website/web_template/footer_horizontal/footer_horizontal.json +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.json @@ -86,10 +86,16 @@ "fieldtype": "Data", "label": "Item 5 URL", "reqd": 0 + }, + { + "fieldname": "content", + "fieldtype": "Markdown Editor", + "label": "Content", + "reqd": 0 } ], "idx": 0, - "modified": "2020-04-19 15:11:42.097670", + "modified": "2020-04-26 15:14:15.892042", "modified_by": "Administrator", "name": "Footer Horizontal", "owner": "Administrator", From a77c35be1d9cd681359ac575c1ebca0e067ab989 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 26 Apr 2020 15:24:22 +0530 Subject: [PATCH 202/337] fix: Set image fieldtype to Attach Image --- .../full_width_image/full_width_image.json | 10 +++++--- .../hero_with_right_image.json | 25 ++++++++++++------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/frappe/website/web_template/full_width_image/full_width_image.json b/frappe/website/web_template/full_width_image/full_width_image.json index 1081bac1ff..08e04e2d3f 100644 --- a/frappe/website/web_template/full_width_image/full_width_image.json +++ b/frappe/website/web_template/full_width_image/full_width_image.json @@ -5,17 +5,19 @@ "fields": [ { "fieldname": "url", - "fieldtype": "Data", - "label": "URL" + "fieldtype": "Attach Image", + "label": "Image", + "reqd": 0 }, { "fieldname": "description", "fieldtype": "Data", - "label": "Description" + "label": "Description", + "reqd": 0 } ], "idx": 0, - "modified": "2020-04-17 16:03:35.676241", + "modified": "2020-04-26 15:09:18.173851", "modified_by": "Administrator", "name": "Full Width Image", "owner": "Administrator", diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json index 26dd33b6c4..bb841a3156 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json @@ -6,41 +6,48 @@ { "fieldname": "title", "fieldtype": "Data", - "label": "Title" + "label": "Title", + "reqd": 0 }, { "fieldname": "subtitle", "fieldtype": "Text", - "label": "Subtitle" + "label": "Subtitle", + "reqd": 0 }, { "fieldname": "image", - "fieldtype": "Data", - "label": "Image" + "fieldtype": "Attach Image", + "label": "Image", + "reqd": 0 }, { "fieldname": "primary_action_label", "fieldtype": "Data", - "label": "Primary Action Label" + "label": "Primary Action Label", + "reqd": 0 }, { "fieldname": "primary_action", "fieldtype": "Data", - "label": "Primary Action" + "label": "Primary Action", + "reqd": 0 }, { "fieldname": "secondary_action_label", "fieldtype": "Data", - "label": "Secondary Action Label" + "label": "Secondary Action Label", + "reqd": 0 }, { "fieldname": "secondary_action", "fieldtype": "Data", - "label": "Secondary Action" + "label": "Secondary Action", + "reqd": 0 } ], "idx": 0, - "modified": "2020-04-17 14:18:24.738411", + "modified": "2020-04-26 15:08:26.937576", "modified_by": "Administrator", "name": "Hero with Right Image", "owner": "Administrator", From e7a163168b3f463d3ff69f9a906fc78f59b7b8c4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 18 Apr 2020 15:59:02 +0530 Subject: [PATCH 203/337] feat: Dashboard view for doctypes --- frappe/desk/doctype/dashboard/dashboard.js | 8 + .../dashboard_chart/dashboard_chart.js | 7 + .../dashboard_chart/dashboard_chart.json | 13 +- .../dashboard_chart/dashboard_chart.py | 22 +- frappe/desk/doctype/number_card/__init__.py | 0 .../desk/doctype/number_card/number_card.js | 120 +++++ .../desk/doctype/number_card/number_card.json | 124 +++++ .../desk/doctype/number_card/number_card.py | 48 ++ .../doctype/number_card/test_number_card.py | 10 + frappe/public/build.json | 2 + frappe/public/js/frappe/form/layout.js | 11 +- frappe/public/js/frappe/list/base_list.js | 2 +- .../public/js/frappe/list/list_sidebar.html | 2 + .../frappe/views/dashboard/dashboard_view.js | 453 ++++++++++++++++++ .../public/js/frappe/widgets/base_widget.js | 28 +- .../public/js/frappe/widgets/chart_widget.js | 78 +-- frappe/public/js/frappe/widgets/new_widget.js | 14 +- .../js/frappe/widgets/number_card_widget.js | 143 ++++++ frappe/public/js/frappe/widgets/utils.js | 12 +- .../public/js/frappe/widgets/widget_dialog.js | 187 +++++++- .../public/js/frappe/widgets/widget_group.js | 13 + frappe/public/less/dashboard_view.less | 40 ++ frappe/public/less/desktop.less | 50 ++ 23 files changed, 1301 insertions(+), 86 deletions(-) create mode 100644 frappe/desk/doctype/number_card/__init__.py create mode 100644 frappe/desk/doctype/number_card/number_card.js create mode 100644 frappe/desk/doctype/number_card/number_card.json create mode 100644 frappe/desk/doctype/number_card/number_card.py create mode 100644 frappe/desk/doctype/number_card/test_number_card.py create mode 100644 frappe/public/js/frappe/views/dashboard/dashboard_view.js create mode 100644 frappe/public/js/frappe/widgets/number_card_widget.js create mode 100644 frappe/public/less/dashboard_view.less diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js index 19ce8eb1fd..dc2991a346 100644 --- a/frappe/desk/doctype/dashboard/dashboard.js +++ b/frappe/desk/doctype/dashboard/dashboard.js @@ -4,5 +4,13 @@ frappe.ui.form.on('Dashboard', { refresh: function(frm) { frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name)); + + frm.set_query("chart", "charts", function(doc, cdt, cdn) { + return { + filters: { + is_standard: 1 + } + }; + }); } }); diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 275028fc15..b869f60ce5 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -9,6 +9,12 @@ frappe.ui.form.on('Dashboard Chart', { frm.add_fetch('source', 'timeseries', 'timeseries'); }, + before_save: function(frm) { + if (frm.is_new() && (frappe.user.has_role('System Manager') || frappe.user.has_role('Dashboard Manager'))) { + frm.doc.is_standard = 1; + } + }, + refresh: function(frm) { frm.chart_filters = null; frm.add_custom_button('Add Chart to Dashboard', () => { @@ -348,6 +354,7 @@ frappe.ui.form.on('Dashboard Chart', { on_change: () => {}, }); + console.log('filters', filters); frm.filter_group.add_filters_to_filter_group(filters); } diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index cd32292783..7530d70fdc 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -35,7 +35,8 @@ "color", "custom_options", "section_break_10", - "last_synced_on" + "last_synced_on", + "is_standard" ], "fields": [ { @@ -220,10 +221,18 @@ "fieldname": "custom_options", "fieldtype": "Code", "label": "Custom Options" + }, + { + "default": "0", + "fieldname": "is_standard", + "fieldtype": "Check", + "hidden": 1, + "label": "Is Standard", + "permlevel": 1 } ], "links": [], - "modified": "2020-04-20 23:49:11.389909", + "modified": "2020-04-17 18:11:33.486037", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 36a75bd9d5..8242e3752d 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -92,20 +92,28 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d return chart_config @frappe.whitelist() -def create_report_chart(args): +def create_dashboard_chart(args): args = frappe.parse_json(args) - _doc = frappe.new_doc('Dashboard Chart') + doc = frappe.new_doc('Dashboard Chart') + roles = frappe.get_roles(frappe.session.user) + if 'Sytem Manager' in roles or 'Dashboard Manager' in roles: + doc.is_standard = 1 - _doc.update(args) + doc.update(args) - if (args.get("custom_options")): - _doc.custom_options = json.dumps(args.get("custom_options")) + if args.get('custom_options'): + doc.custom_options = json.dumps(args.get('custom_options')) if frappe.db.exists('Dashboard Chart', args.chart_name): args.chart_name = append_number_if_name_exists('Dashboard Chart', args.chart_name) - _doc.chart_name = args.chart_name - _doc.insert(ignore_permissions=True) + doc.chart_name = args.chart_name + doc.insert(ignore_permissions=True) + return doc + +@frappe.whitelist() +def create_report_chart(args): + create_dashboard_chart() if args.dashboard: add_chart_to_dashboard(json.dumps(args)) diff --git a/frappe/desk/doctype/number_card/__init__.py b/frappe/desk/doctype/number_card/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js new file mode 100644 index 0000000000..2bf99b9107 --- /dev/null +++ b/frappe/desk/doctype/number_card/number_card.js @@ -0,0 +1,120 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Number Card', { + refresh: function(frm) { + frm.set_df_property("filters_section", "hidden", 1); + frm.trigger('set_options'); + frm.trigger('render_filters_table'); + }, + + before_save: function(frm) { + if (frm.is_new() && (frappe.user.has_role('System Manager') || frappe.user.has_role('Dashboard Manager'))) { + frm.doc.is_standard = 1; + } + }, + + document_type: function(frm) { + frm.set_query('document_type', function() { + return { + filters: { + 'issingle': false + } + } + }); + frm.set_value('filters_json', '[]'); + frm.set_value('aggregate_function_based_on', ''); + if (frm.doc.document_type) { + frm.trigger('set_options'); + } + }, + + set_options: function(frm) { + let aggregate_based_on_fields = []; + const doctype = frm.doc.document_type; + + frappe.model.with_doctype(doctype, () => { + frappe.get_meta(doctype).fields.map(df => { + if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { + aggregate_based_on_fields.push({label: df.label, value: df.fieldname}); + } + }); + + frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields); + }); + }, + + render_filters_table: function(frm) { + frm.set_df_property("filters_section", "hidden", 0); + + let wrapper = $(frm.get_field('filters_json').wrapper).empty(); + frm.filter_table = $(` + + + + + + + + +
    ${__('Filter')}${__('Condition')}${__('Value')}
    `).appendTo(wrapper); + + frm.filters = JSON.parse(frm.doc.filters_json || '[]'); + + frm.trigger('set_filters_in_table'); + + frm.filter_table.on('click', () => { + let dialog = new frappe.ui.Dialog({ + title: __('Set Filters'), + fields: [{ + fieldtype: 'HTML', + fieldname: 'filter_area', + }], + primary_action: function() { + let values = this.get_values(); + if (values) { + this.hide(); + frm.filters = frm.filter_group.get_filters(); + frm.set_value('filters_json', JSON.stringify(frm.filters)); + frm.trigger('set_filters_in_table'); + } + }, + primary_action_label: "Set" + }); + + frappe.dashboards.filters_dialog = dialog; + + frm.filter_group = new frappe.ui.FilterGroup({ + parent: dialog.get_field('filter_area').$wrapper, + doctype: frm.doc.document_type, + on_change: () => {}, + }); + + frm.filter_group.add_filters_to_filter_group(frm.filters); + + dialog.show(); + dialog.set_values(frm.filters); + }); + + }, + + set_filters_in_table: function(frm) { + if (!frm.filters.length) { + const filter_row = $(` + ${__("Click to Set Filters")}`); + frm.filter_table.find('tbody').html(filter_row); + } else { + let filter_rows = ''; + frm.filters.forEach(filter => { + filter_rows += + ` + ${filter[1]} + ${filter[2] || ""} + ${filter[3]} + `; + + }); + frm.filter_table.find('tbody').html(filter_rows); + } + } +}); diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json new file mode 100644 index 0000000000..222e4ed942 --- /dev/null +++ b/frappe/desk/doctype/number_card/number_card.json @@ -0,0 +1,124 @@ +{ + "actions": [], + "autoname": "CARD.#####", + "creation": "2020-04-15 18:06:39.444683", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "label", + "function", + "column_break_2", + "document_type", + "aggregate_function_based_on", + "filters_section", + "filters_json", + "color", + "is_standard" + ], + "fields": [ + { + "fieldname": "document_type", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Document Type", + "options": "DocType", + "reqd": 1 + }, + { + "depends_on": "eval: doc.document_type", + "fieldname": "function", + "fieldtype": "Select", + "label": "Function", + "options": "Count\nSum\nAverage\nMinimum\nMaximum", + "reqd": 1 + }, + { + "depends_on": "eval: doc.function !== 'Count'", + "fieldname": "aggregate_function_based_on", + "fieldtype": "Select", + "label": "Aggregate Function Based On", + "mandatory_depends_on": "eval: doc.function !== 'Count'" + }, + { + "fieldname": "filters_json", + "fieldtype": "Code", + "label": "Filters JSON", + "options": "JSON" + }, + { + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label", + "reqd": 1 + }, + { + "fieldname": "color", + "fieldtype": "Color", + "label": "Color" + }, + { + "default": "0", + "fieldname": "is_standard", + "fieldtype": "Check", + "hidden": 1, + "label": "Is Standard", + "permlevel": 1 + }, + { + "fieldname": "column_break_2", + "fieldtype": "Column Break" + }, + { + "fieldname": "filters_section", + "fieldtype": "Section Break", + "label": "Filters Section" + } + ], + "links": [], + "modified": "2020-04-18 14:12:06.949445", + "modified_by": "Administrator", + "module": "Desk", + "name": "Number Card", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Dashboard Manager", + "share": 1, + "write": 1 + }, + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "All", + "share": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "label", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py new file mode 100644 index 0000000000..509995392c --- /dev/null +++ b/frappe/desk/doctype/number_card/number_card.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document +from frappe.model.naming import append_number_if_name_exists + +class NumberCard(Document): + pass + + +@frappe.whitelist() +def get_result(doc): + doc = frappe.parse_json(doc) + fields = [] + sql_function_map = { + 'Count': 'count', + 'Sum': 'sum', + 'Average': 'avg', + 'Minimum': 'min', + 'Maximum': 'max' + } + + function = sql_function_map[doc.function] + + if function == 'count': + fields = ['{function}(*) as result'.format(function=function)] + else: + fields = ['{function}({based_on}) as result'.format(function=function, based_on=doc.aggregate_function_based_on)] + + filters = frappe.parse_json(doc.filters_json) + number = frappe.db.get_all(doc.document_type, fields = fields, filters = filters)[0]['result'] + number = round(number, 2) if isinstance(number, float) else number + + return number + +@frappe.whitelist() +def create_number_card(args): + args = frappe.parse_json(args) + doc = frappe.new_doc('Number Card') + roles = frappe.get_roles(frappe.session.user) + if 'Sytem Manager' in roles or 'Dashboard Manager' in roles: + doc.is_standard = 1 + doc.update(args) + doc.insert(ignore_permissions=True) + return doc \ No newline at end of file diff --git a/frappe/desk/doctype/number_card/test_number_card.py b/frappe/desk/doctype/number_card/test_number_card.py new file mode 100644 index 0000000000..4aa1ecf282 --- /dev/null +++ b/frappe/desk/doctype/number_card/test_number_card.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestNumberCard(unittest.TestCase): + pass diff --git a/frappe/public/build.json b/frappe/public/build.json index 7f55924a6b..df3d71f537 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -104,6 +104,7 @@ "public/less/form.less", "public/less/mobile.less", "public/less/kanban.less", + "public/less/dashboard_view.less", "public/less/controls.less", "public/less/chat.less", "public/less/filters.less", @@ -296,6 +297,7 @@ "public/js/frappe/views/gantt/gantt_view.js", "public/js/frappe/views/calendar/calendar.js", + "public/js/frappe/views/dashboard/dashboard_view.js", "public/js/frappe/views/image/image_view.js", "public/js/frappe/views/kanban/kanban_view.js", "public/js/frappe/views/inbox/inbox_view.js", diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 8a88ee0c0d..5aeb29b1ed 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -498,11 +498,18 @@ frappe.ui.form.Layout = Class.extend({ }, set_dependant_property: function(condition, fieldname, property) { let set_property = this.evaluate_depends_on_value(condition); + let form_obj; + if (this.frm) { + form_obj = this.frm; + } else if (this.is_dialog) { + form_obj = this; + } + if (form_obj) { if (set_property) { - this.frm.set_df_property(fieldname, property, 1); + form_obj.set_df_property(fieldname, property, 1); } else { - this.frm.set_df_property(fieldname, property, 0); + form_obj.set_df_property(fieldname, property, 0); } } }, diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 0aae8b361f..76bda11f0a 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -686,5 +686,5 @@ class FilterArea { } // utility function to validate view modes -frappe.views.view_modes = ['List', 'Gantt', 'Kanban', 'Calendar', 'Image', 'Inbox', 'Report']; +frappe.views.view_modes = ['List', 'Gantt', 'Kanban', 'Calendar', 'Image', 'Inbox', 'Report', 'Dashboard']; frappe.views.is_valid = view_mode => frappe.views.view_modes.includes(view_mode); diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html index 880a91cf81..37f0dafb96 100644 --- a/frappe/public/js/frappe/list/list_sidebar.html +++ b/frappe/public/js/frappe/list/list_sidebar.html @@ -26,6 +26,8 @@
  • {%= __("List") %}
    • +
  • + {%= __("Dashboard") %}
  • {%= __("Images") %}
  • diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js new file mode 100644 index 0000000000..69bcc0ac74 --- /dev/null +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -0,0 +1,453 @@ +frappe.provide('frappe.views'); + +frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { + get view_name() { + return 'Dashboard'; + } + + setup_defaults() { + return super.setup_defaults() + .then(() => { + this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; + }); + } + + render() { + + } + + setup_view() { + if (this.chart_group || this.number_card_group) { + return; + } + + this.setup_dashboard_page(); + this.setup_dashboard_customization(); + this.make_dashboard(); + } + + setup_dashboard_customization() { + this.$customize = this.$chart_header.find('.customize-dashboard'); + this.$save_or_discard = this.$chart_header.find('.customize-options'); + } + + setup_dashboard_page() { + const dashboard_name = __('{0} Dashboard', [this.doctype]); + const chart_wrapper_html = `
    `; + + this.$frappe_list.html(chart_wrapper_html); + this.page.clear_secondary_action(); + this.$dashboard_page = this.$page.find('.layout-main-section-wrapper').addClass('dashboard-page'); + this.$page.find('.page-form').empty().html( + `
    +
    ${dashboard_name}
    +
    ${__('Customize')}
    +
    + + ${__('Reset')} + / + ${__('Save')} + / + ${__('Discard')} + +
    +
    `); + + this.$dashboard_wrapper = this.$page.find('.dashboard-view'); + this.$chart_header = this.$page.find('.dashboard-header'); + + frappe.utils.bind_actions_with_object(this.$dashboard_page, this); + } + + make_dashboard() { + if (this.dashboard_settings) { + this.charts = this.dashboard_settings.charts; + this.number_cards = this.dashboard_settings.number_cards; + this.render_dashboard(); + } else { + frappe.run_serially([ + () => this.fetch_doctype_number_cards().then(cards => { + this.number_cards = cards; + }), + () => this.fetch_doctype_charts().then(charts => { + this.charts = charts; + }), + () => this.render_dashboard() + ]); + } + } + + + get_field_options() { + let date_fields = [ + {label: __('Created On'), value: 'creation'}, + {label: __('Last Modified On'), value: 'modified'} + ]; + let value_fields = []; + let group_by_fields = []; + let aggregate_function_fields = []; + + frappe.get_meta(this.doctype).fields.map(df => { + if (['Date', 'Datetime'].includes(df.fieldtype)) { + date_fields.push({label: df.label, value: df.fieldname}); + } + if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { + value_fields.push({label: df.label, value: df.fieldname}); + aggregate_function_fields.push({label: df.label, value: df.fieldname}); + } + if (['Link', 'Select'].includes(df.fieldtype)) { + group_by_fields.push({label: df.label, value: df.fieldname}); + } + }); + return { + date_fields: date_fields, + value_fields: value_fields, + group_by_fields: group_by_fields, + aggregate_function_fields: aggregate_function_fields + } + } + + render_number_cards() { + this.number_card_group = new frappe.widget.WidgetGroup({ + container: this.$dashboard_wrapper, + type: "number_card", + columns: 3, + options: { + allow_sorting: true, + allow_create: true, + allow_delete: true, + allow_hiding: true, + }, + default_values: {doctype: this.doctype}, + widgets: this.number_cards || [], + in_customize_mode: true, + }); + + this.in_customize_mode && this.number_card_group.customize(); + } + + render_dashboard_charts() { + this.chart_group = new frappe.widget.WidgetGroup({ + container: this.$dashboard_wrapper, + type: "chart", + columns: 2, + options: { + allow_sorting: true, + allow_create: true, + allow_delete: true, + allow_hiding: true, + }, + custom_dialog: () => this.show_add_chart_dialog(), + widgets: this.charts, + in_customize_mode: this.in_customize_mode || false, + }); + + this.in_customize_mode && this.chart_group.customize(); + this.chart_group.container.find('.widget-group-head').hide(); + } + + render_dashboard() { + this.$dashboard_wrapper.empty(); + frappe.dashboard_utils.get_dashboard_settings().then(settings => { + this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; + this.charts.map(chart => { + chart.label = chart.name; + chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; + }); + this.render_dashboard_charts(); + }); + this.render_number_cards(); + + if (!this.charts.length && !this.number_cards.length) { + this.render_empty_state(); + } + } + + render_empty_state() { + const no_result_message_html = + `

    ${__("You haven't added any Dashboard Charts or Number Cards yet.")} +
    ${__("Click On Customize to add your first widget")}

    `; + + const customize_button = + `

    `; + + const empty_state_image = '/assets/frappe/images/ui-states/empty.png'; + + const empty_state_html = `
    +
    + Generic Empty State +
    + ${no_result_message_html} + ${customize_button} +
    `; + + this.$dashboard_wrapper.append(empty_state_html); + + this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); + } + + fetch_doctype_charts() { + return frappe.db.get_list('Dashboard Chart', { + filters: { + chart_type: ['in', ['Count', 'Sum', 'Group By']], + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] + }).then(charts => { + return charts; + }); + } + + fetch_doctype_number_cards() { + return frappe.db.get_list('Number Card', { + filters: { + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] + }).then(cards => { + return cards; + }); + } + + customize() { + if (this.in_customize_mode) { + return; + } + + + if (this.$empty_state) { + this.$empty_state.remove(); + } + + this.toggle_customize(true); + this.chart_group.in_customize_mode = true; + this.chart_group.customize(); + this.number_cards.in_customize_mode = true; + this.number_card_group.customize(); + } + + save_dashboard_customization() { + this.toggle_customize(false); + + const number_card_config = this.number_card_group.get_widget_config(); + const number_cards = []; + number_card_config.order.map(card_name => { + number_cards.push(number_card_config.widgets[card_name]); + }); + + const chart_config = this.chart_group.get_widget_config(); + const charts = []; + chart_config.order.map(chart_name => { + charts.push(chart_config.widgets[chart_name]); + }); + + this.dashboard_settings = { + charts: charts, + number_cards: number_cards, + }; + + frappe.model.user_settings.save(this.doctype, 'dashboard_settings', this.dashboard_settings); + this.make_dashboard(); + } + + discard_dashboard_customization() { + this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; + this.toggle_customize(false); + this.render_dashboard(); + } + + reset_dashboard_customization() { + this.dashboard_settings = null; + frappe.model.user_settings.save( + this.doctype, 'dashboard_settings', this.dashboard_settings + ).then(()=> this.make_dashboard()); + this.toggle_customize(false); + } + + toggle_customize(show) { + this.$customize.toggle(!show); + this.$save_or_discard.toggle(show); + this.in_customize_mode = show; + } + + show_add_chart_dialog() { + let fields = this.get_field_options(); + const dialog = new frappe.ui.Dialog({ + title: __(`Add a ${this.doctype} Chart`), + fields: [ + { + fieldname: 'new_or_existing', + fieldtype: 'Select', + label: 'Choose an existing chart or create a new chart', + options: ['New Chart', 'Existing Chart'], + reqd: 1, + }, + { + label: 'Chart', + fieldname: 'chart', + fieldtype: 'Link', + get_query: () => { + return { + filters: { + document_type: this.doctype, + is_standard: 1, + } + }; + }, + options: 'Dashboard Chart', + depends_on: 'eval: doc.new_or_existing == "Existing Chart"' + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + label: 'Chart Label', + fieldname: 'label', + fieldtype: 'Data', + mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + fieldname: 'cb_1', + fieldtype: 'Column Break' + }, + { + label: 'Chart Type', + fieldname: 'chart_type', + fieldtype: 'Select', + options: ['Time Series', 'Group By'], + mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"', + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + label: 'Chart Config', + depends_on: 'eval: doc.chart_type == "Time Series" && doc.new_or_existing == "New Chart"', + }, + { + label: 'Function', + fieldname: 'chart_function', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average'], + default: 'Count', + }, + { + label: 'Timespan', + fieldtype: 'Select', + fieldname: 'timespan', + depends_on: 'eval: doc.chart_type == "Time Series"', + options: ['Last Year', 'Last Quarter', 'Last Month', 'Last Week'], + default: 'Last Year', + }, + { + fieldname: 'cb_2', + fieldtype: 'Column Break' + }, + { + label: 'Value Based On', + fieldtype: 'Select', + fieldname: 'based_on', + options: fields.value_fields, + depends_on: 'eval: doc.chart_function=="Sum"' + }, + { + label: 'Time Series Based On', + fieldtype: 'Select', + fieldname: 'based_on', + options: fields.date_fields, + mandatory_depends_on: 'eval: doc.chart_type == "Time Series"' + }, + { + label: 'Time Interval', + fieldname: 'time_interval', + fieldtype: 'Select', + depends_on: 'eval: doc.chart_type == "Time Series"', + options: ['Yearly', 'Quarterly', 'Monthly', 'Weekly', 'Daily'], + default: 'Monthly' + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + label: 'Chart Config', + depends_on: 'eval: doc.chart_type == "Group By" && doc.new_or_existing == "New Chart"', + }, + { + label: 'Group By Type', + fieldname: 'group_by_type', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average'], + default: 'Count', + }, + { + label: 'Aggregate Function Based On', + fieldtype: 'Select', + fieldname: 'aggregate_function_based_on', + options: fields.aggregate_function_fields, + depends_on: 'eval: ["Sum", "Avergage"].includes(doc.group_by_type)', + }, + { + fieldname: 'cb_2', + fieldtype: 'Column Break' + }, + { + label: 'Group By Based On', + fieldtype: 'Select', + fieldname: 'group_by_based_on', + options: fields.group_by_fields, + default: 'Last Year', + }, + { + label: 'Number of Groups', + fieldtype: 'Int', + fieldname: 'number_of_groups', + default: 0, + }, + { + fieldname: 'sb_3', + fieldtype: 'Section Break', + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + label: 'Chart Type', + fieldname: 'type', + fieldtype: 'Select', + options: ['Line', 'Bar', 'Percentage', 'Pie'], + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + fieldname: 'cb_1', + fieldtype: 'Column Break' + }, + { + label: 'Chart Color', + fieldname: 'color', + fieldtype: 'Color', + depends_on: 'eval: doc.new_or_existing == "New Chart"', + }, + ], + primary_action_label: __('Add'), + primary_action: (values) => { + let chart = values; + if (chart.new_or_existing == 'New Chart') { + chart.chart_name = chart.label; + chart.chart_type = chart.chart_type == 'Time Series'? chart.chart_function: chart.chart_type; + chart.document_type = this.doctype; + chart.filters_json = '[]'; + frappe.xcall('frappe.desk.doctype.dashboard_chart.dashboard_chart.create_dashboard_chart', {'args': chart}).then((doc)=> { + this.chart_group.new_widget.on_create({'chart_name': doc.chart_name, 'name': doc.chart_name, 'label': chart.label}); + }); + } else { + this.chart_group.new_widget.on_create({'chart_name': chart.chart, 'label': chart.chart, 'name': chart.chart}); + } + dialog.hide(); + } + }); + dialog.show(); + } + +} diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 730157ed4c..7b3770ec9e 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -72,12 +72,12 @@ export default class Widget { make_widget() { this.widget = $(`
    + }" data-widget-name="${this.name ? this.name : ''}">
    -
    +
    @@ -91,8 +91,11 @@ export default class Widget { this.refresh(); } - set_title() { - this.title_field[0].innerHTML = this.label; + set_title(max_chars) { + this.title_field[0].innerHTML = max_chars? frappe.ellipsis(this.label, max_chars): this.label; + if (max_chars) { + this.title_field[0].setAttribute('title', this.label); + } } add_custom_button(html, action, class_name = "") { @@ -106,13 +109,20 @@ export default class Widget { button.appendTo(this.action_area); } - delete() { - this.widget.addClass("zoomOutDelete"); - // wait for animation - setTimeout(() => { + delete(animate=true) { + let remove_widget = () => { this.widget.remove(); this.options.on_delete && this.options.on_delete(this.name); - }, 300); + } + if (animate) { + this.widget.addClass("zoomOutDelete"); + // wait for animation + setTimeout(() => { + remove_widget(); + }, 300); + } else { + remove_widget(); + } } edit() { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 313b0ea293..f0388dda19 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -6,7 +6,7 @@ frappe.provide("frappe.dashboards.chart_sources"); export default class ChartWidget extends Widget { constructor(opts) { super(opts); - this.height = 240; + this.height = this.height || 240; } get_config() { @@ -14,12 +14,13 @@ export default class ChartWidget extends Widget { name: this.name, chart_name: this.chart_name, label: this.label, + hidden: this.hidden }; } refresh() { delete this.dashboard_chart; - this.set_title(); + this.set_title(15); this.set_body(); this.make_chart(); } @@ -29,7 +30,6 @@ export default class ChartWidget extends Widget { if (this.width == "Full") { this.widget.addClass("full-width"); } - this.make_chart(); } setup_container() { @@ -40,7 +40,7 @@ export default class ChartWidget extends Widget { "Loading..." )}
    ` ); - this.loading.hide().appendTo(this.body); + this.loading.appendTo(this.body); this.empty = $( `
    ${__( @@ -69,6 +69,12 @@ export default class ChartWidget extends Widget { make_chart() { this.get_settings().then(() => { + if (!this.settings) { + this.deleted = true; + this.widget.remove(); + return; + } + if (!this.chart_settings) { this.chart_settings = {}; } @@ -536,40 +542,42 @@ export default class ChartWidget extends Widget { return frappe.model .with_doc("Dashboard Chart", this.chart_name) .then(chart_doc => { - this.chart_doc = chart_doc; - if (this.chart_doc.chart_type == "Custom") { - // custom source - if ( - frappe.dashboards.chart_sources[this.chart_doc.source] - ) { - this.settings = - frappe.dashboards.chart_sources[ - this.chart_doc.source - ]; + if (chart_doc) { + this.chart_doc = chart_doc; + if (this.chart_doc.chart_type == "Custom") { + // custom source + if ( + frappe.dashboards.chart_sources[this.chart_doc.source] + ) { + this.settings = + frappe.dashboards.chart_sources[ + this.chart_doc.source + ]; + return Promise.resolve(); + } else { + const method = + "frappe.desk.doctype.dashboard_chart_source.dashboard_chart_source.get_config"; + return frappe + .xcall(method, { name: this.chart_doc.source }) + .then(config => { + frappe.dom.eval(config); + this.settings = + frappe.dashboards.chart_sources[ + this.chart_doc.source + ]; + }); + } + } else if (this.chart_doc.chart_type == "Report") { + this.settings = { + method: "frappe.desk.query_report.run" + }; return Promise.resolve(); } else { - const method = - "frappe.desk.doctype.dashboard_chart_source.dashboard_chart_source.get_config"; - return frappe - .xcall(method, { name: this.chart_doc.source }) - .then(config => { - frappe.dom.eval(config); - this.settings = - frappe.dashboards.chart_sources[ - this.chart_doc.source - ]; - }); + this.settings = { + method: "frappe.desk.doctype.dashboard_chart.dashboard_chart.get" + }; + return Promise.resolve(); } - } else if (this.chart_doc.chart_type == "Report") { - this.settings = { - method: "frappe.desk.query_report.run" - }; - return Promise.resolve(); - } else { - this.settings = { - method: "frappe.desk.doctype.dashboard_chart.dashboard_chart.get" - }; - return Promise.resolve(); } }); } diff --git a/frappe/public/js/frappe/widgets/new_widget.js b/frappe/public/js/frappe/widgets/new_widget.js index 787cb3a79c..66fa88b761 100644 --- a/frappe/public/js/frappe/widgets/new_widget.js +++ b/frappe/public/js/frappe/widgets/new_widget.js @@ -19,18 +19,25 @@ export default class NewWidget { get_title() { // DO NOT REMOVE: Comment to load translation // __("New Chart") __("New Shortcut") - return __(`New ${frappe.utils.to_title_case(this.type)}`); + return __(`New ${frappe.model.unscrub(this.type)}`); } make_widget() { - this.widget = $(`
    + const new_widget_class = `new-${frappe.scrub(frappe.model.unscrub(this.type), '-')}-widget`; + this.widget = $(`
    + ${this.get_title()}
    `); this.body = this.widget; } setup_events() { - this.widget.on("click", () => this.open_dialog()); + this.widget.on("click", () => { + if (!this.custom_dialog) { + this.open_dialog(); + } else { + this.custom_dialog(); + } + }); } open_dialog() { @@ -40,6 +47,7 @@ export default class NewWidget { label: this.label, type: this.type, values: false, + default_values: this.default_values, primary_action: this.on_create, }); diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js new file mode 100644 index 0000000000..3de6a0c0eb --- /dev/null +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -0,0 +1,143 @@ +import Widget from "./base_widget.js"; +import { go_to_list_with_filters } from "./utils"; + +export default class NumberCardWidget extends Widget { + constructor(opts) { + super(opts); + } + + get_config() { + return { + name: this.name, + label: this.label, + color: this.color, + hidden: this.hidden, + }; + } + + refresh() { + this.set_body(); + } + + set_body() { + this.widget.addClass("number-widget-box"); + $(this.body).html(`
    + ${__('Loading...')} +
    `); + this.make_card(); + } + + make_card() { + frappe.model.with_doc("Number Card", this.name).then(card => { + if (!card) { + if (this.document_type) { + this.set_doc_args(); + frappe.xcall( + 'frappe.desk.doctype.number_card.number_card.create_number_card', + {'args': this.card_doc} + ).then(doc => { + this.name = doc.name; + this.widget.attr('data-widget-name', this.name); + this.render_card(); + }); + } else { + // widget doesn't exist so delete + this.delete(false); + return; + } + } else { + this.card_doc = card; + this.render_card(); + } + this.set_events(); + }); + } + + set_events() { + $(this.body).click(() => { + if (this.in_customize_mode) return; + let filters = JSON.parse(this.card_doc.filters_json); + go_to_list_with_filters(this.card_doc.document_type, filters); + }); + } + + set_doc_args() { + this.card_doc = Object.assign({}, { + document_type: this.document_type, + label: this.label, + function: this.function, + aggregate_function_based_on: this.aggregate_function_based_on, + color: this.color, + filters_json: this.stats_filter + }); + } + + render_card() { + this.prepare_actions(); + this.get_number().then(() => { + $(this.body).html(`
    +
    ${this.number_html}
    +
    ${this.card_doc.label}
    +
    `); + }); + } + + get_number() { + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {doc: this.card_doc}).then(res => { + const number_order = res.toFixed().length - 1; + if (number_order > 12) { + this.number_html = `≈ 10${number_order}`; + } else { + this.number_html = res; + } + }); + } + + prepare_actions() { + let actions = [ + { + label: __("Refresh"), + action: "action-refresh", + handler: () => { + this.render_card(); + } + }, + { + label: __("Edit"), + action: "action-edit", + handler: () => { + frappe.set_route( + "Form", + "Number Card", + this.name + ); + } + }, + ]; + this.set_card_actions(actions); + } + + set_card_actions(actions) { + this.card_actions = $(`
    + + +
    + `); + + this.card_actions.find("a[data-action]").each((i, o) => { + const action = o.dataset.action; + $(o).click(actions.find(a => a.action === action)); + }); + this.action_area.html(this.card_actions); + } +} diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index f233266ce4..f408ecfdd2 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -113,4 +113,14 @@ const build_summary_item = (summary) => {
    `); }; -export { generate_route, generate_grid, build_summary_item }; \ No newline at end of file +function go_to_list_with_filters(doctype, filters) { + const route = `List/${doctype}/List`; + frappe.set_route(route).then(()=> { + let list_view = frappe.views.list_view[route]; + let filter_area = list_view.filter_area; + filter_area.clear(); + filter_area.filter_list.add_filters_to_filter_group(filters); + }) +} + +export { generate_route, generate_grid, build_summary_item, go_to_list_with_filters }; \ No newline at end of file diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 77e2d65ea3..7fff6c897a 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -19,7 +19,7 @@ class WidgetDialog { primary_action: (data) => { data = this.process_data(data); - if (!this.editing) { + if (!this.editing && !data.name) { data.name = `${this.type}-${this.label}-${frappe.utils.get_random(20)}`; } @@ -35,7 +35,7 @@ class WidgetDialog { // __("New Chart") __("New Shortcut") __("Edit Chart") __("Edit Shortcut") let action = this.editing ? "Edit" : "Add"; - return __(`${action} ${frappe.utils.to_title_case(this.type)}`); + return __(`${action} ${frappe.model.unscrub(this.type)}`); } get_fields() { @@ -61,6 +61,38 @@ class WidgetDialog { show_field(fieldname) { this.dialog.set_df_property(fieldname, "hidden", false); } + + setup_filter(doctype) { + if (this.filter_group) { + this.filter_group.wrapper.empty(); + delete this.filter_group; + } + + let $loading = this.dialog.get_field("filter_area_loading").$wrapper; + $(`Loading Filters...`).appendTo($loading); + + this.filters = []; + + if (this.values && this.values.stats_filter) { + const filters_json = JSON.parse(this.values.stats_filter); + this.filters = Object.keys(filters_json).map((filter) => { + let val = filters_json[filter]; + return [this.values.link_to, filter, val[0], val[1], false]; + }); + } + + this.filter_group = new frappe.ui.FilterGroup({ + parent: this.dialog.get_field("filter_area").$wrapper, + doctype: doctype, + on_change: () => {}, + }); + + frappe.model.with_doctype(doctype, () => { + this.filter_group.add_filters_to_filter_group(this.filters); + this.hide_field("filter_area_loading"); + this.show_field("filter_area"); + }); + } } class ChartDialog extends WidgetDialog { @@ -222,37 +254,139 @@ class ShortcutDialog extends WidgetDialog { return data; } +} - setup_filter(doctype) { - if (this.filter_group) { - this.filter_group.wrapper.empty(); - delete this.filter_group; +class NumberCardDialog extends WidgetDialog { + constructor(opts) { + super(opts); + } + + get_fields() { + let fields; + fields = [ + { + fieldtype: 'Select', + label: 'Choose Existing Card or create New Card', + fieldname: 'new_or_existing', + options: ['New Card', 'Existing Card'] + }, + { + fieldtype: 'Link', + fieldname: 'card', + label: 'Number Cards', + options: 'Number Card', + get_query: () => { + return { + filters: { + document_type: this.document_type, + is_standard: 1 + } + }; + }, + depends_on: 'eval: doc.new_or_existing == "Existing Card"' + }, + { + fieldtype: 'Section Break', + fieldname: 'sb_1', + depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Label', + fieldname: 'label', + fieldtype: 'Data', + mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Doctype', + fieldname: 'document_type', + fieldtype: 'Link', + options: 'DocType', + onchange: () => { + this.document_type = this.dialog.get_value("document_type"); + this.set_aggregate_function_fields(this.dialog.get_values()); + this.setup_filter(doctype); + }, + hidden: 1 + }, + { + label: 'Color', + fieldname: 'color', + fieldtype: 'Color' + }, + { + fieldtype: "Column Break", + fieldname: "cb_1", + }, + { + label: 'Function', + fieldname: 'function', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average', 'Minimum', 'Maximum'], + mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Function Based On', + fieldname: 'aggregate_function_based_on', + fieldtype: 'Select', + depends_on: "eval: doc.function !== 'Count'", + mandatory_depends_on: "eval: doc.function !== 'Count'" + }, + { + fieldtype: "Section Break", + fieldname: "sb_1", + label: 'Add Filters', + depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + fieldtype: "HTML", + fieldname: "filter_area_loading", + }, + { + fieldtype: "HTML", + fieldname: "filter_area", + hidden: 1, + }, + { + fieldtype: "Section Break", + fieldname: "sb_1", + }, + ]; + + return fields; + } + + setup_dialog_events() { + if (!this.document_type) { + if (this.default_values['doctype']) { + this.document_type = this.default_values['doctype']; + this.setup_filter(this.default_values['doctype']); + this.set_aggregate_function_fields(this.dialog.get_values()); + } else { + this.show_field('document_type'); + } } + } - let $loading = this.dialog.get_field("filter_area_loading").$wrapper; - $(`Loading Filters...`).appendTo($loading); - - this.filters = []; - - if (this.values && this.values.stats_filter) { - const filters_json = JSON.parse(this.values.stats_filter); - this.filters = Object.keys(filters_json).map((filter) => { - let val = filters_json[filter]; - return [this.values.link_to, filter, val[0], val[1], false]; + set_aggregate_function_fields(values) { + let aggregate_function_fields = []; + if (values.function !== 'Count' && this.document_type) { + frappe.get_meta(this.document_type).fields.map(df => { + if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { + aggregate_function_fields.push({label: df.label, value: df.fieldname}); + } }); } + this.dialog.set_df_property('aggregate_function_based_on', 'options', aggregate_function_fields); + } - this.filter_group = new frappe.ui.FilterGroup({ - parent: this.dialog.get_field("filter_area").$wrapper, - doctype: doctype, - on_change: () => {}, - }); + process_data(data) { + if (data.new_or_existing == 'Existing Card') { + data.name = data.card; + } + data.stats_filter = JSON.stringify(this.filter_group.get_filters()); + data.document_type = this.document_type; - frappe.model.with_doctype(doctype, () => { - this.filter_group.add_filters_to_filter_group(this.filters); - this.hide_field("filter_area_loading"); - this.show_field("filter_area"); - }); + return data; } } @@ -260,6 +394,7 @@ export default function get_dialog_constructor(type) { const widget_map = { chart: ChartDialog, shortcut: ShortcutDialog, + number_card: NumberCardDialog, }; return widget_map[type] || WidgetDialog; diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 4124e4b76e..bbf56189d7 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -4,6 +4,7 @@ import ShortcutWidget from "../widgets/shortcut_widget"; import LinksWidget from "../widgets/links_widget"; import OnboardingWidget from "../widgets/onboarding_widget"; import NewWidget from "../widgets/new_widget"; +import NumberCardWidget from "../widgets/number_card_widget"; frappe.provide("frappe.widget"); @@ -13,6 +14,7 @@ const widget_factory = { shortcut: ShortcutWidget, links: LinksWidget, onboarding: OnboardingWidget, + number_card: NumberCardWidget, }; export default class WidgetGroup { @@ -77,6 +79,14 @@ export default class WidgetGroup { return widget_object; } + remove_widget(widget_obj) { + widget_obj.widget.remove(); + this.widgets_list.filter((widget) => { + if (widget.name == widget_obj.name) return false; + }); + delete this.widgets_dict[widget_obj.name]; + } + customize() { this.widget_area.show(); this.widgets_list.forEach((wid) => { @@ -96,6 +106,9 @@ export default class WidgetGroup { this.new_widget = new NewWidget({ container: this.body, type: this.type, + custom_dialog: this.custom_dialog, + custom_dialog_function: this.custom_dialog_function, + default_values: this.default_values, on_create: (config) => { // Remove new widget this.new_widget.delete(); diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less new file mode 100644 index 0000000000..6325a713d2 --- /dev/null +++ b/frappe/public/less/dashboard_view.less @@ -0,0 +1,40 @@ +.dashboard-page { + .dashboard-view { + min-height: calc(100vh - 284px); + padding: 20px 20px 0 20px; + + .new-widget { + text-align: center; + } + + .new-chart-widget { + min-height: 200px; + } + + .new-number-card-widget { + min-height: 110px; + } + } + + .page-form { + height: 50px; + + .dashboard-header { + padding: 10px; + display: flex; + justify-content: space-between; + width: 100%; + } + + .customize-dashboard { + font-size: 13px; + cursor: pointer; + } + + .customize-options { + display: none; + cursor: pointer; + } + } +} + diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 2230c59ac9..081dbb64fb 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -392,6 +392,56 @@ } } } + + &.number-widget-box { + cursor: pointer; + height: 110px; + + &:hover { + border-color: @text-muted; + } + + .widget-head { + position: relative; + + .widget-title { + display: none; + } + + .widget-control { + position: absolute; + right: -10px; + top: -10px; + } + } + + .widget-body { + text-align: center; + + .number-card-loading { + display: flex; + height: 80px; + align-items: center; + justify-content: center; + } + + .widget-content { + padding: 5px; + + .number { + font-size: 30px; + font-weight: bold; + } + + .number-text { + color: @text-muted; + padding: 5px; + font-size: 14px; + } + } + } + } + } .pill { From 759f76f9cdeb968b9fc33199eefad2a7bad1e6f2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 01:08:45 +0530 Subject: [PATCH 204/337] fix: show cards created by user --- frappe/desk/doctype/number_card/number_card.py | 6 +++++- frappe/public/js/frappe/widgets/widget_dialog.js | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 509995392c..14d7aeea3d 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -45,4 +45,8 @@ def create_number_card(args): doc.is_standard = 1 doc.update(args) doc.insert(ignore_permissions=True) - return doc \ No newline at end of file + return doc + +def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): + or_filters = {'creation': frappe.session.user, 'is_standard': 1} + return frappe.db.get_list('Number Card', fields=['name', 'label'], or_filters=or_filters, as_list = 1) \ No newline at end of file diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 7fff6c897a..d729012a3b 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -277,9 +277,9 @@ class NumberCardDialog extends WidgetDialog { options: 'Number Card', get_query: () => { return { + 'query': 'frappe.desk.doctype.number_card.number_card.get_cards_for_user', filters: { - document_type: this.document_type, - is_standard: 1 + document_type: this.document_type, } }; }, @@ -360,16 +360,16 @@ class NumberCardDialog extends WidgetDialog { if (this.default_values['doctype']) { this.document_type = this.default_values['doctype']; this.setup_filter(this.default_values['doctype']); - this.set_aggregate_function_fields(this.dialog.get_values()); + this.set_aggregate_function_fields(); } else { this.show_field('document_type'); } } } - set_aggregate_function_fields(values) { + set_aggregate_function_fields() { let aggregate_function_fields = []; - if (values.function !== 'Count' && this.document_type) { + if (this.document_type) { frappe.get_meta(this.document_type).fields.map(df => { if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { aggregate_function_fields.push({label: df.label, value: df.fieldname}); From f3db07fe016186f706efe92b66459dc5ebc332d5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 02:35:24 +0530 Subject: [PATCH 205/337] fix(patch): patch to set existing dashboard charts as standard --- .../desk/doctype/number_card/number_card.py | 8 ++++-- frappe/patches.txt | 1 + ...t_existing_dashboard_charts_as_standard.py | 27 +++++++++++++++++++ .../public/js/frappe/widgets/widget_dialog.js | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 14d7aeea3d..545e88b7c6 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -48,5 +48,9 @@ def create_number_card(args): return doc def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): - or_filters = {'creation': frappe.session.user, 'is_standard': 1} - return frappe.db.get_list('Number Card', fields=['name', 'label'], or_filters=or_filters, as_list = 1) \ No newline at end of file + or_filters = {'owner': frappe.session.user, 'is_standard': 1} + return frappe.db.get_list('Number Card', + fields=['name', 'label'], + filters=filters, + or_filters=or_filters, + as_list = 1) \ No newline at end of file diff --git a/frappe/patches.txt b/frappe/patches.txt index cbda8cf677..c5daf872b1 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -273,3 +273,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings') frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() frappe.patches.v13_0.website_theme_custom_scss +frappe.patches.v13_0.set_existing_dashboard_charts_as_standard diff --git a/frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py b/frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py new file mode 100644 index 0000000000..0e7abea8bd --- /dev/null +++ b/frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py @@ -0,0 +1,27 @@ +import frappe + +def execute(): + if not frappe.db.table_exists('Dashboard Chart'): + return + + users_with_permission = frappe.get_all( + "Has Role", + fields=["parent"], + filters={"role": ['in', ['System Manager', 'Dashboard Manager']], "parenttype": "User"}, + distinct=True, + as_list=True + ) + + users = tuple( + [item if type(item) == str else item.encode('utf8') for sublist in users_with_permission for item in sublist] + ) + + frappe.db.sql(""" + UPDATE + `tabDashboard Chart` + SET + `tabDashboard Chart`.`is_standard`=1 + WHERE + `tabDashboard Chart`.owner in {users} + """.format(users=users) + ) diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index d729012a3b..7d02693dc0 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -329,7 +329,7 @@ class NumberCardDialog extends WidgetDialog { fieldname: 'aggregate_function_based_on', fieldtype: 'Select', depends_on: "eval: doc.function !== 'Count'", - mandatory_depends_on: "eval: doc.function !== 'Count'" + mandatory_depends_on: 'eval: doc.function !== "Count" && doc.new_or_existing == "New Card"' }, { fieldtype: "Section Break", From adfcf5c8176fbdbf63868053f6d0ab2329010c17 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 16:26:08 +0530 Subject: [PATCH 206/337] fix: get dashboard settings from db --- frappe/public/js/frappe/utils/dashboard_utils.js | 10 +++++++--- .../public/js/frappe/views/dashboard/dashboard_view.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js index 66f3d5e21f..16f54a1f84 100644 --- a/frappe/public/js/frappe/utils/dashboard_utils.js +++ b/frappe/public/js/frappe/utils/dashboard_utils.js @@ -57,13 +57,17 @@ frappe.dashboard_utils = { }, get_dashboard_settings() { - return frappe.model.with_doc('Dashboard Settings', frappe.session.user).then(settings => { - if (!settings) { + return frappe.db.get_list('Dashboard Settings', + { + filters: {name: frappe.session.user}, + fields: ['*'] + }).then(settings => { + if (!settings.length) { return this.create_dashboard_settings().then(settings => { return settings; }); } else { - return settings; + return settings[0]; } }); }, diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 69bcc0ac74..de4e82840a 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -148,6 +148,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { render_dashboard() { this.$dashboard_wrapper.empty(); + frappe.dashboard_utils.get_dashboard_settings().then(settings => { this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; this.charts.map(chart => { @@ -156,6 +157,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { }); this.render_dashboard_charts(); }); + this.render_number_cards(); if (!this.charts.length && !this.number_cards.length) { From 4c99c1dfb689ee9b2f0bcf6ac6f6a1242e24ee6e Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 17:04:41 +0530 Subject: [PATCH 207/337] fix: don't allow duplicates in the view --- .../frappe/views/dashboard/dashboard_view.js | 149 +++++++++--------- 1 file changed, 78 insertions(+), 71 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index de4e82840a..713191026e 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -77,36 +77,50 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { } } + render_dashboard() { + this.$dashboard_wrapper.empty(); - get_field_options() { - let date_fields = [ - {label: __('Created On'), value: 'creation'}, - {label: __('Last Modified On'), value: 'modified'} - ]; - let value_fields = []; - let group_by_fields = []; - let aggregate_function_fields = []; - - frappe.get_meta(this.doctype).fields.map(df => { - if (['Date', 'Datetime'].includes(df.fieldtype)) { - date_fields.push({label: df.label, value: df.fieldname}); - } - if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { - value_fields.push({label: df.label, value: df.fieldname}); - aggregate_function_fields.push({label: df.label, value: df.fieldname}); - } - if (['Link', 'Select'].includes(df.fieldtype)) { - group_by_fields.push({label: df.label, value: df.fieldname}); - } + frappe.dashboard_utils.get_dashboard_settings().then(settings => { + this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; + this.charts.map(chart => { + chart.label = chart.chart_name; + chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; + }); + this.render_dashboard_charts(); }); - return { - date_fields: date_fields, - value_fields: value_fields, - group_by_fields: group_by_fields, - aggregate_function_fields: aggregate_function_fields + + this.render_number_cards(); + + if (!this.charts.length && !this.number_cards.length) { + this.render_empty_state(); } } + fetch_doctype_charts() { + return frappe.db.get_list('Dashboard Chart', { + filters: { + chart_type: ['in', ['Count', 'Sum', 'Group By']], + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] + }).then(charts => { + return charts; + }); + } + + fetch_doctype_number_cards() { + return frappe.db.get_list('Number Card', { + filters: { + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] + }).then(cards => { + return cards; + }); + } + render_number_cards() { this.number_card_group = new frappe.widget.WidgetGroup({ container: this.$dashboard_wrapper, @@ -146,25 +160,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.chart_group.container.find('.widget-group-head').hide(); } - render_dashboard() { - this.$dashboard_wrapper.empty(); - - frappe.dashboard_utils.get_dashboard_settings().then(settings => { - this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; - this.charts.map(chart => { - chart.label = chart.name; - chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; - }); - this.render_dashboard_charts(); - }); - - this.render_number_cards(); - - if (!this.charts.length && !this.number_cards.length) { - this.render_empty_state(); - } - } - render_empty_state() { const no_result_message_html = `

    ${__("You haven't added any Dashboard Charts or Number Cards yet.")} @@ -190,31 +185,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); } - fetch_doctype_charts() { - return frappe.db.get_list('Dashboard Chart', { - filters: { - chart_type: ['in', ['Count', 'Sum', 'Group By']], - document_type: this.doctype, - is_standard: true - }, - fields: ['*'] - }).then(charts => { - return charts; - }); - } - - fetch_doctype_number_cards() { - return frappe.db.get_list('Number Card', { - filters: { - document_type: this.doctype, - is_standard: true - }, - fields: ['*'] - }).then(cards => { - return cards; - }); - } - customize() { if (this.in_customize_mode) { return; @@ -236,17 +206,21 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.toggle_customize(false); const number_card_config = this.number_card_group.get_widget_config(); - const number_cards = []; + let number_cards = []; number_card_config.order.map(card_name => { number_cards.push(number_card_config.widgets[card_name]); }); const chart_config = this.chart_group.get_widget_config(); - const charts = []; + let charts = []; chart_config.order.map(chart_name => { charts.push(chart_config.widgets[chart_name]); }); + // Don't allow duplicates of the same card or chart + charts = this.remove_duplicates(charts); + number_cards = this.remove_duplicates(number_cards); + this.dashboard_settings = { charts: charts, number_cards: number_cards, @@ -452,4 +426,37 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { dialog.show(); } + get_field_options() { + let date_fields = [ + {label: __('Created On'), value: 'creation'}, + {label: __('Last Modified On'), value: 'modified'} + ]; + let value_fields = []; + let group_by_fields = []; + let aggregate_function_fields = []; + + frappe.get_meta(this.doctype).fields.map(df => { + if (['Date', 'Datetime'].includes(df.fieldtype)) { + date_fields.push({label: df.label, value: df.fieldname}); + } + if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { + value_fields.push({label: df.label, value: df.fieldname}); + aggregate_function_fields.push({label: df.label, value: df.fieldname}); + } + if (['Link', 'Select'].includes(df.fieldtype)) { + group_by_fields.push({label: df.label, value: df.fieldname}); + } + }); + return { + date_fields: date_fields, + value_fields: value_fields, + group_by_fields: group_by_fields, + aggregate_function_fields: aggregate_function_fields + } + } + + remove_duplicates(items) { + return items.filter((item, index) => items.indexOf(item) === index); + } + } From beb9cd0c030646e0003430a3a8b2d91b1bd76d58 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 17:32:15 +0530 Subject: [PATCH 208/337] fix: indent using tabs --- .../frappe/views/dashboard/dashboard_view.js | 784 +++++++++--------- 1 file changed, 392 insertions(+), 392 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 713191026e..dd8bfbd3fd 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -3,460 +3,460 @@ frappe.provide('frappe.views'); frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { get view_name() { return 'Dashboard'; - } + } - setup_defaults() { + setup_defaults() { return super.setup_defaults() .then(() => { - this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; + this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; }); - } + } - render() { + render() { - } + } - setup_view() { - if (this.chart_group || this.number_card_group) { - return; - } + setup_view() { + if (this.chart_group || this.number_card_group) { + return; + } - this.setup_dashboard_page(); - this.setup_dashboard_customization(); - this.make_dashboard(); - } + this.setup_dashboard_page(); + this.setup_dashboard_customization(); + this.make_dashboard(); + } - setup_dashboard_customization() { - this.$customize = this.$chart_header.find('.customize-dashboard'); - this.$save_or_discard = this.$chart_header.find('.customize-options'); - } + setup_dashboard_customization() { + this.$customize = this.$chart_header.find('.customize-dashboard'); + this.$save_or_discard = this.$chart_header.find('.customize-options'); + } - setup_dashboard_page() { - const dashboard_name = __('{0} Dashboard', [this.doctype]); - const chart_wrapper_html = `

    `; + setup_dashboard_page() { + const dashboard_name = __('{0} Dashboard', [this.doctype]); + const chart_wrapper_html = `
    `; - this.$frappe_list.html(chart_wrapper_html); - this.page.clear_secondary_action(); - this.$dashboard_page = this.$page.find('.layout-main-section-wrapper').addClass('dashboard-page'); - this.$page.find('.page-form').empty().html( - `
    -
    ${dashboard_name}
    -
    ${__('Customize')}
    -
    - - ${__('Reset')} - / - ${__('Save')} - / - ${__('Discard')} - -
    -
    `); + this.$frappe_list.html(chart_wrapper_html); + this.page.clear_secondary_action(); + this.$dashboard_page = this.$page.find('.layout-main-section-wrapper').addClass('dashboard-page'); + this.$page.find('.page-form').empty().html( + `
    +
    ${dashboard_name}
    +
    ${__('Customize')}
    +
    + + ${__('Reset')} + / + ${__('Save')} + / + ${__('Discard')} + +
    +
    `); - this.$dashboard_wrapper = this.$page.find('.dashboard-view'); - this.$chart_header = this.$page.find('.dashboard-header'); + this.$dashboard_wrapper = this.$page.find('.dashboard-view'); + this.$chart_header = this.$page.find('.dashboard-header'); - frappe.utils.bind_actions_with_object(this.$dashboard_page, this); - } + frappe.utils.bind_actions_with_object(this.$dashboard_page, this); + } - make_dashboard() { - if (this.dashboard_settings) { - this.charts = this.dashboard_settings.charts; - this.number_cards = this.dashboard_settings.number_cards; - this.render_dashboard(); - } else { - frappe.run_serially([ - () => this.fetch_doctype_number_cards().then(cards => { - this.number_cards = cards; - }), - () => this.fetch_doctype_charts().then(charts => { - this.charts = charts; - }), - () => this.render_dashboard() - ]); - } - } + make_dashboard() { + if (this.dashboard_settings) { + this.charts = this.dashboard_settings.charts; + this.number_cards = this.dashboard_settings.number_cards; + this.render_dashboard(); + } else { + frappe.run_serially([ + () => this.fetch_doctype_number_cards().then(cards => { + this.number_cards = cards; + }), + () => this.fetch_doctype_charts().then(charts => { + this.charts = charts; + }), + () => this.render_dashboard() + ]); + } + } - render_dashboard() { - this.$dashboard_wrapper.empty(); + render_dashboard() { + this.$dashboard_wrapper.empty(); - frappe.dashboard_utils.get_dashboard_settings().then(settings => { - this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; - this.charts.map(chart => { - chart.label = chart.chart_name; - chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; - }); - this.render_dashboard_charts(); - }); + frappe.dashboard_utils.get_dashboard_settings().then(settings => { + this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; + this.charts.map(chart => { + chart.label = chart.chart_name; + chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; + }); + this.render_dashboard_charts(); + }); - this.render_number_cards(); + this.render_number_cards(); - if (!this.charts.length && !this.number_cards.length) { - this.render_empty_state(); - } - } + if (!this.charts.length && !this.number_cards.length) { + this.render_empty_state(); + } + } - fetch_doctype_charts() { - return frappe.db.get_list('Dashboard Chart', { + fetch_doctype_charts() { + return frappe.db.get_list('Dashboard Chart', { filters: { chart_type: ['in', ['Count', 'Sum', 'Group By']], - document_type: this.doctype, - is_standard: true - }, - fields: ['*'] + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] }).then(charts => { - return charts; - }); - } + return charts; + }); + } - fetch_doctype_number_cards() { - return frappe.db.get_list('Number Card', { + fetch_doctype_number_cards() { + return frappe.db.get_list('Number Card', { filters: { - document_type: this.doctype, - is_standard: true - }, - fields: ['*'] + document_type: this.doctype, + is_standard: true + }, + fields: ['*'] }).then(cards => { - return cards; - }); - } + return cards; + }); + } - render_number_cards() { - this.number_card_group = new frappe.widget.WidgetGroup({ - container: this.$dashboard_wrapper, - type: "number_card", - columns: 3, - options: { - allow_sorting: true, - allow_create: true, - allow_delete: true, - allow_hiding: true, - }, - default_values: {doctype: this.doctype}, - widgets: this.number_cards || [], - in_customize_mode: true, - }); + render_number_cards() { + this.number_card_group = new frappe.widget.WidgetGroup({ + container: this.$dashboard_wrapper, + type: "number_card", + columns: 3, + options: { + allow_sorting: true, + allow_create: true, + allow_delete: true, + allow_hiding: true, + }, + default_values: {doctype: this.doctype}, + widgets: this.number_cards || [], + in_customize_mode: true, + }); - this.in_customize_mode && this.number_card_group.customize(); - } + this.in_customize_mode && this.number_card_group.customize(); + } - render_dashboard_charts() { - this.chart_group = new frappe.widget.WidgetGroup({ - container: this.$dashboard_wrapper, - type: "chart", - columns: 2, - options: { - allow_sorting: true, - allow_create: true, - allow_delete: true, - allow_hiding: true, - }, - custom_dialog: () => this.show_add_chart_dialog(), - widgets: this.charts, - in_customize_mode: this.in_customize_mode || false, - }); + render_dashboard_charts() { + this.chart_group = new frappe.widget.WidgetGroup({ + container: this.$dashboard_wrapper, + type: "chart", + columns: 2, + options: { + allow_sorting: true, + allow_create: true, + allow_delete: true, + allow_hiding: true, + }, + custom_dialog: () => this.show_add_chart_dialog(), + widgets: this.charts, + in_customize_mode: this.in_customize_mode || false, + }); - this.in_customize_mode && this.chart_group.customize(); - this.chart_group.container.find('.widget-group-head').hide(); - } + this.in_customize_mode && this.chart_group.customize(); + this.chart_group.container.find('.widget-group-head').hide(); + } - render_empty_state() { - const no_result_message_html = - `

    ${__("You haven't added any Dashboard Charts or Number Cards yet.")} -
    ${__("Click On Customize to add your first widget")}

    `; + render_empty_state() { + const no_result_message_html = + `

    ${__("You haven't added any Dashboard Charts or Number Cards yet.")} +
    ${__("Click On Customize to add your first widget")}

    `; - const customize_button = - `

    `; +

    `; - const empty_state_image = '/assets/frappe/images/ui-states/empty.png'; + const empty_state_image = '/assets/frappe/images/ui-states/empty.png'; - const empty_state_html = `
    + const empty_state_html = `
    Generic Empty State -
    - ${no_result_message_html} +
    + ${no_result_message_html} ${customize_button} -
    `; +
    `; - this.$dashboard_wrapper.append(empty_state_html); + this.$dashboard_wrapper.append(empty_state_html); - this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); - } + this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); + } - customize() { - if (this.in_customize_mode) { - return; - } + customize() { + if (this.in_customize_mode) { + return; + } - if (this.$empty_state) { - this.$empty_state.remove(); - } + if (this.$empty_state) { + this.$empty_state.remove(); + } - this.toggle_customize(true); - this.chart_group.in_customize_mode = true; - this.chart_group.customize(); - this.number_cards.in_customize_mode = true; - this.number_card_group.customize(); - } + this.toggle_customize(true); + this.chart_group.in_customize_mode = true; + this.chart_group.customize(); + this.number_cards.in_customize_mode = true; + this.number_card_group.customize(); + } - save_dashboard_customization() { - this.toggle_customize(false); + save_dashboard_customization() { + this.toggle_customize(false); - const number_card_config = this.number_card_group.get_widget_config(); - let number_cards = []; - number_card_config.order.map(card_name => { - number_cards.push(number_card_config.widgets[card_name]); - }); + const number_card_config = this.number_card_group.get_widget_config(); + let number_cards = []; + number_card_config.order.map(card_name => { + number_cards.push(number_card_config.widgets[card_name]); + }); - const chart_config = this.chart_group.get_widget_config(); - let charts = []; - chart_config.order.map(chart_name => { - charts.push(chart_config.widgets[chart_name]); - }); + const chart_config = this.chart_group.get_widget_config(); + let charts = []; + chart_config.order.map(chart_name => { + charts.push(chart_config.widgets[chart_name]); + }); - // Don't allow duplicates of the same card or chart - charts = this.remove_duplicates(charts); - number_cards = this.remove_duplicates(number_cards); + // Don't allow duplicates of the same card or chart + charts = this.remove_duplicates(charts); + number_cards = this.remove_duplicates(number_cards); - this.dashboard_settings = { - charts: charts, - number_cards: number_cards, - }; + this.dashboard_settings = { + charts: charts, + number_cards: number_cards, + }; - frappe.model.user_settings.save(this.doctype, 'dashboard_settings', this.dashboard_settings); - this.make_dashboard(); - } + frappe.model.user_settings.save(this.doctype, 'dashboard_settings', this.dashboard_settings); + this.make_dashboard(); + } - discard_dashboard_customization() { - this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; - this.toggle_customize(false); - this.render_dashboard(); - } + discard_dashboard_customization() { + this.dashboard_settings = frappe.get_user_settings(this.doctype)['dashboard_settings'] || null; + this.toggle_customize(false); + this.render_dashboard(); + } - reset_dashboard_customization() { - this.dashboard_settings = null; - frappe.model.user_settings.save( - this.doctype, 'dashboard_settings', this.dashboard_settings - ).then(()=> this.make_dashboard()); - this.toggle_customize(false); - } + reset_dashboard_customization() { + this.dashboard_settings = null; + frappe.model.user_settings.save( + this.doctype, 'dashboard_settings', this.dashboard_settings + ).then(()=> this.make_dashboard()); + this.toggle_customize(false); + } - toggle_customize(show) { - this.$customize.toggle(!show); - this.$save_or_discard.toggle(show); - this.in_customize_mode = show; - } + toggle_customize(show) { + this.$customize.toggle(!show); + this.$save_or_discard.toggle(show); + this.in_customize_mode = show; + } - show_add_chart_dialog() { - let fields = this.get_field_options(); - const dialog = new frappe.ui.Dialog({ - title: __(`Add a ${this.doctype} Chart`), - fields: [ - { + show_add_chart_dialog() { + let fields = this.get_field_options(); + const dialog = new frappe.ui.Dialog({ + title: __(`Add a ${this.doctype} Chart`), + fields: [ + { fieldname: 'new_or_existing', fieldtype: 'Select', - label: 'Choose an existing chart or create a new chart', - options: ['New Chart', 'Existing Chart'], - reqd: 1, - }, - { - label: 'Chart', - fieldname: 'chart', - fieldtype: 'Link', - get_query: () => { - return { - filters: { - document_type: this.doctype, - is_standard: 1, - } - }; - }, - options: 'Dashboard Chart', - depends_on: 'eval: doc.new_or_existing == "Existing Chart"' - }, - { - fieldname: 'sb_2', - fieldtype: 'Section Break', - depends_on: 'eval: doc.new_or_existing == "New Chart"' - }, - { - label: 'Chart Label', - fieldname: 'label', - fieldtype: 'Data', - mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"' - }, - { - fieldname: 'cb_1', - fieldtype: 'Column Break' - }, - { - label: 'Chart Type', - fieldname: 'chart_type', - fieldtype: 'Select', - options: ['Time Series', 'Group By'], - mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"', - }, - { - fieldname: 'sb_2', - fieldtype: 'Section Break', - label: 'Chart Config', - depends_on: 'eval: doc.chart_type == "Time Series" && doc.new_or_existing == "New Chart"', - }, - { - label: 'Function', - fieldname: 'chart_function', - fieldtype: 'Select', - options: ['Count', 'Sum', 'Average'], - default: 'Count', - }, - { - label: 'Timespan', - fieldtype: 'Select', - fieldname: 'timespan', - depends_on: 'eval: doc.chart_type == "Time Series"', - options: ['Last Year', 'Last Quarter', 'Last Month', 'Last Week'], - default: 'Last Year', - }, - { - fieldname: 'cb_2', - fieldtype: 'Column Break' - }, - { - label: 'Value Based On', - fieldtype: 'Select', - fieldname: 'based_on', - options: fields.value_fields, - depends_on: 'eval: doc.chart_function=="Sum"' - }, - { - label: 'Time Series Based On', - fieldtype: 'Select', - fieldname: 'based_on', - options: fields.date_fields, - mandatory_depends_on: 'eval: doc.chart_type == "Time Series"' - }, - { - label: 'Time Interval', - fieldname: 'time_interval', - fieldtype: 'Select', - depends_on: 'eval: doc.chart_type == "Time Series"', - options: ['Yearly', 'Quarterly', 'Monthly', 'Weekly', 'Daily'], - default: 'Monthly' - }, - { - fieldname: 'sb_2', - fieldtype: 'Section Break', - label: 'Chart Config', - depends_on: 'eval: doc.chart_type == "Group By" && doc.new_or_existing == "New Chart"', - }, - { - label: 'Group By Type', - fieldname: 'group_by_type', - fieldtype: 'Select', - options: ['Count', 'Sum', 'Average'], - default: 'Count', - }, - { - label: 'Aggregate Function Based On', - fieldtype: 'Select', - fieldname: 'aggregate_function_based_on', - options: fields.aggregate_function_fields, - depends_on: 'eval: ["Sum", "Avergage"].includes(doc.group_by_type)', - }, - { - fieldname: 'cb_2', - fieldtype: 'Column Break' - }, - { - label: 'Group By Based On', - fieldtype: 'Select', - fieldname: 'group_by_based_on', - options: fields.group_by_fields, - default: 'Last Year', - }, - { - label: 'Number of Groups', - fieldtype: 'Int', - fieldname: 'number_of_groups', - default: 0, - }, - { - fieldname: 'sb_3', - fieldtype: 'Section Break', - depends_on: 'eval: doc.new_or_existing == "New Chart"' - }, - { - label: 'Chart Type', - fieldname: 'type', - fieldtype: 'Select', - options: ['Line', 'Bar', 'Percentage', 'Pie'], - depends_on: 'eval: doc.new_or_existing == "New Chart"' - }, - { - fieldname: 'cb_1', - fieldtype: 'Column Break' - }, - { - label: 'Chart Color', - fieldname: 'color', - fieldtype: 'Color', - depends_on: 'eval: doc.new_or_existing == "New Chart"', - }, - ], - primary_action_label: __('Add'), - primary_action: (values) => { - let chart = values; - if (chart.new_or_existing == 'New Chart') { - chart.chart_name = chart.label; - chart.chart_type = chart.chart_type == 'Time Series'? chart.chart_function: chart.chart_type; - chart.document_type = this.doctype; - chart.filters_json = '[]'; - frappe.xcall('frappe.desk.doctype.dashboard_chart.dashboard_chart.create_dashboard_chart', {'args': chart}).then((doc)=> { - this.chart_group.new_widget.on_create({'chart_name': doc.chart_name, 'name': doc.chart_name, 'label': chart.label}); - }); - } else { - this.chart_group.new_widget.on_create({'chart_name': chart.chart, 'label': chart.chart, 'name': chart.chart}); - } - dialog.hide(); - } - }); - dialog.show(); - } + label: 'Choose an existing chart or create a new chart', + options: ['New Chart', 'Existing Chart'], + reqd: 1, + }, + { + label: 'Chart', + fieldname: 'chart', + fieldtype: 'Link', + get_query: () => { + return { + filters: { + document_type: this.doctype, + is_standard: 1, + } + }; + }, + options: 'Dashboard Chart', + depends_on: 'eval: doc.new_or_existing == "Existing Chart"' + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + label: 'Chart Label', + fieldname: 'label', + fieldtype: 'Data', + mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + fieldname: 'cb_1', + fieldtype: 'Column Break' + }, + { + label: 'Chart Type', + fieldname: 'chart_type', + fieldtype: 'Select', + options: ['Time Series', 'Group By'], + mandatory_depends_on: 'eval: doc.new_or_existing == "New Chart"', + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + label: 'Chart Config', + depends_on: 'eval: doc.chart_type == "Time Series" && doc.new_or_existing == "New Chart"', + }, + { + label: 'Function', + fieldname: 'chart_function', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average'], + default: 'Count', + }, + { + label: 'Timespan', + fieldtype: 'Select', + fieldname: 'timespan', + depends_on: 'eval: doc.chart_type == "Time Series"', + options: ['Last Year', 'Last Quarter', 'Last Month', 'Last Week'], + default: 'Last Year', + }, + { + fieldname: 'cb_2', + fieldtype: 'Column Break' + }, + { + label: 'Value Based On', + fieldtype: 'Select', + fieldname: 'based_on', + options: fields.value_fields, + depends_on: 'eval: doc.chart_function=="Sum"' + }, + { + label: 'Time Series Based On', + fieldtype: 'Select', + fieldname: 'based_on', + options: fields.date_fields, + mandatory_depends_on: 'eval: doc.chart_type == "Time Series"' + }, + { + label: 'Time Interval', + fieldname: 'time_interval', + fieldtype: 'Select', + depends_on: 'eval: doc.chart_type == "Time Series"', + options: ['Yearly', 'Quarterly', 'Monthly', 'Weekly', 'Daily'], + default: 'Monthly' + }, + { + fieldname: 'sb_2', + fieldtype: 'Section Break', + label: 'Chart Config', + depends_on: 'eval: doc.chart_type == "Group By" && doc.new_or_existing == "New Chart"', + }, + { + label: 'Group By Type', + fieldname: 'group_by_type', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average'], + default: 'Count', + }, + { + label: 'Aggregate Function Based On', + fieldtype: 'Select', + fieldname: 'aggregate_function_based_on', + options: fields.aggregate_function_fields, + depends_on: 'eval: ["Sum", "Avergage"].includes(doc.group_by_type)', + }, + { + fieldname: 'cb_2', + fieldtype: 'Column Break' + }, + { + label: 'Group By Based On', + fieldtype: 'Select', + fieldname: 'group_by_based_on', + options: fields.group_by_fields, + default: 'Last Year', + }, + { + label: 'Number of Groups', + fieldtype: 'Int', + fieldname: 'number_of_groups', + default: 0, + }, + { + fieldname: 'sb_3', + fieldtype: 'Section Break', + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + label: 'Chart Type', + fieldname: 'type', + fieldtype: 'Select', + options: ['Line', 'Bar', 'Percentage', 'Pie'], + depends_on: 'eval: doc.new_or_existing == "New Chart"' + }, + { + fieldname: 'cb_1', + fieldtype: 'Column Break' + }, + { + label: 'Chart Color', + fieldname: 'color', + fieldtype: 'Color', + depends_on: 'eval: doc.new_or_existing == "New Chart"', + }, + ], + primary_action_label: __('Add'), + primary_action: (values) => { + let chart = values; + if (chart.new_or_existing == 'New Chart') { + chart.chart_name = chart.label; + chart.chart_type = chart.chart_type == 'Time Series'? chart.chart_function: chart.chart_type; + chart.document_type = this.doctype; + chart.filters_json = '[]'; + frappe.xcall('frappe.desk.doctype.dashboard_chart.dashboard_chart.create_dashboard_chart', {'args': chart}).then((doc)=> { + this.chart_group.new_widget.on_create({'chart_name': doc.chart_name, 'name': doc.chart_name, 'label': chart.label}); + }); + } else { + this.chart_group.new_widget.on_create({'chart_name': chart.chart, 'label': chart.chart, 'name': chart.chart}); + } + dialog.hide(); + } + }); + dialog.show(); + } - get_field_options() { - let date_fields = [ + get_field_options() { + let date_fields = [ {label: __('Created On'), value: 'creation'}, {label: __('Last Modified On'), value: 'modified'} ]; let value_fields = []; let group_by_fields = []; - let aggregate_function_fields = []; + let aggregate_function_fields = []; - frappe.get_meta(this.doctype).fields.map(df => { - if (['Date', 'Datetime'].includes(df.fieldtype)) { - date_fields.push({label: df.label, value: df.fieldname}); - } - if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { - value_fields.push({label: df.label, value: df.fieldname}); - aggregate_function_fields.push({label: df.label, value: df.fieldname}); - } - if (['Link', 'Select'].includes(df.fieldtype)) { - group_by_fields.push({label: df.label, value: df.fieldname}); - } - }); - return { - date_fields: date_fields, - value_fields: value_fields, - group_by_fields: group_by_fields, - aggregate_function_fields: aggregate_function_fields - } - } + frappe.get_meta(this.doctype).fields.map(df => { + if (['Date', 'Datetime'].includes(df.fieldtype)) { + date_fields.push({label: df.label, value: df.fieldname}); + } + if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) { + value_fields.push({label: df.label, value: df.fieldname}); + aggregate_function_fields.push({label: df.label, value: df.fieldname}); + } + if (['Link', 'Select'].includes(df.fieldtype)) { + group_by_fields.push({label: df.label, value: df.fieldname}); + } + }); + return { + date_fields: date_fields, + value_fields: value_fields, + group_by_fields: group_by_fields, + aggregate_function_fields: aggregate_function_fields + } + } - remove_duplicates(items) { - return items.filter((item, index) => items.indexOf(item) === index); - } + remove_duplicates(items) { + return items.filter((item, index) => items.indexOf(item) === index); + } } From 71349a958b5ced329c85339e7c1f2f9e041c79d2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 17:38:49 +0530 Subject: [PATCH 209/337] fix: indent --- .../public/js/frappe/widgets/widget_dialog.js | 170 +++++++++--------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 7d02693dc0..adfdacabbd 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -264,93 +264,93 @@ class NumberCardDialog extends WidgetDialog { get_fields() { let fields; fields = [ - { - fieldtype: 'Select', - label: 'Choose Existing Card or create New Card', - fieldname: 'new_or_existing', - options: ['New Card', 'Existing Card'] + { + fieldtype: 'Select', + label: 'Choose Existing Card or create New Card', + fieldname: 'new_or_existing', + options: ['New Card', 'Existing Card'] + }, + { + fieldtype: 'Link', + fieldname: 'card', + label: 'Number Cards', + options: 'Number Card', + get_query: () => { + return { + 'query': 'frappe.desk.doctype.number_card.number_card.get_cards_for_user', + filters: { + document_type: this.document_type, + } + }; }, - { - fieldtype: 'Link', - fieldname: 'card', - label: 'Number Cards', - options: 'Number Card', - get_query: () => { - return { - 'query': 'frappe.desk.doctype.number_card.number_card.get_cards_for_user', - filters: { - document_type: this.document_type, - } - }; - }, - depends_on: 'eval: doc.new_or_existing == "Existing Card"' + depends_on: 'eval: doc.new_or_existing == "Existing Card"' + }, + { + fieldtype: 'Section Break', + fieldname: 'sb_1', + depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Label', + fieldname: 'label', + fieldtype: 'Data', + mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Doctype', + fieldname: 'document_type', + fieldtype: 'Link', + options: 'DocType', + onchange: () => { + this.document_type = this.dialog.get_value("document_type"); + this.set_aggregate_function_fields(this.dialog.get_values()); + this.setup_filter(doctype); }, - { - fieldtype: 'Section Break', - fieldname: 'sb_1', - depends_on: 'eval: doc.new_or_existing == "New Card"' - }, - { - label: 'Label', - fieldname: 'label', - fieldtype: 'Data', - mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' - }, - { - label: 'Doctype', - fieldname: 'document_type', - fieldtype: 'Link', - options: 'DocType', - onchange: () => { - this.document_type = this.dialog.get_value("document_type"); - this.set_aggregate_function_fields(this.dialog.get_values()); - this.setup_filter(doctype); - }, - hidden: 1 - }, - { - label: 'Color', - fieldname: 'color', - fieldtype: 'Color' - }, - { - fieldtype: "Column Break", - fieldname: "cb_1", - }, - { - label: 'Function', - fieldname: 'function', - fieldtype: 'Select', - options: ['Count', 'Sum', 'Average', 'Minimum', 'Maximum'], - mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' - }, - { - label: 'Function Based On', - fieldname: 'aggregate_function_based_on', - fieldtype: 'Select', - depends_on: "eval: doc.function !== 'Count'", - mandatory_depends_on: 'eval: doc.function !== "Count" && doc.new_or_existing == "New Card"' - }, - { - fieldtype: "Section Break", - fieldname: "sb_1", - label: 'Add Filters', - depends_on: 'eval: doc.new_or_existing == "New Card"' - }, - { - fieldtype: "HTML", - fieldname: "filter_area_loading", - }, - { - fieldtype: "HTML", - fieldname: "filter_area", - hidden: 1, - }, - { - fieldtype: "Section Break", - fieldname: "sb_1", - }, - ]; + hidden: 1 + }, + { + label: 'Color', + fieldname: 'color', + fieldtype: 'Color' + }, + { + fieldtype: "Column Break", + fieldname: "cb_1", + }, + { + label: 'Function', + fieldname: 'function', + fieldtype: 'Select', + options: ['Count', 'Sum', 'Average', 'Minimum', 'Maximum'], + mandatory_depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + label: 'Function Based On', + fieldname: 'aggregate_function_based_on', + fieldtype: 'Select', + depends_on: "eval: doc.function !== 'Count'", + mandatory_depends_on: 'eval: doc.function !== "Count" && doc.new_or_existing == "New Card"' + }, + { + fieldtype: "Section Break", + fieldname: "sb_1", + label: 'Add Filters', + depends_on: 'eval: doc.new_or_existing == "New Card"' + }, + { + fieldtype: "HTML", + fieldname: "filter_area_loading", + }, + { + fieldtype: "HTML", + fieldname: "filter_area", + hidden: 1, + }, + { + fieldtype: "Section Break", + fieldname: "sb_1", + }, + ]; return fields; } From aeedefc3121bad4db2b83bb2a6da1d1116b9623b Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 18:30:04 +0530 Subject: [PATCH 210/337] refactor: simplify code --- .../frappe/views/dashboard/dashboard_view.js | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index dd8bfbd3fd..2f3bd98f5b 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -66,12 +66,22 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.render_dashboard(); } else { frappe.run_serially([ - () => this.fetch_doctype_number_cards().then(cards => { - this.number_cards = cards; - }), - () => this.fetch_doctype_charts().then(charts => { - this.charts = charts; - }), + () => this.fetch_dashboard_items( + 'Dashboard Chart', + { + chart_type: ['in', ['Count', 'Sum', 'Group By']], + document_type: this.doctype, + is_standard: true + }, + 'charts' + ), + () => this.fetch_dashboard_items('Number Card', + { + document_type: this.doctype, + is_standard: true + }, + 'number_cards' + ), () => this.render_dashboard() ]); } @@ -96,28 +106,12 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { } } - fetch_doctype_charts() { - return frappe.db.get_list('Dashboard Chart', { - filters: { - chart_type: ['in', ['Count', 'Sum', 'Group By']], - document_type: this.doctype, - is_standard: true - }, + fetch_dashboard_items(doctype, filters, obj_name) { + return frappe.db.get_list(doctype, { + filters: filters, fields: ['*'] - }).then(charts => { - return charts; - }); - } - - fetch_doctype_number_cards() { - return frappe.db.get_list('Number Card', { - filters: { - document_type: this.doctype, - is_standard: true - }, - fields: ['*'] - }).then(cards => { - return cards; + }).then(items => { + this[obj_name] = items; }); } @@ -202,24 +196,20 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.number_card_group.customize(); } + get_widgets_to_save(widget_group) { + const config = widget_group.get_widget_config(); + let widgets = []; + config.order.map(widget_name => { + widgets.push(config.widgets[widget_name]); + }); + return this.remove_duplicates(widgets); + } + save_dashboard_customization() { this.toggle_customize(false); - const number_card_config = this.number_card_group.get_widget_config(); - let number_cards = []; - number_card_config.order.map(card_name => { - number_cards.push(number_card_config.widgets[card_name]); - }); - - const chart_config = this.chart_group.get_widget_config(); - let charts = []; - chart_config.order.map(chart_name => { - charts.push(chart_config.widgets[chart_name]); - }); - - // Don't allow duplicates of the same card or chart - charts = this.remove_duplicates(charts); - number_cards = this.remove_duplicates(number_cards); + const charts = this.get_widgets_to_save(this.chart_group); + const number_cards = this.get_widgets_to_save(this.number_card_group); this.dashboard_settings = { charts: charts, From 5ebe5d0a2fe0684fc3682add6f12d7037302891f Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 19 Apr 2020 19:18:08 +0530 Subject: [PATCH 211/337] feat: add number cards to Dashboard --- frappe/core/page/dashboard/dashboard.js | 54 ++++++++++++++++--- frappe/desk/doctype/dashboard/dashboard.js | 10 +++- frappe/desk/doctype/dashboard/dashboard.json | 11 +++- frappe/desk/doctype/dashboard/dashboard.py | 9 ++++ .../dashboard_chart/dashboard_chart.js | 1 - .../desk/doctype/number_card/number_card.py | 32 +++++++++++ .../desk/doctype/number_card_link/__init__.py | 0 .../number_card_link/number_card_link.json | 31 +++++++++++ .../number_card_link/number_card_link.py | 10 ++++ frappe/hooks.py | 2 + .../frappe/views/dashboard/dashboard_view.js | 2 +- 11 files changed, 151 insertions(+), 11 deletions(-) create mode 100644 frappe/desk/doctype/number_card_link/__init__.py create mode 100644 frappe/desk/doctype/number_card_link/number_card_link.json create mode 100644 frappe/desk/doctype/number_card_link/number_card_link.py diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index ad65b05894..0c5286597b 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -76,7 +76,16 @@ class Dashboard { } refresh() { - this.get_permitted_dashboard_charts().then(charts => { + frappe.run_serially([ + () => this.render_cards(), + () => this.render_charts() + ]); + } + + render_charts() { + return this.get_permitted_items( + 'frappe.desk.doctype.dashboard.dashboard.get_permitted_charts' + ).then(charts => { if (!charts.length) { frappe.msgprint(__('No Permitted Charts on this Dashboard'), __('No Permitted Charts')) } @@ -92,6 +101,7 @@ class Dashboard { ...chart } }); + this.chart_group = new frappe.widget.WidgetGroup({ title: null, container: this.container, @@ -110,14 +120,46 @@ class Dashboard { }); } - get_permitted_dashboard_charts() { + render_cards() { + return this.get_permitted_items( + 'frappe.desk.doctype.dashboard.dashboard.get_permitted_cards' + ).then(cards => { + if (!cards.length) { + frappe.msgprint(__('No Permitted Cards on this Dashboard'), __('No Permitted Cards')) + } + + this.number_cards = + cards.map(card => { + return { + name: card.card, + } + }); + + this.number_card_group = new frappe.widget.WidgetGroup({ + container: this.container, + type: "number_card", + columns: 3, + options: { + allow_sorting: false, + allow_create: false, + allow_delete: false, + allow_hiding: false, + allow_edit: false, + }, + widgets: this.number_cards, + }); + }); + } + + get_permitted_items(method) { return frappe.xcall( - 'frappe.desk.doctype.dashboard.dashboard.get_permitted_charts', + method, { dashboard_name: this.dashboard_name - }).then(charts => { - return charts; - }); + }).then(items => { + return items; + } + ); } set_dropdown() { diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js index dc2991a346..7109c7ed38 100644 --- a/frappe/desk/doctype/dashboard/dashboard.js +++ b/frappe/desk/doctype/dashboard/dashboard.js @@ -5,7 +5,15 @@ frappe.ui.form.on('Dashboard', { refresh: function(frm) { frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name)); - frm.set_query("chart", "charts", function(doc, cdt, cdn) { + frm.set_query("chart", "charts", function() { + return { + filters: { + is_standard: 1 + } + }; + }); + + frm.set_query("card", "cards", function() { return { filters: { is_standard: 1 diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json index c177ee70ac..c17bc3235c 100644 --- a/frappe/desk/doctype/dashboard/dashboard.json +++ b/frappe/desk/doctype/dashboard/dashboard.json @@ -8,7 +8,8 @@ "field_order": [ "dashboard_name", "is_default", - "charts" + "charts", + "cards" ], "fields": [ { @@ -31,10 +32,16 @@ "label": "Charts", "options": "Dashboard Chart Link", "reqd": 1 + }, + { + "fieldname": "cards", + "fieldtype": "Table", + "label": "Cards", + "options": "Number Card Link" } ], "links": [], - "modified": "2020-03-25 21:09:37.080132", + "modified": "2020-04-19 17:44:36.237163", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard", diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py index 5c344956bf..b85e135071 100644 --- a/frappe/desk/doctype/dashboard/dashboard.py +++ b/frappe/desk/doctype/dashboard/dashboard.py @@ -21,3 +21,12 @@ def get_permitted_charts(dashboard_name): if frappe.has_permission('Dashboard Chart', doc=chart.chart): permitted_charts.append(chart) return permitted_charts + +@frappe.whitelist() +def get_permitted_cards(dashboard_name): + permitted_cards = [] + dashboard = frappe.get_doc('Dashboard', dashboard_name) + for card in dashboard.cards: + if frappe.has_permission('Number Card', doc=card.card): + permitted_cards.append(card) + return permitted_cards diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index b869f60ce5..060f938f28 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -354,7 +354,6 @@ frappe.ui.form.on('Dashboard Chart', { on_change: () => {}, }); - console.log('filters', filters); frm.filter_group.add_filters_to_filter_group(filters); } diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 545e88b7c6..a1d9fd07d2 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -11,6 +11,38 @@ class NumberCard(Document): pass +def get_permission_query_conditions(user): + + if not user: + user = frappe.session.user + + if user == 'Administrator': + return + + roles = frappe.get_roles(user) + if "System Manager" in roles: + return None + + allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read()) + print('allowed doctypes', allowed_doctypes) + + return ''' + `tabNumber Card`.`document_type` in {allowed_doctypes} + '''.format( + allowed_doctypes=allowed_doctypes, + ) + +def has_permission(doc, ptype, user): + roles = frappe.get_roles(user) + if "System Manager" in roles: + return True + + allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read()) + if doc.document_type in allowed_doctypes: + return True + + return False + @frappe.whitelist() def get_result(doc): doc = frappe.parse_json(doc) diff --git a/frappe/desk/doctype/number_card_link/__init__.py b/frappe/desk/doctype/number_card_link/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/number_card_link/number_card_link.json b/frappe/desk/doctype/number_card_link/number_card_link.json new file mode 100644 index 0000000000..ac035b32d8 --- /dev/null +++ b/frappe/desk/doctype/number_card_link/number_card_link.json @@ -0,0 +1,31 @@ +{ + "actions": [], + "creation": "2020-04-19 17:43:50.858343", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "card" + ], + "fields": [ + { + "fieldname": "card", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Card", + "options": "Number Card" + } + ], + "istable": 1, + "links": [], + "modified": "2020-04-19 17:45:11.878472", + "modified_by": "Administrator", + "module": "Desk", + "name": "Number Card Link", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/number_card_link/number_card_link.py b/frappe/desk/doctype/number_card_link/number_card_link.py new file mode 100644 index 0000000000..67ad7e70cd --- /dev/null +++ b/frappe/desk/doctype/number_card_link/number_card_link.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class NumberCardLink(Document): + pass diff --git a/frappe/hooks.py b/frappe/hooks.py index 2561399a78..a63fba14f9 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -89,6 +89,7 @@ permission_query_conditions = { "Dashboard Settings": "frappe.desk.doctype.dashboard_settings.dashboard_settings.get_permission_query_conditions", "Notification Log": "frappe.desk.doctype.notification_log.notification_log.get_permission_query_conditions", "Dashboard Chart": "frappe.desk.doctype.dashboard_chart.dashboard_chart.get_permission_query_conditions", + "Number Card": "frappe.desk.doctype.number_card.number_card.get_permission_query_conditions", "Notification Settings": "frappe.desk.doctype.notification_settings.notification_settings.get_permission_query_conditions", "Note": "frappe.desk.doctype.note.note.get_permission_query_conditions", "Kanban Board": "frappe.desk.doctype.kanban_board.kanban_board.get_permission_query_conditions", @@ -105,6 +106,7 @@ has_permission = { "User": "frappe.core.doctype.user.user.has_permission", "Note": "frappe.desk.doctype.note.note.has_permission", "Dashboard Chart": "frappe.desk.doctype.dashboard_chart.dashboard_chart.has_permission", + "Number Card": "frappe.desk.doctype.number_card.number_card.has_permission", "Kanban Board": "frappe.desk.doctype.kanban_board.kanban_board.has_permission", "Contact": "frappe.contacts.address_and_contact.has_permission", "Address": "frappe.contacts.address_and_contact.has_permission", diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 2f3bd98f5b..0914838977 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -128,7 +128,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { }, default_values: {doctype: this.doctype}, widgets: this.number_cards || [], - in_customize_mode: true, + in_customize_mode: this.in_customize_mode || false, }); this.in_customize_mode && this.number_card_group.customize(); From 886d24c221f3effe53f8df660c791b6ea7c405d6 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 20 Apr 2020 16:42:33 +0530 Subject: [PATCH 212/337] fix: set max chars according to widget width --- frappe/public/js/frappe/widgets/chart_widget.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index f0388dda19..69fb214ab0 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -20,11 +20,15 @@ export default class ChartWidget extends Widget { refresh() { delete this.dashboard_chart; - this.set_title(15); this.set_body(); this.make_chart(); } + set_chart_title() { + const max_chars = this.widget.width() < 500? 30: 60; + this.set_title(max_chars); + } + set_body() { this.widget.addClass("dashboard-widget-box"); if (this.width == "Full") { @@ -51,6 +55,8 @@ export default class ChartWidget extends Widget { this.chart_wrapper = $(`
    `); this.chart_wrapper.appendTo(this.body); + + this.set_chart_title(); } set_summary() { From 785593681b860ac8d5b5a2b882a2705f12c69bed Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 23 Apr 2020 12:43:57 +0530 Subject: [PATCH 213/337] fix: reduce max char for chart title --- frappe/public/js/frappe/widgets/chart_widget.js | 2 +- frappe/public/js/frappe/widgets/widget_dialog.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 69fb214ab0..b31949cd9d 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -25,7 +25,7 @@ export default class ChartWidget extends Widget { } set_chart_title() { - const max_chars = this.widget.width() < 500? 30: 60; + const max_chars = this.widget.width() < 500? 20: 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 adfdacabbd..a9ea8637cf 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -304,7 +304,7 @@ class NumberCardDialog extends WidgetDialog { onchange: () => { this.document_type = this.dialog.get_value("document_type"); this.set_aggregate_function_fields(this.dialog.get_values()); - this.setup_filter(doctype); + this.setup_filter(this.document_type); }, hidden: 1 }, From 9c7763ee21bc946df73bd4c91ecb9752accb1032 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 23 Apr 2020 14:10:28 +0530 Subject: [PATCH 214/337] fix: use is_public and don't set as hidden --- frappe/desk/doctype/dashboard/dashboard.js | 4 ++-- .../dashboard_chart/dashboard_chart.js | 5 ----- .../dashboard_chart/dashboard_chart.json | 15 +++++++------ .../dashboard_chart/dashboard_chart.py | 9 ++++++-- .../desk/doctype/number_card/number_card.js | 6 ----- .../desk/doctype/number_card/number_card.json | 22 +++++++++---------- .../desk/doctype/number_card/number_card.py | 5 ++--- frappe/patches.txt | 2 +- ...et_existing_dashboard_charts_as_public.py} | 2 +- .../frappe/views/dashboard/dashboard_view.js | 6 ++--- 10 files changed, 34 insertions(+), 42 deletions(-) rename frappe/patches/v13_0/{set_existing_dashboard_charts_as_standard.py => set_existing_dashboard_charts_as_public.py} (93%) diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js index 7109c7ed38..609e943995 100644 --- a/frappe/desk/doctype/dashboard/dashboard.js +++ b/frappe/desk/doctype/dashboard/dashboard.js @@ -8,7 +8,7 @@ frappe.ui.form.on('Dashboard', { frm.set_query("chart", "charts", function() { return { filters: { - is_standard: 1 + is_public: 1 } }; }); @@ -16,7 +16,7 @@ frappe.ui.form.on('Dashboard', { frm.set_query("card", "cards", function() { return { filters: { - is_standard: 1 + is_public: 1 } }; }); diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 060f938f28..f8d5886b26 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -9,11 +9,6 @@ frappe.ui.form.on('Dashboard Chart', { frm.add_fetch('source', 'timeseries', 'timeseries'); }, - before_save: function(frm) { - if (frm.is_new() && (frappe.user.has_role('System Manager') || frappe.user.has_role('Dashboard Manager'))) { - frm.doc.is_standard = 1; - } - }, refresh: function(frm) { frm.chart_filters = null; diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 7530d70fdc..75941a9019 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -22,6 +22,7 @@ "aggregate_function_based_on", "number_of_groups", "column_break_6", + "is_public", "timespan", "from_date", "to_date", @@ -35,8 +36,7 @@ "color", "custom_options", "section_break_10", - "last_synced_on", - "is_standard" + "last_synced_on" ], "fields": [ { @@ -100,7 +100,7 @@ }, { "default": "0", - "depends_on": "eval:doc.chart_type !== 'Group By'", + "depends_on": "eval: ['Count', 'Sum', 'Average'].includes(doc.chart_type)", "fieldname": "timeseries", "fieldtype": "Check", "label": "Time Series" @@ -224,15 +224,15 @@ }, { "default": "0", - "fieldname": "is_standard", + "description": "This chart will be public to all Users if this is set", + "fieldname": "is_public", "fieldtype": "Check", - "hidden": 1, - "label": "Is Standard", + "label": "Is Public", "permlevel": 1 } ], "links": [], - "modified": "2020-04-17 18:11:33.486037", + "modified": "2020-04-23 13:01:07.178866", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", @@ -263,6 +263,7 @@ "write": 1 }, { + "create": 1, "email": 1, "export": 1, "print": 1, diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 8242e3752d..9636dcb347 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -96,8 +96,6 @@ def create_dashboard_chart(args): args = frappe.parse_json(args) doc = frappe.new_doc('Dashboard Chart') roles = frappe.get_roles(frappe.session.user) - if 'Sytem Manager' in roles or 'Dashboard Manager' in roles: - doc.is_standard = 1 doc.update(args) @@ -364,6 +362,13 @@ def get_year_ending(date): # last day of this month return add_to_date(date, days=-1) +def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters): + or_filters = {'owner': frappe.session.user, 'is_public': 1} + return frappe.db.get_list('Dashboard Chart', + fields=['name'], + filters=filters, + or_filters=or_filters, + as_list = 1) class DashboardChart(Document): diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js index 2bf99b9107..a4823e2692 100644 --- a/frappe/desk/doctype/number_card/number_card.js +++ b/frappe/desk/doctype/number_card/number_card.js @@ -8,12 +8,6 @@ frappe.ui.form.on('Number Card', { frm.trigger('render_filters_table'); }, - before_save: function(frm) { - if (frm.is_new() && (frappe.user.has_role('System Manager') || frappe.user.has_role('Dashboard Manager'))) { - frm.doc.is_standard = 1; - } - }, - document_type: function(frm) { frm.set_query('document_type', function() { return { diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json index 222e4ed942..6af3f34aaf 100644 --- a/frappe/desk/doctype/number_card/number_card.json +++ b/frappe/desk/doctype/number_card/number_card.json @@ -9,12 +9,12 @@ "label", "function", "column_break_2", + "is_public", "document_type", "aggregate_function_based_on", "filters_section", "filters_json", - "color", - "is_standard" + "color" ], "fields": [ { @@ -58,14 +58,6 @@ "fieldtype": "Color", "label": "Color" }, - { - "default": "0", - "fieldname": "is_standard", - "fieldtype": "Check", - "hidden": 1, - "label": "Is Standard", - "permlevel": 1 - }, { "fieldname": "column_break_2", "fieldtype": "Column Break" @@ -74,10 +66,18 @@ "fieldname": "filters_section", "fieldtype": "Section Break", "label": "Filters Section" + }, + { + "default": "0", + "description": "This card will be public to all Users if this is set", + "fieldname": "is_public", + "fieldtype": "Check", + "label": "Is Public", + "permlevel": 1 } ], "links": [], - "modified": "2020-04-18 14:12:06.949445", + "modified": "2020-04-23 13:03:57.103284", "modified_by": "Administrator", "module": "Desk", "name": "Number Card", diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index a1d9fd07d2..f8f2548a49 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -73,14 +73,13 @@ def create_number_card(args): args = frappe.parse_json(args) doc = frappe.new_doc('Number Card') roles = frappe.get_roles(frappe.session.user) - if 'Sytem Manager' in roles or 'Dashboard Manager' in roles: - doc.is_standard = 1 + doc.update(args) doc.insert(ignore_permissions=True) return doc def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): - or_filters = {'owner': frappe.session.user, 'is_standard': 1} + or_filters = {'owner': frappe.session.user, 'is_public': 1} return frappe.db.get_list('Number Card', fields=['name', 'label'], filters=filters, diff --git a/frappe/patches.txt b/frappe/patches.txt index c5daf872b1..97a79df889 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -273,4 +273,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings') frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() frappe.patches.v13_0.website_theme_custom_scss -frappe.patches.v13_0.set_existing_dashboard_charts_as_standard +frappe.patches.v13_0.set_existing_dashboard_charts_as_public diff --git a/frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py b/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py similarity index 93% rename from frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py rename to frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py index 0e7abea8bd..29732688c7 100644 --- a/frappe/patches/v13_0/set_existing_dashboard_charts_as_standard.py +++ b/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py @@ -20,7 +20,7 @@ def execute(): UPDATE `tabDashboard Chart` SET - `tabDashboard Chart`.`is_standard`=1 + `tabDashboard Chart`.`is_public`=1 WHERE `tabDashboard Chart`.owner in {users} """.format(users=users) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 0914838977..f545fd7bd3 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -71,14 +71,12 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { { chart_type: ['in', ['Count', 'Sum', 'Group By']], document_type: this.doctype, - is_standard: true }, 'charts' ), () => this.fetch_dashboard_items('Number Card', { document_type: this.doctype, - is_standard: true }, 'number_cards' ), @@ -258,9 +256,9 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { fieldtype: 'Link', get_query: () => { return { + 'query': 'frappe.desk.doctype.dashboard_chart.dashboard_chart.get_charts_for_user', filters: { - document_type: this.doctype, - is_standard: 1, + document_type: this.doctype, } }; }, From 299b24f09c48fbe8141340a096f97208161a6bee Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 25 Apr 2020 16:38:16 +0530 Subject: [PATCH 215/337] feat: add stats to number cards --- .../desk/doctype/number_card/number_card.json | 31 ++++- .../desk/doctype/number_card/number_card.py | 44 ++++++- .../js/frappe/widgets/number_card_widget.js | 116 ++++++++++++++---- frappe/public/js/frappe/widgets/utils.js | 17 ++- frappe/public/less/desktop.less | 34 +++-- 5 files changed, 203 insertions(+), 39 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json index 6af3f34aaf..d97e711d28 100644 --- a/frappe/desk/doctype/number_card/number_card.json +++ b/frappe/desk/doctype/number_card/number_card.json @@ -8,10 +8,13 @@ "field_order": [ "label", "function", - "column_break_2", - "is_public", - "document_type", "aggregate_function_based_on", + "column_break_2", + "document_type", + "is_public", + "stats_section", + "show_percentage_stats", + "stats_time_interval", "filters_section", "filters_json", "color" @@ -74,10 +77,30 @@ "fieldtype": "Check", "label": "Is Public", "permlevel": 1 + }, + { + "default": "1", + "fieldname": "show_percentage_stats", + "fieldtype": "Check", + "label": "Show Percentage Stats" + }, + { + "default": "Daily", + "depends_on": "eval: doc.show_percentage_stats", + "description": "Show percentage difference according to this time interval", + "fieldname": "stats_time_interval", + "fieldtype": "Select", + "label": "Stats Time Interval", + "options": "Daily\nWeekly\nMonthly\nYearly" + }, + { + "fieldname": "stats_section", + "fieldtype": "Section Break", + "label": "Stats" } ], "links": [], - "modified": "2020-04-23 13:03:57.103284", + "modified": "2020-04-25 15:59:57.004756", "modified_by": "Administrator", "module": "Desk", "name": "Number Card", diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index f8f2548a49..a6104c3b01 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -24,7 +24,6 @@ def get_permission_query_conditions(user): return None allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read()) - print('allowed doctypes', allowed_doctypes) return ''' `tabNumber Card`.`document_type` in {allowed_doctypes} @@ -44,7 +43,7 @@ def has_permission(doc, ptype, user): return False @frappe.whitelist() -def get_result(doc): +def get_result(doc, to_date=None): doc = frappe.parse_json(doc) fields = [] sql_function_map = { @@ -63,16 +62,51 @@ def get_result(doc): fields = ['{function}({based_on}) as result'.format(function=function, based_on=doc.aggregate_function_based_on)] filters = frappe.parse_json(doc.filters_json) - number = frappe.db.get_all(doc.document_type, fields = fields, filters = filters)[0]['result'] - number = round(number, 2) if isinstance(number, float) else number + if to_date: + filters.append([doc.document_type, 'creation', '<', to_date, False]) + + number = frappe.db.get_all(doc.document_type, fields = fields, filters = filters)[0]['result'] + + frappe.db.set_value('Number Card', doc.name, 'previous_result', number) + return number + +@frappe.whitelist() +def get_percentage_difference(doc, result): + doc = frappe.parse_json(doc) + result = frappe.parse_json(result) + + doc = frappe.get_doc('Number Card', doc.name) + + if not doc.get('show_percentage_stats'): + return + + previous_result = calculate_previous_result(doc) + difference = (result - previous_result)/100.0 + + return difference + + +def calculate_previous_result(doc): + from frappe.utils import add_to_date + + current_date = frappe.utils.now() + if doc.stats_time_interval == 'Daily': + previous_date = frappe.utils.add_to_date(current_date, days=-1) + elif doc.stats_time_interval == 'Weekly': + previous_date = frappe.utils.add_to_date(current_date, weeks=-1) + elif doc.stats_time_interval == 'Monthly': + previous_date = frappe.utils.add_to_date(current_date, months=-1) + else: + previous_date = frappe.utils.add_to_date(current_date, years=-1) + + number = get_result(doc, previous_date) return number @frappe.whitelist() def create_number_card(args): args = frappe.parse_json(args) doc = frappe.new_doc('Number Card') - roles = frappe.get_roles(frappe.session.user) doc.update(args) doc.insert(ignore_permissions=True) diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 3de6a0c0eb..86b7fa687a 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -1,5 +1,5 @@ import Widget from "./base_widget.js"; -import { go_to_list_with_filters } from "./utils"; +import { go_to_list_with_filters, shorten_number } from "./utils"; export default class NumberCardWidget extends Widget { constructor(opts) { @@ -21,25 +21,19 @@ export default class NumberCardWidget extends Widget { set_body() { this.widget.addClass("number-widget-box"); - $(this.body).html(`
    - ${__('Loading...')} -
    `); this.make_card(); } + set_title() { + $(this.title_field).html(`
    ${this.card_doc.label}
    `); + } + make_card() { frappe.model.with_doc("Number Card", this.name).then(card => { if (!card) { if (this.document_type) { - this.set_doc_args(); - frappe.xcall( - 'frappe.desk.doctype.number_card.number_card.create_number_card', - {'args': this.card_doc} - ).then(doc => { - this.name = doc.name; - this.widget.attr('data-widget-name', this.name); - this.render_card(); - }); + this.create_number_card(); + this.render_card(); } else { // widget doesn't exist so delete this.delete(false); @@ -49,10 +43,22 @@ export default class NumberCardWidget extends Widget { this.card_doc = card; this.render_card(); } + this.set_events(); }); } + create_number_card() { + this.set_doc_args(); + frappe.xcall( + 'frappe.desk.doctype.number_card.number_card.create_number_card', + {'args': this.card_doc} + ).then(doc => { + this.name = doc.name; + this.widget.attr('data-widget-name', this.name); + }); + } + set_events() { $(this.body).click(() => { if (this.in_customize_mode) return; @@ -74,25 +80,91 @@ export default class NumberCardWidget extends Widget { render_card() { this.prepare_actions(); - this.get_number().then(() => { - $(this.body).html(`
    -
    ${this.number_html}
    -
    ${this.card_doc.label}
    -
    `); - }); + this.set_title(); + this.set_loading_state(); + + frappe.run_serially([ + () => this.render_number(), + () => this.render_stats(), + ]); + } + + set_loading_state() { + $(this.body).html(`
    + ${__('Loading...')} +
    `); } get_number() { return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {doc: this.card_doc}).then(res => { - const number_order = res.toFixed().length - 1; - if (number_order > 12) { - this.number_html = `≈ 10${number_order}`; + this.number = res; + if (this.card_doc.function !== 'Count') { + this.get_formatted_number(res); } else { this.number_html = res; } }); } + get_formatted_number(number) { + frappe.model.with_doctype(this.card_doc.document_type, () => { + const based_on_df = + frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on); + const shortened_number = shorten_number(number); + let number_parts = shortened_number.split(' '); + + const symbol = number_parts[1] || ''; + const formatted_number = $(frappe.format(number_parts[0], based_on_df)).text(); + + this.number_html = formatted_number + ' ' + symbol; + }); + + } + + render_number() { + return this.get_number().then(() => { + $(this.body).html(`
    +
    ${this.number_html}
    +
    `); + }); + } + + render_stats() { + let caret_html =''; + let color_class = ''; + + return this.get_percentage_stats().then(() => { + if (this.percentage_stat == undefined) return; + + if (this.percentage_stat == 0) { + color_class = 'grey-stat'; + } else if (this.percentage_stat > 0) { + caret_html = ''; + color_class = 'green-stat'; + } else { + caret_html = ''; + color_class = 'red-stat'; + } + + $(this.body).find('.widget-content').append(`
    + ${caret_html} + ${Math.abs(this.percentage_stat)} % +
    `) + }); + } + + get_percentage_stats() { + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', + { + doc: this.card_doc, + result: this.number + }).then(res => { + if (res !== undefined) { + this.percentage_stat = +res.toFixed(2); + } + }); + } + prepare_actions() { let actions = [ { diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index f408ecfdd2..a3f6726264 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -123,4 +123,19 @@ function go_to_list_with_filters(doctype, filters) { }) } -export { generate_route, generate_grid, build_summary_item, go_to_list_with_filters }; \ No newline at end of file +function shorten_number(number) { + let x = Math.abs(Math.round(number)) + + switch(true) { + case x >= 1.0e+12: + return Math.round(number/1.0e+12) + " T"; + case x >= 1.0e+9: + return Math.round(number/1.0e+9) + " B"; + case x >= 1.0e+6: + return Math.round(number/1.0e+6) + " M"; + default: + return number.toFixed(); + } +} + +export { generate_route, generate_grid, build_summary_item, go_to_list_with_filters, shorten_number }; \ No newline at end of file diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 081dbb64fb..414d6133fa 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -395,38 +395,42 @@ &.number-widget-box { cursor: pointer; - height: 110px; + height: 100px; + padding: 10px; &:hover { border-color: @text-muted; } .widget-head { - position: relative; .widget-title { - display: none; + font-weight: normal; + color: @text-muted; + font-size: 14px; + margin-top: -5px; } .widget-control { - position: absolute; right: -10px; top: -10px; } } .widget-body { - text-align: center; + text-align: left; .number-card-loading { display: flex; - height: 80px; + height: 50px; align-items: center; justify-content: center; } .widget-content { - padding: 5px; + padding-top: 15px; + display: flex; + justify-content: space-between; .number { font-size: 30px; @@ -438,6 +442,22 @@ padding: 5px; font-size: 14px; } + + .card-stats { + padding-top: 20px; + } + + .green-stat { + color: green; + } + + .red-stat { + color: @red; + } + + .grey-stat { + color: @text-muted; + } } } } From ba83728412b05a162c015a9d55b1e2d0c9f1842b Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 25 Apr 2020 17:06:01 +0530 Subject: [PATCH 216/337] fix: fix rendering of formatted number --- .../js/frappe/widgets/number_card_widget.js | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 86b7fa687a..ed124ef656 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -99,26 +99,25 @@ export default class NumberCardWidget extends Widget { return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {doc: this.card_doc}).then(res => { this.number = res; if (this.card_doc.function !== 'Count') { - this.get_formatted_number(res); + return frappe.model.with_doctype(this.card_doc.document_type, () => { + this.get_formatted_number(); + }); } else { this.number_html = res; } }); } - get_formatted_number(number) { - frappe.model.with_doctype(this.card_doc.document_type, () => { - const based_on_df = - frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on); - const shortened_number = shorten_number(number); - let number_parts = shortened_number.split(' '); + get_formatted_number() { + const based_on_df = + frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on); + const shortened_number = shorten_number(this.number); + let number_parts = shortened_number.split(' '); - const symbol = number_parts[1] || ''; - const formatted_number = $(frappe.format(number_parts[0], based_on_df)).text(); - - this.number_html = formatted_number + ' ' + symbol; - }); + const symbol = number_parts[1] || ''; + const formatted_number = $(frappe.format(number_parts[0], based_on_df)).text(); + this.number_html = formatted_number + ' ' + symbol; } render_number() { From fde95c7f3ae05af4a7b65127df79c08689728cd4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 25 Apr 2020 17:16:15 +0530 Subject: [PATCH 217/337] fix: decrease font size of number --- frappe/public/less/desktop.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 414d6133fa..fd24ec02bb 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -428,12 +428,12 @@ } .widget-content { - padding-top: 15px; + padding-top: 20px; display: flex; justify-content: space-between; .number { - font-size: 30px; + font-size: 26px; font-weight: bold; } @@ -444,7 +444,7 @@ } .card-stats { - padding-top: 20px; + padding-top: 15px; } .green-stat { From 2916eeb5620956c8a364a3cec41ec8435b188b3b Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 25 Apr 2020 17:45:59 +0530 Subject: [PATCH 218/337] fix: add label and document type to search fields --- frappe/desk/doctype/number_card/number_card.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json index d97e711d28..8d04ce07f5 100644 --- a/frappe/desk/doctype/number_card/number_card.json +++ b/frappe/desk/doctype/number_card/number_card.json @@ -100,7 +100,7 @@ } ], "links": [], - "modified": "2020-04-25 15:59:57.004756", + "modified": "2020-04-25 17:31:34.204607", "modified_by": "Administrator", "module": "Desk", "name": "Number Card", @@ -140,6 +140,7 @@ "share": 1 } ], + "search_fields": "label, document_type", "sort_field": "modified", "sort_order": "DESC", "title_field": "label", From 3c63423331681c8afce9f2b92ca8c254b964c566 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 12:21:42 +0530 Subject: [PATCH 219/337] fix: remove msgprint for cards in dashboard --- frappe/core/page/dashboard/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 0c5286597b..c6d697aa38 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -125,7 +125,7 @@ class Dashboard { 'frappe.desk.doctype.dashboard.dashboard.get_permitted_cards' ).then(cards => { if (!cards.length) { - frappe.msgprint(__('No Permitted Cards on this Dashboard'), __('No Permitted Cards')) + return; } this.number_cards = From d43ec4320bebc150a6a3f9f6440f64084d51a937 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 12:23:11 +0530 Subject: [PATCH 220/337] fix: fix indent --- frappe/core/page/dashboard/dashboard.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index c6d697aa38..7733ee5bcf 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -129,10 +129,10 @@ class Dashboard { } this.number_cards = - cards.map(card => { - return { - name: card.card, - } + cards.map(card => { + return { + name: card.card, + }; }); this.number_card_group = new frappe.widget.WidgetGroup({ From de8f7faa477cf8ff9d2e6d090456af3877304360 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 12:25:17 +0530 Subject: [PATCH 221/337] fix: remove unused imports and variables --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 1 - frappe/desk/doctype/number_card/number_card.py | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 9636dcb347..f97f1e6edf 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -95,7 +95,6 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d def create_dashboard_chart(args): args = frappe.parse_json(args) doc = frappe.new_doc('Dashboard Chart') - roles = frappe.get_roles(frappe.session.user) doc.update(args) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index a6104c3b01..ecdcc56929 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -from frappe.model.naming import append_number_if_name_exists class NumberCard(Document): pass @@ -92,13 +91,13 @@ def calculate_previous_result(doc): current_date = frappe.utils.now() if doc.stats_time_interval == 'Daily': - previous_date = frappe.utils.add_to_date(current_date, days=-1) + previous_date = add_to_date(current_date, days=-1) elif doc.stats_time_interval == 'Weekly': - previous_date = frappe.utils.add_to_date(current_date, weeks=-1) + previous_date = add_to_date(current_date, weeks=-1) elif doc.stats_time_interval == 'Monthly': - previous_date = frappe.utils.add_to_date(current_date, months=-1) + previous_date = add_to_date(current_date, months=-1) else: - previous_date = frappe.utils.add_to_date(current_date, years=-1) + previous_date = add_to_date(current_date, years=-1) number = get_result(doc, previous_date) return number From ec7fc7f3450280f747c8f786afc904e16a33d792 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 12:37:40 +0530 Subject: [PATCH 222/337] fix: code formatting --- .../desk/doctype/number_card/number_card.js | 2 +- .../public/js/frappe/utils/dashboard_utils.js | 11 ++-- .../frappe/views/dashboard/dashboard_view.js | 11 ++-- .../public/js/frappe/widgets/base_widget.js | 3 +- .../js/frappe/widgets/number_card_widget.js | 51 ++++++++++--------- frappe/public/js/frappe/widgets/utils.js | 4 +- 6 files changed, 45 insertions(+), 37 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js index a4823e2692..812582ae05 100644 --- a/frappe/desk/doctype/number_card/number_card.js +++ b/frappe/desk/doctype/number_card/number_card.js @@ -14,7 +14,7 @@ frappe.ui.form.on('Number Card', { filters: { 'issingle': false } - } + }; }); frm.set_value('filters_json', '[]'); frm.set_value('aggregate_function_based_on', ''); diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js index 16f54a1f84..a1628be34a 100644 --- a/frappe/public/js/frappe/utils/dashboard_utils.js +++ b/frappe/public/js/frappe/utils/dashboard_utils.js @@ -57,9 +57,10 @@ frappe.dashboard_utils = { }, get_dashboard_settings() { - return frappe.db.get_list('Dashboard Settings', - { - filters: {name: frappe.session.user}, + return frappe.db.get_list('Dashboard Settings', { + filters: { + name: frappe.session.user + }, fields: ['*'] }).then(settings => { if (!settings.length) { @@ -75,7 +76,9 @@ frappe.dashboard_utils = { create_dashboard_settings() { return frappe.xcall( 'frappe.desk.doctype.dashboard_settings.dashboard_settings.create_dashboard_settings', - {user: frappe.session.user} + { + user: frappe.session.user + } ).then(settings => { return settings; }); diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index f545fd7bd3..a3fe931f49 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -96,7 +96,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { }); this.render_dashboard_charts(); }); - this.render_number_cards(); if (!this.charts.length && !this.number_cards.length) { @@ -173,7 +172,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
    `; this.$dashboard_wrapper.append(empty_state_html); - this.$empty_state = this.$dashboard_wrapper.find('.empty-dashboard'); } @@ -182,7 +180,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { return; } - if (this.$empty_state) { this.$empty_state.remove(); } @@ -228,7 +225,8 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.dashboard_settings = null; frappe.model.user_settings.save( this.doctype, 'dashboard_settings', this.dashboard_settings - ).then(()=> this.make_dashboard()); + ).then(() => this.make_dashboard()); + this.toggle_customize(false); } @@ -435,16 +433,17 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { group_by_fields.push({label: df.label, value: df.fieldname}); } }); + return { date_fields: date_fields, value_fields: value_fields, group_by_fields: group_by_fields, aggregate_function_fields: aggregate_function_fields - } + }; } remove_duplicates(items) { return items.filter((item, index) => items.indexOf(item) === index); } -} +}; diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 7b3770ec9e..e2df42472a 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -113,7 +113,8 @@ export default class Widget { let remove_widget = () => { this.widget.remove(); this.options.on_delete && this.options.on_delete(this.name); - } + }; + if (animate) { this.widget.addClass("zoomOutDelete"); // wait for animation diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index ed124ef656..9eb985ca82 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -19,7 +19,7 @@ export default class NumberCardWidget extends Widget { this.set_body(); } - set_body() { + set_body() { this.widget.addClass("number-widget-box"); this.make_card(); } @@ -29,7 +29,7 @@ export default class NumberCardWidget extends Widget { } make_card() { - frappe.model.with_doc("Number Card", this.name).then(card => { + frappe.model.with_doc('Number Card', this.name).then(card => { if (!card) { if (this.document_type) { this.create_number_card(); @@ -52,7 +52,9 @@ export default class NumberCardWidget extends Widget { this.set_doc_args(); frappe.xcall( 'frappe.desk.doctype.number_card.number_card.create_number_card', - {'args': this.card_doc} + { + 'args': this.card_doc + } ).then(doc => { this.name = doc.name; this.widget.attr('data-widget-name', this.name); @@ -96,7 +98,9 @@ export default class NumberCardWidget extends Widget { } get_number() { - return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {doc: this.card_doc}).then(res => { + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', { + doc: this.card_doc + }).then(res => { this.number = res; if (this.card_doc.function !== 'Count') { return frappe.model.with_doctype(this.card_doc.document_type, () => { @@ -148,43 +152,43 @@ export default class NumberCardWidget extends Widget { $(this.body).find('.widget-content').append(`
    ${caret_html} ${Math.abs(this.percentage_stat)} % -
    `) +
    • `); }); } get_percentage_stats() { - return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', - { - doc: this.card_doc, - result: this.number - }).then(res => { - if (res !== undefined) { - this.percentage_stat = +res.toFixed(2); - } + return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', { + doc: this.card_doc, + result: this.number + }).then(res => { + if (res !== undefined) { + this.percentage_stat = +res.toFixed(2); + } }); } prepare_actions() { let actions = [ { - label: __("Refresh"), - action: "action-refresh", + label: __('Refresh'), + action: 'action-refresh', handler: () => { this.render_card(); } }, { - label: __("Edit"), - action: "action-edit", + label: __('Edit'), + action: 'action-edit', handler: () => { frappe.set_route( - "Form", - "Number Card", + 'Form', + 'Number Card', this.name ); } }, ]; + this.set_card_actions(actions); } @@ -196,11 +200,11 @@ export default class NumberCardWidget extends Widget {
    `); @@ -209,6 +213,7 @@ export default class NumberCardWidget extends Widget { const action = o.dataset.action; $(o).click(actions.find(a => a.action === action)); }); + this.action_area.html(this.card_actions); } } diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index a3f6726264..039ede305a 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -124,9 +124,9 @@ function go_to_list_with_filters(doctype, filters) { } function shorten_number(number) { - let x = Math.abs(Math.round(number)) + let x = Math.abs(Math.round(number)); - switch(true) { + switch (true) { case x >= 1.0e+12: return Math.round(number/1.0e+12) + " T"; case x >= 1.0e+9: From d2a9f1b46e17b7f4c631e0494feec862aac789a0 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sun, 26 Apr 2020 16:08:48 +0530 Subject: [PATCH 223/337] fix: indent --- frappe/core/page/dashboard/dashboard.js | 6 ++-- .../js/frappe/widgets/number_card_widget.js | 28 +++++++++---------- frappe/public/js/frappe/widgets/utils.js | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js index 7733ee5bcf..222a31a863 100644 --- a/frappe/core/page/dashboard/dashboard.js +++ b/frappe/core/page/dashboard/dashboard.js @@ -156,10 +156,10 @@ class Dashboard { method, { dashboard_name: this.dashboard_name - }).then(items => { - return items; } - ); + ).then(items => { + return items; + }); } set_dropdown() { diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 9eb985ca82..4766d97e92 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -193,21 +193,19 @@ export default class NumberCardWidget extends Widget { } set_card_actions(actions) { - this.card_actions = $(`
    - -
      - ${actions.map( - action => - `
    • - ${action.label} -
      • ` - ) - .join('')} -
    -
    - `); + this.card_actions = + $(`
    + + +
    `); this.card_actions.find("a[data-action]").each((i, o) => { const action = o.dataset.action; diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index 039ede305a..59067bd9a0 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -120,7 +120,7 @@ function go_to_list_with_filters(doctype, filters) { let filter_area = list_view.filter_area; filter_area.clear(); filter_area.filter_list.add_filters_to_filter_group(filters); - }) + }); } function shorten_number(number) { From 75031287652d9d76914ef5c199345d8a9e2f8d1e Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Sun, 26 Apr 2020 17:18:11 +0530 Subject: [PATCH 224/337] Revert "fix: Set fields in grid form as read only for non-editable grids" --- frappe/public/js/frappe/form/grid_row.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 31d62dc445..8738efc1ee 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -22,9 +22,6 @@ export default class GridRow { if(me.grid.allow_on_grid_editing() && me.grid.is_editable()) { // pass } else { - if (!me.grid.is_editable()) { - me.docfields.map(df => df.read_only = 1); - } me.toggle_view(); return false; } From 84a3d9271e1dca021e43738d680f3d74a1635126 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 26 Apr 2020 20:32:51 +0530 Subject: [PATCH 225/337] fix: Only make form-area scrollable - Exclude grid-form-footer from scrolling area --- frappe/public/less/form_grid.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less index ed457a9ce8..88c5cf7bbc 100644 --- a/frappe/public/less/form_grid.less +++ b/frappe/public/less/form_grid.less @@ -263,8 +263,10 @@ } .grid-form-body { - max-height: 75vh; - overflow-y: auto; + .form-area { + max-height: 70vh; + overflow-y: auto; + } } .grid-header-toolbar { From 3292cfb82d7a186bf28fbe1c56b45550724ad8c9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 26 Apr 2020 20:36:01 +0530 Subject: [PATCH 226/337] fix(style): Make grid form look visually centered & fix scrolling - Scroll -15px to make grid form look visually centered - Do not scroll if grid is displayed in modal --- frappe/public/js/frappe/dom.js | 4 ++++ frappe/public/js/frappe/form/grid_row.js | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js index 819ecb526e..7b59f9da08 100644 --- a/frappe/public/js/frappe/dom.js +++ b/frappe/public/js/frappe/dom.js @@ -85,6 +85,10 @@ frappe.dom = { ); }, + is_element_in_modal(element) { + return Boolean($(element).parents('.modal').length); + }, + set_style: function(txt, id) { if(!txt) return; diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 31d62dc445..5ed31e6e49 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -527,7 +527,7 @@ export default class GridRow { return this; } show_form() { - if(!this.grid_form) { + if (!this.grid_form) { this.grid_form = new GridRowForm({ row: this }); @@ -536,13 +536,15 @@ export default class GridRow { this.row.toggle(false); // this.form_panel.toggle(true); frappe.dom.freeze("", "dark"); - if(cur_frm) cur_frm.cur_grid = this; + if (cur_frm) cur_frm.cur_grid = this; this.wrapper.addClass("grid-row-open"); - if(!frappe.dom.is_element_in_viewport(this.wrapper)) { - frappe.utils.scroll_to(this.wrapper, true, 15); + if (!frappe.dom.is_element_in_viewport(this.wrapper) + && !frappe.dom.is_element_in_modal(this.wrapper)) { + // -15 offset to make form look visually centered + frappe.utils.scroll_to(this.wrapper, true, -15); } - if(this.frm) { + if (this.frm) { this.frm.script_manager.trigger(this.doc.parentfield + "_on_form_rendered"); this.frm.script_manager.trigger("form_render", this.doc.doctype, this.doc.name); } @@ -550,7 +552,9 @@ export default class GridRow { hide_form() { frappe.dom.unfreeze(); this.row.toggle(true); - frappe.utils.scroll_to(this.row, true, 15); + if (!frappe.dom.is_element_in_modal(this.row)) { + frappe.utils.scroll_to(this.row, true, 15); + } this.refresh(); if(cur_frm) cur_frm.cur_grid = null; this.wrapper.removeClass("grid-row-open"); From 44b78e7fb21da754355ef11482c0d325cab8be79 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sun, 26 Apr 2020 20:47:11 +0530 Subject: [PATCH 227/337] fix: proper sass mapping and always failing test --- rollup/config.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rollup/config.js b/rollup/config.js index 5f0b2bc60a..e4dbdc6053 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -109,7 +109,7 @@ function get_rollup_options_for_js(output_file, input_files) { function get_rollup_options_for_css(output_file, input_files) { const output_path = path.resolve(assets_path, output_file); - const minimize_css = output_path.startsWith('css/') && production; + const starts_with_css = output_file.startsWith('css/'); const plugins = [ // enables array of inputs @@ -125,15 +125,24 @@ function get_rollup_options_for_css(output_file, input_files) { path.resolve(get_public_path('frappe'), 'less') ] }], - ['sass', get_options_for_scss()] + ['sass', { + ...get_options_for_scss(), + outFile: output_path, + sourceMapContents: true + }] ], include: [ path.resolve(bench_path, '**/*.less'), path.resolve(bench_path, '**/*.scss'), path.resolve(bench_path, '**/*.css') ], +<<<<<<< Updated upstream minimize: minimize_css, sourceMap: output_file.startsWith('css/') && !production +======= + minimize: starts_with_css && production, + sourceMap: starts_with_css && !production +>>>>>>> Stashed changes }) ]; From 4d80b592e29d21ad383b579f09909cdf6ca20762 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Sun, 26 Apr 2020 20:48:21 +0530 Subject: [PATCH 228/337] fix: merge conflict --- rollup/config.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rollup/config.js b/rollup/config.js index e4dbdc6053..a88b966916 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -136,13 +136,8 @@ function get_rollup_options_for_css(output_file, input_files) { path.resolve(bench_path, '**/*.scss'), path.resolve(bench_path, '**/*.css') ], -<<<<<<< Updated upstream - minimize: minimize_css, - sourceMap: output_file.startsWith('css/') && !production -======= minimize: starts_with_css && production, sourceMap: starts_with_css && !production ->>>>>>> Stashed changes }) ]; From c4c71bc5391fc1294a8fb6c020f6464723278cb1 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Sun, 26 Apr 2020 21:26:28 +0530 Subject: [PATCH 229/337] fix: initialise filters in Dashboard Chart --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 36a75bd9d5..7bed8f4504 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -79,7 +79,7 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d to_date = chart.to_date timegrain = time_interval or chart.time_interval - filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json) + filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json) or [] # don't include cancelled documents filters.append([chart.document_type, 'docstatus', '<', 2, False]) From 273df7d51cbf473c3cac857788b1fc4d6521348e Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Sun, 26 Apr 2020 22:40:57 +0530 Subject: [PATCH 230/337] fix: Labels in Users Desk Page --- frappe/core/desk_page/users/users.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/desk_page/users/users.json b/frappe/core/desk_page/users/users.json index 30455b86e6..f1f43a4ef0 100644 --- a/frappe/core/desk_page/users/users.json +++ b/frappe/core/desk_page/users/users.json @@ -27,7 +27,7 @@ "idx": 0, "is_standard": 1, "label": "Users", - "modified": "2020-04-01 11:24:40.767676", + "modified": "2020-04-26 22:36:14.311554", "modified_by": "Administrator", "module": "Core", "name": "Users", @@ -46,12 +46,12 @@ "type": "DocType" }, { - "label": "permission-manager", + "label": "Permission Manager", "link_to": "permission-manager", "type": "Page" }, { - "label": "user-profile", + "label": "User Profile", "link_to": "user-profile", "type": "Page" } From 014c9798bf9251e6eefa7ddceea4be8972763f6c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 27 Apr 2020 13:15:09 +0530 Subject: [PATCH 231/337] fix: Handle empty values in Footer template --- .../web_template/footer_horizontal/footer_horizontal.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/website/web_template/footer_horizontal/footer_horizontal.html b/frappe/website/web_template/footer_horizontal/footer_horizontal.html index f4ec2a0696..10af7a7a34 100644 --- a/frappe/website/web_template/footer_horizontal/footer_horizontal.html +++ b/frappe/website/web_template/footer_horizontal/footer_horizontal.html @@ -1,7 +1,7 @@
    {%- if brand_image -%}
    - Brand Logo + {{ brand_label or 'Brand Logo' }}
    {%- endif -%}
    @@ -17,16 +17,18 @@ {%- endfor -%}
    + {%- if content -%}
    {{ content }}
    + {%- endif -%}
    - {{ address }} + {{ address or '' }}
    - {{ copyright }} + {{ copyright or '' }}
    From d8a0b8cc534ca983c8043a3df5dbf67ce14fab78 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 27 Apr 2020 14:35:47 +0530 Subject: [PATCH 232/337] fix: Allow Yes, No, Y, N values for Check fields --- frappe/core/doctype/data_import/importer_new.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 1f446cfb39..21b6065ff1 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -351,9 +351,9 @@ class Importer: value = cstr(value) # convert boolean values to 0 or 1 - if df.fieldtype == "Check" and value.lower().strip() in ["t", "f", "true", "false"]: + if df.fieldtype == "Check" and value.lower().strip() in ["t", "f", "true", "false", "yes", "no", "y", "n"]: value = value.lower().strip() - value = 1 if value in ["t", "true"] else 0 + value = 1 if value in ["t", "true", "y", "yes"] else 0 if df.fieldtype in ["Int", "Check"]: value = cint(value) From f9ff4e6af7aa2dd0d64a176fffec66f9578365c6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 27 Apr 2020 14:36:12 +0530 Subject: [PATCH 233/337] fix: Validate value only if it is set --- frappe/core/doctype/data_import/importer_new.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 21b6065ff1..3dcb902482 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -610,7 +610,7 @@ class Importer: "message": msg, } ) - return False + return elif df.fieldtype == "Link": d = self.get_missing_link_field_values(df.options) @@ -643,8 +643,10 @@ class Importer: if value in INVALID_VALUES: value = None - value = validate_value(value, df) - if value: + if value is not None: + value = validate_value(value, df) + + if value is not None: doc[df.fieldname] = self.parse_value(value, df) is_table = frappe.get_meta(doctype).istable From fc94add547d53926dc3810c3c357f7581efadf76 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 27 Apr 2020 14:36:32 +0530 Subject: [PATCH 234/337] fix: Show child table after fieldname in warnings --- frappe/core/doctype/data_import_beta/data_import_beta.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.js b/frappe/core/doctype/data_import_beta/data_import_beta.js index a594b213c5..82c490c524 100644 --- a/frappe/core/doctype/data_import_beta/data_import_beta.js +++ b/frappe/core/doctype/data_import_beta/data_import_beta.js @@ -337,7 +337,12 @@ frappe.ui.form.on('Data Import Beta', { let message = warnings_by_row[row_number] .map(w => { if (w.field) { - return `
  • ${w.field.label}: ${w.message}
    • `; + let label = + w.field.label + + (w.field.parent !== frm.doc.reference_doctype + ? ` (${w.field.parent})` + : ''); + return `
  • ${label}: ${w.message}
    • `; } return `
  • ${w.message}
    • `; }) From 51dfe2971b3b9a47cc6cdbad2ea58f3d8e170dab Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 27 Apr 2020 15:36:00 +0530 Subject: [PATCH 235/337] feat: rename section and added description to preview section --- frappe/website/doctype/blog_post/blog_post.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index f4f66c95ea..18e00e7905 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -133,7 +133,7 @@ { "fieldname": "seo_section", "fieldtype": "Section Break", - "label": "SEO Section" + "label": "SEO" }, { "fieldname": "meta_description", @@ -150,11 +150,12 @@ "label": "Meta Image" }, { + "description": "This is a test preview based on the meta description generated for this blog. The description can be of any length but Google will truncate it to 155 - 160 characters. You can also check the previews for Facebook and Twitter using their debugger tools. ", "fieldname": "section_break_20", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Google Search Preview" }, { - "description": "This is an example Google SERP Preview.", "fieldname": "google_preview", "fieldtype": "HTML", "label": "Google Snippet Preview", @@ -167,7 +168,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-04-22 20:07:37.324345", + "modified": "2020-04-27 15:12:02.179731", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", From fd15d2608cfbdce7f867ce85f8191ca8246ca293 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 27 Apr 2020 15:36:14 +0530 Subject: [PATCH 236/337] refactor: clean html for preview --- frappe/website/doctype/blog_post/blog_post.js | 56 +++++++------------ 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js index c40bf7cbe0..dea86b3b27 100644 --- a/frappe/website/doctype/blog_post/blog_post.js +++ b/frappe/website/doctype/blog_post/blog_post.js @@ -16,44 +16,26 @@ frappe.ui.form.on('Blog Post', { } }); function generate_google_search_preview(frm){ - frm.call('get_site_url').then((r)=>{ - let google_preview = frm.get_field("google_preview"); - let seo_title = (frm.doc.title).slice(0, 60); - let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); + let google_preview = frm.get_field("google_preview"); + let seo_title = (frm.doc.title).slice(0, 60); + let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); + let date = frm.doc.published_on ? new frappe.datetime.datetime(frm.doc.published_on).moment.format('ll') + ' - ' : ''; + let route_array = frm.doc.route.split('/'); + route_array.pop(); - google_preview.html(` - - -
    -
    -
    - -
    -
    -
    -
    - - ${ r.message + '/' + frm.doc.route } - -

    - - ${ seo_title } - -

    -

    - ${ frm.doc.published_on } - ${ seo_description } -

    -
    -
    -
    - -
    + google_preview.html(` + +
    + + ${frappe.boot.sitename} + › ${route_array.join(' › ')} + +
    + ${ seo_title }
    +

    + ${ date } ${ seo_description } +

    - `) - }); + `); } From b8512b689d317bdadcc56e396ce7542b162d9b4b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 27 Apr 2020 15:40:22 +0530 Subject: [PATCH 237/337] feat: clean up unused api and white spaces --- frappe/website/doctype/blog_post/blog_post.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 3e6ce3f1c8..ad57c8a667 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -37,7 +37,7 @@ class BlogPost(WebsiteGenerator): if self.published and not self.published_on: self.published_on = today() - + # update posts frappe.db.sql("""UPDATE `tabBlogger` SET `posts`=(SELECT COUNT(*) FROM `tabBlog Post` WHERE IFNULL(`blogger`,'')=`tabBlogger`.`name`) @@ -65,10 +65,10 @@ class BlogPost(WebsiteGenerator): context.content = get_html_content_based_on_type(self, 'content', self.content_type) - + #if meta description is not present, then blog intro or first 140 characters of the blog will be set as description context.description["description"] = self.meta_description or self.blog_intro or strip_html_tags(context.content[:140]) - + context.metatags = { "name": self.title, "description": context.description, @@ -76,7 +76,7 @@ class BlogPost(WebsiteGenerator): #if meta image is not present, then first image inside the blog will be set as the meta image image = find_first_image(context.content) - context.metatags["image"] = self.meta_image or image + context.metatags["image"] = self.meta_image or image self.load_comments(context) @@ -96,9 +96,6 @@ class BlogPost(WebsiteGenerator): context.comment_text = _('1 comment') else: context.comment_text = _('{0} comments').format(len(context.comment_list)) - - def get_site_url(self): - return frappe.utils.get_url() def get_list_context(context=None): list_context = frappe._dict( From 80a3288e72140cfba67d339d4038d77fffbf9e10 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 27 Apr 2020 15:54:21 +0530 Subject: [PATCH 238/337] fix: assignment error --- frappe/website/doctype/blog_post/blog_post.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index ad57c8a667..27ca122302 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -67,7 +67,7 @@ class BlogPost(WebsiteGenerator): context.content = get_html_content_based_on_type(self, 'content', self.content_type) #if meta description is not present, then blog intro or first 140 characters of the blog will be set as description - context.description["description"] = self.meta_description or self.blog_intro or strip_html_tags(context.content[:140]) + context.description = self.meta_description or self.blog_intro or strip_html_tags(context.content[:140]) context.metatags = { "name": self.title, From f62ce81866aa072e7b030820a949c43290d26e99 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 27 Apr 2020 15:54:59 +0530 Subject: [PATCH 239/337] refactor: explicitly set None --- frappe/website/doctype/blog_post/blog_post.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 27ca122302..e2e24afbab 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -76,7 +76,7 @@ class BlogPost(WebsiteGenerator): #if meta image is not present, then first image inside the blog will be set as the meta image image = find_first_image(context.content) - context.metatags["image"] = self.meta_image or image + context.metatags["image"] = self.meta_image or image or None self.load_comments(context) From fc3195537d040b94a885bed49a5a6a0c70b09b14 Mon Sep 17 00:00:00 2001 From: Michelle Alva <50285544+michellealva@users.noreply.github.com> Date: Mon, 27 Apr 2020 18:09:31 +0530 Subject: [PATCH 240/337] fix: change tooltip document types to type In Role Permissions Manager, the tooltip for document type shows document types. Changed it to document type --- frappe/core/page/permission_manager/permission_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index ed3b0d17db..3f5d7c0a7b 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -45,7 +45,7 @@ frappe.PermissionEngine = Class.extend({ setup_page: function() { var me = this; this.doctype_select - = this.wrapper.page.add_select(__("Document Types"), + = this.wrapper.page.add_select(__("Document Type"), [{value: "", label: __("Select Document Type")+"..."}].concat(this.options.doctypes)) .change(function() { frappe.set_route("permission-manager", $(this).val()); From fda7a45c52da717a1f52e565b2cd913bbe725bff Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Mon, 27 Apr 2020 18:25:16 +0530 Subject: [PATCH 241/337] fix: corrected flush job for passing test_flush --- frappe/email/queue.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index d4fbf798c5..a31ebe3f96 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -348,17 +348,20 @@ def flush(from_test=False): smtpserver = SMTPServer() smtpserver_dict[email.sender] = smtpserver - send_one_args = { - 'email': email.name, - 'smtpserver': smtpserver, - 'auto_commit': auto_commit, - 'from_test': from_test - } - enqueue( - method = 'frappe.email.queue.send_one', - queue = 'short', - **send_one_args - ) + if from_test: + send_one(email.name, smtpserver, auto_commit, from_test=from_test) + else: + send_one_args = { + 'email': email.name, + 'smtpserver': smtpserver, + 'auto_commit': auto_commit, + 'from_test': from_test + } + enqueue( + method = 'frappe.email.queue.send_one', + queue = 'short', + **send_one_args + ) # NOTE: removing commit here because we pass auto_commit # finally: @@ -387,8 +390,13 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False, from_test=Fals `tabEmail Queue` where name=%s - for update''', email, as_dict=True)[0] - + for update''', email, as_dict=True) + + if len(email): + email = email[0] + else: + return + recipients_list = frappe.db.sql('''select name, recipient, status from `tabEmail Queue Recipient` where parent=%s''', email.name, as_dict=1) From 6c7127000cb0de77194026ddff3243d25d2b4549 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 27 Apr 2020 19:17:48 +0530 Subject: [PATCH 242/337] fix(patch): reload doctype in patch --- frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py b/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py index 29732688c7..36e83e14e3 100644 --- a/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py +++ b/frappe/patches/v13_0/set_existing_dashboard_charts_as_public.py @@ -1,6 +1,8 @@ import frappe def execute(): + frappe.reload_doctype('Dashboard Chart') + if not frappe.db.table_exists('Dashboard Chart'): return From 3e09a085c389e7da4a25921f64a7eb52afc10c94 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Mon, 27 Apr 2020 20:02:34 +0530 Subject: [PATCH 243/337] fix: sanitize blog category before rendering reference id: ISS-20-21-00320 Signed-off-by: Chinmay D. Pai --- frappe/website/doctype/blog_post/blog_post.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 148ba15be7..b9cb0a1465 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -106,7 +106,7 @@ def get_list_context(context=None): title = _('Blog') ) - category = sanitize_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category) + category = frappe.utils.escape_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category) if category: category_title = get_blog_category(category) list_context.sub_title = _("Posts filed under {0}").format(category_title) @@ -149,7 +149,7 @@ def get_blog_category(route): def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by=None): conditions = [] - category = filters.blog_category or sanitize_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category) + category = filters.blog_category or frappe.utils.escape_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category) if filters: if filters.blogger: conditions.append('t1.blogger=%s' % frappe.db.escape(filters.blogger)) From 099a9bf851790af67d1870fbf9e1caec5556bb8b Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 27 Apr 2020 22:51:43 +0530 Subject: [PATCH 244/337] fix: add search fields to number cards link query --- .../desk/doctype/number_card/number_card.py | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index ecdcc56929..6157ba271c 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -112,9 +112,34 @@ def create_number_card(args): return doc def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): - or_filters = {'owner': frappe.session.user, 'is_public': 1} - return frappe.db.get_list('Number Card', - fields=['name', 'label'], + meta = frappe.get_meta(doctype) + searchfields = meta.get_search_fields() + search_conditions = [] + + if txt: + for field in searchfields: + search_conditions.append('`tab{doctype}`.`{field}` like %(txt)s'.format(field=field, doctype=doctype, txt=txt)) + + search_conditions = ' or '.join(search_conditions) + + search_conditions = 'and (' + search_conditions +')' if search_conditions else '' + conditions, values = frappe.db.build_conditions(filters) + values['txt'] = '%' + txt + '%' + + return frappe.db.sql( + '''select + `tabNumber Card`.name, `tabNumber Card`.label, `tabNumber Card`.document_type + from + `tabNumber Card` + where + {conditions} and + (`tabNumber Card`.owner = '{user}' or + `tabNumber Card`.is_public = 1) + {search_conditions} + '''.format( filters=filters, - or_filters=or_filters, - as_list = 1) \ No newline at end of file + user = frappe.session.user, + search_conditions = search_conditions, + conditions=conditions + ), values) + From d1ee6d163c2f0d58f0a9b8d6e821d9c794a4cbf2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 27 Apr 2020 22:52:41 +0530 Subject: [PATCH 245/337] fix: fix height of new card widget --- frappe/public/less/dashboard_view.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less index 6325a713d2..9a989400b2 100644 --- a/frappe/public/less/dashboard_view.less +++ b/frappe/public/less/dashboard_view.less @@ -12,7 +12,7 @@ } .new-number-card-widget { - min-height: 110px; + min-height: 100px; } } From 5f52e51e7b5b048ec7e972d55847fc83fe995e9b Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 27 Apr 2020 23:05:11 +0530 Subject: [PATCH 246/337] fix: add top margin to empty state message --- frappe/public/less/dashboard_view.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less index 9a989400b2..2b3d642cfb 100644 --- a/frappe/public/less/dashboard_view.less +++ b/frappe/public/less/dashboard_view.less @@ -16,6 +16,10 @@ } } + .empty-dashboard { + margin-top: 45px; + } + .page-form { height: 50px; From c8550120e4c80a949ebef90f46873f1f7a679c78 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Mon, 27 Apr 2020 23:01:36 +0530 Subject: [PATCH 247/337] chore: return if no string_type is found Signed-off-by: Chinmay D. Pai --- frappe/utils/data.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index acebfa2271..63aadd8f05 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -700,6 +700,9 @@ def strip_html(text): return _striptags_re.sub("", text) def escape_html(text): + if not isinstance(text, string_types): + return + html_escape_table = { "&": "&", '"': """, From b5a5365bfe5a8398b967693cce2c4aca93c4baa9 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Mon, 27 Apr 2020 23:07:36 +0530 Subject: [PATCH 248/337] chore: add missing return value Signed-off-by: Chinmay D. Pai --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 63aadd8f05..9ee683b12f 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -701,7 +701,7 @@ def strip_html(text): def escape_html(text): if not isinstance(text, string_types): - return + return text html_escape_table = { "&": "&", From 6efce72a3a4d8e158ad8948c0cc4fc9ccbfcbede Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 28 Apr 2020 09:21:48 +0530 Subject: [PATCH 249/337] fix(backup): Use fallback dbport if no port is set for a site --- frappe/utils/backups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 55dcdefe51..a4c2c4bb70 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -25,7 +25,7 @@ class BackupGenerator: def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, db_host="localhost", db_port=3306): self.db_host = db_host - self.db_port = db_port + self.db_port = db_port or 3306 self.db_name = db_name self.user = user self.password = password From 88d5ef1bd7183d965cdd47a57ebc4b50fbfb2ddc Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 10:40:24 +0530 Subject: [PATCH 250/337] fix: linitng fixes --- frappe/website/doctype/blog_post/blog_post.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js index dea86b3b27..adc03ca77e 100644 --- a/frappe/website/doctype/blog_post/blog_post.js +++ b/frappe/website/doctype/blog_post/blog_post.js @@ -15,7 +15,8 @@ frappe.ui.form.on('Blog Post', { generate_google_search_preview(frm); } }); -function generate_google_search_preview(frm){ + +function generate_google_search_preview(frm) { let google_preview = frm.get_field("google_preview"); let seo_title = (frm.doc.title).slice(0, 60); let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); From 205c852f1c5a9aea5427e45b4082c966cc783197 Mon Sep 17 00:00:00 2001 From: Abhishek Kedar <44434910+AKedar21@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:32:24 +0530 Subject: [PATCH 251/337] fix: removed from_test parameter in send_one function from_test parameter is not at all used anywhere in the send_one function so removed it, and its value will be always False. --- frappe/email/queue.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/email/queue.py b/frappe/email/queue.py index a31ebe3f96..ce512de276 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -349,13 +349,12 @@ def flush(from_test=False): smtpserver_dict[email.sender] = smtpserver if from_test: - send_one(email.name, smtpserver, auto_commit, from_test=from_test) + send_one(email.name, smtpserver, auto_commit) else: send_one_args = { 'email': email.name, 'smtpserver': smtpserver, 'auto_commit': auto_commit, - 'from_test': from_test } enqueue( method = 'frappe.email.queue.send_one', @@ -379,7 +378,7 @@ def get_queue(): limit 500''', { 'now': now_datetime() }, as_dict=True) -def send_one(email, smtpserver=None, auto_commit=True, now=False, from_test=False): +def send_one(email, smtpserver=None, auto_commit=True, now=False): '''Send Email Queue with given smtpserver''' email = frappe.db.sql('''select From f5a18a514e0b45804939ad20bf5928ccde5e5e57 Mon Sep 17 00:00:00 2001 From: Marica Date: Tue, 28 Apr 2020 12:31:36 +0530 Subject: [PATCH 252/337] fix: Validation on Select field with Default and no Options. (#10041) * fix: Validation on Select field with Default and no Options. * Apply suggestions from code review Co-Authored-By: Shivam Mishra * fix: Use frappe.bold() Co-authored-by: Shivam Mishra --- frappe/core/doctype/doctype/doctype.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index d922cfe166..0509ea9af7 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -733,8 +733,11 @@ def validate_fields(meta): d.default = '0' if d.fieldtype == "Check" and d.default not in ('0', '1'): frappe.throw(_("Default for 'Check' type of field must be either '0' or '1'")) - if d.fieldtype == "Select" and d.default and (d.default not in d.options.split("\n")): - frappe.throw(_("Default for {0} must be an option").format(d.fieldname)) + if d.fieldtype == "Select" and d.default: + if not d.options: + frappe.throw(_("Options for {0} must be set before setting the default value.").format(frappe.bold(d.fieldname))) + elif d.default not in d.options.split("\n"): + frappe.throw(_("Default value for {0} must be in the list of options.").format(frappe.bold(d.fieldname))) def check_precision(d): if d.fieldtype in ("Currency", "Float", "Percent") and d.precision is not None and not (1 <= cint(d.precision) <= 6): From 957aede112c1e5855d930bfca33ab8f9180a8690 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 13:09:24 +0530 Subject: [PATCH 253/337] fix: validate options for Table and Table Multiselect --- frappe/core/doctype/doctype/doctype.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index d922cfe166..2d671476f6 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -903,6 +903,16 @@ def validate_fields(meta): frappe.msgprint(text_str + df_options_str, title="Invalid Data Field", raise_exception=True) + def check_child_table_option(docfield): + if not docfield.fieldtype in ['Table MultiSelect', 'Table']: return + + doctype = docfield.options + meta = frappe.get_meta(doctype) + + if not meta.istable: + frappe.throw(_('Option {0} for field {1} is not a child table') + .format(frappe.bold(doctype), frappe.bold(docfield.fieldname)), title=_("Invalid Option")) + fields = meta.get("fields") fieldname_list = [d.fieldname for d in fields] @@ -931,6 +941,7 @@ def validate_fields(meta): check_illegal_default(d) check_unique_and_text(meta.get("name"), d) check_illegal_depends_on_conditions(d) + check_child_table_option(d) check_table_multiselect_option(d) scrub_options_in_select(d) scrub_fetch_from(d) From e47b138cb04880d236f50699920ffb504a45e978 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 28 Apr 2020 13:14:27 +0530 Subject: [PATCH 254/337] feat: add resize to customize options and enable for charts --- .../frappe/views/dashboard/dashboard_view.js | 1 + .../public/js/frappe/widgets/base_widget.js | 37 ++++++++++++++++--- .../public/js/frappe/widgets/chart_widget.js | 5 ++- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index a3fe931f49..946b68160b 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -141,6 +141,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { allow_create: true, allow_delete: true, allow_hiding: true, + allow_resize: true, }, custom_dialog: () => this.show_add_chart_dialog(), widgets: this.charts, diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index e2df42472a..bc9b7db985 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -27,14 +27,16 @@ export default class Widget { options.allow_delete && this.add_custom_button( '', - () => this.delete() + () => this.delete(), + "", + `${__('Delete')}` ); options.allow_sorting && this.add_custom_button( '', null, - "drag-handle" + "drag-handle", ); if (options.allow_hiding) { @@ -45,10 +47,12 @@ export default class Widget { this.footer.css("opacity", 0.5); } const classname = this.hidden ? 'fa fa-eye' : 'fa fa-eye-slash'; + const title = this.hidden ? `${__('Show')}` : `${__('Hide')}`; this.add_custom_button( ``, () => this.hide_or_show(), - "show-or-hide-button" + "show-or-hide-button", + title ); this.show_or_hide_button = this.action_area.find( @@ -62,6 +66,13 @@ export default class Widget { () => this.edit() ); + options.allow_resize && + this.add_custom_button( + '', + () => this.toggle_width(), + "", + `${__('Resize')}` + ); } make() { @@ -98,9 +109,9 @@ export default class Widget { } } - add_custom_button(html, action, class_name = "") { + add_custom_button(html, action, class_name = "", title="") { let button = $( - `` + `` ); button.click(event => { event.stopPropagation(); @@ -145,6 +156,18 @@ export default class Widget { this.edit_dialog.make(); } + toggle_width() { + if (!this.width) { + this.widget.addClass("full-width"); + this.width = 'Full'; + this.refresh(); + } else { + this.widget.removeClass("full-width"); + this.width = null; + this.refresh(); + } + } + hide_or_show() { if (!this.hidden) { this.body.css("opacity", 0.5); @@ -160,7 +183,9 @@ export default class Widget { this.show_or_hide_button.empty(); const classname = this.hidden ? 'fa fa-eye' : 'fa fa-eye-slash'; - $(``).appendTo( + const title = this.hidden ? `${__('Show')}` : `${__('Hide')}`; + + $(``).appendTo( this.show_or_hide_button ); } diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index b31949cd9d..425dcdf2b9 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -14,7 +14,8 @@ export default class ChartWidget extends Widget { name: this.name, chart_name: this.chart_name, label: this.label, - hidden: this.hidden + hidden: this.hidden, + width: this.width, }; } @@ -33,6 +34,8 @@ export default class ChartWidget extends Widget { this.widget.addClass("dashboard-widget-box"); if (this.width == "Full") { this.widget.addClass("full-width"); + } else { + this.widget.removeClass("full-width"); } } From 84c8d20ce9b39583394da2c2a0fe1bdaff448c7e Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 28 Apr 2020 13:41:32 +0530 Subject: [PATCH 255/337] fix: set resize button tooltip according to state --- .../public/js/frappe/widgets/base_widget.js | 25 +++++++++++++------ .../public/js/frappe/widgets/chart_widget.js | 2 -- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index bc9b7db985..ae5d27c36e 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -66,13 +66,19 @@ export default class Widget { () => this.edit() ); - options.allow_resize && + if (options.allow_resize) { + const title = this.width == 'Full'? `${__('Collapse')}` : `${__('Expand')}`; this.add_custom_button( '', () => this.toggle_width(), - "", - `${__('Resize')}` + "resize-button", + title ); + + this.resize_button = this.action_area.find( + ".resize-button" + ); + } } make() { @@ -157,15 +163,18 @@ export default class Widget { } toggle_width() { - if (!this.width) { - this.widget.addClass("full-width"); - this.width = 'Full'; - this.refresh(); - } else { + if (this.width == 'Full') { this.widget.removeClass("full-width"); this.width = null; this.refresh(); + } else { + this.widget.addClass("full-width"); + this.width = 'Full'; + this.refresh(); } + + const title = this.width == 'Full' ? `${__('Collapse')}` : `${__('Expand')}`; + this.resize_button.attr('title', title); } hide_or_show() { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 425dcdf2b9..78026aa869 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -34,8 +34,6 @@ export default class ChartWidget extends Widget { this.widget.addClass("dashboard-widget-box"); if (this.width == "Full") { this.widget.addClass("full-width"); - } else { - this.widget.removeClass("full-width"); } } From 79ffeac421495759420f98bc19b6a8fd20544365 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 28 Apr 2020 13:48:13 +0530 Subject: [PATCH 256/337] fix: remove unused option in widget config --- frappe/public/js/frappe/widgets/widget_group.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index bbf56189d7..7e685201f5 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -107,7 +107,6 @@ export default class WidgetGroup { container: this.body, type: this.type, custom_dialog: this.custom_dialog, - custom_dialog_function: this.custom_dialog_function, default_values: this.default_values, on_create: (config) => { // Remove new widget From ad66cfcb8ba105068d60b2fd633744830ee0b1fb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 13:44:52 +0530 Subject: [PATCH 257/337] fix: trigger after_load and after_save explicitly --- frappe/public/js/frappe/web_form/web_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 62a339f650..caec796f6d 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -29,7 +29,7 @@ export default class WebForm extends frappe.ui.FieldGroup { // webform client script frappe.init_client_script && frappe.init_client_script(); - frappe.web_form.events.trigger('after_load'); + this.after_load && this.after_load(); } on(fieldname, handler) { @@ -134,7 +134,7 @@ export default class WebForm extends frappe.ui.FieldGroup { if (!response.exc) { // Success this.handle_success(response.message); - frappe.web_form.events.trigger('after_save'); + this.after_save && this.after_save(); } }, always: function() { From 14d02cbbfb7f849c94de07f9c4238a86d7e26e19 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 13:55:47 +0530 Subject: [PATCH 258/337] fix: explicit check of return value of validate --- frappe/public/js/frappe/web_form/web_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index caec796f6d..13bba7064c 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -102,7 +102,9 @@ export default class WebForm extends frappe.ui.FieldGroup { } save() { - this.validate && this.validate(); + if (this.validate && !this.validate()) { + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation")) + } // validation hack: get_values will check for missing data let doc_values = super.get_values(this.allow_incomplete); From 80346e1bd6de3be4d028745ce6e4266a02a0807f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 14:00:04 +0530 Subject: [PATCH 259/337] fix: title --- frappe/public/js/frappe/web_form/web_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 13bba7064c..b2059d0c38 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -103,7 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup { save() { if (this.validate && !this.validate()) { - frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation")) + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")) } // validation hack: get_values will check for missing data From 689b68341e04cfadf067eeea6b9e04e23ec2f1c4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 28 Apr 2020 14:07:29 +0530 Subject: [PATCH 260/337] fix: Add `__unsaved` flag for newly created doc --- frappe/model/create_new.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py index 91fb079fca..2142d544fe 100644 --- a/frappe/model/create_new.py +++ b/frappe/model/create_new.py @@ -45,6 +45,7 @@ def make_new_doc(doctype): doc = doc.get_valid_dict(sanitize=False) doc["doctype"] = doctype doc["__islocal"] = 1 + doc["__unsaved"] = 1 return doc From 0c62b0629e6391801db4d3ae47a65622ac31d3f4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 28 Apr 2020 14:07:43 +0530 Subject: [PATCH 261/337] fix: Fix message for doc save without changes - To avoid confusion --- frappe/public/js/frappe/form/save.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index 7efbbe2d3d..8f88ff8db0 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -36,7 +36,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) { freeze_message: freeze_message }); } else { - frappe.show_alert({message: __("Document not updated"), indicator: "yellow"}); + frappe.show_alert({message: __("No changes in document"), indicator: "blue"}); $(btn).prop("disabled", false); } }; From 2190b44a6f46e028cee8773afcc23eca9f4f9ccf Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 19:06:58 +0530 Subject: [PATCH 262/337] fix (style): added semi-colon --- frappe/public/js/frappe/web_form/web_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index b2059d0c38..81b219aece 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -103,7 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup { save() { if (this.validate && !this.validate()) { - frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")) + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")); } // validation hack: get_values will check for missing data From a195421097b0ded8b531ce74ad9cf831f95780b1 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 28 Apr 2020 19:22:20 +0530 Subject: [PATCH 263/337] fix: do not check for frappe.conf.monitor while stopping monitor --- frappe/monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/monitor.py b/frappe/monitor.py index 7181bd92ad..cd365fd13f 100644 --- a/frappe/monitor.py +++ b/frappe/monitor.py @@ -23,7 +23,7 @@ def start(transaction_type="request", method=None, kwargs=None): def stop(response=None): - if frappe.conf.monitor and hasattr(frappe.local, "monitor"): + if hasattr(frappe.local, "monitor"): frappe.local.monitor.dump(response) From d49941f2d1bf760d8fbb98b1aa64f151cf00809a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 20:25:23 +0530 Subject: [PATCH 264/337] style: membership check --- frappe/core/doctype/doctype/doctype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 2d671476f6..09a5e999b0 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -904,7 +904,7 @@ def validate_fields(meta): frappe.msgprint(text_str + df_options_str, title="Invalid Data Field", raise_exception=True) def check_child_table_option(docfield): - if not docfield.fieldtype in ['Table MultiSelect', 'Table']: return + if docfield.fieldtype not in ['Table MultiSelect', 'Table']: return doctype = docfield.options meta = frappe.get_meta(doctype) From 031aad0d8524db5725a0fe4d43cb73d29a949c4e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 12:28:08 +0530 Subject: [PATCH 265/337] perf: Cache get_tables values - To avoid redundant db calls --- frappe/database/database.py | 11 ++++++++++- frappe/database/schema.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index b083ff1014..cc76745c2e 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -769,7 +769,16 @@ class Database(object): return ("tab" + doctype) in self.get_tables() def get_tables(self): - return [d[0] for d in self.sql("select table_name from information_schema.tables where table_schema not in ('pg_catalog', 'information_schema')")] + tables = frappe.cache().get_value('db_tables') + if not tables: + table_rows = self.sql(""" + SELECT table_name + FROM information_schema.tables + WHERE table_schema NOT IN ('pg_catalog', 'information_schema') + """) + tables = set([d[0] for d in table_rows]) + frappe.cache().set_value('db_tables', tables) + return tables def a_row_exists(self, doctype): """Returns True if atleast one row exists.""" diff --git a/frappe/database/schema.py b/frappe/database/schema.py index 28e055f382..3d484a1f1b 100644 --- a/frappe/database/schema.py +++ b/frappe/database/schema.py @@ -31,6 +31,7 @@ class DBTable: def sync(self): if self.is_new(): + frappe.cache().delete_key('db_tables') self.create() else: frappe.cache().hdel('table_columns', self.table_name) From 8002bd2da88dcfa8038e36668bfd262e8999f09b Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 13:37:20 +0530 Subject: [PATCH 266/337] fix: formatting --- frappe/desk/doctype/number_card/number_card.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 6157ba271c..4e5047b5d4 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -10,8 +10,7 @@ class NumberCard(Document): pass -def get_permission_query_conditions(user): - +def get_permission_query_conditions(user=None): if not user: user = frappe.session.user @@ -65,7 +64,7 @@ def get_result(doc, to_date=None): if to_date: filters.append([doc.document_type, 'creation', '<', to_date, False]) - number = frappe.db.get_all(doc.document_type, fields = fields, filters = filters)[0]['result'] + number = frappe.db.get_all(doc.document_type, fields=fields, filters=filters)[0]['result'] frappe.db.set_value('Number Card', doc.name, 'previous_result', number) return number @@ -138,8 +137,8 @@ def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters): {search_conditions} '''.format( filters=filters, - user = frappe.session.user, - search_conditions = search_conditions, + user=frappe.session.user, + search_conditions=search_conditions, conditions=conditions ), values) From ec9463c105a2a2059e3fcd3e08a9124bea86d180 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 13:48:37 +0530 Subject: [PATCH 267/337] fix: check if list is empty --- frappe/desk/doctype/number_card/number_card.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index 4e5047b5d4..e26d5cc9a5 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -64,7 +64,8 @@ def get_result(doc, to_date=None): if to_date: filters.append([doc.document_type, 'creation', '<', to_date, False]) - number = frappe.db.get_all(doc.document_type, fields=fields, filters=filters)[0]['result'] + res = frappe.db.get_all(doc.document_type, fields=fields, filters=filters) + number = res[0]['result'] if res else 0 frappe.db.set_value('Number Card', doc.name, 'previous_result', number) return number From 6833cbe8224bb08e220e2b3b584b33392d8a47a5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 13:49:32 +0530 Subject: [PATCH 268/337] fix: add number card to translation comment --- frappe/public/js/frappe/widgets/new_widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/new_widget.js b/frappe/public/js/frappe/widgets/new_widget.js index 66fa88b761..e0cfd51ab4 100644 --- a/frappe/public/js/frappe/widgets/new_widget.js +++ b/frappe/public/js/frappe/widgets/new_widget.js @@ -18,7 +18,7 @@ export default class NewWidget { get_title() { // DO NOT REMOVE: Comment to load translation - // __("New Chart") __("New Shortcut") + // __("New Chart") __("New Shortcut") __("New Number Card") return __(`New ${frappe.model.unscrub(this.type)}`); } From 651109bb004fa9edd9a400358b1db7e6ffed3019 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 14:07:51 +0530 Subject: [PATCH 269/337] fix: Translatable string --- frappe/database/schema.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/database/schema.py b/frappe/database/schema.py index 3d484a1f1b..9c7008a8ed 100644 --- a/frappe/database/schema.py +++ b/frappe/database/schema.py @@ -144,10 +144,9 @@ class DBTable: if max_length and max_length[0][0] and max_length[0][0] > new_length: if col.fieldname in self.columns: self.columns[col.fieldname].length = current_length - - frappe.msgprint(_("""Reverting length to {0} for '{1}' in '{2}'; - Setting the length as {3} will cause truncation of data.""") - .format(current_length, col.fieldname, self.doctype, new_length)) + info_message = _("Reverting length to {0} for '{1}' in '{2}'. Setting the length as {3} will cause truncation of data.") \ + .format(current_length, col.fieldname, self.doctype, new_length) + frappe.msgprint(info_message) def is_new(self): return self.table_name not in frappe.db.get_tables() From 7a6a9b2b207733dc77821b2e5d382fe28e89bc2a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 14:15:06 +0530 Subject: [PATCH 270/337] fix: Use standard button components in Hero --- frappe/website/web_template/hero/hero.html | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/frappe/website/web_template/hero/hero.html b/frappe/website/web_template/hero/hero.html index a3fb4aa466..e7b69ab782 100644 --- a/frappe/website/web_template/hero/hero.html +++ b/frappe/website/web_template/hero/hero.html @@ -9,22 +9,12 @@

    {%- endif -%} {%- if primary_action or secondary_action -%} -
    +
    {%- if primary_action -%} -
    - - {{ primary_action_label }} - -
    + {{ c('button', label=primary_action_label, url=primary_action, variant="primary", size="large") }} {%- endif -%} {%- if secondary_action -%} -
    - - {{ secondary_action_label }} - -
    + {{ c('button', label=secondary_action_label, url=secondary_action, variant="secondary", size="large", class="ml-4") }} {%- endif -%}
    {%- endif -%} From 811d0d64d90986bf637b0c4608327e212766ddd7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 14:15:46 +0530 Subject: [PATCH 271/337] fix: Option to bleed image outside Hero --- .../hero_with_right_image.html | 16 ++++++++++++---- .../hero_with_right_image.json | 8 +++++++- .../website/website_theme/standard/standard.json | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html index 57a1a02af7..11d49eb287 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -1,5 +1,5 @@
    -
    +

    @@ -22,8 +22,16 @@

    {%- if image -%} - + {{ c('image_with_blur', + class=["hidden md:block", "w-full md:w-6/12" if contain_image else "md:max-w-md lg:max-w-lg xl:max-w-xl xxl:max-w-2xl"], + src=image, + alt="") + }} {%- endif -%}
    + +{%- if not contain_image -%} + +{%- endif -%} diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json index bb841a3156..3cb4701e7c 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.json @@ -21,6 +21,12 @@ "label": "Image", "reqd": 0 }, + { + "fieldname": "contain_image", + "fieldtype": "Check", + "label": "Restrict Image inside Container", + "reqd": 0 + }, { "fieldname": "primary_action_label", "fieldtype": "Data", @@ -47,7 +53,7 @@ } ], "idx": 0, - "modified": "2020-04-26 15:08:26.937576", + "modified": "2020-04-29 14:12:31.613545", "modified_by": "Administrator", "name": "Hero with Right Image", "owner": "Administrator", diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index ca9e81bf27..1729e4616a 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -10,7 +10,7 @@ "font_properties": "300,600", "footer": [], "idx": 26, - "modified": "2020-04-24 23:52:27.211811", + "modified": "2020-04-29 12:26:48.399125", "modified_by": "Administrator", "module": "Website", "name": "Standard", From a5724699c61b9a918172c03da3faff732cfe0cbd Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 14:03:26 +0530 Subject: [PATCH 272/337] fix: formatting --- .../js/frappe/views/dashboard/dashboard_view.js | 4 ++-- frappe/public/js/frappe/widgets/base_widget.js | 2 +- frappe/public/js/frappe/widgets/chart_widget.js | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 946b68160b..40cbd1986f 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -89,7 +89,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.$dashboard_wrapper.empty(); frappe.dashboard_utils.get_dashboard_settings().then(settings => { - this.dashboard_chart_settings = settings.chart_config? JSON.parse(settings.chart_config): {}; + this.dashboard_chart_settings = settings.chart_config ? JSON.parse(settings.chart_config) : {}; this.charts.map(chart => { chart.label = chart.chart_name; chart.chart_settings = this.dashboard_chart_settings[chart.chart_name] || {}; @@ -398,7 +398,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { let chart = values; if (chart.new_or_existing == 'New Chart') { chart.chart_name = chart.label; - chart.chart_type = chart.chart_type == 'Time Series'? chart.chart_function: chart.chart_type; + chart.chart_type = chart.chart_type == 'Time Series' ? chart.chart_function : chart.chart_type; chart.document_type = this.doctype; chart.filters_json = '[]'; frappe.xcall('frappe.desk.doctype.dashboard_chart.dashboard_chart.create_dashboard_chart', {'args': chart}).then((doc)=> { diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index ae5d27c36e..aea26d762d 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -109,7 +109,7 @@ export default class Widget { } set_title(max_chars) { - this.title_field[0].innerHTML = max_chars? frappe.ellipsis(this.label, max_chars): this.label; + this.title_field[0].innerHTML = max_chars ? frappe.ellipsis(this.label, max_chars) : this.label; if (max_chars) { this.title_field[0].setAttribute('title', this.label); } diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 78026aa869..68811a81ae 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -26,7 +26,7 @@ export default class ChartWidget extends Widget { } set_chart_title() { - const max_chars = this.widget.width() < 500? 20: 60; + const max_chars = this.widget.width() < 500 ? 20 : 60; this.set_title(max_chars); } @@ -455,11 +455,10 @@ export default class ChartWidget extends Widget { chart_name: this.chart_doc.name, filters: filters, refresh: refresh ? 1 : 0, - time_interval: - args && args.time_interval? args.time_interval: null, - timespan: args && args.timespan? args.timespan: null, - from_date: args && args.from_date? args.from_date: null, - to_date: args && args.to_date? args.to_date: null + time_interval: args && args.time_interval ? args.time_interval : null, + timespan: args && args.timespan ? args.timespan : null, + from_date: args && args.from_date ? args.from_date : null, + to_date: args && args.to_date ? args.to_date : null }; } return frappe.xcall(method, args); From bf3a80f05de7fc9dbcf41d2199d71c832cbc5148 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 14:39:14 +0530 Subject: [PATCH 273/337] fix: Directly used set comprehension As indicated by deepsource --- frappe/database/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index cc76745c2e..103538944c 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -776,7 +776,7 @@ class Database(object): FROM information_schema.tables WHERE table_schema NOT IN ('pg_catalog', 'information_schema') """) - tables = set([d[0] for d in table_rows]) + tables = set(d[0] for d in table_rows) frappe.cache().set_value('db_tables', tables) return tables From a73be732fd55d1ba8a2952ab9043530a8ef2ad75 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 29 Apr 2020 16:43:01 +0530 Subject: [PATCH 274/337] refactor: Fix redundant cache value set --- frappe/database/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 103538944c..3092e6c0ae 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -777,7 +777,7 @@ class Database(object): WHERE table_schema NOT IN ('pg_catalog', 'information_schema') """) tables = set(d[0] for d in table_rows) - frappe.cache().set_value('db_tables', tables) + frappe.cache().set_value('db_tables', tables) return tables def a_row_exists(self, doctype): From 109d2e7f12c4b8786d21abd09beac2987e1027f9 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Wed, 29 Apr 2020 17:33:20 +0530 Subject: [PATCH 275/337] rename seo section to meta tags --- .../website/doctype/blog_post/blog_post.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index 18e00e7905..04e349a2b0 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -22,7 +22,7 @@ "content_md", "content_html", "email_sent", - "seo_section", + "meta_tags", "meta_description", "column_break_18", "meta_image", @@ -130,11 +130,6 @@ "fieldtype": "Check", "label": "Disable Comments" }, - { - "fieldname": "seo_section", - "fieldtype": "Section Break", - "label": "SEO" - }, { "fieldname": "meta_description", "fieldtype": "Small Text", @@ -150,16 +145,20 @@ "label": "Meta Image" }, { - "description": "This is a test preview based on the meta description generated for this blog. The description can be of any length but Google will truncate it to 155 - 160 characters. You can also check the previews for Facebook and Twitter using their debugger tools. ", "fieldname": "section_break_20", - "fieldtype": "Section Break", - "label": "Google Search Preview" + "fieldtype": "Section Break" }, { + "description": "This is an example Google SERP Preview.", "fieldname": "google_preview", "fieldtype": "HTML", "label": "Google Snippet Preview", "read_only": 1 + }, + { + "fieldname": "meta_tags", + "fieldtype": "Section Break", + "label": "Meta Tags" } ], "has_web_view": 1, @@ -168,7 +167,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-04-27 15:12:02.179731", + "modified": "2020-04-29 17:32:41.055883", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", From e4731d0fd7d86a69d657a9f7e4efb503bd88169e Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 16:06:52 +0530 Subject: [PATCH 276/337] fix: fix indent --- .../public/js/frappe/widgets/number_card_widget.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 4766d97e92..741b7cc6ea 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -193,19 +193,23 @@ export default class NumberCardWidget extends Widget { } set_card_actions(actions) { + /* eslint-disable indent */ this.card_actions = $(`
    `); + /* eslint-disable indent */ this.card_actions.find("a[data-action]").each((i, o) => { const action = o.dataset.action; From 10b4f1335cfd35395dba2165aa6db24168a44cbf Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 18:27:51 +0530 Subject: [PATCH 277/337] fix: Only show "No changes in document" if form is not dirty --- frappe/public/js/frappe/form/save.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index 8f88ff8db0..8386cb6c7e 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -36,7 +36,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) { freeze_message: freeze_message }); } else { - frappe.show_alert({message: __("No changes in document"), indicator: "blue"}); + !frm.is_dirty() && frappe.show_alert({message: __("No changes in document"), indicator: "blue"}); $(btn).prop("disabled", false); } }; From 8735683635bebd125e5e4869e2a74cd3d00ea988 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 18:59:33 +0530 Subject: [PATCH 278/337] refactor: Remove Webview feature --- frappe/website/doctype/css_class/__init__.py | 0 frappe/website/doctype/css_class/css_class.js | 8 - .../website/doctype/css_class/css_class.json | 60 ------- frappe/website/doctype/css_class/css_class.py | 10 -- .../doctype/css_class/test_css_class.py | 10 -- frappe/website/doctype/web_view/__init__.py | 0 .../doctype/web_view/templates/web_view.html | 7 - .../web_view/templates/web_view_content.html | 83 ---------- .../web_view/templates/web_view_row.html | 4 - .../website/doctype/web_view/test_web_view.py | 115 ------------- frappe/website/doctype/web_view/web_view.js | 8 - frappe/website/doctype/web_view/web_view.json | 154 ------------------ frappe/website/doctype/web_view/web_view.py | 104 ------------ .../doctype/web_view_component/__init__.py | 0 .../web_view_component.json | 146 ----------------- .../web_view_component/web_view_component.py | 10 -- 16 files changed, 719 deletions(-) delete mode 100644 frappe/website/doctype/css_class/__init__.py delete mode 100644 frappe/website/doctype/css_class/css_class.js delete mode 100644 frappe/website/doctype/css_class/css_class.json delete mode 100644 frappe/website/doctype/css_class/css_class.py delete mode 100644 frappe/website/doctype/css_class/test_css_class.py delete mode 100644 frappe/website/doctype/web_view/__init__.py delete mode 100644 frappe/website/doctype/web_view/templates/web_view.html delete mode 100644 frappe/website/doctype/web_view/templates/web_view_content.html delete mode 100644 frappe/website/doctype/web_view/templates/web_view_row.html delete mode 100644 frappe/website/doctype/web_view/test_web_view.py delete mode 100644 frappe/website/doctype/web_view/web_view.js delete mode 100644 frappe/website/doctype/web_view/web_view.json delete mode 100644 frappe/website/doctype/web_view/web_view.py delete mode 100644 frappe/website/doctype/web_view_component/__init__.py delete mode 100644 frappe/website/doctype/web_view_component/web_view_component.json delete mode 100644 frappe/website/doctype/web_view_component/web_view_component.py diff --git a/frappe/website/doctype/css_class/__init__.py b/frappe/website/doctype/css_class/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/css_class/css_class.js b/frappe/website/doctype/css_class/css_class.js deleted file mode 100644 index 4544e249bf..0000000000 --- a/frappe/website/doctype/css_class/css_class.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2020, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('CSS Class', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/website/doctype/css_class/css_class.json b/frappe/website/doctype/css_class/css_class.json deleted file mode 100644 index 2a7e1e010e..0000000000 --- a/frappe/website/doctype/css_class/css_class.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "actions": [], - "allow_import": 1, - "allow_rename": 1, - "autoname": "Prompt", - "creation": "2020-03-17 15:03:31.431344", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "is_global", - "is_dynamic", - "css" - ], - "fields": [ - { - "default": "0", - "fieldname": "is_global", - "fieldtype": "Check", - "label": "Is Global?" - }, - { - "fieldname": "css", - "fieldtype": "Code", - "in_list_view": 1, - "label": "CSS", - "reqd": 1 - }, - { - "default": "0", - "description": "Website Theme elements are accessible as Jinja variables. Example: \"{{ primary_color }}\"", - "fieldname": "is_dynamic", - "fieldtype": "Check", - "label": "Is Dynamic?" - } - ], - "links": [], - "modified": "2020-03-17 17:01:14.874631", - "modified_by": "Administrator", - "module": "Website", - "name": "CSS Class", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Website Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/css_class/css_class.py b/frappe/website/doctype/css_class/css_class.py deleted file mode 100644 index cb9e7483d4..0000000000 --- a/frappe/website/doctype/css_class/css_class.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class CSSClass(Document): - pass diff --git a/frappe/website/doctype/css_class/test_css_class.py b/frappe/website/doctype/css_class/test_css_class.py deleted file mode 100644 index 551b44e3f2..0000000000 --- a/frappe/website/doctype/css_class/test_css_class.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestCSSClass(unittest.TestCase): - pass diff --git a/frappe/website/doctype/web_view/__init__.py b/frappe/website/doctype/web_view/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/web_view/templates/web_view.html b/frappe/website/doctype/web_view/templates/web_view.html deleted file mode 100644 index bf993c05fb..0000000000 --- a/frappe/website/doctype/web_view/templates/web_view.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "templates/web.html" %} - -{% block page_content %} - {% include "frappe/website/doctype/web_view/templates/web_view_content.html" %} -{% endblock %} - - \ No newline at end of file diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html deleted file mode 100644 index a1ac143639..0000000000 --- a/frappe/website/doctype/web_view/templates/web_view_content.html +++ /dev/null @@ -1,83 +0,0 @@ -{%- if css_rules or css -%} - - -{%- endif -%} - -{%- macro render_element(element) -%} - {%- if element.element_type in ('Content', 'Web View') -%} -
    - {{ element.web_content_html }} -
    - {%- elif element.element_type=='Image' -%} - - {%- endif -%} -{%- endmacro -%} - -{%- macro element_class(element) -%} - {{ element.element_class or "" }} -{%- endmacro -%} - -{%- macro element_style(element) -%} - {%- if element.element_style or element.background_color -%} - style = "{{ element.element_style or '' }} {%if element.background_color %}background-color: {{ element.background_color }};{% endif %}" - {%- endif -%} -{%- endmacro -%} - -{%- macro render_sections(sections) -%} -{%- for section in sections -%} -
    -
    - {%- if section.section_intro -%} -
    {{ section.section_intro }}
    - {%- endif -%} - - {%- if section.section_type == 'List' -%} - {%- for element in section.elements -%} - {{ render_element(element) }} - {%- endfor -%} - - {%- elif section.section_type == 'Grid' -%} -
    - {%- for element in section.elements -%} -
    - {{ render_element(element) }} -
    - {%- endfor -%} -
    - - {%- elif section.section_type == 'Tabbed' -%} - -
    - {%- for element in section.elements -%} -
    - {{ render_element(element) }} -
    - {%- endfor -%} -
    - - {%- endif -%} -
    -
    -{%- endfor -%} -{%- endmacro -%} - -{% if content_type == 'HTML' -%} -{{ content_html }} -{%- else -%} -{{ render_sections(sections) }} -{%- endif -%} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/templates/web_view_row.html b/frappe/website/doctype/web_view/templates/web_view_row.html deleted file mode 100644 index 2b999819cb..0000000000 --- a/frappe/website/doctype/web_view/templates/web_view_row.html +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py deleted file mode 100644 index 3dc072a6dd..0000000000 --- a/frappe/website/doctype/web_view/test_web_view.py +++ /dev/null @@ -1,115 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -from frappe.website.doctype.web_page.test_web_page import get_page_content - -test_dependencies = ['Web Page'] # for test - -class TestWebView(unittest.TestCase): - @classmethod - def setUpClass(cls): - frappe.delete_doc_if_exists('Web View', 'test-web-view') - frappe.delete_doc_if_exists('Web View', 'html-web-view') - frappe.delete_doc_if_exists('CSS Class', 'test-css-class') - - frappe.get_doc(dict( - doctype = 'CSS Class', - name = 'test-css-class', - css = '.test-class { color: red; }' - )).insert() - - # simple html webview - frappe.get_doc(dict( - doctype = 'Web View', - title = 'HTML Web View', - route = 'html-web-view', - published = 1, - content_type = 'HTML', - content_html = '

    Hello HTML

    ' - )).insert() - - # simple web view with components - - frappe.get_doc(dict( - doctype = 'Web View', - title = 'Test Web View', - route = 'test-web-view', - published = 1, - content_type = 'Components', - components = [ - dict( - element_type = 'Section', - section_type = 'List' - ), - dict( - element_type = 'Content', - web_content_type = 'Markdown', - web_content_markdown = '## Heading\n\nBody' - ), - dict( - element_type = 'Content', - web_content_type = 'HTML', - web_content_html = '
    Here is some HTML
    ' - ), - dict( - element_type = 'Section', - section_type = 'Grid' - ), - dict( - element_type = 'Content', - element_class = 'test-css-class', - web_content_type = 'Markdown', - web_content_markdown = 'Column 1' - ), - dict( - element_type = 'Content', - web_content_type = 'Markdown', - web_content_markdown = 'Column 2' - ), - dict( - element_type = 'Web View', - web_view = 'html-web-view', - ), - ] - )).insert() - - def test_web_view(self): - html = get_page_content('test-web-view') - self.assert_web_view_in_html(html) - - def test_html_web_view(self): - html = get_page_content('html-web-view') - self.assertTrue('Hello HTML' in html) - - def assert_web_view_in_html(self, html): - self.assertTrue('

    Heading

    ' in html) - self.assertTrue('
    Here is some HTML
    ' in html) - self.assertTrue('Column 1' in html) - self.assertTrue('Column 2' in html) - self.assertTrue('Hello HTML' in html) - self.assertTrue('.test-class { color: red; }' in html) - - def test_web_view_in_footer(self): - website_settings = frappe.get_single("Website Settings") - website_settings.footer_type = 'Web View' - website_settings.footer_web_view = 'test-web-view' - website_settings.save() - - html = get_page_content('test-web-page-1') - - website_settings.footer_type = 'Standard' - website_settings.footer_web_view = '' - website_settings.save() - - # web view should still come as footer - self.assert_web_view_in_html(html) - - html_without_footer = get_page_content('test-web-page-1') - - # no more footer - self.assertFalse('Column 1' in html_without_footer) diff --git a/frappe/website/doctype/web_view/web_view.js b/frappe/website/doctype/web_view/web_view.js deleted file mode 100644 index 449c0949b6..0000000000 --- a/frappe/website/doctype/web_view/web_view.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2020, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Web View', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json deleted file mode 100644 index d4ccbad0e4..0000000000 --- a/frappe/website/doctype/web_view/web_view.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "actions": [], - "allow_guest_to_view": 1, - "allow_import": 1, - "allow_rename": 1, - "beta": 1, - "creation": "2020-03-16 15:28:03.828741", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "route", - "column_break_4", - "full_width", - "published", - "section_break_6", - "content_type", - "content_html", - "components", - "style_section", - "css", - "metatags_section", - "meta_title", - "meta_description", - "meta_image" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1, - "unique": 1 - }, - { - "fieldname": "route", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Route" - }, - { - "default": "0", - "fieldname": "published", - "fieldtype": "Check", - "label": "Published" - }, - { - "fieldname": "css", - "fieldtype": "Code", - "label": "CSS" - }, - { - "fieldname": "column_break_4", - "fieldtype": "Column Break" - }, - { - "default": "0", - "fieldname": "full_width", - "fieldtype": "Check", - "label": "Full Width" - }, - { - "fieldname": "section_break_6", - "fieldtype": "Section Break", - "label": "Content" - }, - { - "default": "Components", - "fieldname": "content_type", - "fieldtype": "Select", - "label": "Content Type", - "options": "Components\nHTML", - "reqd": 1 - }, - { - "depends_on": "eval:doc.content_type==='Components'", - "fieldname": "components", - "fieldtype": "Table", - "label": "Components", - "options": "Web View Component" - }, - { - "depends_on": "eval:doc.content_type===\"HTML\"", - "fieldname": "content_html", - "fieldtype": "HTML Editor", - "label": "Content HTML" - }, - { - "fieldname": "style_section", - "fieldtype": "Section Break", - "label": "Style" - }, - { - "fieldname": "metatags_section", - "fieldtype": "Section Break", - "label": "Meta Tags" - }, - { - "fieldname": "meta_title", - "fieldtype": "Data", - "label": "Title" - }, - { - "fieldname": "meta_description", - "fieldtype": "Small Text", - "label": "Description" - }, - { - "fieldname": "meta_image", - "fieldtype": "Attach Image", - "label": "Image" - } - ], - "has_web_view": 1, - "is_published_field": "published", - "links": [], - "modified": "2020-04-22 00:54:23.413077", - "modified_by": "Administrator", - "module": "Website", - "name": "Web View", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Website Manager", - "share": 1, - "write": 1 - } - ], - "route": "route", - "sort_field": "creation", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py deleted file mode 100644 index 8b441579b6..0000000000 --- a/frappe/website/doctype/web_view/web_view.py +++ /dev/null @@ -1,104 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.website.website_generator import WebsiteGenerator -from frappe.utils import markdown -import frappe - -class WebView(WebsiteGenerator): - def get_context(self, context): - # group components into sections - if self.content_type=='Components': - self.build_components(context) - - self.set_metatags(context) - return context - - def build_components(self, context): - context.sections = [] - context.css_rules = [] - for component in self.components: - if not context.sections and component.element_type!='Section': - self.add_default_section(context) - - if component.element_type=='Section': - self.add_section(context, component) - else: - self.add_component(context, component) - - self.add_css_class(context, component) - self.add_color(component) - self.add_missing_semi(component) - - return context - - def add_section(self, context, component): - component.elements = [] - context.sections.append(component) - - if component.section_intro: - component.section_intro = markdown(component.section_intro) - - def add_component(self, context, component): - if component.hide: - return - - if component.element_type == 'Web View' and component.web_view: - component.web_content_html = frappe.get_doc('Web View', component.web_view).render_content() - - elif component.web_content_type == 'Markdown': - component.web_content_html = markdown(component.web_content_markdown) - - if component.title: - component.element_id = frappe.scrub(component.title) - - context.sections[-1].elements.append(component) - - def add_css_class(self, context, component): - # add css class definitions selected by the user - if component.element_class and not component.hide: - css, is_dynamic = frappe.db.get_value('CSS Class', component.element_class, ['css', 'is_dynamic']) - if is_dynamic: - css = frappe.render_template(css, self.get_theme()) - context.css_rules.append(css) - - def add_color(self, component): - # convert to css color - if component.background_color and not component.hide: - component.background_color = frappe.db.get_value('Color', - component.background_color, 'color', cache=True) - - def add_missing_semi(self, component): - if component.element_style and not component.element_style.strip().endswith(';'): - component.element_style = component.element_style.strip() + ';' - - def render_content(self): - # webview can be rendered as an object (see footer) - return frappe.render_template("frappe/website/doctype/web_view/templates/web_view_content.html", self.get_context(self.as_dict())) - - def get_theme(self): - # get theme properties - if not hasattr(self, '_theme'): - default_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme") - self._theme = frappe.get_value('Website Theme', default_theme, '*') - return self._theme - - def add_default_section(self, context): - # add a default section if not added - context.sections.append(frappe._dict( - element_type='Section', - section_type='List', - title='Default Section', - elements=[] - )) - - def set_metatags(self, context): - context.metatags = { - "name": self.meta_title or context.title, - "description": self.meta_description, - "image": self.meta_image - } - diff --git a/frappe/website/doctype/web_view_component/__init__.py b/frappe/website/doctype/web_view_component/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/web_view_component/web_view_component.json b/frappe/website/doctype/web_view_component/web_view_component.json deleted file mode 100644 index 15dd761c81..0000000000 --- a/frappe/website/doctype/web_view_component/web_view_component.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "actions": [], - "creation": "2020-03-16 15:25:17.530296", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "element_type", - "title", - "hide", - "contain_section_width", - "column_break_3", - "columns", - "background_color", - "element_class", - "element_style", - "section_break_5", - "web_view", - "section_type", - "web_content_type", - "web_content_html", - "web_content_markdown", - "image_url", - "section_intro" - ], - "fields": [ - { - "fieldname": "element_type", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Element Type", - "options": "Section\nContent\nImage\nWeb View", - "reqd": 1 - }, - { - "default": "List", - "depends_on": "eval:doc.element_type==='Section'", - "fieldname": "section_type", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Section Type", - "options": "List\nTabbed\nGrid" - }, - { - "default": "Markdown", - "depends_on": "eval:doc.element_type==='Content'", - "fieldname": "web_content_type", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Web Content Type", - "options": "Markdown\nHTML" - }, - { - "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'HTML'", - "fieldname": "web_content_html", - "fieldtype": "HTML Editor", - "label": "Web Content HTML" - }, - { - "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'Markdown'", - "fieldname": "web_content_markdown", - "fieldtype": "Markdown Editor", - "label": "Web Content Markdown" - }, - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title" - }, - { - "fieldname": "columns", - "fieldtype": "Int", - "label": "Columns" - }, - { - "fieldname": "element_class", - "fieldtype": "Link", - "label": "Element Class", - "options": "CSS Class" - }, - { - "fieldname": "section_break_5", - "fieldtype": "Section Break" - }, - { - "fieldname": "column_break_3", - "fieldtype": "Column Break" - }, - { - "depends_on": "eval:doc.element_type==='Image'", - "fieldname": "image_url", - "fieldtype": "Small Text", - "label": "Image URL" - }, - { - "depends_on": "eval:doc.element_type==='Section'", - "fieldname": "section_intro", - "fieldtype": "Markdown Editor", - "label": "Section Intro" - }, - { - "default": "0", - "fieldname": "hide", - "fieldtype": "Check", - "label": "Hide" - }, - { - "fieldname": "element_style", - "fieldtype": "Small Text", - "label": "Element Style" - }, - { - "default": "0", - "depends_on": "eval:doc.element_type==='Section'", - "fieldname": "contain_section_width", - "fieldtype": "Check", - "label": "Contain Section Width" - }, - { - "fieldname": "background_color", - "fieldtype": "Link", - "label": "Background Color", - "options": "Color" - }, - { - "depends_on": "eval:doc.element_type==='Web View'", - "fieldname": "web_view", - "fieldtype": "Link", - "label": "Web View", - "options": "Web View" - } - ], - "istable": 1, - "links": [], - "modified": "2020-04-19 03:02:53.233036", - "modified_by": "Administrator", - "module": "Website", - "name": "Web View Component", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/web_view_component/web_view_component.py b/frappe/website/doctype/web_view_component/web_view_component.py deleted file mode 100644 index dcf1726c4a..0000000000 --- a/frappe/website/doctype/web_view_component/web_view_component.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class WebViewComponent(Document): - pass From 74f0f3019b631236ab602a5944e9fab04962d338 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 19:24:26 +0530 Subject: [PATCH 279/337] fix: make arrow on select box clickable --- frappe/public/less/controls.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less index d88e6adaec..564c77c07f 100644 --- a/frappe/public/less/controls.less +++ b/frappe/public/less/controls.less @@ -162,6 +162,6 @@ top: 8px; height: 15px; right: 12px; - top: 8px; + pointer-events: none; } } From ee3d0ee2a4901db8d63c830fe0f3f2270fc4bf7f Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 19:58:20 +0530 Subject: [PATCH 280/337] fix: fix error for child table in_list_view check --- frappe/core/doctype/doctype/doctype.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 0509ea9af7..31beabc56a 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -712,9 +712,10 @@ def validate_fields(meta): if d.fieldtype == "Currency" and cint(d.width) < 100: frappe.throw(_("Max width for type Currency is 100px in row {0}").format(d.idx)) - def check_in_list_view(d): + def check_in_list_view(is_table, d): if d.in_list_view and (d.fieldtype in not_allowed_in_list_view): - frappe.throw(_("'In List View' not allowed for type {0} in row {1}").format(d.fieldtype, d.idx)) + property_label = 'In Grid View' if is_table else 'In List View' + frappe.throw(_("'{0}' not allowed for type {1} in row {2}").format(property_label, d.fieldtype, d.idx)) def check_in_global_search(d): if d.in_global_search and d.fieldtype in no_value_fields: @@ -929,7 +930,7 @@ def validate_fields(meta): check_link_table_options(meta.get("name"), d) check_dynamic_link_options(d) check_hidden_and_mandatory(meta.get("name"), d) - check_in_list_view(d) + check_in_list_view(meta.get('istable'), d) check_in_global_search(d) check_illegal_default(d) check_unique_and_text(meta.get("name"), d) From 80da9bc85aaca4fa8d296d57e7f85ed74482039f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 29 Apr 2020 20:05:54 +0530 Subject: [PATCH 281/337] fix: Patch to remove webview --- frappe/patches/v13_0/remove_web_view.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 frappe/patches/v13_0/remove_web_view.py diff --git a/frappe/patches/v13_0/remove_web_view.py b/frappe/patches/v13_0/remove_web_view.py new file mode 100644 index 0000000000..7c9109fd03 --- /dev/null +++ b/frappe/patches/v13_0/remove_web_view.py @@ -0,0 +1,6 @@ +import frappe + +def execute(): + frappe.delete_doc_if_exists("DocType", "Web View") + frappe.delete_doc_if_exists("DocType", "Web View Component") + frappe.delete_doc_if_exists("DocType", "CSS Class") \ No newline at end of file From fb8ca03640b9be45a37bf755ef45d40fbfd69e6d Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 29 Apr 2020 21:42:24 +0530 Subject: [PATCH 282/337] fix: remove unnecessary set_value --- frappe/desk/doctype/number_card/number_card.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index e26d5cc9a5..41be5fac47 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -67,7 +67,6 @@ def get_result(doc, to_date=None): res = frappe.db.get_all(doc.document_type, fields=fields, filters=filters) number = res[0]['result'] if res else 0 - frappe.db.set_value('Number Card', doc.name, 'previous_result', number) return number @frappe.whitelist() From 2f821f9c2d27834142e1f89bbedbee9874c355c2 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Wed, 29 Apr 2020 21:58:00 +0530 Subject: [PATCH 283/337] chore: fix deepsource issues * use set comprehension instead of generator * remove redundant else statement Signed-off-by: Chinmay D. Pai --- frappe/database/database.py | 2 +- frappe/database/schema.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 3092e6c0ae..364f0c73cd 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -776,7 +776,7 @@ class Database(object): FROM information_schema.tables WHERE table_schema NOT IN ('pg_catalog', 'information_schema') """) - tables = set(d[0] for d in table_rows) + tables = {d[0] for d in table_rows} frappe.cache().set_value('db_tables', tables) return tables diff --git a/frappe/database/schema.py b/frappe/database/schema.py index 9c7008a8ed..83c22090eb 100644 --- a/frappe/database/schema.py +++ b/frappe/database/schema.py @@ -138,8 +138,7 @@ class DBTable: if frappe.db.is_missing_column(e): # Unknown column 'column_name' in 'field list' continue - else: - raise + raise if max_length and max_length[0][0] and max_length[0][0] > new_length: if col.fieldname in self.columns: From 551722c7254b77ccb391552168ecac871f587b34 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 23:01:16 +0530 Subject: [PATCH 284/337] fix: Ability to hide blocks --- frappe/templates/components/web_block.html | 2 ++ .../doctype/web_page_block/web_page_block.json | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/templates/components/web_block.html b/frappe/templates/components/web_block.html index d898417970..f0ed8f2df4 100644 --- a/frappe/templates/components/web_block.html +++ b/frappe/templates/components/web_block.html @@ -7,6 +7,7 @@ web_block.css_class ]) -%} +{%- if not web_block.hide_block -%} <{{htmltag}} class="{{ classes }}" data-section-idx="{{ web_block.idx | e }}" data-section-template="{{ web_block.web_template | e }}"> {%- if web_block.add_container -%} @@ -17,3 +18,4 @@
    {%- endif -%} +{%- endif -%} diff --git a/frappe/website/doctype/web_page_block/web_page_block.json b/frappe/website/doctype/web_page_block/web_page_block.json index b415567bd0..77f2e25469 100644 --- a/frappe/website/doctype/web_page_block/web_page_block.json +++ b/frappe/website/doctype/web_page_block/web_page_block.json @@ -12,7 +12,8 @@ "column_break_5", "add_container", "add_padding", - "add_shade" + "add_shade", + "hide_block" ], "fields": [ { @@ -54,18 +55,24 @@ "default": "0", "fieldname": "add_shade", "fieldtype": "Check", - "label": "Shaded Section" + "label": "Add Gray Background" }, { "default": "1", "fieldname": "add_container", "fieldtype": "Check", "label": "Add Container" + }, + { + "default": "0", + "fieldname": "hide_block", + "fieldtype": "Check", + "label": "Hide Block" } ], "istable": 1, "links": [], - "modified": "2020-04-19 16:16:44.524042", + "modified": "2020-04-29 15:08:25.976179", "modified_by": "Administrator", "module": "Website", "name": "Web Page Block", From 4620074db49d94db938f1b1bf0549a7abe9d3b2d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 23:02:22 +0530 Subject: [PATCH 285/337] fix: Add Section Break for Cards Section template --- .../web_template_field.json | 4 +- .../section_with_cards.json | 98 ++++++++++++++----- 2 files changed, 75 insertions(+), 27 deletions(-) diff --git a/frappe/website/doctype/web_template_field/web_template_field.json b/frappe/website/doctype/web_template_field/web_template_field.json index 09335adf3a..900655e207 100644 --- a/frappe/website/doctype/web_template_field/web_template_field.json +++ b/frappe/website/doctype/web_template_field/web_template_field.json @@ -31,7 +31,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Fieldtype", - "options": "Attach Image\nCheck\nData\nInt\nSelect\nSmall Text\nText\nMarkdown Editor", + "options": "Attach Image\nCheck\nData\nInt\nSelect\nSmall Text\nText\nMarkdown Editor\nSection Break\nColumn Break", "reqd": 1 }, { @@ -48,7 +48,7 @@ ], "istable": 1, "links": [], - "modified": "2020-04-24 17:05:25.322767", + "modified": "2020-04-29 14:53:23.192395", "modified_by": "Administrator", "module": "Website", "name": "Web Template Field", diff --git a/frappe/website/web_template/section_with_cards/section_with_cards.json b/frappe/website/web_template/section_with_cards/section_with_cards.json index 89426651ad..9ec430ae60 100644 --- a/frappe/website/web_template/section_with_cards/section_with_cards.json +++ b/frappe/website/web_template/section_with_cards/section_with_cards.json @@ -22,153 +22,201 @@ "options": "Small\nMedium\nLarge", "reqd": 0 }, + { + "fieldname": "card_1", + "fieldtype": "Section Break", + "label": "Card 1", + "reqd": 0 + }, { "fieldname": "card_1_title", "fieldtype": "Data", - "label": "Card 1 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_1_content", "fieldtype": "Small Text", - "label": "Card 1 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_1_url", "fieldtype": "Data", - "label": "Card 1 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_2", + "fieldtype": "Section Break", + "label": "Card 2", "reqd": 0 }, { "fieldname": "card_2_title", "fieldtype": "Data", - "label": "Card 2 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_2_content", "fieldtype": "Small Text", - "label": "Card 2 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_2_url", "fieldtype": "Data", - "label": "Card 2 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_3", + "fieldtype": "Section Break", + "label": "Card 3", "reqd": 0 }, { "fieldname": "card_3_title", "fieldtype": "Data", - "label": "Card 3 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_3_content", "fieldtype": "Small Text", - "label": "Card 3 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_3_url", "fieldtype": "Data", - "label": "Card 3 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_4", + "fieldtype": "Section Break", + "label": "Card 4", "reqd": 0 }, { "fieldname": "card_4_title", "fieldtype": "Data", - "label": "Card 4 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_4_content", "fieldtype": "Small Text", - "label": "Card 4 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_4_url", "fieldtype": "Data", - "label": "Card 4 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_5", + "fieldtype": "Section Break", + "label": "Card 5", "reqd": 0 }, { "fieldname": "card_5_title", "fieldtype": "Data", - "label": "Card 5 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_5_content", "fieldtype": "Small Text", - "label": "Card 5 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_5_url", "fieldtype": "Data", - "label": "Card 5 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_6", + "fieldtype": "Section Break", + "label": "Card 6", "reqd": 0 }, { "fieldname": "card_6_title", "fieldtype": "Data", - "label": "Card 6 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_6_content", "fieldtype": "Small Text", - "label": "Card 6 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_6_url", "fieldtype": "Data", - "label": "Card 6 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_7", + "fieldtype": "Section Break", + "label": "Card 7", "reqd": 0 }, { "fieldname": "card_7_title", "fieldtype": "Data", - "label": "Card 7 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_7_content", "fieldtype": "Small Text", - "label": "Card 7 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_7_url", "fieldtype": "Data", - "label": "Card 7 URL", + "label": "URL", + "reqd": 0 + }, + { + "fieldname": "card_8", + "fieldtype": "Section Break", + "label": "Card 8", "reqd": 0 }, { "fieldname": "card_8_title", "fieldtype": "Data", - "label": "Card 8 Title", + "label": "Title", "reqd": 0 }, { "fieldname": "card_8_content", "fieldtype": "Small Text", - "label": "Card 8 Content", + "label": "Content", "reqd": 0 }, { "fieldname": "card_8_url", "fieldtype": "Data", - "label": "Card 8 URL", + "label": "URL", "reqd": 0 } ], "idx": 0, - "modified": "2020-04-21 21:24:04.192839", + "modified": "2020-04-29 22:40:03.362229", "modified_by": "Administrator", "name": "Section with Cards", "owner": "Administrator", From 2bbe26ada024824faeadefb5d85cff774eef4376 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 23:02:43 +0530 Subject: [PATCH 286/337] fix: Max height for hero image --- .../hero_with_right_image/hero_with_right_image.html | 2 +- tailwind.config.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html index 11d49eb287..8efc46a1b7 100644 --- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html +++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html @@ -23,7 +23,7 @@
    {%- if image -%} {{ c('image_with_blur', - class=["hidden md:block", "w-full md:w-6/12" if contain_image else "md:max-w-md lg:max-w-lg xl:max-w-xl xxl:max-w-2xl"], + class=["hidden md:block max-h-144", "w-full md:w-6/12" if contain_image else "md:max-w-md lg:max-w-lg xl:max-w-xl xxl:max-w-2xl"], src=image, alt="") }} diff --git a/tailwind.config.js b/tailwind.config.js index e75ff16e85..03678ee166 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -46,6 +46,9 @@ module.exports = { borderRadius: { xl: '0.75rem' }, + maxHeight: { + '144': '36rem' + }, boxShadow: theme => ({ 'outline-primary': `0 0 0 3px ${rgba(theme('colors.blue.300'), 0.45)}` }), From 2788cf3d196cbf67bcfdc4ae182f2d2181c108bd Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 29 Apr 2020 23:03:46 +0530 Subject: [PATCH 287/337] fix: Clickable navbar button in firefox --- .../navbar_with_links_on_right.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html index ffa8be24da..01652f8c80 100644 --- a/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html +++ b/frappe/website/web_template/navbar_with_links_on_right/navbar_with_links_on_right.html @@ -6,8 +6,8 @@
    - -